ic-mops 2.12.3 → 2.13.0

package/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Next
 
+## 2.13.0
+- Fix `mops update` and `mops outdated` jumping across major versions (or pre-1.0 minor versions) — they are now caret-bound by default, matching `cargo update`. For example, `core = "2.0.0"` now updates within `2.x.y` instead of jumping to a future `3.0.0`. Use `--major` to opt into cross-major updates.
+
 ## 2.12.3
 - Fix `mops install --lock update` silently no-op'ing on a corrupt lockfile (#515)
 - `mops publish` no longer rejects unknown `mops.toml` sections, `package.*` keys, or `requirements.*` entries — these typo guards were the only place in the CLI that complained about unknown keys, drifted from the docs/types, and blocked publish on harmless local-only config like `[moc]`, `[canisters]`, `[build]`, and `[lint]` (#512)

package/cli.ts

@@ -627,14 +627,26 @@ program
 program
   .command("outdated")
   .description("Print outdated dependencies specified in mops.toml")
-  .action(async () => {
-    await outdated();
+  .addOption(
+    new Option(
+      "--major",
+      "Allow updates that cross the caret bound (major versions, or for 0.x.y packages, minor versions)",
+    ),
+  )
+  .action(async (options) => {
+    await outdated(options);
   });
 
 // update
 program
   .command("update [pkg]")
   .description("Update dependencies specified in mops.toml")
+  .addOption(
+    new Option(
+      "--major",
+      "Allow updates that cross the caret bound (major versions, or for 0.x.y packages, minor versions)",
+    ),
+  )
   .addOption(
     new Option("--lock <action>", "Lockfile action").choices([
       "update",

package/commands/available-updates.ts

@@ -1,14 +1,18 @@
 import process from "node:process";
 import chalk from "chalk";
+import semver from "semver";
 import { mainActor } from "../api/actors.js";
 import { Config } from "../types.js";
 import { getDepName, getDepPinnedVersion } from "../helpers/get-dep-name.js";
 import { SemverPart } from "../declarations/main/main.did.js";
 
+export type UpdateBound = "caret" | "major";
+
 // [pkg, oldVersion, newVersion]
 export async function getAvailableUpdates(
   config: Config,
   pkg?: string,
+  bound: UpdateBound = "caret",
 ): Promise<Array<[string, string, string]>> {
   let deps = Object.values(config.dependencies || {});
   let devDeps = Object.values(config["dev-dependencies"] || {});
@@ -46,8 +50,12 @@ export async function getAvailableUpdates(
           pinnedVersion.split(".").length === 1
             ? { minor: null }
             : { patch: null };
+      } else if (bound === "caret") {
+        // Caret (cargo-style): ^0.x.y -> 0.x.* (patch only); ^1+ -> same major (minor+patch)
+        let major = semver.major(dep.version!);
+        semverPart = major === 0 ? { patch: null } : { minor: null };
       }
-      return [name, dep.version || "", semverPart];
+      return [name, dep.version!, semverPart];
     }),
   );
 

package/commands/outdated.ts

@@ -3,13 +3,17 @@ import { checkConfigFile, readConfig } from "../mops.js";
 import { getAvailableUpdates } from "./available-updates.js";
 import { getDepName, getDepPinnedVersion } from "../helpers/get-dep-name.js";
 
-export async function outdated() {
+export async function outdated({ major }: { major?: boolean } = {}) {
   if (!checkConfigFile()) {
     return;
   }
   let config = readConfig();
 
-  let available = await getAvailableUpdates(config);
+  let available = await getAvailableUpdates(
+    config,
+    undefined,
+    major ? "major" : "caret",
+  );
 
   if (available.length === 0) {
     console.log(chalk.green("All dependencies are up to date!"));

package/commands/update.ts

@@ -14,9 +14,13 @@ type UpdateOptions = {
   verbose?: boolean;
   dev?: boolean;
   lock?: "update" | "ignore";
+  major?: boolean;
 };
 
-export async function update(pkg?: string, { lock }: UpdateOptions = {}) {
+export async function update(
+  pkg?: string,
+  { lock, major }: UpdateOptions = {},
+) {
   if (!checkConfigFile()) {
     return;
   }
@@ -59,7 +63,11 @@ export async function update(pkg?: string, { lock }: UpdateOptions = {}) {
   }
 
   // update mops packages
-  let available = await getAvailableUpdates(config, pkg);
+  let available = await getAvailableUpdates(
+    config,
+    pkg,
+    major ? "major" : "caret",
+  );
 
   if (available.length === 0) {
     if (pkg) {

package/dist/cli.js

@@ -492,13 +492,15 @@ program
 program
     .command("outdated")
     .description("Print outdated dependencies specified in mops.toml")
-    .action(async () => {
-    await outdated();
+    .addOption(new Option("--major", "Allow updates that cross the caret bound (major versions, or for 0.x.y packages, minor versions)"))
+    .action(async (options) => {
+    await outdated(options);
 });
 // update
 program
     .command("update [pkg]")
     .description("Update dependencies specified in mops.toml")
+    .addOption(new Option("--major", "Allow updates that cross the caret bound (major versions, or for 0.x.y packages, minor versions)"))
     .addOption(new Option("--lock <action>", "Lockfile action").choices([
     "update",
     "ignore",

package/dist/commands/available-updates.d.ts

@@ -1,2 +1,3 @@
 import { Config } from "../types.js";
-export declare function getAvailableUpdates(config: Config, pkg?: string): Promise<Array<[string, string, string]>>;
+export type UpdateBound = "caret" | "major";
+export declare function getAvailableUpdates(config: Config, pkg?: string, bound?: UpdateBound): Promise<Array<[string, string, string]>>;

package/dist/commands/available-updates.js

@@ -1,9 +1,10 @@
 import process from "node:process";
 import chalk from "chalk";
+import semver from "semver";
 import { mainActor } from "../api/actors.js";
 import { getDepName, getDepPinnedVersion } from "../helpers/get-dep-name.js";
 // [pkg, oldVersion, newVersion]
-export async function getAvailableUpdates(config, pkg) {
+export async function getAvailableUpdates(config, pkg, bound = "caret") {
     let deps = Object.values(config.dependencies || {});
     let devDeps = Object.values(config["dev-dependencies"] || {});
     let allDeps = [...deps, ...devDeps].filter((dep) => dep.version);
@@ -34,7 +35,12 @@ export async function getAvailableUpdates(config, pkg) {
                     ? { minor: null }
                     : { patch: null };
         }
-        return [name, dep.version || "", semverPart];
+        else if (bound === "caret") {
+            // Caret (cargo-style): ^0.x.y -> 0.x.* (patch only); ^1+ -> same major (minor+patch)
+            let major = semver.major(dep.version);
+            semverPart = major === 0 ? { patch: null } : { minor: null };
+        }
+        return [name, dep.version, semverPart];
     }));
     if ("err" in res) {
         console.log(chalk.red("Error:"), res.err);

package/dist/commands/outdated.d.ts

@@ -1 +1,3 @@
-export declare function outdated(): Promise<void>;
+export declare function outdated({ major }?: {
+    major?: boolean;
+}): Promise<void>;

package/dist/commands/outdated.js

@@ -2,12 +2,12 @@ import chalk from "chalk";
 import { checkConfigFile, readConfig } from "../mops.js";
 import { getAvailableUpdates } from "./available-updates.js";
 import { getDepName, getDepPinnedVersion } from "../helpers/get-dep-name.js";
-export async function outdated() {
+export async function outdated({ major } = {}) {
     if (!checkConfigFile()) {
         return;
     }
     let config = readConfig();
-    let available = await getAvailableUpdates(config);
+    let available = await getAvailableUpdates(config, undefined, major ? "major" : "caret");
     if (available.length === 0) {
         console.log(chalk.green("All dependencies are up to date!"));
     }

package/dist/commands/update.d.ts

@@ -2,6 +2,7 @@ type UpdateOptions = {
     verbose?: boolean;
     dev?: boolean;
     lock?: "update" | "ignore";
+    major?: boolean;
 };
-export declare function update(pkg?: string, { lock }?: UpdateOptions): Promise<void>;
+export declare function update(pkg?: string, { lock, major }?: UpdateOptions): Promise<void>;
 export {};

package/dist/commands/update.js

@@ -4,7 +4,7 @@ import { add } from "./add.js";
 import { getAvailableUpdates } from "./available-updates.js";
 import { checkIntegrity } from "../integrity.js";
 import { getDepName, getDepPinnedVersion } from "../helpers/get-dep-name.js";
-export async function update(pkg, { lock } = {}) {
+export async function update(pkg, { lock, major } = {}) {
     if (!checkConfigFile()) {
         return;
     }
@@ -36,7 +36,7 @@ export async function update(pkg, { lock } = {}) {
         }
     }
     // update mops packages
-    let available = await getAvailableUpdates(config, pkg);
+    let available = await getAvailableUpdates(config, pkg, major ? "major" : "caret");
     if (available.length === 0) {
         if (pkg) {
             console.log(chalk.green(`Package "${pkg}" is up to date!`));

package/dist/package.json

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

package/dist/tests/cli.test.js

@@ -1,7 +1,7 @@
 import { describe, expect, jest, test } from "@jest/globals";
 import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "path";
-import { cli } from "./helpers";
+import { cli, normalizePaths } from "./helpers";
 describe("cli", () => {
     test("--version", async () => {
         expect((await cli(["--version"])).stdout).toMatch(/CLI \d+\.\d+\.\d+/);
@@ -117,3 +117,78 @@ describe("install", () => {
         }
     });
 });
+// `mops update` and `mops outdated` default to caret-bound resolution: stay
+// within `0.x.y` (or `1.x.y`) and never cross majors. Fixture pins:
+//   base = "0.14.5"  -> caret bumps within 0.14.x; --major jumps past it
+//   core = "1.0.0"   -> caret stays put (no 1.x.y > 1.0.0); --major jumps to 2.x
+describe("update / outdated bounds", () => {
+    jest.setTimeout(120_000);
+    const cwd = path.join(import.meta.dirname, "install/update-bound");
+    const tomlFile = path.join(cwd, "mops.toml");
+    const original = readFileSync(tomlFile, "utf8");
+    const cleanup = () => {
+        rmSync(path.join(cwd, "mops.lock"), { force: true });
+        rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+        writeFileSync(tomlFile, original);
+    };
+    const baseVersion = (toml) => toml.match(/base = "(0\.\d+\.\d+)"/)?.[1];
+    const coreMajor = (toml) => parseInt(toml.match(/core = "(\d+)\./)?.[1] ?? "0");
+    test("mops update stays within the caret bound by default", async () => {
+        cleanup();
+        try {
+            await cli(["install"], { cwd, env: { CI: undefined } });
+            const result = await cli(["update"], { cwd, env: { CI: undefined } });
+            expect(result.exitCode).toBe(0);
+            const after = readFileSync(tomlFile, "utf8");
+            // base (pre-1.0): bumped within 0.14.x (patch bumps allowed)
+            expect(baseVersion(after)).toMatch(/^0\.14\./);
+            expect(baseVersion(after)).not.toBe("0.14.5");
+            // core (1.x): no 1.x.y > 1.0.0 published, so no bump across majors
+            expect(coreMajor(after)).toBe(1);
+        }
+        finally {
+            cleanup();
+        }
+    });
+    test("mops update --major crosses the caret bound", async () => {
+        cleanup();
+        try {
+            await cli(["install"], { cwd, env: { CI: undefined } });
+            const result = await cli(["update", "--major"], {
+                cwd,
+                env: { CI: undefined },
+            });
+            expect(result.exitCode).toBe(0);
+            const after = readFileSync(tomlFile, "utf8");
+            // base: jumps past 0.14.x (next minor or major)
+            const baseMinor = parseInt(after.match(/base = "0\.(\d+)\./)?.[1] ?? "0");
+            expect(baseMinor).toBeGreaterThanOrEqual(15);
+            // core: jumps to 2.x or later
+            expect(coreMajor(after)).toBeGreaterThanOrEqual(2);
+        }
+        finally {
+            cleanup();
+        }
+    });
+    test("mops outdated honors --major flag", async () => {
+        cleanup();
+        try {
+            await cli(["install"], { cwd, env: { CI: undefined } });
+            const caret = normalizePaths((await cli(["outdated"], { cwd, env: { CI: undefined } })).stdout);
+            const major = normalizePaths((await cli(["outdated", "--major"], { cwd, env: { CI: undefined } }))
+                .stdout);
+            // caret-bound: base bumps within 0.14.x; core (if reported) stays in 1.x
+            expect(caret).toMatch(/base 0\.14\.5 -> 0\.14\./);
+            const caretCore = caret.match(/core 1\.0\.0 -> (\d+)\./)?.[1];
+            if (caretCore) {
+                expect(parseInt(caretCore)).toBe(1);
+            }
+            // --major: both bump across their major bounds
+            expect(major).toMatch(/base 0\.14\.5 -> 0\.(1[5-9]|[2-9]\d)/);
+            expect(major).toMatch(/core 1\.0\.0 -> [2-9]/);
+        }
+        finally {
+            cleanup();
+        }
+    });
+});

package/package.json

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

package/tests/cli.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, jest, test } from "@jest/globals";
 import { existsSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import path from "path";
-import { cli } from "./helpers";
+import { cli, normalizePaths } from "./helpers";
 
 describe("cli", () => {
   test("--version", async () => {
@@ -129,3 +129,88 @@ describe("install", () => {
     }
   });
 });
+
+// `mops update` and `mops outdated` default to caret-bound resolution: stay
+// within `0.x.y` (or `1.x.y`) and never cross majors. Fixture pins:
+//   base = "0.14.5"  -> caret bumps within 0.14.x; --major jumps past it
+//   core = "1.0.0"   -> caret stays put (no 1.x.y > 1.0.0); --major jumps to 2.x
+describe("update / outdated bounds", () => {
+  jest.setTimeout(120_000);
+
+  const cwd = path.join(import.meta.dirname, "install/update-bound");
+  const tomlFile = path.join(cwd, "mops.toml");
+  const original = readFileSync(tomlFile, "utf8");
+
+  const cleanup = () => {
+    rmSync(path.join(cwd, "mops.lock"), { force: true });
+    rmSync(path.join(cwd, ".mops"), { recursive: true, force: true });
+    writeFileSync(tomlFile, original);
+  };
+
+  const baseVersion = (toml: string) =>
+    toml.match(/base = "(0\.\d+\.\d+)"/)?.[1];
+  const coreMajor = (toml: string) =>
+    parseInt(toml.match(/core = "(\d+)\./)?.[1] ?? "0");
+
+  test("mops update stays within the caret bound by default", async () => {
+    cleanup();
+    try {
+      await cli(["install"], { cwd, env: { CI: undefined } });
+      const result = await cli(["update"], { cwd, env: { CI: undefined } });
+      expect(result.exitCode).toBe(0);
+      const after = readFileSync(tomlFile, "utf8");
+      // base (pre-1.0): bumped within 0.14.x (patch bumps allowed)
+      expect(baseVersion(after)).toMatch(/^0\.14\./);
+      expect(baseVersion(after)).not.toBe("0.14.5");
+      // core (1.x): no 1.x.y > 1.0.0 published, so no bump across majors
+      expect(coreMajor(after)).toBe(1);
+    } finally {
+      cleanup();
+    }
+  });
+
+  test("mops update --major crosses the caret bound", async () => {
+    cleanup();
+    try {
+      await cli(["install"], { cwd, env: { CI: undefined } });
+      const result = await cli(["update", "--major"], {
+        cwd,
+        env: { CI: undefined },
+      });
+      expect(result.exitCode).toBe(0);
+      const after = readFileSync(tomlFile, "utf8");
+      // base: jumps past 0.14.x (next minor or major)
+      const baseMinor = parseInt(after.match(/base = "0\.(\d+)\./)?.[1] ?? "0");
+      expect(baseMinor).toBeGreaterThanOrEqual(15);
+      // core: jumps to 2.x or later
+      expect(coreMajor(after)).toBeGreaterThanOrEqual(2);
+    } finally {
+      cleanup();
+    }
+  });
+
+  test("mops outdated honors --major flag", async () => {
+    cleanup();
+    try {
+      await cli(["install"], { cwd, env: { CI: undefined } });
+      const caret = normalizePaths(
+        (await cli(["outdated"], { cwd, env: { CI: undefined } })).stdout,
+      );
+      const major = normalizePaths(
+        (await cli(["outdated", "--major"], { cwd, env: { CI: undefined } }))
+          .stdout,
+      );
+      // caret-bound: base bumps within 0.14.x; core (if reported) stays in 1.x
+      expect(caret).toMatch(/base 0\.14\.5 -> 0\.14\./);
+      const caretCore = caret.match(/core 1\.0\.0 -> (\d+)\./)?.[1];
+      if (caretCore) {
+        expect(parseInt(caretCore)).toBe(1);
+      }
+      // --major: both bump across their major bounds
+      expect(major).toMatch(/base 0\.14\.5 -> 0\.(1[5-9]|[2-9]\d)/);
+      expect(major).toMatch(/core 1\.0\.0 -> [2-9]/);
+    } finally {
+      cleanup();
+    }
+  });
+});

package/tests/install/update-bound/mops.toml

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