ic-mops 2.12.0 → 2.12.2

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next
 
+## 2.12.2
+- Fix `mops install` (and any `--lock check` flow) failing with "Mismatched number of resolved packages" when a project's resolved dependencies include multiple aliases (e.g. `base`, `base@0`, `base@0.16`) that pin to the same `name@version`
+
+## 2.12.1
+- `mops check`/`build`/`check-stable` skip migration staging when only the pending `next` migration is needed, so `moc` diagnostics reference the real `next-migration/<file>` path.
+
 ## 2.12.0
 - Migration staging directory moved from `.mops/.migrations/<canister>/` to `<parent-of-chain>/.migrations-<canister>/`, so migration files can import shared modules from sibling folders (e.g. a `types/` folder next to `migrations/`) — relative imports now resolve to the same target whether moc reads the original chain dir or the staged one. The staged dir self-stamps a `.gitignore` so it doesn't pollute `git status`; `mops init` now also adds `.migrations-*/` to the project `.gitignore`
 - `[canisters.<name>.migrations]` now requires `chain` and `next` to share the same parent directory (any layout where the parents differed is rejected with a clear error). The default layout `chain = "migrations"` + `next = "next-migration"` already satisfies this. For per-canister setups, use sibling subdirectories, e.g. `chain = "src/backend/migrations"` + `next = "src/backend/next-migration"`

package/dist/helpers/migrations.js

@@ -98,6 +98,15 @@ export async function prepareMigrationArgs(migrations, canisterName, mode, verbo
             cleanup: async () => { },
         };
     }
+    // Shortcut: when only the pending next migration is needed (empty chain or
+    // trimmed to 1), point moc at next-migration/ so diagnostics use the real path.
+    if (nextFile && nextDir && (chainFiles.length === 0 || limit === 1)) {
+        const migrationArgs = [`--enhanced-migration=${nextDir}`];
+        if (isTrimming) {
+            migrationArgs.push("-A=M0254");
+        }
+        return { migrationArgs, cleanup: async () => { } };
+    }
     const tempDir = stagedMigrationsDir(chainDir, canisterName);
     await rm(tempDir, { recursive: true, force: true });
     mkdirSync(tempDir, { recursive: true });

package/dist/integrity.js

@@ -31,7 +31,8 @@ async function getResolvedMopsPackageIds() {
     let packageIds = Object.entries(resolvedPackages)
         .filter(([_, version]) => getDependencyType(version) === "mops")
         .map(([name, version]) => getPackageId(name, version));
-    return packageIds;
+    // dedupe: aliases like `base@0`, `base@0.16` collapse to the same packageId
+    return [...new Set(packageIds)];
 }
 // get hash of local file from '.mops' dir by fileId
 export function getLocalFileHash(fileId) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ic-mops",
-  "version": "2.12.0",
+  "version": "2.12.2",
   "type": "module",
   "bin": {
     "mops": "bin/mops.js",

package/dist/tests/cli.test.js

@@ -67,4 +67,23 @@ describe("install", () => {
     });
     // mops add/remove/update/sync are not separately tested here because they
     // all route through the same checkIntegrity code path tested above.
+    // Regression: aliases pinning the same package@version (e.g. `core` and
+    // `core@1` both at "1.0.0") inflated the resolved-packageIds count and
+    // tripped the lockfile integrity check with a spurious
+    // "Mismatched number of resolved packages" error. See issue #506.
+    test("integrity check passes when aliases resolve to the same package@version", async () => {
+        const cwd = path.join(import.meta.dirname, "install/aliases");
+        const lockFile = path.join(cwd, "mops.lock");
+        rmSync(lockFile, { force: true });
+        try {
+            const result = await cli(["install"], { cwd, env: { CI: undefined } });
+            expect(result.stderr).not.toMatch(/Mismatched number of resolved packages/);
+            expect(result.exitCode).toBe(0);
+            expect(existsSync(lockFile)).toBe(true);
+        }
+        finally {
+            rmSync(lockFile, { force: true });
+            rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+        }
+    });
 });

package/dist/tests/migrate.test.js

@@ -112,6 +112,41 @@ describe("migrate", () => {
             await patchMigrations(cwd, "check-limit = 2");
             await cliSnapshot(["check", "--verbose"], { cwd }, 0);
         });
+        test("error inside a chain migration reports its file location", async () => {
+            const cwd = await makeTempFixture("with-next");
+            await writeFile(path.join(cwd, "migrations", "20250301_000000_AddEmail.mo"), 'import State "../types/State";\n' +
+                "module {\n" +
+                "  public func migration(old : State.V2) : State.V3 {\n" +
+                "    { old with email = 42 };\n" +
+                "  };\n" +
+                "};\n");
+            await cliSnapshot(["check"], { cwd }, 1);
+        });
+        async function corruptNextMigration(cwd) {
+            const nextDir = path.join(cwd, "next-migration");
+            const nextFile = readdirSync(nextDir).find((f) => f.endsWith(".mo"));
+            await writeFile(path.join(nextDir, nextFile), 'import State "../types/State";\n' +
+                "module {\n" +
+                "  public func migration(old : State.V3) : State.V4 {\n" +
+                '    { id = "wrong"; name = old.name; email = old.email };\n' +
+                "  };\n" +
+                "};\n");
+        }
+        test("check-limit=1 with pending next reports real next-migration path on error", async () => {
+            const cwd = await makeTempFixture("with-next");
+            await patchMigrations(cwd, "check-limit = 1");
+            await corruptNextMigration(cwd);
+            await cliSnapshot(["check"], { cwd }, 1);
+        });
+        test("empty chain with pending next reports real next-migration path on error", async () => {
+            const cwd = await makeTempFixture("with-next");
+            const chainDir = path.join(cwd, "migrations");
+            for (const f of readdirSync(chainDir).filter((f) => f.endsWith(".mo"))) {
+                await rm(path.join(chainDir, f));
+            }
+            await corruptNextMigration(cwd);
+            await cliSnapshot(["check"], { cwd }, 1);
+        });
     });
     describe("build", () => {
         test("build produces .most with full migration chain", async () => {

package/helpers/migrations.ts

@@ -153,6 +153,16 @@ export async function prepareMigrationArgs(
     };
   }
 
+  // Shortcut: when only the pending next migration is needed (empty chain or
+  // trimmed to 1), point moc at next-migration/ so diagnostics use the real path.
+  if (nextFile && nextDir && (chainFiles.length === 0 || limit === 1)) {
+    const migrationArgs = [`--enhanced-migration=${nextDir}`];
+    if (isTrimming) {
+      migrationArgs.push("-A=M0254");
+    }
+    return { migrationArgs, cleanup: async () => {} };
+  }
+
   const tempDir = stagedMigrationsDir(chainDir, canisterName);
   await rm(tempDir, { recursive: true, force: true });
   mkdirSync(tempDir, { recursive: true });

package/integrity.ts

@@ -63,7 +63,8 @@ async function getResolvedMopsPackageIds(): Promise<string[]> {
   let packageIds = Object.entries(resolvedPackages)
     .filter(([_, version]) => getDependencyType(version) === "mops")
     .map(([name, version]) => getPackageId(name, version));
-  return packageIds;
+  // dedupe: aliases like `base@0`, `base@0.16` collapse to the same packageId
+  return [...new Set(packageIds)];
 }
 
 // get hash of local file from '.mops' dir by fileId

package/package.json

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

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

@@ -85,6 +85,42 @@ check-stable Comparing deployed.most ↔ .mops/.check-stable/new.most
 }
 `;
 
+exports[`migrate check check-limit=1 with pending next reports real next-migration path on error 1`] = `
+{
+  "exitCode": 1,
+  "stderr": "next-migration/20250401_000000_RenameId.mo:4.12-4.19: type error [M0050], literal of type
+  Text
+does not have expected type
+  Nat
+✗ Check failed for canister backend (exit code: 1)",
+  "stdout": "",
+}
+`;
+
+exports[`migrate check empty chain with pending next reports real next-migration path on error 1`] = `
+{
+  "exitCode": 1,
+  "stderr": "next-migration/20250401_000000_RenameId.mo:4.12-4.19: type error [M0050], literal of type
+  Text
+does not have expected type
+  Nat
+✗ Check failed for canister backend (exit code: 1)",
+  "stdout": "",
+}
+`;
+
+exports[`migrate check error inside a chain migration reports its file location 1`] = `
+{
+  "exitCode": 1,
+  "stderr": ".migrations-backend/20250301_000000_AddEmail.mo:4.24-4.26: type error [M0050], literal of type
+  Nat
+does not have expected type
+  Text
+✗ Check failed for canister backend (exit code: 1)",
+  "stdout": "",
+}
+`;
+
 exports[`migrate migrate freeze moves the file from next to chain 1`] = `
 {
   "exitCode": 0,

package/tests/cli.test.ts

@@ -71,4 +71,25 @@ describe("install", () => {
 
   // mops add/remove/update/sync are not separately tested here because they
   // all route through the same checkIntegrity code path tested above.
+
+  // Regression: aliases pinning the same package@version (e.g. `core` and
+  // `core@1` both at "1.0.0") inflated the resolved-packageIds count and
+  // tripped the lockfile integrity check with a spurious
+  // "Mismatched number of resolved packages" error. See issue #506.
+  test("integrity check passes when aliases resolve to the same package@version", async () => {
+    const cwd = path.join(import.meta.dirname, "install/aliases");
+    const lockFile = path.join(cwd, "mops.lock");
+    rmSync(lockFile, { force: true });
+    try {
+      const result = await cli(["install"], { cwd, env: { CI: undefined } });
+      expect(result.stderr).not.toMatch(
+        /Mismatched number of resolved packages/,
+      );
+      expect(result.exitCode).toBe(0);
+      expect(existsSync(lockFile)).toBe(true);
+    } finally {
+      rmSync(lockFile, { force: true });
+      rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+    }
+  });
 });

package/tests/install/aliases/mops.toml

@@ -0,0 +1,3 @@
+[dependencies]
+core = "1.0.0"
+"core@1" = "1.0.0"

package/tests/migrate.test.ts

@@ -154,6 +154,51 @@ describe("migrate", () => {
       await patchMigrations(cwd, "check-limit = 2");
       await cliSnapshot(["check", "--verbose"], { cwd }, 0);
     });
+
+    test("error inside a chain migration reports its file location", async () => {
+      const cwd = await makeTempFixture("with-next");
+      await writeFile(
+        path.join(cwd, "migrations", "20250301_000000_AddEmail.mo"),
+        'import State "../types/State";\n' +
+          "module {\n" +
+          "  public func migration(old : State.V2) : State.V3 {\n" +
+          "    { old with email = 42 };\n" +
+          "  };\n" +
+          "};\n",
+      );
+      await cliSnapshot(["check"], { cwd }, 1);
+    });
+
+    async function corruptNextMigration(cwd: string): Promise<void> {
+      const nextDir = path.join(cwd, "next-migration");
+      const nextFile = readdirSync(nextDir).find((f) => f.endsWith(".mo"))!;
+      await writeFile(
+        path.join(nextDir, nextFile),
+        'import State "../types/State";\n' +
+          "module {\n" +
+          "  public func migration(old : State.V3) : State.V4 {\n" +
+          '    { id = "wrong"; name = old.name; email = old.email };\n' +
+          "  };\n" +
+          "};\n",
+      );
+    }
+
+    test("check-limit=1 with pending next reports real next-migration path on error", async () => {
+      const cwd = await makeTempFixture("with-next");
+      await patchMigrations(cwd, "check-limit = 1");
+      await corruptNextMigration(cwd);
+      await cliSnapshot(["check"], { cwd }, 1);
+    });
+
+    test("empty chain with pending next reports real next-migration path on error", async () => {
+      const cwd = await makeTempFixture("with-next");
+      const chainDir = path.join(cwd, "migrations");
+      for (const f of readdirSync(chainDir).filter((f) => f.endsWith(".mo"))) {
+        await rm(path.join(chainDir, f));
+      }
+      await corruptNextMigration(cwd);
+      await cliSnapshot(["check"], { cwd }, 1);
+    });
   });
 
   describe("build", () => {