movehat 0.0.8-alpha.0 → 0.0.9-alpha.0

package/dist/cli.js

@@ -4,6 +4,7 @@ import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import testCommand from './commands/test.js';
+import testMoveCommand from './commands/test-move.js';
 import compileCommand from './commands/compile.js';
 import initCommand from './commands/init.js';
 import runCommand from './commands/run.js';
@@ -59,8 +60,23 @@ program
     .action(runCommand);
 program
     .command('test')
-    .description('Run TypeScript tests with Mocha')
-    .action(testCommand);
+    .description('Run all tests (Move + TypeScript)')
+    .option('--move-only', 'Run only Move unit tests')
+    .option('--ts-only', 'Run only TypeScript integration tests')
+    .option('--watch', 'Run TypeScript tests in watch mode')
+    .option('--filter <pattern>', 'Filter Move tests by name pattern')
+    .action((options) => testCommand(options));
+program
+    .command('test:move')
+    .description('Run Move unit tests')
+    .option('--filter <pattern>', 'Filter tests by name pattern')
+    .option('--ignore-warnings', 'Ignore compilation warnings')
+    .action((options) => testMoveCommand(options));
+program
+    .command('test:ts')
+    .description('Run TypeScript integration tests')
+    .option('--watch', 'Run tests in watch mode')
+    .action((options) => testCommand({ tsOnly: true, watch: options.watch }));
 // Fork commands
 const fork = program
     .command('fork')

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/commands/test-move.d.ts

@@ -0,0 +1,7 @@
+interface TestMoveOptions {
+    filter?: string;
+    ignoreWarnings?: boolean;
+}
+export default function testMoveCommand(options?: TestMoveOptions): Promise<void>;
+export {};
+//# sourceMappingURL=test-move.d.ts.map

package/dist/commands/test-move.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-move.d.ts","sourceRoot":"","sources":["../../src/commands/test-move.ts"],"names":[],"mappings":"AAKA,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAA8B,eAAe,CAAC,OAAO,GAAE,eAAoB,iBAkD1E"}

package/dist/commands/test-move.js

@@ -0,0 +1,50 @@
+import fs from "fs";
+import path from "path";
+import { spawn } from "child_process";
+import { loadUserConfig } from "../core/config.js";
+export default async function testMoveCommand(options = {}) {
+    try {
+        const userConfig = await loadUserConfig();
+        const moveDir = path.resolve(process.cwd(), userConfig.moveDir || "./move");
+        if (!fs.existsSync(moveDir)) {
+            console.error(`Move directory not found: ${moveDir}`);
+            console.error(`   Update movehat.config.ts -> moveDir`);
+            process.exit(1);
+        }
+        console.log("Running Move unit tests...\n");
+        const args = ["move", "test", "--package-dir", moveDir];
+        // Add filter if provided
+        if (options.filter) {
+            args.push("--filter", options.filter);
+        }
+        // Add ignore-warnings flag if provided
+        if (options.ignoreWarnings) {
+            args.push("--ignore-compile-warnings");
+        }
+        // Spawn movement CLI
+        const child = spawn("movement", args, {
+            stdio: "inherit",
+            cwd: process.cwd(),
+        });
+        child.on("exit", (code) => {
+            if (code === 0) {
+                console.log("\n✓ Move tests passed");
+            }
+            else {
+                console.error("\n✗ Move tests failed");
+            }
+            process.exit(code || 0);
+        });
+        child.on("error", (error) => {
+            console.error(`Failed to run Move tests: ${error.message}`);
+            console.error("   Make sure Movement CLI is installed");
+            console.error("   Run: movement --version");
+            process.exit(1);
+        });
+    }
+    catch (err) {
+        console.error("Move tests failed:", err.message ?? err);
+        process.exit(1);
+    }
+}
+//# sourceMappingURL=test-move.js.map

package/dist/commands/test-move.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-move.js","sourceRoot":"","sources":["../../src/commands/test-move.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOnD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,eAAe,CAAC,UAA2B,EAAE;IACzE,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,cAAc,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAC;QAE5E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;YACtD,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;QAE5C,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;QAExD,yBAAyB;QACzB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,uCAAuC;QACvC,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QACzC,CAAC;QAED,qBAAqB;QACrB,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE;YACpC,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;SACnB,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5D,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;YACxD,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC5C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC"}

package/dist/commands/test.d.ts

@@ -1,2 +1,9 @@
-export default function testCommand(): Promise<void>;
+interface TestOptions {
+    moveOnly?: boolean;
+    tsOnly?: boolean;
+    watch?: boolean;
+    filter?: string;
+}
+export default function testCommand(options?: TestOptions): Promise<void>;
+export {};
 //# sourceMappingURL=test.d.ts.map

package/dist/commands/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":"AAIA,wBAA8B,WAAW,kBAqCxC"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":"AAMA,UAAU,WAAW;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAA8B,WAAW,CAAC,OAAO,GAAE,WAAgB,iBA2BlE"}

package/dist/commands/test.js

@@ -1,35 +1,116 @@
 import { spawn } from "child_process";
 import { join } from "path";
 import { existsSync } from "fs";
-export default async function testCommand() {
-    const testDir = join(process.cwd(), "tests");
-    if (!existsSync(testDir)) {
-        console.error("No tests directory found.");
-        console.error("   Create a 'tests' directory with your TypeScript test files.");
-        process.exit(1);
+import { loadUserConfig } from "../core/config.js";
+import path from "path";
+export default async function testCommand(options = {}) {
+    // Handle move-only flag
+    if (options.moveOnly) {
+        return runMoveTestsSync(options.filter);
+    }
+    // Handle ts-only flag (current behavior)
+    if (options.tsOnly) {
+        return runTypeScriptTests(options.watch);
     }
-    console.log("Running TypeScript tests with Mocha...\n");
-    // Find mocha from project's node_modules
-    const mochaPath = join(process.cwd(), "node_modules", ".bin", "mocha");
-    if (!existsSync(mochaPath)) {
-        console.error("Mocha not found in project dependencies.");
-        console.error("   Install it with: npm install --save-dev mocha");
+    // Default: Run both Move and TypeScript tests
+    console.log("Running all tests...\n");
+    console.log("=" + "=".repeat(60) + "\n");
+    // First run Move tests (fail fast)
+    try {
+        await runMoveTestsSync();
+        console.log("\n" + "=" + "=".repeat(60) + "\n");
+    }
+    catch (error) {
+        console.error("\n✗ Move tests failed");
+        console.log("\n" + "=" + "=".repeat(60));
         process.exit(1);
     }
-    // Run mocha with TypeScript support
-    const child = spawn(mochaPath, [], {
-        stdio: "inherit",
-        env: {
-            ...process.env,
-            // Inherit network if set
-        },
-    });
-    child.on("exit", (code) => {
-        process.exit(code || 0);
+    // Then run TypeScript tests
+    return runTypeScriptTests(false);
+}
+function runMoveTestsSync(filter) {
+    return new Promise(async (resolve, reject) => {
+        console.log("1. Move Unit Tests");
+        console.log("-" + "-".repeat(60) + "\n");
+        try {
+            const userConfig = await loadUserConfig();
+            const moveDir = path.resolve(process.cwd(), userConfig.moveDir || "./move");
+            if (!existsSync(moveDir)) {
+                console.log("⊘ No Move directory found (./move not found)");
+                console.log("   Skipping Move tests...\n");
+                resolve();
+                return;
+            }
+            const args = ["move", "test", "--package-dir", moveDir];
+            if (filter) {
+                args.push("--filter", filter);
+            }
+            const child = spawn("movement", args, {
+                stdio: "inherit",
+                cwd: process.cwd(),
+            });
+            child.on("exit", (code) => {
+                if (code === 0) {
+                    console.log("\n✓ Move tests passed");
+                    resolve();
+                }
+                else {
+                    reject(new Error("Move tests failed"));
+                }
+            });
+            child.on("error", (error) => {
+                console.error(`Failed to run Move tests: ${error.message}`);
+                console.error("   Make sure Movement CLI is installed");
+                reject(error);
+            });
+        }
+        catch (error) {
+            reject(error);
+        }
     });
-    child.on("error", (error) => {
-        console.error(`Failed to run tests: ${error.message}`);
-        process.exit(1);
+}
+function runTypeScriptTests(watch = false) {
+    return new Promise((resolve, reject) => {
+        console.log("2. TypeScript Integration Tests");
+        console.log("-" + "-".repeat(60) + "\n");
+        const testDir = join(process.cwd(), "tests");
+        if (!existsSync(testDir)) {
+            console.log("⊘ No TypeScript tests found (tests directory not found)");
+            console.log("   Skipping TypeScript tests...\n");
+            resolve();
+            return;
+        }
+        const mochaPath = join(process.cwd(), "node_modules", ".bin", "mocha");
+        if (!existsSync(mochaPath)) {
+            console.error("✗ Mocha not found in project dependencies.");
+            console.error("   Install it with: npm install --save-dev mocha");
+            reject(new Error("Mocha not found"));
+            return;
+        }
+        const args = watch ? ["--watch"] : [];
+        const child = spawn(mochaPath, args, {
+            stdio: "inherit",
+            env: {
+                ...process.env,
+            },
+        });
+        child.on("exit", (code) => {
+            if (code === 0) {
+                console.log("\n✓ TypeScript tests passed");
+                console.log("\n" + "=" + "=".repeat(60));
+                console.log("\n✓ All tests passed!\n");
+                resolve();
+            }
+            else {
+                console.error("\n✗ TypeScript tests failed");
+                console.log("\n" + "=" + "=".repeat(60));
+                process.exit(code || 1);
+            }
+        });
+        child.on("error", (error) => {
+            console.error(`Failed to run TypeScript tests: ${error.message}`);
+            reject(error);
+        });
     });
 }
 //# sourceMappingURL=test.js.map

package/dist/commands/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAEhC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW;IACvC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;IAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC3C,OAAO,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;QAChF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;IAExD,yCAAyC;IACzC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAEvE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,oCAAoC;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,EAAE,EAAE;QACjC,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE;YACH,GAAG,OAAO,CAAC,GAAG;YACd,yBAAyB;SAC1B;KACF,CAAC,CAAC;IAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,wBAAwB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,IAAI,MAAM,MAAM,CAAC;AASxB,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CAAC,UAAuB,EAAE;IACjE,wBAAwB;IACxB,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,8CAA8C;IAC9C,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACtC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IAEzC,mCAAmC;IACnC,IAAI,CAAC;QACH,MAAM,gBAAgB,EAAE,CAAC;QACzB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACvC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,4BAA4B;IAC5B,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAe;IACvC,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,cAAc,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC,CAAC;YAE5E,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;gBAC5D,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC3C,OAAO,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,CAAC;YAExD,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChC,CAAC;YAED,MAAM,KAAK,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE;gBACpC,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;aACnB,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;gBACxB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;oBACrC,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,CAAC;YAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5D,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBACxD,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAiB,KAAK;IAChD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAC/C,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QAE7C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,yDAAyD,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACjD,OAAO,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAEvE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,OAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;YAClE,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACrC,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEtC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,EAAE;YACnC,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;aACf;SACF,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;gBACvC,OAAO,EAAE,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;gBAC7C,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBACzC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,OAAO,CAAC,KAAK,CAAC,mCAAmC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAClE,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/templates/README.md

@@ -52,11 +52,25 @@ npm run compile
 npm test
 ```
 
-**How it works:**
-- Tests use **Transaction Simulation** - no real blockchain required
-- Runs instantly without gas costs
-- Uses Movement testnet by default with auto-generated test accounts
-- Perfect for TDD and CI/CD workflows
+**Two types of tests available:**
+
+1. **Move Unit Tests** (`tests/Counter.move` lines 50-63)
+   - Written in Move with `#[test]` annotations
+   - Test internal logic and business rules
+   - Ultra-fast execution (milliseconds)
+   - Run with: `npm run test:move`
+
+2. **TypeScript Integration Tests** (`tests/Counter.test.ts`)
+   - Written in TypeScript using Transaction Simulation
+   - Test end-to-end flows and SDK integration
+   - No blockchain or gas costs required
+   - Run with: `npm run test:ts`
+
+**Commands:**
+- `npm test` - Runs both Move + TypeScript tests
+- `npm run test:move` - Only Move unit tests (fast)
+- `npm run test:ts` - Only TypeScript integration tests
+- `npm run test:watch` - TypeScript tests in watch mode
 
 ### 5. Deploy (optional)
 

package/dist/templates/package.json

@@ -3,8 +3,10 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "test": "mocha",
-    "test:watch": "mocha --watch",
+    "test": "movehat test",
+    "test:move": "movehat test:move",
+    "test:ts": "movehat test:ts",
+    "test:watch": "movehat test:ts --watch",
     "deploy": "movehat run scripts/deploy-counter.ts"
   },
   "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "movehat",
-  "version": "0.0.8-alpha.0",
+  "version": "0.0.9-alpha.0",
   "type": "module",
   "description": "Hardhat-like development framework for Movement L1 and Aptos Move smart contracts",
   "bin": {

package/src/cli.ts

@@ -4,6 +4,7 @@ import { readFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import testCommand from './commands/test.js';
+import testMoveCommand from './commands/test-move.js';
 import compileCommand from './commands/compile.js';
 import initCommand from './commands/init.js';
 import runCommand from './commands/run.js';
@@ -67,8 +68,25 @@ program
 
 program
     .command('test')
-    .description('Run TypeScript tests with Mocha')
-    .action(testCommand);
+    .description('Run all tests (Move + TypeScript)')
+    .option('--move-only', 'Run only Move unit tests')
+    .option('--ts-only', 'Run only TypeScript integration tests')
+    .option('--watch', 'Run TypeScript tests in watch mode')
+    .option('--filter <pattern>', 'Filter Move tests by name pattern')
+    .action((options) => testCommand(options));
+
+program
+    .command('test:move')
+    .description('Run Move unit tests')
+    .option('--filter <pattern>', 'Filter tests by name pattern')
+    .option('--ignore-warnings', 'Ignore compilation warnings')
+    .action((options) => testMoveCommand(options));
+
+program
+    .command('test:ts')
+    .description('Run TypeScript integration tests')
+    .option('--watch', 'Run tests in watch mode')
+    .action((options) => testCommand({ tsOnly: true, watch: options.watch }));
 
 // Fork commands
 const fork = program

package/src/commands/test-move.ts

@@ -0,0 +1,61 @@
+import fs from "fs";
+import path from "path";
+import { spawn } from "child_process";
+import { loadUserConfig } from "../core/config.js";
+
+interface TestMoveOptions {
+  filter?: string;
+  ignoreWarnings?: boolean;
+}
+
+export default async function testMoveCommand(options: TestMoveOptions = {}) {
+  try {
+    const userConfig = await loadUserConfig();
+    const moveDir = path.resolve(process.cwd(), userConfig.moveDir || "./move");
+
+    if (!fs.existsSync(moveDir)) {
+      console.error(`Move directory not found: ${moveDir}`);
+      console.error(`   Update movehat.config.ts -> moveDir`);
+      process.exit(1);
+    }
+
+    console.log("Running Move unit tests...\n");
+
+    const args = ["move", "test", "--package-dir", moveDir];
+
+    // Add filter if provided
+    if (options.filter) {
+      args.push("--filter", options.filter);
+    }
+
+    // Add ignore-warnings flag if provided
+    if (options.ignoreWarnings) {
+      args.push("--ignore-compile-warnings");
+    }
+
+    // Spawn movement CLI
+    const child = spawn("movement", args, {
+      stdio: "inherit",
+      cwd: process.cwd(),
+    });
+
+    child.on("exit", (code) => {
+      if (code === 0) {
+        console.log("\n✓ Move tests passed");
+      } else {
+        console.error("\n✗ Move tests failed");
+      }
+      process.exit(code || 0);
+    });
+
+    child.on("error", (error) => {
+      console.error(`Failed to run Move tests: ${error.message}`);
+      console.error("   Make sure Movement CLI is installed");
+      console.error("   Run: movement --version");
+      process.exit(1);
+    });
+  } catch (err: any) {
+    console.error("Move tests failed:", err.message ?? err);
+    process.exit(1);
+  }
+}

package/src/commands/test.ts

@@ -1,42 +1,140 @@
 import { spawn } from "child_process";
 import { join } from "path";
 import { existsSync } from "fs";
+import { loadUserConfig } from "../core/config.js";
+import path from "path";
 
-export default async function testCommand() {
-  const testDir = join(process.cwd(), "tests");
+interface TestOptions {
+  moveOnly?: boolean;
+  tsOnly?: boolean;
+  watch?: boolean;
+  filter?: string;
+}
 
-  if (!existsSync(testDir)) {
-    console.error("No tests directory found.");
-    console.error("   Create a 'tests' directory with your TypeScript test files.");
-    process.exit(1);
+export default async function testCommand(options: TestOptions = {}) {
+  // Handle move-only flag
+  if (options.moveOnly) {
+    return runMoveTestsSync(options.filter);
   }
 
-  console.log("Running TypeScript tests with Mocha...\n");
+  // Handle ts-only flag (current behavior)
+  if (options.tsOnly) {
+    return runTypeScriptTests(options.watch);
+  }
 
-  // Find mocha from project's node_modules
-  const mochaPath = join(process.cwd(), "node_modules", ".bin", "mocha");
+  // Default: Run both Move and TypeScript tests
+  console.log("Running all tests...\n");
+  console.log("=" + "=".repeat(60) + "\n");
 
-  if (!existsSync(mochaPath)) {
-    console.error("Mocha not found in project dependencies.");
-    console.error("   Install it with: npm install --save-dev mocha");
+  // First run Move tests (fail fast)
+  try {
+    await runMoveTestsSync();
+    console.log("\n" + "=" + "=".repeat(60) + "\n");
+  } catch (error) {
+    console.error("\n✗ Move tests failed");
+    console.log("\n" + "=" + "=".repeat(60));
     process.exit(1);
   }
 
-  // Run mocha with TypeScript support
-  const child = spawn(mochaPath, [], {
-    stdio: "inherit",
-    env: {
-      ...process.env,
-      // Inherit network if set
-    },
-  });
+  // Then run TypeScript tests
+  return runTypeScriptTests(false);
+}
+
+function runMoveTestsSync(filter?: string): Promise<void> {
+  return new Promise(async (resolve, reject) => {
+    console.log("1. Move Unit Tests");
+    console.log("-" + "-".repeat(60) + "\n");
+
+    try {
+      const userConfig = await loadUserConfig();
+      const moveDir = path.resolve(process.cwd(), userConfig.moveDir || "./move");
+
+      if (!existsSync(moveDir)) {
+        console.log("⊘ No Move directory found (./move not found)");
+        console.log("   Skipping Move tests...\n");
+        resolve();
+        return;
+      }
+
+      const args = ["move", "test", "--package-dir", moveDir];
+
+      if (filter) {
+        args.push("--filter", filter);
+      }
+
+      const child = spawn("movement", args, {
+        stdio: "inherit",
+        cwd: process.cwd(),
+      });
+
+      child.on("exit", (code) => {
+        if (code === 0) {
+          console.log("\n✓ Move tests passed");
+          resolve();
+        } else {
+          reject(new Error("Move tests failed"));
+        }
+      });
 
-  child.on("exit", (code) => {
-    process.exit(code || 0);
+      child.on("error", (error) => {
+        console.error(`Failed to run Move tests: ${error.message}`);
+        console.error("   Make sure Movement CLI is installed");
+        reject(error);
+      });
+    } catch (error) {
+      reject(error);
+    }
   });
+}
 
-  child.on("error", (error) => {
-    console.error(`Failed to run tests: ${error.message}`);
-    process.exit(1);
+function runTypeScriptTests(watch: boolean = false): Promise<void> {
+  return new Promise((resolve, reject) => {
+    console.log("2. TypeScript Integration Tests");
+    console.log("-" + "-".repeat(60) + "\n");
+
+    const testDir = join(process.cwd(), "tests");
+
+    if (!existsSync(testDir)) {
+      console.log("⊘ No TypeScript tests found (tests directory not found)");
+      console.log("   Skipping TypeScript tests...\n");
+      resolve();
+      return;
+    }
+
+    const mochaPath = join(process.cwd(), "node_modules", ".bin", "mocha");
+
+    if (!existsSync(mochaPath)) {
+      console.error("✗ Mocha not found in project dependencies.");
+      console.error("   Install it with: npm install --save-dev mocha");
+      reject(new Error("Mocha not found"));
+      return;
+    }
+
+    const args = watch ? ["--watch"] : [];
+
+    const child = spawn(mochaPath, args, {
+      stdio: "inherit",
+      env: {
+        ...process.env,
+      },
+    });
+
+    child.on("exit", (code) => {
+      if (code === 0) {
+        console.log("\n✓ TypeScript tests passed");
+        console.log("\n" + "=" + "=".repeat(60));
+        console.log("\n✓ All tests passed!\n");
+        resolve();
+      } else {
+        console.error("\n✗ TypeScript tests failed");
+        console.log("\n" + "=" + "=".repeat(60));
+        process.exit(code || 1);
+      }
+    });
+
+    child.on("error", (error) => {
+      console.error(`Failed to run TypeScript tests: ${error.message}`);
+      reject(error);
+    });
   });
-}
+}

package/src/templates/README.md

@@ -52,11 +52,25 @@ npm run compile
 npm test
 ```
 
-**How it works:**
-- Tests use **Transaction Simulation** - no real blockchain required
-- Runs instantly without gas costs
-- Uses Movement testnet by default with auto-generated test accounts
-- Perfect for TDD and CI/CD workflows
+**Two types of tests available:**
+
+1. **Move Unit Tests** (`tests/Counter.move` lines 50-63)
+   - Written in Move with `#[test]` annotations
+   - Test internal logic and business rules
+   - Ultra-fast execution (milliseconds)
+   - Run with: `npm run test:move`
+
+2. **TypeScript Integration Tests** (`tests/Counter.test.ts`)
+   - Written in TypeScript using Transaction Simulation
+   - Test end-to-end flows and SDK integration
+   - No blockchain or gas costs required
+   - Run with: `npm run test:ts`
+
+**Commands:**
+- `npm test` - Runs both Move + TypeScript tests
+- `npm run test:move` - Only Move unit tests (fast)
+- `npm run test:ts` - Only TypeScript integration tests
+- `npm run test:watch` - TypeScript tests in watch mode
 
 ### 5. Deploy (optional)
 

package/src/templates/package.json

@@ -3,8 +3,10 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "test": "mocha",
-    "test:watch": "mocha --watch",
+    "test": "movehat test",
+    "test:move": "movehat test:move",
+    "test:ts": "movehat test:ts",
+    "test:watch": "movehat test:ts --watch",
     "deploy": "movehat run scripts/deploy-counter.ts"
   },
   "dependencies": {