@5ive-tech/sdk 1.1.7 → 1.1.9

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.9",
   "description": "Client-agnostic TypeScript SDK for Five VM scripts on Solana",
   "type": "module",
   "main": "dist/index.js",
@@ -36,6 +36,7 @@
     "copy-assets": "mkdir -p dist/assets/vm && COPYFILE_DISABLE=1 cp src/assets/vm/* dist/assets/vm/",
     "test": "node examples/basic-usage.js",
     "test:jest": "NODE_OPTIONS=--experimental-vm-modules jest --runInBand",
+    "test:localnet": "USE_SOLANA_MOCKS=0 RUN_LOCALNET_VALIDATOR_TESTS=1 NODE_OPTIONS=--experimental-vm-modules jest --runInBand src/__tests__/integration/localnet-fee-vault.test.ts",
     "gen-types": "node ./node_modules/typescript/bin/tsc && node dist/bin/gen-types.js",
     "prepublishOnly": "npm run build"
   },