ic-mops 2.9.0 → 2.10.0

package/helpers/resolve-canisters.ts

@@ -14,11 +14,22 @@ export function resolveCanisterConfigs(
   );
 }
 
-export function resolveCanisterEntrypoints(config: Config): string[] {
-  const canisters = resolveCanisterConfigs(config);
-  return Object.values(canisters)
-    .map((c) => c.main)
-    .filter((main): main is string => Boolean(main));
+export function filterCanisters(
+  canisters: Record<string, CanisterConfig>,
+  names?: string[],
+): Record<string, CanisterConfig> {
+  if (!names) {
+    return canisters;
+  }
+  const invalidNames = names.filter((name) => !(name in canisters));
+  if (invalidNames.length) {
+    cliError(
+      `Canister(s) not found in mops.toml: ${invalidNames.join(", ")}. Available: ${Object.keys(canisters).join(", ")}`,
+    );
+  }
+  return Object.fromEntries(
+    Object.entries(canisters).filter(([name]) => names.includes(name)),
+  );
 }
 
 export function resolveSingleCanister(
@@ -50,3 +61,23 @@ export function resolveSingleCanister(
 
   return { name: names[0]!, canister: canisters[names[0]!]! };
 }
+
+export function looksLikeFile(arg: string): boolean {
+  return (
+    arg.endsWith(".mo") ||
+    arg.endsWith(".most") ||
+    arg.includes("/") ||
+    arg.includes("\\")
+  );
+}
+
+export function validateCanisterArgs(
+  canister: CanisterConfig,
+  canisterName: string,
+): void {
+  if (canister.args && typeof canister.args === "string") {
+    cliError(
+      `Canister config 'args' should be an array of strings for canister ${canisterName}`,
+    );
+  }
+}

package/package.json

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

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

@@ -32,11 +32,11 @@ exports[`check error 2`] = `
 }
 `;
 
-exports[`check no args falls back to [canisters] entrypoints 1`] = `
+exports[`check no args checks all canisters 1`] = `
 {
   "exitCode": 0,
   "stderr": "",
-  "stdout": "✓ Ok.mo",
+  "stdout": "✓ backend",
 }
 `;
 

package/tests/check/canisters-canister-args/Warning.mo

@@ -0,0 +1,5 @@
+actor {
+  public func example() : async () {
+    let unused = 123;
+  };
+};

package/tests/check/canisters-canister-args/mops.toml

@@ -0,0 +1,9 @@
+[toolchain]
+moc = "1.3.0"
+
+[moc]
+args = ["--default-persistent-actors"]
+
+[canisters.backend]
+main = "Warning.mo"
+args = ["-Werror"]

package/tests/check-stable/canister-args/migrations/20250101_000000_Init.mo

@@ -0,0 +1,8 @@
+module {
+  public func migration(_ : {}) : { a : Nat; b : Text } {
+    {
+      a = 42;
+      b = "hello";
+    };
+  };
+};

package/tests/check-stable/canister-args/migrations/20250201_000000_AddField.mo

@@ -0,0 +1,9 @@
+module {
+  public func migration(old : { a : Nat; b : Text }) : {
+    a : Nat;
+    b : Text;
+    c : Bool;
+  } {
+    { old with c = true };
+  };
+};

package/tests/check-stable/canister-args/mops.toml

@@ -0,0 +1,9 @@
+[toolchain]
+moc = "1.5.0"
+
+[moc]
+args = ["--default-persistent-actors"]
+
+[canisters.backend]
+main = "src/main.mo"
+args = ["--enhanced-migration=migrations"]

package/tests/check-stable/canister-args/old.most

@@ -0,0 +1,8 @@
+// Version: 4.0.0
+{
+  "20250101_000000_Init" : {} -> {a : Nat; b : Text}
+}
+actor  {
+  stable a : Nat;
+  stable b : Text
+};

package/tests/check-stable/canister-args/src/main.mo

@@ -0,0 +1,11 @@
+import Prim "mo:prim";
+
+actor {
+  let a : Nat;
+  let b : Text;
+  let c : Bool;
+
+  public func check() : async () {
+    Prim.debugPrint(debug_show { a; b; c });
+  };
+};

package/tests/check-stable.test.ts

@@ -59,6 +59,27 @@ describe("check-stable", () => {
     expect(existsSync(path.join(cwd, "new.wasm"))).toBe(false);
   });
 
+  test("[canisters.X].args are passed to moc (enhanced migration)", async () => {
+    const cwd = path.join(import.meta.dirname, "check-stable/canister-args");
+    const result = await cli(["check-stable", "old.most"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/Stable compatibility check passed/);
+  });
+
+  test("no args checks all canisters with [check-stable] config", async () => {
+    const cwd = path.join(import.meta.dirname, "check/deployed-compatible");
+    const result = await cli(["check-stable"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/Stable compatibility check passed/);
+  });
+
+  test("canister name filters to specific canister", async () => {
+    const cwd = path.join(import.meta.dirname, "check/deployed-compatible");
+    const result = await cli(["check-stable", "backend"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/Stable compatibility check passed/);
+  });
+
   test("errors when old file does not exist", async () => {
     const cwd = path.join(import.meta.dirname, "check-stable/compatible");
     const result = await cli(["check-stable", "nonexistent.mo"], { cwd });

package/tests/check.test.ts

@@ -49,12 +49,19 @@ describe("check", () => {
     await cliSnapshot(["check", "Warning.mo"], { cwd }, 1);
   });
 
-  test("no args falls back to [canisters] entrypoints", async () => {
+  test("no args checks all canisters", async () => {
     const cwd = path.join(import.meta.dirname, "check/canisters");
     await cliSnapshot(["check"], { cwd }, 0);
   });
 
-  test("canister entrypoint resolved relative to config root when run from subdirectory", async () => {
+  test("canister name filters to specific canister", async () => {
+    const cwd = path.join(import.meta.dirname, "check/canisters");
+    const result = await cli(["check", "backend"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/✓ backend/);
+  });
+
+  test("canister resolved relative to config root when run from subdirectory", async () => {
     const fixtureRoot = path.join(
       import.meta.dirname,
       "check/canisters-subdir",
@@ -65,21 +72,35 @@ describe("check", () => {
     expect(result.stdout).toMatch(/✓/);
   });
 
-  test("[moc] args applied when using canister fallback", async () => {
+  test("[moc] args applied to canister check", async () => {
     const cwd = path.join(import.meta.dirname, "check/canisters-moc-args");
     const result = await cli(["check"], { cwd });
     expect(result.exitCode).toBe(1);
     expect(result.stderr).toMatch(/warning \[M0194\]/);
   });
 
-  test("canister entrypoint with errors", async () => {
+  test("[canisters.X].args applied to canister check", async () => {
+    const cwd = path.join(import.meta.dirname, "check/canisters-canister-args");
+    const result = await cli(["check"], { cwd });
+    expect(result.exitCode).toBe(1);
+    expect(result.stderr).toMatch(/warning \[M0194\]/);
+  });
+
+  test("canister with errors", async () => {
     const cwd = path.join(import.meta.dirname, "check/canisters-error");
     const result = await cli(["check"], { cwd });
     expect(result.exitCode).toBe(1);
     expect(result.stderr).toMatch(/error/i);
   });
 
-  test("--fix with canister fallback", async () => {
+  test("invalid canister name errors", async () => {
+    const cwd = path.join(import.meta.dirname, "check/canisters");
+    const result = await cli(["check", "nonexistent"], { cwd });
+    expect(result.exitCode).toBe(1);
+    expect(result.stderr).toMatch(/not found in mops\.toml/);
+  });
+
+  test("--fix with canister", async () => {
     const cwd = path.join(import.meta.dirname, "check/canisters");
     const result = await cli(["check", "--fix"], { cwd });
     expect(result.exitCode).toBe(0);