ic-mops 2.3.1 → 2.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "type": "module",
   "bin": {
     "mops": "dist/bin/mops.js",

package/release-cli.ts

@@ -11,8 +11,13 @@ import { findChangelogEntry } from "./helpers/find-changelog-entry.js";
 
 let __dirname = new URL(".", import.meta.url).pathname;
 
-// build using Docker
-execSync("./build.sh", { stdio: "inherit", cwd: __dirname });
+if (!process.env.SKIP_BUILD) {
+  execSync("./build.sh", { stdio: "inherit", cwd: __dirname });
+} else if (!fs.existsSync(path.resolve(__dirname, "bundle/cli.tgz"))) {
+  throw new Error(
+    "SKIP_BUILD is set but bundle/cli.tgz does not exist. Run build.sh first.",
+  );
+}
 
 let commitHash =
   process.env.COMMIT_HASH || execSync("git rev-parse HEAD").toString().trim();

package/tests/__snapshots__/build.test.ts.snap

@@ -75,3 +75,15 @@ build canister bar
 ✓ Built 2 canisters successfully",
 }
 `;
+
+exports[`build warns when args contain managed flags 1`] = `
+{
+  "exitCode": 1,
+  "stderr": "Warning: '-o' in args for canister foo may conflict with mops build — use [build].outputDir in mops.toml or --output flag instead
+Warning: '-c' in args for canister foo may conflict with mops build — this flag is always set by mops build
+Warning: '--idl' in args for canister foo may conflict with mops build — this flag is always set by mops build
+Error while compiling canister foo
+ENOENT: no such file or directory, open '.mops/.build/foo.did'",
+  "stdout": "build canister foo",
+}
+`;

package/tests/build/custom-output/dfx.json

@@ -0,0 +1,8 @@
+{
+  "canisters": {
+    "main": {
+      "type": "motoko",
+      "main": "src/Main.mo"
+    }
+  }
+}

package/tests/build/custom-output/mops.toml

@@ -0,0 +1,8 @@
+[dependencies]
+core = "1.0.0"
+
+[canisters.main]
+main = "src/Main.mo"
+
+[build]
+outputDir = "custom-out"

package/tests/build/custom-output/src/Main.mo

@@ -0,0 +1,5 @@
+persistent actor {
+  public func greet(name : Text) : async Text {
+    "Hello, " # name # "!";
+  };
+};

package/tests/build.test.ts

@@ -1,29 +1,97 @@
 import { describe, expect, test } from "@jest/globals";
 import { execa } from "execa";
-import { existsSync } from "node:fs";
+import { existsSync, rmSync } from "node:fs";
 import path from "path";
-import { cliSnapshot } from "./helpers";
+import { cli, cliSnapshot } from "./helpers";
 
 const distBin = path.resolve(import.meta.dirname, "../dist/bin/mops.js");
 
+function cleanFixture(cwd: string, ...extras: string[]) {
+  rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+  for (const p of extras) {
+    rmSync(p, { recursive: true, force: true });
+  }
+}
+
 describe("build", () => {
   test("ok", async () => {
     const cwd = path.join(import.meta.dirname, "build/success");
-    await cliSnapshot(["build", "--verbose"], { cwd }, 0);
-    await cliSnapshot(["build", "foo"], { cwd }, 0);
-    await cliSnapshot(["build", "bar"], { cwd }, 0);
-    await cliSnapshot(["build", "foo", "bar"], { cwd }, 0);
+    try {
+      await cliSnapshot(["build", "--verbose"], { cwd }, 0);
+      await cliSnapshot(["build", "foo"], { cwd }, 0);
+      await cliSnapshot(["build", "bar"], { cwd }, 0);
+      await cliSnapshot(["build", "foo", "bar"], { cwd }, 0);
+    } finally {
+      cleanFixture(cwd);
+    }
   });
 
   test("error", async () => {
     const cwd = path.join(import.meta.dirname, "build/error");
-    await cliSnapshot(["build", "foo", "--verbose"], { cwd }, 0);
-    expect((await cliSnapshot(["build", "bar"], { cwd }, 1)).stderr).toMatch(
-      "Candid compatibility check failed for canister bar",
-    );
-    expect(
-      (await cliSnapshot(["build", "foo", "bar"], { cwd }, 1)).stderr,
-    ).toMatch("Candid compatibility check failed for canister bar");
+    try {
+      await cliSnapshot(["build", "foo", "--verbose"], { cwd }, 0);
+      expect((await cliSnapshot(["build", "bar"], { cwd }, 1)).stderr).toMatch(
+        "Candid compatibility check failed for canister bar",
+      );
+      expect(
+        (await cliSnapshot(["build", "foo", "bar"], { cwd }, 1)).stderr,
+      ).toMatch("Candid compatibility check failed for canister bar");
+    } finally {
+      cleanFixture(cwd);
+    }
+  });
+
+  // [build].outputDir in mops.toml should control where build output goes
+  test("custom output path via config outputDir", async () => {
+    const cwd = path.join(import.meta.dirname, "build/custom-output");
+    const customOut = path.join(cwd, "custom-out");
+    const customWasm = path.join(customOut, "main.wasm");
+    const customDid = path.join(customOut, "main.did");
+    const defaultDid = path.join(cwd, ".mops/.build/main.did");
+
+    try {
+      const result = await cli(["build"], { cwd });
+      expect(result.exitCode).toBe(0);
+      expect(existsSync(customWasm)).toBe(true);
+      expect(existsSync(customDid)).toBe(true);
+      expect(existsSync(defaultDid)).toBe(false);
+    } finally {
+      cleanFixture(cwd, customOut);
+    }
+  });
+
+  // Regression: --output CLI option was silently ignored due to
+  // Commander storing it as options.output while build() read options.outputDir
+  test("--output CLI option", async () => {
+    const cwd = path.join(import.meta.dirname, "build/success");
+    const outputDir = path.join(cwd, "cli-output-test");
+
+    try {
+      const result = await cli(["build", "foo", "--output", outputDir], {
+        cwd,
+      });
+      expect(result.exitCode).toBe(0);
+      expect(existsSync(path.join(outputDir, "foo.wasm"))).toBe(true);
+      expect(existsSync(path.join(outputDir, "foo.did"))).toBe(true);
+    } finally {
+      cleanFixture(cwd, outputDir);
+    }
+  });
+
+  test("warns when args contain managed flags", async () => {
+    const cwd = path.join(import.meta.dirname, "build/success");
+    const artifact = path.join(cwd, "x");
+    const artifactDid = path.join(cwd, "x.did");
+
+    try {
+      await cliSnapshot(
+        ["build", "foo", "--", "-o", "x", "-c", "--idl"],
+        { cwd },
+        1,
+      );
+    } finally {
+      cleanFixture(cwd, artifact, artifactDid);
+    }
   });
 
   // Regression: bin/mops.js must route through environments/nodejs/cli.js
@@ -35,14 +103,18 @@ describe("build", () => {
     "wasm bindings initialized via dist entry point",
     async () => {
       const cwd = path.join(import.meta.dirname, "build/success");
-      const result = await execa("node", [distBin, "build", "foo"], {
-        cwd,
-        stdio: "pipe",
-        reject: false,
-      });
+      try {
+        const result = await execa("node", [distBin, "build", "foo"], {
+          cwd,
+          stdio: "pipe",
+          reject: false,
+        });
 
-      expect(result.stderr).not.toContain("Wasm bindings have not been set");
-      expect(result.exitCode).toBe(0);
+        expect(result.stderr).not.toContain("Wasm bindings have not been set");
+        expect(result.exitCode).toBe(0);
+      } finally {
+        cleanFixture(cwd);
+      }
     },
   );
 });

package/tests/check/canisters-subdir/mops.toml

@@ -0,0 +1,8 @@
+[toolchain]
+moc = "1.3.0"
+
+[moc]
+args = ["--default-persistent-actors"]
+
+[canisters.backend]
+main = "src/backend/main.mo"

package/tests/check/canisters-subdir/src/backend/main.mo

@@ -0,0 +1,5 @@
+actor {
+  public func hello() : async Text {
+    "Hello, World!";
+  };
+};

package/tests/check.test.ts

@@ -54,6 +54,17 @@ describe("check", () => {
     await cliSnapshot(["check"], { cwd }, 0);
   });
 
+  test("canister entrypoint resolved relative to config root when run from subdirectory", async () => {
+    const fixtureRoot = path.join(
+      import.meta.dirname,
+      "check/canisters-subdir",
+    );
+    const subdir = path.join(fixtureRoot, "src/backend");
+    const result = await cli(["check"], { cwd: subdir });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/✓/);
+  });
+
   test("[moc] args applied when using canister fallback", async () => {
     const cwd = path.join(import.meta.dirname, "check/canisters-moc-args");
     const result = await cli(["check"], { cwd });

package/tests/pocket-ic/mops.toml

@@ -0,0 +1,3 @@
+[toolchain]
+moc = "1.3.0"
+pocket-ic = "12.0.0"

package/tests/pocket-ic/test/hello.test.mo

@@ -0,0 +1,3 @@
+persistent actor {
+  public func runTests() : async () {};
+};

package/tests/pocket-ic.test.ts

@@ -0,0 +1,19 @@
+import { describe, test, expect } from "@jest/globals";
+import path from "path";
+import { cli } from "./helpers";
+
+describe("pocket-ic", () => {
+  test("runs tests with pocket-ic 12.0.0", async () => {
+    const cwd = path.join(import.meta.dirname, "pocket-ic");
+    const result = await cli(
+      ["test", "--reporter", "verbose", "--replica", "pocket-ic"],
+      { cwd },
+    );
+
+    expect(result.stderr).not.toContain("is not supported");
+    expect(result.stderr).not.toContain(
+      "only supports pocket-ic 9.x.x and 4.0.0",
+    );
+    expect(result.exitCode).toBe(0);
+  });
+});

package/wasm/pkg/nodejs/wasm_bg.wasm.d.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
 export const add_custom_sections: (a: number, b: number, c: any) => [number, number, number, number];
+export const is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;

package/wasm/pkg/web/wasm.d.ts

@@ -9,8 +9,8 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
-  readonly is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
   readonly add_custom_sections: (a: number, b: number, c: any) => [number, number, number, number];
+  readonly is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_exn_store: (a: number) => void;

package/wasm/pkg/web/wasm_bg.wasm.d.ts

@@ -1,8 +1,8 @@
 /* tslint:disable */
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
-export const is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
 export const add_custom_sections: (a: number, b: number, c: any) => [number, number, number, number];
+export const is_candid_compatible: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_malloc: (a: number, b: number) => number;
 export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
 export const __wbindgen_exn_store: (a: number) => void;