Fixed issue with Symbol typing

wharfkit · Aug 21, 2023 · 3441ddd · 3441ddd
1 parent 7ea64c6
commit 3441ddd
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/codegen/interfaces.ts b/src/codegen/interfaces.ts
@@ -29,16 +29,17 @@ export function generateActionNamesInterface(abi: ABI.Def): ts.InterfaceDeclarat
 
 export function generateActionInterface(actionStruct, abi): ts.InterfaceDeclaration {
     const members = actionStruct.fields.map((field) => {
+        const typeReferenceNode = ts.factory.createTypeReferenceNode(
+            findParamTypeString(field.type, 'Types.', abi)
+        )
+
         return ts.factory.createPropertySignature(
             undefined,
             field.name.toLowerCase(),
             field.type.includes('?')
                 ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
                 : undefined,
-            ts.factory.createTypeReferenceNode(
-                findExternalType(field.type, abi, 'Types.'),
-                undefined
-            )
+            typeReferenceNode
         )
     })
 
@@ -68,3 +69,17 @@ export function generateActionsNamespace(abi: ABI.Def): ts.ModuleDeclaration {
         ts.NodeFlags.Namespace
     )
 }
+
+function findParamTypeString(typeString: string, namespace: string | null, abi: ABI.Def): string {
+    const fieldType = findExternalType(typeString, abi, namespace ? namespace : undefined)
+
+    if (['String', 'Boolean', 'Number'].includes(fieldType)) {
+        return fieldType.toLowerCase()
+    }
+
+    if (fieldType === 'Symbol') {
+        return 'Asset.SymbolType'
+    }
+
+    return fieldType
+}
diff --git a/test/data/contracts/mock-rewards.ts b/test/data/contracts/mock-rewards.ts
@@ -55,7 +55,7 @@ export namespace RewardsGm {
             amount?: AssetType
         }
         export interface Configure {
-            token_symbol: Symbol
+            token_symbol: Asset.SymbolType
             oracle_account: NameType
             oracle_pairs: Types.OraclePair[]
         }