ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inconsistency between walletTypeToResolveType and generateTypeDefName (#1318)

Browse Source
This commit is contained in:
ekzyis 2024-08-19 17:36:07 -05:00 committed by GitHub
parent a495c421ce
commit 6801b775c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/resolvers/wallet.js
View File

@ -13,7 +13,7 @@ import assertApiKeyNotPermitted from './apiKey'
import { bolt11Tags } from '@/lib/bolt11' import { bolt11Tags } from '@/lib/bolt11'
import { finalizeHodlInvoice } from 'worker/wallet' import { finalizeHodlInvoice } from 'worker/wallet'
import walletDefs from 'wallets/server' import walletDefs from 'wallets/server'
import { generateResolverName, walletTypeToResolveType } from '@/lib/wallet' import { generateResolverName, generateTypeDefName } from '@/lib/wallet'
import { lnAddrOptions } from '@/lib/lnurl' import { lnAddrOptions } from '@/lib/lnurl'
function injectResolvers (resolvers) { function injectResolvers (resolvers) {
@ -353,7 +353,7 @@ const resolvers = {
wallet: async (wallet) => { wallet: async (wallet) => {
return { return {
...wallet.wallet, ...wallet.wallet,
__resolveType: walletTypeToResolveType(wallet.type) __resolveType: generateTypeDefName(wallet.type)
} }
} }
}, },

4
api/typeDefs/wallet.js
View File

@ -38,7 +38,7 @@ function rawTypeDefs () {
.map(fieldToGqlArg) .map(fieldToGqlArg)
.map(s => ' ' + s) .map(s => ' ' + s)
.join('\n') .join('\n')
const typeDefName = generateTypeDefName(w.walletField) const typeDefName = generateTypeDefName(w.walletType)
const typeDef = `type ${typeDefName} {\n${args}\n}` const typeDef = `type ${typeDefName} {\n${args}\n}`
console.log(typeDef) console.log(typeDef)
return typeDef return typeDef
@ -46,7 +46,7 @@ function rawTypeDefs () {
let union = 'union WalletDetails = ' let union = 'union WalletDetails = '
union += walletDefs.map((w) => { union += walletDefs.map((w) => {
const typeDefName = generateTypeDefName(w.walletField) const typeDefName = generateTypeDefName(w.walletType)
return typeDefName return typeDefName
}).join(' | ') }).join(' | ')
console.log(union) console.log(union)

7
lib/wallet.js
View File

@ -11,12 +11,7 @@ export function generateResolverName (walletField) {
return `upsert${capitalized}` return `upsert${capitalized}`
} }
export function generateTypeDefName (walletField) { export function generateTypeDefName (walletType) {
return walletField[0].toUpperCase() + walletField.slice(1)
}
export function walletTypeToResolveType (walletType) {
// wallet type is in UPPER_CASE but __resolveType requires PascalCase
const PascalCase = walletType.split('_').map(s => s[0].toUpperCase() + s.slice(1).toLowerCase()).join('') const PascalCase = walletType.split('_').map(s => s[0].toUpperCase() + s.slice(1).toLowerCase()).join('')
return `Wallet${PascalCase}` return `Wallet${PascalCase}`
} }