@5ive-tech/sdk 1.1.7 → 1.1.8

package/dist/config/ProgramIdResolver.d.ts

@@ -6,7 +6,7 @@
  * Baked program ID injected at release time (set by scripts/set-default-program-id.sh)
  * Empty string by default; overridden in npm published packages.
  */
-export declare const FIVE_BAKED_PROGRAM_ID = "";
+export declare const FIVE_BAKED_PROGRAM_ID = "4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d";
 /**
  * Centralized resolver for program IDs across all SDK operations.
  * Ensures consistent validation and error messaging.

package/dist/config/ProgramIdResolver.js

@@ -7,7 +7,7 @@ import { validator } from '../validation/index.js';
  * Baked program ID injected at release time (set by scripts/set-default-program-id.sh)
  * Empty string by default; overridden in npm published packages.
  */
-export const FIVE_BAKED_PROGRAM_ID = '';
+export const FIVE_BAKED_PROGRAM_ID = '4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d';
 /**
  * Centralized resolver for program IDs across all SDK operations.
  * Ensures consistent validation and error messaging.

package/dist/testing/AccountTestFixture.js

@@ -219,7 +219,7 @@ export class AccountTestFixture {
                 else if (spec.type === 'state' || spec.type === 'mutable') {
                     // Create state/mutable account with initial data
                     const space = 1024; // Default space
-                    const owner = options.fiveVMProgramId || new PublicKey('9MHGM73eszNUtmJS6ypDCESguxWhCBnkUPpTMyLGqURH');
+                    const owner = options.fiveVMProgramId || new PublicKey('4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d');
                     // Serialize state data if provided
                     let initialData;
                     if (spec.state && spec.type === 'state') {
@@ -242,7 +242,7 @@ export class AccountTestFixture {
                 else if (spec.type === 'init') {
                     // Create init account (will be initialized by script)
                     const space = 1024;
-                    const owner = options.fiveVMProgramId || new PublicKey('9MHGM73eszNUtmJS6ypDCESguxWhCBnkUPpTMyLGqURH');
+                    const owner = options.fiveVMProgramId || new PublicKey('4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d');
                     publicKey = await manager.createAccount(space, owner);
                     if (options.debug) {
                         console.log(`  ${spec.name} (init): ${publicKey.toString()}`);
@@ -256,7 +256,7 @@ export class AccountTestFixture {
                 else {
                     // Create readonly account
                     const space = 0;
-                    const owner = options.fiveVMProgramId || new PublicKey('9MHGM73eszNUtmJS6ypDCESguxWhCBnkUPpTMyLGqURH');
+                    const owner = options.fiveVMProgramId || new PublicKey('4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d');
                     publicKey = await manager.createAccount(space, owner);
                     if (options.debug) {
                         console.log(`  ${spec.name} (readonly): ${publicKey.toString()}`);

package/dist/testing/TestDiscovery.d.ts

@@ -13,6 +13,8 @@ export interface VSourceTest {
     file: string;
     functionName: string;
     parameters?: any[];
+    expectedResult?: any;
+    expectsResult?: boolean;
     description?: string;
 }
 /**
@@ -36,6 +38,8 @@ export interface DiscoveredTest {
     source?: VSourceTest;
     description?: string;
     parameters?: any[];
+    expectedResult?: any;
+    expectsResult?: boolean;
 }
 /**
  * Discover tests from directory
@@ -64,6 +68,8 @@ export declare class TestDiscovery {
      * Parse .v source file for test functions and parameters
      */
     private static parseVFile;
+    private static splitParamsAndExpectation;
+    private static parseTokenValue;
     /**
      * Compile a .v test source file
      */

package/dist/testing/TestDiscovery.js

@@ -6,7 +6,7 @@
  * extracts parameters from @test-params comments, and compiles source files.
  */
 import { readFile, readdir, stat } from 'fs/promises';
-import { join, basename } from 'path';
+import { basename, join } from 'path';
 import { FiveSDK } from '../FiveSDK.js';
 /**
  * Discover tests from directory
@@ -121,80 +121,62 @@ export class TestDiscovery {
         const tests = [];
         try {
             const content = await readFile(file, 'utf8');
-            // Find all function definitions with potential test annotations
-            // Pattern 1: pub function with #[test] annotation
-            // Pattern 2: function with specific naming convention (test_*, *_test)
             const lines = content.split('\n');
-            let currentFunction = null;
-            let currentParams = null;
-            let currentDescription = null;
+            let pendingParams;
             for (let i = 0; i < lines.length; i++) {
                 const line = lines[i].trim();
                 // Check for @test-params comment
-                const paramsMatch = line.match(/@test-params\s+(.*)/);
+                const paramsMatch = line.match(/@test-params(?:\s+(.*))?$/);
                 if (paramsMatch) {
                     try {
-                        const paramsStr = paramsMatch[1].trim();
-                        // Try to parse as JSON array first
-                        if (paramsStr.startsWith('[')) {
-                            currentParams = JSON.parse(paramsStr);
+                        const paramsStr = (paramsMatch[1] || '').trim();
+                        if (paramsStr.length === 0) {
+                            pendingParams = [];
+                        }
+                        else if (paramsStr.startsWith('[')) {
+                            const parsed = JSON.parse(paramsStr);
+                            pendingParams = Array.isArray(parsed) ? parsed : [];
                         }
                         else {
-                            // Parse space-separated values
-                            currentParams = paramsStr.split(/\s+/).map(p => {
-                                // Try to parse as number
-                                if (!isNaN(Number(p))) {
-                                    return Number(p);
-                                }
-                                return p;
-                            });
+                            pendingParams = paramsStr
+                                .split(/\s+/)
+                                .filter(Boolean)
+                                .map((token) => this.parseTokenValue(token));
                         }
                     }
                     catch (error) {
                         console.warn(`Failed to parse @test-params in ${file}:${i + 1}: ${line}`);
+                        pendingParams = undefined;
                     }
                     continue;
                 }
-                // Check for test annotation
-                if (line.startsWith('#[test]') || line.includes('#[test]')) {
-                    // Next non-empty line should be the function definition
-                    for (let j = i + 1; j < lines.length; j++) {
-                        const nextLine = lines[j].trim();
-                        if (nextLine && !nextLine.startsWith('//')) {
-                            const funcMatch = nextLine.match(/(?:pub\s+)?(?:fn|instruction|script)\s+(\w+)\s*\(/);
-                            if (funcMatch) {
-                                currentFunction = funcMatch[1];
-                                break;
-                            }
-                        }
-                    }
-                    continue;
-                }
-                // Check for pub function that matches test naming convention
-                const funcMatch = line.match(/pub\s+(?:fn|instruction|script)\s+(test_\w+|_?\w+_test)\s*\(/);
+                // Match canonical DSL test function forms:
+                //   pub test_name(...)
+                //   pub fn test_name(...)
+                const funcMatch = line.match(/^pub\s+(?:fn\s+)?(test_[A-Za-z0-9_]*|[A-Za-z0-9_]*_test)\s*\([^)]*\)\s*(?:->\s*([A-Za-z0-9_<>\[\]]+))?/);
                 if (funcMatch) {
                     const functionName = funcMatch[1];
-                    // Check if we have parameters from @test-params comment
-                    if (currentParams || currentFunction) {
-                        const name = basename(file, '.v') + '::' + functionName;
-                        tests.push({
-                            name,
-                            path: file,
+                    const returnType = funcMatch[2];
+                    const hasReturnValue = !!returnType;
+                    const [parameters, expectedResult, expectsResult] = this.splitParamsAndExpectation(pendingParams, hasReturnValue);
+                    const name = `${basename(file, '.v')}::${functionName}`;
+                    tests.push({
+                        name,
+                        path: file,
+                        type: 'v-source',
+                        source: {
                             type: 'v-source',
-                            source: {
-                                type: 'v-source',
-                                file,
-                                functionName,
-                                parameters: currentParams || undefined,
-                                description: currentDescription || undefined
-                            },
-                            parameters: currentParams || undefined,
-                            description: currentDescription || undefined
-                        });
-                        currentParams = null;
-                        currentDescription = null;
-                        currentFunction = null;
-                    }
+                            file,
+                            functionName,
+                            parameters: parameters.length > 0 ? parameters : undefined,
+                            expectedResult,
+                            expectsResult
+                        },
+                        parameters: parameters.length > 0 ? parameters : undefined,
+                        expectedResult,
+                        expectsResult
+                    });
+                    pendingParams = undefined;
                 }
             }
         }
@@ -203,6 +185,29 @@ export class TestDiscovery {
         }
         return tests;
     }
+    static splitParamsAndExpectation(values, hasReturnValue) {
+        const parsed = Array.isArray(values) ? values : [];
+        if (!hasReturnValue || parsed.length === 0) {
+            return [parsed, undefined, false];
+        }
+        const params = parsed.slice(0, parsed.length - 1);
+        return [params, parsed[parsed.length - 1], true];
+    }
+    static parseTokenValue(token) {
+        if ((token.startsWith('"') && token.endsWith('"')) ||
+            (token.startsWith("'") && token.endsWith("'"))) {
+            return token.slice(1, -1);
+        }
+        if (token === 'true')
+            return true;
+        if (token === 'false')
+            return false;
+        const asNumber = Number(token);
+        if (!Number.isNaN(asNumber)) {
+            return asNumber;
+        }
+        return token;
+    }
     /**
      * Compile a .v test source file
      */

package/dist/testing/TestRunner.d.ts

@@ -76,6 +76,7 @@ export interface TestRunnerOptions {
  */
 export declare class FiveTestRunner {
     private options;
+    private compilationCache;
     constructor(options?: TestRunnerOptions);
     /**
      * Run a single test case
@@ -111,7 +112,6 @@ export declare class FiveTestRunner {
     private getValidationError;
     private matchesPattern;
     private chunkArray;
-    private findTestFiles;
     private formatTestResult;
     private formatSuiteResult;
 }

package/dist/testing/TestRunner.js

@@ -4,14 +4,16 @@
  * SDK-based test utilities that replace shell script approaches with programmatic
  * Five SDK usage. Provides comprehensive testing capabilities for Five VM scripts.
  */
-import { readFile, readdir } from 'fs/promises';
-import { join, basename } from 'path';
+import { readFile } from 'fs/promises';
+import { basename } from 'path';
 import { FiveSDK } from '../FiveSDK.js';
+import { TestDiscovery } from './TestDiscovery.js';
 /**
  * Five SDK-based test runner
  */
 export class FiveTestRunner {
     constructor(options = {}) {
+        this.compilationCache = new Map();
         this.options = {
             timeout: 30000,
             maxComputeUnits: 1000000,
@@ -40,13 +42,22 @@ export class FiveTestRunner {
                 };
             }
             let bytecode;
+            let abi;
             // Get bytecode (compile source or load existing)
             if (testCase.source) {
-                const result = await this.compileToBytecode(testCase.source);
-                if (!result.success || !result.bytecode) {
-                    throw new Error(`Compilation failed: ${result.errors?.join(', ')}`);
+                if (!this.compilationCache.has(testCase.source)) {
+                    const result = await this.compileToBytecode(testCase.source);
+                    if (!result.success || !result.bytecode) {
+                        throw new Error(`Compilation failed: ${result.errors?.join(', ')}`);
+                    }
+                    this.compilationCache.set(testCase.source, {
+                        bytecode: result.bytecode,
+                        abi: result.abi
+                    });
                 }
-                bytecode = result.bytecode;
+                const cached = this.compilationCache.get(testCase.source);
+                bytecode = cached.bytecode;
+                abi = cached.abi;
             }
             else if (testCase.bytecode) {
                 const data = await readFile(testCase.bytecode);
@@ -67,7 +78,8 @@ export class FiveTestRunner {
             const executionPromise = FiveSDK.executeLocally(bytecode, testCase.function || 0, testCase.parameters || [], {
                 debug: this.options.debug,
                 trace: this.options.trace,
-                computeUnitLimit: this.options.maxComputeUnits
+                computeUnitLimit: this.options.maxComputeUnits,
+                abi
             });
             const timeoutPromise = new Promise((_, reject) => setTimeout(() => reject(new Error('Test timeout')), executionTimeout));
             const result = await Promise.race([executionPromise, timeoutPromise]);
@@ -187,23 +199,52 @@ export class FiveTestRunner {
      * Discover and load test suites from directory
      */
     async discoverTestSuites(directory, pattern = '**/*.test.json') {
-        const testFiles = await this.findTestFiles(directory, pattern);
+        const discovered = await TestDiscovery.discoverTests(directory, { verbose: this.options.verbose });
         const suites = [];
-        for (const file of testFiles) {
-            try {
-                const content = await readFile(file, 'utf8');
-                const data = JSON.parse(content);
-                const suite = {
-                    name: data.name || basename(file, '.test.json'),
-                    description: data.description,
-                    testCases: data.tests || data.testCases || []
-                };
-                suites.push(suite);
+        const byFile = new Map();
+        const loadedJsonSuites = new Set();
+        for (const test of discovered) {
+            if (test.type === 'json-suite') {
+                if (loadedJsonSuites.has(test.path)) {
+                    continue;
+                }
+                try {
+                    const content = await readFile(test.path, 'utf8');
+                    const data = JSON.parse(content);
+                    suites.push({
+                        name: data.name || basename(test.path, '.test.json'),
+                        description: data.description,
+                        testCases: data.tests || data.testCases || []
+                    });
+                    loadedJsonSuites.add(test.path);
+                }
+                catch (error) {
+                    console.warn(`Failed to load test suite ${test.path}: ${error}`);
+                }
+                continue;
             }
-            catch (error) {
-                console.warn(`Failed to load test suite ${file}: ${error}`);
+            if (test.type === 'v-source' && test.source) {
+                const cases = byFile.get(test.path) || [];
+                cases.push({
+                    name: test.name,
+                    source: test.path,
+                    function: test.source.functionName,
+                    parameters: test.parameters || [],
+                    expected: {
+                        success: true,
+                        result: test.expectsResult ? test.expectedResult : undefined
+                    }
+                });
+                byFile.set(test.path, cases);
             }
         }
+        for (const [file, testCases] of byFile.entries()) {
+            suites.push({
+                name: basename(file, '.v'),
+                description: `Tests from ${file}`,
+                testCases
+            });
+        }
         return suites;
     }
     /**
@@ -245,7 +286,7 @@ export class FiveTestRunner {
     // Private helper methods
     async compileToBytecode(sourcePath) {
         const source = await readFile(sourcePath, 'utf8');
-        return FiveSDK.compile(source, { debug: this.options.debug });
+        return FiveSDK.compile({ filename: sourcePath, content: source }, { debug: this.options.debug });
     }
     validateResult(result, expected) {
         // Check success/failure
@@ -298,26 +339,6 @@ export class FiveTestRunner {
         }
         return chunks;
     }
-    async findTestFiles(directory, pattern) {
-        const files = [];
-        try {
-            const entries = await readdir(directory, { withFileTypes: true });
-            for (const entry of entries) {
-                const fullPath = join(directory, entry.name);
-                if (entry.isDirectory()) {
-                    const subFiles = await this.findTestFiles(fullPath, pattern);
-                    files.push(...subFiles);
-                }
-                else if (entry.isFile() && entry.name.endsWith('.test.json')) {
-                    files.push(fullPath);
-                }
-            }
-        }
-        catch (error) {
-            // Directory doesn't exist or not accessible
-        }
-        return files;
-    }
     formatTestResult(result) {
         const icon = result.passed ? '✅' : '❌';
         const duration = `${result.duration}ms`;

package/dist/types.d.ts

@@ -203,7 +203,7 @@ export interface CLIError extends Error {
     category: string;
     details?: any;
 }
-export declare const FIVE_VM_PROGRAM_ID = "Five111111111111111111111111111111111111111";
+export declare const FIVE_VM_PROGRAM_ID = "4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d";
 export interface FiveSDKConfig {
     network?: string;
     connection?: any;

package/dist/types.js

@@ -2,7 +2,7 @@
  * Type definitions for Five SDK.
  */
 // ==================== Legacy SDK Types (for compatibility) ====================
-export const FIVE_VM_PROGRAM_ID = "Five111111111111111111111111111111111111111";
+export const FIVE_VM_PROGRAM_ID = "4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d";
 export class FiveSDKError extends Error {
     constructor(message, code, details) {
         super(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@5ive-tech/sdk",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "Client-agnostic TypeScript SDK for Five VM scripts on Solana",
   "type": "module",
   "main": "dist/index.js",
@@ -56,4 +56,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}