fix: fixing failing tests

Author: dafuga

src/commands/contract/contract-utils.ts

@@ -0,0 +1,57 @@
+/**
+ * Shared utility functions for contract code generation.
+ * These are extracted to avoid circular dependencies between helpers.ts and finders.ts.
+ */
+
+const decorators = ['?', '[]']
+
+export function extractDecorator(type: string): {type: string; decorator?: string} {
+    for (const decorator of decorators) {
+        if (type.includes(decorator)) {
+            type = type.replace(decorator, '')
+
+            return {type, decorator}
+        }
+    }
+
+    return {type}
+}
+
+export function parseType(type: string): string {
+    type = type.replace('$', '')
+
+    if (type === 'String') {
+        return 'string'
+    }
+
+    if (type === 'String[]') {
+        return 'string[]'
+    }
+
+    if (type === 'Boolean') {
+        return 'boolean'
+    }
+
+    if (type === 'Boolean[]') {
+        return 'boolean[]'
+    }
+
+    return type
+}
+
+export function trim(string: string) {
+    return string.replace(/\s/g, '')
+}
+
+export function capitalize(string: string) {
+    if (typeof string !== 'string' || string.length === 0) {
+        return ''
+    }
+
+    return string.charAt(0).toUpperCase() + string.slice(1)
+}
+
+export function cleanupType(type: string): string {
+    return extractDecorator(parseType(trim(type))).type
+}
+

src/commands/contract/deploy.ts

@@ -454,14 +454,7 @@ export async function deployContract(
         console.log(`Transaction ID: ${result.resolved?.transaction.id}`)
     } catch (error) {
         const errorMessage = (error as Error).message
-        throw new Error(
-            `Failed to deploy contract: ${errorMessage}\n\n` +
-                `Make sure:\n` +
-                `1. The blockchain is running (wharfkit chain local start)\n` +
-                `2. The account "${accountName}" exists\n` +
-                `3. You have a wallet key with permissions for this account\n` +
-                `4. The ABI file exists alongside the WASM file`
-        )
+        throw new Error(`Failed to deploy contract: ${errorMessage}`)
     }
 }
 

src/commands/contract/finders.ts

@@ -1,6 +1,6 @@
 import * as Antelope from '@wharfkit/antelope'
 import type {ABI} from '@wharfkit/antelope'
-import {capitalize, extractDecorator, formatInternalType, parseType, trim} from './helpers'
+import {capitalize, extractDecorator, parseType, trim} from './contract-utils'
 import {formatClassName} from '../../utils'
 
 const ANTELOPE_CLASSES: string[] = []
@@ -125,13 +125,3 @@ export function findCoreClass(type: string): string | undefined {
     )
 }
 
-export function findInternalType(
-    type: string,
-    typeNamespace: string | undefined,
-    abi: ABI.Def
-): string {
-    const {type: typeString, decorator} = findType(type, abi, typeNamespace)
-
-    // TODO: inside findType, namespace is prefixed, but format internal is doing the same
-    return formatInternalType(typeString, typeNamespace, abi, decorator)
-}

src/commands/contract/helpers.ts

@@ -1,9 +1,13 @@
 import type {ABI} from '@wharfkit/antelope'
 import * as ts from 'typescript'
 import {formatClassName} from '../../utils'
+import {capitalize, extractDecorator, parseType, trim} from './contract-utils'
 import {findAbiType, findAliasFromType, findCoreClass, findCoreType, findVariant} from './finders'
 import type {TypeInterfaceDeclaration} from './interfaces'
 
+// Re-export utilities for backwards compatibility
+export {capitalize, extractDecorator, parseType, trim, cleanupType} from './contract-utils'
+
 export function getCoreImports(abi: ABI.Def) {
     const coreImports: string[] = []
     const coreTypes: string[] = []
@@ -211,55 +215,15 @@ export function formatInternalType(
     return `${type}${decorator}`
 }
 
-const decorators = ['?', '[]']
-export function extractDecorator(type: string): {type: string; decorator?: string} {
-    for (const decorator of decorators) {
-        if (type.includes(decorator)) {
-            type = type.replace(decorator, '')
-
-            return {type, decorator}
-        }
-    }
-
-    return {type}
-}
-
-export function cleanupType(type: string): string {
-    return extractDecorator(parseType(trim(type))).type
-}
-
-export function parseType(type: string): string {
-    type = type.replace('$', '')
-
-    if (type === 'String') {
-        return 'string'
-    }
-
-    if (type === 'String[]') {
-        return 'string[]'
-    }
-
-    if (type === 'Boolean') {
-        return 'boolean'
-    }
-
-    if (type === 'Boolean[]') {
-        return 'boolean[]'
-    }
-
-    return type
-}
-
-export function trim(string: string) {
-    return string.replace(/\s/g, '')
-}
-
-export function capitalize(string) {
-    if (typeof string !== 'string' || string.length === 0) {
-        return ''
-    }
+export function findInternalType(
+    type: string,
+    typeNamespace: string | undefined,
+    abi: ABI.Def
+): string {
+    const {type: typeString, decorator} = findAbiType(type, abi, typeNamespace)
 
-    return string.charAt(0).toUpperCase() + string.slice(1)
+    // TODO: inside findAbiType, namespace is prefixed, but formatInternalType is doing the same
+    return formatInternalType(typeString, typeNamespace, abi, decorator)
 }
 
 export function removeDuplicateInterfaces(

src/commands/contract/structs.ts

@@ -1,8 +1,7 @@
 import type {ABI} from '@wharfkit/antelope'
 import ts from 'typescript'
-import {extractDecorator, parseType} from './helpers'
+import {extractDecorator, findInternalType, parseType} from './helpers'
 import {formatClassName} from '../../utils'
-import {findInternalType} from './finders'
 
 interface FieldType {
     name: string