ic-mops 2.8.0 → 2.8.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next
 
+## 2.8.1
+
+- Fix `mops check-stable` failing when `[moc] args` contains flags with relative paths (e.g. `--actor-idl=system-idl`)
+
 ## 2.8.0
 
 - `mops build` now generates a `.most` (Motoko stable types) file alongside `.wasm` and `.did` for each canister; the `.most` file can be passed directly to `mops check-stable` to verify upgrade compatibility

package/commands/check-stable.ts

@@ -1,6 +1,6 @@
-import { basename, join, relative, resolve } from "node:path";
+import { basename, join } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
-import { rename, rm } from "node:fs/promises";
+import { rm } from "node:fs/promises";
 import chalk from "chalk";
 import { execa } from "execa";
 import { cliError } from "../error.js";
@@ -62,8 +62,7 @@ export async function runStableCheck(
     options = {},
   } = params;
 
-  const checkStableDir = resolve(CHECK_STABLE_DIR);
-  const sources = (await sourcesArgs({ cwd: checkStableDir })).flat();
+  const sources = (await sourcesArgs()).flat();
   const isOldMostFile = oldFile.endsWith(".most");
 
   if (!existsSync(oldFile)) {
@@ -137,10 +136,13 @@ async function generateStableTypes(
   globalMocArgs: string[],
   options: Partial<CheckStableOptions>,
 ): Promise<string> {
-  const relFile = relative(resolve(CHECK_STABLE_DIR), resolve(moFile));
+  const base = basename(outputPath, ".most");
+  const wasmPath = join(CHECK_STABLE_DIR, base + ".wasm");
   const args = [
     "--stable-types",
-    relFile,
+    "-o",
+    wasmPath,
+    moFile,
     ...sources,
     ...globalMocArgs,
     ...(options.extraArgs ?? []),
@@ -155,7 +157,6 @@ async function generateStableTypes(
   }
 
   const result = await execa(mocPath, args, {
-    cwd: CHECK_STABLE_DIR,
     stdio: "pipe",
     reject: false,
   });
@@ -169,9 +170,7 @@ async function generateStableTypes(
     );
   }
 
-  const base = basename(moFile, ".mo");
-  await rename(join(CHECK_STABLE_DIR, base + ".most"), outputPath);
-  await rm(join(CHECK_STABLE_DIR, base + ".wasm"), { force: true });
+  await rm(wasmPath, { force: true });
 
   return outputPath;
 }

package/dist/commands/check-stable.js

@@ -1,6 +1,6 @@
-import { basename, join, relative, resolve } from "node:path";
+import { basename, join } from "node:path";
 import { existsSync, mkdirSync } from "node:fs";
-import { rename, rm } from "node:fs/promises";
+import { rm } from "node:fs/promises";
 import chalk from "chalk";
 import { execa } from "execa";
 import { cliError } from "../error.js";
@@ -28,8 +28,7 @@ export async function checkStable(oldFile, canisterName, options = {}) {
 }
 export async function runStableCheck(params) {
     const { oldFile, canisterMain, canisterName, mocPath, globalMocArgs, options = {}, } = params;
-    const checkStableDir = resolve(CHECK_STABLE_DIR);
-    const sources = (await sourcesArgs({ cwd: checkStableDir })).flat();
+    const sources = (await sourcesArgs()).flat();
     const isOldMostFile = oldFile.endsWith(".most");
     if (!existsSync(oldFile)) {
         cliError(`File not found: ${oldFile}`);
@@ -65,10 +64,13 @@ export async function runStableCheck(params) {
     }
 }
 async function generateStableTypes(mocPath, moFile, outputPath, sources, globalMocArgs, options) {
-    const relFile = relative(resolve(CHECK_STABLE_DIR), resolve(moFile));
+    const base = basename(outputPath, ".most");
+    const wasmPath = join(CHECK_STABLE_DIR, base + ".wasm");
     const args = [
         "--stable-types",
-        relFile,
+        "-o",
+        wasmPath,
+        moFile,
         ...sources,
         ...globalMocArgs,
         ...(options.extraArgs ?? []),
@@ -78,7 +80,6 @@ async function generateStableTypes(mocPath, moFile, outputPath, sources, globalM
         console.log(chalk.gray(mocPath, JSON.stringify(args)));
     }
     const result = await execa(mocPath, args, {
-        cwd: CHECK_STABLE_DIR,
         stdio: "pipe",
         reject: false,
     });
@@ -88,8 +89,6 @@ async function generateStableTypes(mocPath, moFile, outputPath, sources, globalM
         }
         cliError(`Failed to generate stable types for ${moFile} (exit code: ${result.exitCode})`);
     }
-    const base = basename(moFile, ".mo");
-    await rename(join(CHECK_STABLE_DIR, base + ".most"), outputPath);
-    await rm(join(CHECK_STABLE_DIR, base + ".wasm"), { force: true });
+    await rm(wasmPath, { force: true });
     return outputPath;
 }

package/dist/package.json

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

package/dist/tests/check-stable.test.js

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "@jest/globals";
+import { existsSync } from "node:fs";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "path";
@@ -42,6 +43,16 @@ describe("check-stable", () => {
             await rm(tempDir, { recursive: true, force: true });
         }
     });
+    test("works with relative paths in moc args (e.g. --actor-idl)", async () => {
+        const cwd = path.join(import.meta.dirname, "check-stable/actor-idl");
+        const result = await cli(["check-stable", "old.mo"], { cwd });
+        expect(result.exitCode).toBe(0);
+        expect(result.stdout).toMatch(/Stable compatibility check passed/);
+        expect(existsSync(path.join(cwd, "old.most"))).toBe(false);
+        expect(existsSync(path.join(cwd, "old.wasm"))).toBe(false);
+        expect(existsSync(path.join(cwd, "new.most"))).toBe(false);
+        expect(existsSync(path.join(cwd, "new.wasm"))).toBe(false);
+    });
     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/package.json

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

package/tests/check-stable/actor-idl/mops.toml

@@ -0,0 +1,8 @@
+[toolchain]
+moc = "1.3.0"
+
+[moc]
+args = ["--default-persistent-actors", "--actor-idl=system-idl"]
+
+[canisters.backend]
+main = "new.mo"

package/tests/check-stable/actor-idl/new.mo

@@ -0,0 +1,6 @@
+import IC "ic:aaaaa-aa";
+
+actor {
+  var counter : Nat = 0;
+  var name : Text = "";
+};

package/tests/check-stable/actor-idl/old.mo

@@ -0,0 +1,5 @@
+import IC "ic:aaaaa-aa";
+
+actor {
+  var counter : Nat = 0;
+};

package/tests/check-stable/actor-idl/system-idl/aaaaa-aa.did

@@ -0,0 +1,3 @@
+service ic : {
+  raw_rand : () -> (blob);
+};

package/tests/check-stable.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "@jest/globals";
+import { existsSync } from "node:fs";
 import { mkdtemp, rm, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "path";
@@ -47,6 +48,17 @@ describe("check-stable", () => {
     }
   });
 
+  test("works with relative paths in moc args (e.g. --actor-idl)", async () => {
+    const cwd = path.join(import.meta.dirname, "check-stable/actor-idl");
+    const result = await cli(["check-stable", "old.mo"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toMatch(/Stable compatibility check passed/);
+    expect(existsSync(path.join(cwd, "old.most"))).toBe(false);
+    expect(existsSync(path.join(cwd, "old.wasm"))).toBe(false);
+    expect(existsSync(path.join(cwd, "new.most"))).toBe(false);
+    expect(existsSync(path.join(cwd, "new.wasm"))).toBe(false);
+  });
+
   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 });