ic-mops 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Next
 
+## 2.2.0
+- Add `[moc]` config section for global `moc` compiler flags (applied to `check`, `build`, `test`, `bench`, `watch`)
+- Add `mops moc-args` command to print global `moc` flags from `[moc]` config section
+- Fix `mops check --fix` crash on overlapping diagnostic edits (e.g., nested function calls)
+
 ## 2.1.0
 - Add `mops check --fix` subcommand (for Motoko files) with autofix logic
 - Add `mops check` subcommand for type-checking Motoko files

package/RELEASE.md

@@ -130,6 +130,25 @@ dfx deploy --network ic --no-wallet cli --identity mops
 
 This deploys the `cli-releases` canister (serving `cli.mops.one`) to the Internet Computer mainnet.
 
+### 10. Commit and push release artifacts
+
+Step 8 generates files in `cli-releases/` that must be committed and pushed:
+
+```bash
+git add cli-releases/
+git commit -m "cli-releases: v<version> artifacts"
+```
+
+Since direct pushes to `main` are not allowed, create a branch and PR:
+
+```bash
+git checkout -b <username>/release-X.Y.Z-artifacts
+git push -u origin <username>/release-X.Y.Z-artifacts
+gh pr create --title "cli-releases: vX.Y.Z artifacts" --body "Release artifacts generated by \`npm run release-cli\` for CLI vX.Y.Z."
+```
+
+Merge this PR after approval.
+
 ## Verify build
 
 Anyone can verify a released version by rebuilding from source:

package/cli.ts

@@ -46,7 +46,9 @@ import {
   apiVersion,
   checkApiCompatibility,
   checkConfigFile,
+  getGlobalMocArgs,
   getNetworkFile,
+  readConfig,
   setNetwork,
   version,
 } from "./mops.js";
@@ -255,6 +257,19 @@ program
     console.log(sourcesArr.join("\n"));
   });
 
+// moc-args
+program
+  .command("moc-args")
+  .description("Print global moc compiler flags from [moc] config section")
+  .action(async () => {
+    checkConfigFile(true);
+    let config = readConfig();
+    let args = getGlobalMocArgs(config);
+    if (args.length) {
+      console.log(args.join("\n"));
+    }
+  });
+
 // search
 program
   .command("search <text>")

package/commands/bench.ts

@@ -12,7 +12,12 @@ import { filesize } from "filesize";
 import terminalSize from "terminal-size";
 import { SemVer } from "semver";
 
-import { getRootDir, readConfig, readDfxJson } from "../mops.js";
+import {
+  getGlobalMocArgs,
+  getRootDir,
+  readConfig,
+  readDfxJson,
+} from "../mops.js";
 import { parallel } from "../parallel.js";
 import { absToRel } from "./test/utils.js";
 import { getMocVersion } from "../helpers/get-moc-version.js";
@@ -138,13 +143,15 @@ export async function bench(
 
   await replica.start({ silent: options.silent });
 
+  let globalMocArgs = getGlobalMocArgs(config);
+
   if (!process.env.CI && !options.silent) {
     console.log("Deploying canisters...");
   }
 
   await parallel(os.cpus().length, files, async (file: string) => {
     try {
-      await deployBenchFile(file, options, replica);
+      await deployBenchFile(file, options, replica, globalMocArgs);
     } catch (err) {
       console.error("Unexpected error. Stopping replica...");
       await replica.stop();
@@ -267,6 +274,7 @@ async function deployBenchFile(
   file: string,
   options: BenchOptions,
   replica: BenchReplica,
+  globalMocArgs: string[],
 ): Promise<void> {
   let rootDir = getRootDir();
   let tempDir = path.join(rootDir, ".mops/.bench/", path.parse(file).name);
@@ -294,7 +302,7 @@ async function deployBenchFile(
   let mocArgs = getMocArgs(options);
   options.verbose && console.time(`build ${canisterName}`);
   await execaCommand(
-    `${mocPath} -c --idl canister.mo ${mocArgs} ${(await sources({ cwd: tempDir })).join(" ")}`,
+    `${mocPath} -c --idl canister.mo ${globalMocArgs.join(" ")} ${mocArgs} ${(await sources({ cwd: tempDir })).join(" ")}`,
     {
       cwd: tempDir,
       stdio: options.verbose ? "pipe" : ["pipe", "ignore", "pipe"],

package/commands/build.ts

@@ -6,7 +6,7 @@ import { join } from "node:path";
 import { cliError } from "../error.js";
 import { isCandidCompatible } from "../helpers/is-candid-compatible.js";
 import { CustomSection, getWasmBindings } from "../wasm.js";
-import { readConfig } from "../mops.js";
+import { getGlobalMocArgs, readConfig } from "../mops.js";
 import { CanisterConfig } from "../types.js";
 import { sourcesArgs } from "./sources.js";
 import { toolchain } from "./toolchain/index.js";
@@ -82,8 +82,8 @@ export async function build(
       "-o",
       wasmPath,
       motokoPath,
-      ...(options.extraArgs ?? []),
       ...(await sourcesArgs()).flat(),
+      ...getGlobalMocArgs(config),
     ];
     if (config.build?.args) {
       if (typeof config.build.args === "string") {
@@ -101,6 +101,7 @@ export async function build(
       }
       args.push(...canister.args);
     }
+    args.push(...(options.extraArgs ?? []));
     const isPublicCandid = true; // always true for now to reduce corner cases
     const candidVisibility = isPublicCandid ? "icp:public" : "icp:private";
     if (isPublicCandid) {

package/commands/check.ts

@@ -2,6 +2,7 @@ import { relative } from "node:path";
 import chalk from "chalk";
 import { execa } from "execa";
 import { cliError } from "../error.js";
+import { getGlobalMocArgs, readConfig } from "../mops.js";
 import { autofixMotoko } from "../helpers/autofix-motoko.js";
 import { getMocSemVer } from "../helpers/get-moc-version.js";
 import { sourcesArgs } from "./sources.js";
@@ -30,8 +31,10 @@ export async function check(
     cliError("No Motoko files specified for checking");
   }
 
+  const config = readConfig();
   const mocPath = await toolchain.bin("moc", { fallback: true });
   const sources = await sourcesArgs();
+  const globalMocArgs = getGlobalMocArgs(config);
 
   // --all-libs enables richer diagnostics with edit suggestions from moc (requires moc >= 1.3.0)
   const allLibs = supportsAllLibsFlag();
@@ -53,6 +56,7 @@ export async function check(
     "--check",
     ...(allLibs ? ["--all-libs"] : []),
     ...sources.flat(),
+    ...globalMocArgs,
     ...(options.extraArgs ?? []),
   ];
 

package/commands/test/test.ts

@@ -13,7 +13,7 @@ import { SemVer } from "semver";
 import { ActorMethod } from "@icp-sdk/core/agent";
 
 import { sources } from "../sources.js";
-import { getRootDir, readConfig } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { parallel } from "../../parallel.js";
 
 import { MMF1 } from "./mmf1.js";
@@ -232,6 +232,7 @@ export async function testWithReporter(
 
   let config = readConfig();
   let sourcesArr = await sources();
+  let globalMocArgs = getGlobalMocArgs(config);
 
   if (!mocPath) {
     mocPath = await toolchain.bin("moc", { fallback: true });
@@ -298,6 +299,7 @@ export async function testWithReporter(
         "--hide-warnings",
         "--error-detail=2",
         ...sourcesArr.join(" ").split(" "),
+        ...globalMocArgs,
         file,
       ].filter((x) => x);
 

package/commands/watch/error-checker.ts

@@ -4,7 +4,7 @@ import os from "node:os";
 import chalk from "chalk";
 
 import { getMocPath } from "../../helpers/get-moc-path.js";
-import { getRootDir } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { sources } from "../sources.js";
 import { parallel } from "../../parallel.js";
 import { globMoFiles } from "./globMoFiles.js";
@@ -44,6 +44,7 @@ export class ErrorChecker {
     let rootDir = getRootDir();
     let mocPath = getMocPath();
     let deps = await sources({ cwd: rootDir });
+    let globalMocArgs = getGlobalMocArgs(readConfig());
 
     let paths = globMoFiles(rootDir);
 
@@ -54,7 +55,12 @@ export class ErrorChecker {
       try {
         await promisify(execFile)(
           mocPath,
-          ["--check", ...deps.flatMap((x) => x.split(" ")), file],
+          [
+            "--check",
+            ...deps.flatMap((x) => x.split(" ")),
+            ...globalMocArgs,
+            file,
+          ],
           { cwd: rootDir },
         );
       } catch (error: any) {

package/commands/watch/warning-checker.ts

@@ -4,7 +4,7 @@ import os from "node:os";
 import chalk from "chalk";
 
 import { getMocPath } from "../../helpers/get-moc-path.js";
-import { getRootDir } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { sources } from "../sources.js";
 import { ErrorChecker } from "./error-checker.js";
 import { parallel } from "../../parallel.js";
@@ -70,6 +70,7 @@ export class WarningChecker {
     let rootDir = getRootDir();
     let mocPath = getMocPath();
     let deps = await sources({ cwd: rootDir });
+    let globalMocArgs = getGlobalMocArgs(readConfig());
     let paths = globMoFiles(rootDir);
 
     this.totalFiles = paths.length;
@@ -82,7 +83,12 @@ export class WarningChecker {
 
       let { stderr } = await promisify(execFile)(
         mocPath,
-        ["--check", ...deps.flatMap((x) => x.split(" ")), file],
+        [
+          "--check",
+          ...deps.flatMap((x) => x.split(" ")),
+          ...globalMocArgs,
+          file,
+        ],
         { cwd: rootDir, signal },
       ).catch((error) => {
         if (error.code === "ABORT_ERR") {

package/dist/cli.js

@@ -32,7 +32,7 @@ import { toolchain } from "./commands/toolchain/index.js";
 import { update } from "./commands/update.js";
 import { getPrincipal, getUserProp, importPem, setUserProp, } from "./commands/user.js";
 import { watch } from "./commands/watch/watch.js";
-import { apiVersion, checkApiCompatibility, checkConfigFile, getNetworkFile, setNetwork, version, } from "./mops.js";
+import { apiVersion, checkApiCompatibility, checkConfigFile, getGlobalMocArgs, getNetworkFile, readConfig, setNetwork, version, } from "./mops.js";
 import { resolvePackages } from "./resolve-packages.js";
 import { TOOLCHAINS } from "./commands/toolchain/toolchain-utils.js";
 events.setMaxListeners(20);
@@ -193,6 +193,18 @@ program
     let sourcesArr = await sources(options);
     console.log(sourcesArr.join("\n"));
 });
+// moc-args
+program
+    .command("moc-args")
+    .description("Print global moc compiler flags from [moc] config section")
+    .action(async () => {
+    checkConfigFile(true);
+    let config = readConfig();
+    let args = getGlobalMocArgs(config);
+    if (args.length) {
+        console.log(args.join("\n"));
+    }
+});
 // search
 program
     .command("search <text>")

package/dist/commands/bench.js

@@ -11,7 +11,7 @@ import stringWidth from "string-width";
 import { filesize } from "filesize";
 import terminalSize from "terminal-size";
 import { SemVer } from "semver";
-import { getRootDir, readConfig, readDfxJson } from "../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig, readDfxJson, } from "../mops.js";
 import { parallel } from "../parallel.js";
 import { absToRel } from "./test/utils.js";
 import { getMocVersion } from "../helpers/get-moc-version.js";
@@ -95,12 +95,13 @@ export async function bench(filter = "", optionsArg = {}) {
         }
     }
     await replica.start({ silent: options.silent });
+    let globalMocArgs = getGlobalMocArgs(config);
     if (!process.env.CI && !options.silent) {
         console.log("Deploying canisters...");
     }
     await parallel(os.cpus().length, files, async (file) => {
         try {
-            await deployBenchFile(file, options, replica);
+            await deployBenchFile(file, options, replica, globalMocArgs);
         }
         catch (err) {
             console.error("Unexpected error. Stopping replica...");
@@ -191,7 +192,7 @@ function getMocArgs(options) {
     }
     return args;
 }
-async function deployBenchFile(file, options, replica) {
+async function deployBenchFile(file, options, replica, globalMocArgs) {
     let rootDir = getRootDir();
     let tempDir = path.join(rootDir, ".mops/.bench/", path.parse(file).name);
     let canisterName = path.parse(file).name;
@@ -205,7 +206,7 @@ async function deployBenchFile(file, options, replica) {
     let mocPath = getMocPath();
     let mocArgs = getMocArgs(options);
     options.verbose && console.time(`build ${canisterName}`);
-    await execaCommand(`${mocPath} -c --idl canister.mo ${mocArgs} ${(await sources({ cwd: tempDir })).join(" ")}`, {
+    await execaCommand(`${mocPath} -c --idl canister.mo ${globalMocArgs.join(" ")} ${mocArgs} ${(await sources({ cwd: tempDir })).join(" ")}`, {
         cwd: tempDir,
         stdio: options.verbose ? "pipe" : ["pipe", "ignore", "pipe"],
     });

package/dist/commands/build.js

@@ -6,7 +6,7 @@ import { join } from "node:path";
 import { cliError } from "../error.js";
 import { isCandidCompatible } from "../helpers/is-candid-compatible.js";
 import { getWasmBindings } from "../wasm.js";
-import { readConfig } from "../mops.js";
+import { getGlobalMocArgs, readConfig } from "../mops.js";
 import { sourcesArgs } from "./sources.js";
 import { toolchain } from "./toolchain/index.js";
 export const DEFAULT_BUILD_OUTPUT_DIR = ".mops/.build";
@@ -55,8 +55,8 @@ export async function build(canisterNames, options) {
             "-o",
             wasmPath,
             motokoPath,
-            ...(options.extraArgs ?? []),
             ...(await sourcesArgs()).flat(),
+            ...getGlobalMocArgs(config),
         ];
         if (config.build?.args) {
             if (typeof config.build.args === "string") {
@@ -70,6 +70,7 @@ export async function build(canisterNames, options) {
             }
             args.push(...canister.args);
         }
+        args.push(...(options.extraArgs ?? []));
         const isPublicCandid = true; // always true for now to reduce corner cases
         const candidVisibility = isPublicCandid ? "icp:public" : "icp:private";
         if (isPublicCandid) {

package/dist/commands/check.js

@@ -2,6 +2,7 @@ import { relative } from "node:path";
 import chalk from "chalk";
 import { execa } from "execa";
 import { cliError } from "../error.js";
+import { getGlobalMocArgs, readConfig } from "../mops.js";
 import { autofixMotoko } from "../helpers/autofix-motoko.js";
 import { getMocSemVer } from "../helpers/get-moc-version.js";
 import { sourcesArgs } from "./sources.js";
@@ -16,8 +17,10 @@ export async function check(files, options = {}) {
     if (fileList.length === 0) {
         cliError("No Motoko files specified for checking");
     }
+    const config = readConfig();
     const mocPath = await toolchain.bin("moc", { fallback: true });
     const sources = await sourcesArgs();
+    const globalMocArgs = getGlobalMocArgs(config);
     // --all-libs enables richer diagnostics with edit suggestions from moc (requires moc >= 1.3.0)
     const allLibs = supportsAllLibsFlag();
     if (!allLibs) {
@@ -30,6 +33,7 @@ export async function check(files, options = {}) {
         "--check",
         ...(allLibs ? ["--all-libs"] : []),
         ...sources.flat(),
+        ...globalMocArgs,
         ...(options.extraArgs ?? []),
     ];
     if (options.fix) {

package/dist/commands/test/test.js

@@ -10,7 +10,7 @@ import chokidar from "chokidar";
 import debounce from "debounce";
 import { SemVer } from "semver";
 import { sources } from "../sources.js";
-import { getRootDir, readConfig } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { parallel } from "../../parallel.js";
 import { MMF1 } from "./mmf1.js";
 import { absToRel, pipeMMF, pipeStderrToMMF, pipeStdoutToMMF, } from "./utils.js";
@@ -152,6 +152,7 @@ export async function testWithReporter(reporterName, filter = "", defaultMode =
     reporter.addFiles(files);
     let config = readConfig();
     let sourcesArr = await sources();
+    let globalMocArgs = getGlobalMocArgs(config);
     if (!mocPath) {
         mocPath = await toolchain.bin("moc", { fallback: true });
     }
@@ -197,6 +198,7 @@ export async function testWithReporter(reporterName, filter = "", defaultMode =
                 "--hide-warnings",
                 "--error-detail=2",
                 ...sourcesArr.join(" ").split(" "),
+                ...globalMocArgs,
                 file,
             ].filter((x) => x);
             // interpret

package/dist/commands/watch/error-checker.js

@@ -3,7 +3,7 @@ import { promisify } from "node:util";
 import os from "node:os";
 import chalk from "chalk";
 import { getMocPath } from "../../helpers/get-moc-path.js";
-import { getRootDir } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { sources } from "../sources.js";
 import { parallel } from "../../parallel.js";
 import { globMoFiles } from "./globMoFiles.js";
@@ -31,12 +31,18 @@ export class ErrorChecker {
         let rootDir = getRootDir();
         let mocPath = getMocPath();
         let deps = await sources({ cwd: rootDir });
+        let globalMocArgs = getGlobalMocArgs(readConfig());
         let paths = globMoFiles(rootDir);
         this.totalFiles = paths.length;
         this.processedFiles = 0;
         await parallel(os.cpus().length, paths, async (file) => {
             try {
-                await promisify(execFile)(mocPath, ["--check", ...deps.flatMap((x) => x.split(" ")), file], { cwd: rootDir });
+                await promisify(execFile)(mocPath, [
+                    "--check",
+                    ...deps.flatMap((x) => x.split(" ")),
+                    ...globalMocArgs,
+                    file,
+                ], { cwd: rootDir });
             }
             catch (error) {
                 error.message.split("\n").forEach((line) => {

package/dist/commands/watch/warning-checker.js

@@ -3,7 +3,7 @@ import { promisify } from "node:util";
 import os from "node:os";
 import chalk from "chalk";
 import { getMocPath } from "../../helpers/get-moc-path.js";
-import { getRootDir } from "../../mops.js";
+import { getGlobalMocArgs, getRootDir, readConfig } from "../../mops.js";
 import { sources } from "../sources.js";
 import { parallel } from "../../parallel.js";
 import { globMoFiles } from "./globMoFiles.js";
@@ -51,6 +51,7 @@ export class WarningChecker {
         let rootDir = getRootDir();
         let mocPath = getMocPath();
         let deps = await sources({ cwd: rootDir });
+        let globalMocArgs = getGlobalMocArgs(readConfig());
         let paths = globMoFiles(rootDir);
         this.totalFiles = paths.length;
         this.processedFiles = 0;
@@ -58,7 +59,12 @@ export class WarningChecker {
             let controller = new AbortController();
             let { signal } = controller;
             this.controllers.set(file, controller);
-            let { stderr } = await promisify(execFile)(mocPath, ["--check", ...deps.flatMap((x) => x.split(" ")), file], { cwd: rootDir, signal }).catch((error) => {
+            let { stderr } = await promisify(execFile)(mocPath, [
+                "--check",
+                ...deps.flatMap((x) => x.split(" ")),
+                ...globalMocArgs,
+                file,
+            ], { cwd: rootDir, signal }).catch((error) => {
                 if (error.code === "ABORT_ERR") {
                     return { stderr: "" };
                 }

package/dist/error.d.ts

@@ -1 +1 @@
-export declare function cliError(...args: unknown[]): void;
+export declare function cliError(...args: unknown[]): never;

package/dist/helpers/autofix-motoko.js

@@ -16,75 +16,120 @@ export function parseDiagnostics(stdout) {
     })
         .filter((d) => d !== null);
 }
-function extractFixes(diagnostics) {
-    const fixes = [];
+function extractDiagnosticFixes(diagnostics) {
+    const result = new Map();
     for (const diag of diagnostics) {
+        const editsByFile = new Map();
         for (const span of diag.spans) {
             if (span.suggestion_applicability === "MachineApplicable" &&
                 span.suggested_replacement !== null) {
-                fixes.push({
-                    file: span.file,
-                    code: diag.code,
-                    edit: {
-                        range: {
-                            start: {
-                                line: span.line_start - 1,
-                                character: span.column_start - 1,
-                            },
-                            end: {
-                                line: span.line_end - 1,
-                                character: span.column_end - 1,
-                            },
+                const file = resolve(span.file);
+                const edits = editsByFile.get(file) ?? [];
+                edits.push({
+                    range: {
+                        start: {
+                            line: span.line_start - 1,
+                            character: span.column_start - 1,
+                        },
+                        end: {
+                            line: span.line_end - 1,
+                            character: span.column_end - 1,
                         },
-                        newText: span.suggested_replacement,
                     },
+                    newText: span.suggested_replacement,
                 });
+                editsByFile.set(file, edits);
             }
         }
+        for (const [file, edits] of editsByFile) {
+            const existing = result.get(file) ?? [];
+            existing.push({ code: diag.code, edits });
+            result.set(file, existing);
+        }
     }
-    return fixes;
+    return result;
+}
+function normalizeRange(range) {
+    const { start, end } = range;
+    if (start.line > end.line ||
+        (start.line === end.line && start.character > end.character)) {
+        return { start: end, end: start };
+    }
+    return range;
+}
+/**
+ * Applies diagnostic fixes to a document, processing each diagnostic as
+ * an atomic unit. If any edit from a diagnostic overlaps with an already-accepted
+ * edit, the entire diagnostic is skipped (picked up in subsequent iterations).
+ * Based on vscode-languageserver-textdocument's TextDocument.applyEdits.
+ */
+function applyDiagnosticFixes(doc, fixes) {
+    const acceptedEdits = [];
+    const appliedCodes = [];
+    for (const fix of fixes) {
+        const offsets = fix.edits.map((e) => {
+            const range = normalizeRange(e.range);
+            return {
+                start: doc.offsetAt(range.start),
+                end: doc.offsetAt(range.end),
+                newText: e.newText,
+            };
+        });
+        const overlaps = offsets.some((o) => acceptedEdits.some((a) => o.start < a.end && o.end > a.start));
+        if (overlaps) {
+            continue;
+        }
+        acceptedEdits.push(...offsets);
+        appliedCodes.push(fix.code);
+    }
+    acceptedEdits.sort((a, b) => a.start - b.start);
+    const text = doc.getText();
+    const spans = [];
+    let lastOffset = 0;
+    for (const edit of acceptedEdits) {
+        if (edit.start < lastOffset) {
+            continue;
+        }
+        if (edit.start > lastOffset) {
+            spans.push(text.substring(lastOffset, edit.start));
+        }
+        if (edit.newText.length) {
+            spans.push(edit.newText);
+        }
+        lastOffset = edit.end;
+    }
+    spans.push(text.substring(lastOffset));
+    return { text: spans.join(""), appliedCodes };
 }
 const MAX_FIX_ITERATIONS = 10;
 export async function autofixMotoko(mocPath, files, mocArgs) {
     const fixedFilesCodes = new Map();
     for (let iteration = 0; iteration < MAX_FIX_ITERATIONS; iteration++) {
-        const allFixes = [];
+        const fixesByFile = new Map();
         for (const file of files) {
-            const result = await execa(mocPath, [file, "--error-format=json", ...mocArgs], { stdio: "pipe", reject: false });
+            const result = await execa(mocPath, [file, ...mocArgs, "--error-format=json"], { stdio: "pipe", reject: false });
             const diagnostics = parseDiagnostics(result.stdout);
-            allFixes.push(...extractFixes(diagnostics));
+            for (const [targetFile, fixes] of extractDiagnosticFixes(diagnostics)) {
+                const existing = fixesByFile.get(targetFile) ?? [];
+                existing.push(...fixes);
+                fixesByFile.set(targetFile, existing);
+            }
         }
-        if (allFixes.length === 0) {
+        if (fixesByFile.size === 0) {
             break;
         }
-        const fixesByFile = new Map();
-        for (const fix of allFixes) {
-            const normalizedPath = resolve(fix.file);
-            const existing = fixesByFile.get(normalizedPath) ?? [];
-            existing.push(fix);
-            fixesByFile.set(normalizedPath, existing);
-        }
         let progress = false;
         for (const [file, fixes] of fixesByFile) {
             const original = await readFile(file, "utf-8");
             const doc = TextDocument.create(`file://${file}`, "motoko", 0, original);
-            let result;
-            try {
-                result = TextDocument.applyEdits(doc, fixes.map((f) => f.edit));
-            }
-            catch (err) {
-                console.warn(`Warning: could not apply fixes to ${file}: ${err}`);
-                continue;
-            }
+            const { text: result, appliedCodes } = applyDiagnosticFixes(doc, fixes);
             if (result === original) {
                 continue;
             }
             await writeFile(file, result, "utf-8");
             progress = true;
             const existing = fixedFilesCodes.get(file) ?? [];
-            for (const fix of fixes) {
-                existing.push(fix.code);
-            }
+            existing.push(...appliedCodes);
             fixedFilesCodes.set(file, existing);
         }
         if (!progress) {

package/dist/mops.d.ts

@@ -23,6 +23,7 @@ export declare function getGithubCommit(repo: string, ref: string): Promise<any>
 export declare function getDependencyType(version: string): "local" | "mops" | "github";
 export declare function parseDepValue(name: string, value: string): Dependency;
 export declare function readConfig(configFile?: string): Config;
+export declare function getGlobalMocArgs(config: Config): string[];
 export declare function writeConfig(config: Config, configFile?: string): void;
 export declare function formatDir(name: string, version: string): string;
 export declare function formatGithubDir(name: string, repo: string): string;

package/dist/mops.js

@@ -6,6 +6,7 @@ import chalk from "chalk";
 import prompts from "prompts";
 import fetch from "node-fetch";
 import { decodeFile } from "./pem.js";
+import { cliError } from "./error.js";
 import { mainActor, storageActor } from "./api/actors.js";
 import { getNetwork } from "./api/network.js";
 import { getHighestVersion } from "./api/getHighestVersion.js";
@@ -177,6 +178,15 @@ export function readConfig(configFile = getClosestConfigFile()) {
     });
     return config;
 }
+export function getGlobalMocArgs(config) {
+    if (!config.moc?.args) {
+        return [];
+    }
+    if (typeof config.moc.args === "string") {
+        cliError(`[moc] config 'args' should be an array of strings in mops.toml config file`);
+    }
+    return config.moc.args;
+}
 export function writeConfig(config, configFile = getClosestConfigFile()) {
     let resConfig = JSON.parse(JSON.stringify(config));
     let deps = resConfig.dependencies || {};

package/dist/package.json

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

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

@@ -52,6 +52,9 @@ describe("check --fix", () => {
             M0237: 17,
         });
     });
+    test("overlapping edits", async () => {
+        await testCheckFix("overlapping.mo", { M0223: 1, M0236: 2 });
+    });
     test("transitive imports", async () => {
         const runMainPath = copyFixture("transitive-main.mo");
         const runLibPath = copyFixture("transitive-lib.mo");
@@ -62,6 +65,19 @@ describe("check --fix", () => {
         const afterResult = await cli(["check", runMainPath, "--", ...diagnosticFlags], { cwd: fixDir });
         expect(countCodes(afterResult.stdout)).toEqual({});
     });
+    test("--error-format=human does not break --fix", async () => {
+        const runFilePath = copyFixture("M0223.mo");
+        const fixResult = await cli([
+            "check",
+            runFilePath,
+            "--fix",
+            "--",
+            warningFlags,
+            "--error-format=human",
+        ], { cwd: fixDir });
+        expect(fixResult.stdout).toContain("1 fix applied");
+        expect(readFileSync(runFilePath, "utf-8")).not.toContain("<Nat>");
+    });
     test("verbose", async () => {
         const result = await cli(["check", "Ok.mo", "--fix", "--verbose"], {
             cwd: fixDir,

package/dist/tests/check.test.js

@@ -30,4 +30,8 @@ describe("check", () => {
         expect(result.stderr).toMatch(/warning \[M0194\]/);
         expect(result.stderr).toMatch(/unused identifier/);
     });
+    test("[moc] args are passed to moc", async () => {
+        const cwd = path.join(import.meta.dirname, "check/moc-args");
+        await cliSnapshot(["check", "Warning.mo"], { cwd }, 1);
+    });
 });

package/dist/tests/moc-args.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/moc-args.test.js

@@ -0,0 +1,17 @@
+import { describe, expect, test } from "@jest/globals";
+import path from "path";
+import { cli } from "./helpers";
+describe("moc-args", () => {
+    test("prints moc args from [moc] config", async () => {
+        const cwd = path.join(import.meta.dirname, "check/moc-args");
+        const result = await cli(["moc-args"], { cwd });
+        expect(result.exitCode).toBe(0);
+        expect(result.stdout).toBe("-Werror");
+    });
+    test("prints nothing when no [moc] config", async () => {
+        const cwd = path.join(import.meta.dirname, "check/success");
+        const result = await cli(["moc-args"], { cwd });
+        expect(result.exitCode).toBe(0);
+        expect(result.stdout).toBe("");
+    });
+});

package/dist/types.d.ts

@@ -19,6 +19,9 @@ export type Config = {
     "dev-dependencies"?: Dependencies;
     toolchain?: Toolchain;
     requirements?: Requirements;
+    moc?: {
+        args?: string[];
+    };
     canisters?: Record<string, string | CanisterConfig>;
     build?: {
         outputDir?: string;

package/error.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 
-export function cliError(...args: unknown[]) {
+export function cliError(...args: unknown[]): never {
   console.error(chalk.red(...args));
   process.exit(1);
 }

package/helpers/autofix-motoko.ts

@@ -6,12 +6,6 @@ import {
   type TextEdit,
 } from "vscode-languageserver-textdocument";
 
-interface Fix {
-  file: string;
-  code: string;
-  edit: TextEdit;
-}
-
 interface MocSpan {
   file: string;
   line_start: number;
@@ -46,35 +40,127 @@ export function parseDiagnostics(stdout: string): MocDiagnostic[] {
     .filter((d) => d !== null);
 }
 
-function extractFixes(diagnostics: MocDiagnostic[]): Fix[] {
-  const fixes: Fix[] = [];
+interface DiagnosticFix {
+  code: string;
+  edits: TextEdit[];
+}
+
+function extractDiagnosticFixes(
+  diagnostics: MocDiagnostic[],
+): Map<string, DiagnosticFix[]> {
+  const result = new Map<string, DiagnosticFix[]>();
+
   for (const diag of diagnostics) {
+    const editsByFile = new Map<string, TextEdit[]>();
+
     for (const span of diag.spans) {
       if (
         span.suggestion_applicability === "MachineApplicable" &&
         span.suggested_replacement !== null
       ) {
-        fixes.push({
-          file: span.file,
-          code: diag.code,
-          edit: {
-            range: {
-              start: {
-                line: span.line_start - 1,
-                character: span.column_start - 1,
-              },
-              end: {
-                line: span.line_end - 1,
-                character: span.column_end - 1,
-              },
+        const file = resolve(span.file);
+        const edits = editsByFile.get(file) ?? [];
+        edits.push({
+          range: {
+            start: {
+              line: span.line_start - 1,
+              character: span.column_start - 1,
+            },
+            end: {
+              line: span.line_end - 1,
+              character: span.column_end - 1,
             },
-            newText: span.suggested_replacement,
           },
+          newText: span.suggested_replacement,
         });
+        editsByFile.set(file, edits);
       }
     }
+
+    for (const [file, edits] of editsByFile) {
+      const existing = result.get(file) ?? [];
+      existing.push({ code: diag.code, edits });
+      result.set(file, existing);
+    }
+  }
+
+  return result;
+}
+
+type Range = TextEdit["range"];
+
+function normalizeRange(range: Range): Range {
+  const { start, end } = range;
+  if (
+    start.line > end.line ||
+    (start.line === end.line && start.character > end.character)
+  ) {
+    return { start: end, end: start };
+  }
+  return range;
+}
+
+interface OffsetEdit {
+  start: number;
+  end: number;
+  newText: string;
+}
+
+/**
+ * Applies diagnostic fixes to a document, processing each diagnostic as
+ * an atomic unit. If any edit from a diagnostic overlaps with an already-accepted
+ * edit, the entire diagnostic is skipped (picked up in subsequent iterations).
+ * Based on vscode-languageserver-textdocument's TextDocument.applyEdits.
+ */
+function applyDiagnosticFixes(
+  doc: TextDocument,
+  fixes: DiagnosticFix[],
+): { text: string; appliedCodes: string[] } {
+  const acceptedEdits: OffsetEdit[] = [];
+  const appliedCodes: string[] = [];
+
+  for (const fix of fixes) {
+    const offsets: OffsetEdit[] = fix.edits.map((e) => {
+      const range = normalizeRange(e.range);
+      return {
+        start: doc.offsetAt(range.start),
+        end: doc.offsetAt(range.end),
+        newText: e.newText,
+      };
+    });
+
+    const overlaps = offsets.some((o) =>
+      acceptedEdits.some((a) => o.start < a.end && o.end > a.start),
+    );
+    if (overlaps) {
+      continue;
+    }
+
+    acceptedEdits.push(...offsets);
+    appliedCodes.push(fix.code);
+  }
+
+  acceptedEdits.sort((a, b) => a.start - b.start);
+
+  const text = doc.getText();
+  const spans: string[] = [];
+  let lastOffset = 0;
+
+  for (const edit of acceptedEdits) {
+    if (edit.start < lastOffset) {
+      continue;
+    }
+    if (edit.start > lastOffset) {
+      spans.push(text.substring(lastOffset, edit.start));
+    }
+    if (edit.newText.length) {
+      spans.push(edit.newText);
+    }
+    lastOffset = edit.end;
   }
-  return fixes;
+
+  spans.push(text.substring(lastOffset));
+  return { text: spans.join(""), appliedCodes };
 }
 
 const MAX_FIX_ITERATIONS = 10;
@@ -93,47 +179,33 @@ export async function autofixMotoko(
   const fixedFilesCodes = new Map<string, string[]>();
 
   for (let iteration = 0; iteration < MAX_FIX_ITERATIONS; iteration++) {
-    const allFixes: Fix[] = [];
+    const fixesByFile = new Map<string, DiagnosticFix[]>();
 
     for (const file of files) {
       const result = await execa(
         mocPath,
-        [file, "--error-format=json", ...mocArgs],
+        [file, ...mocArgs, "--error-format=json"],
         { stdio: "pipe", reject: false },
       );
 
       const diagnostics = parseDiagnostics(result.stdout);
-      allFixes.push(...extractFixes(diagnostics));
+      for (const [targetFile, fixes] of extractDiagnosticFixes(diagnostics)) {
+        const existing = fixesByFile.get(targetFile) ?? [];
+        existing.push(...fixes);
+        fixesByFile.set(targetFile, existing);
+      }
     }
 
-    if (allFixes.length === 0) {
+    if (fixesByFile.size === 0) {
       break;
     }
 
-    const fixesByFile = new Map<string, Fix[]>();
-    for (const fix of allFixes) {
-      const normalizedPath = resolve(fix.file);
-      const existing = fixesByFile.get(normalizedPath) ?? [];
-      existing.push(fix);
-      fixesByFile.set(normalizedPath, existing);
-    }
-
     let progress = false;
 
     for (const [file, fixes] of fixesByFile) {
       const original = await readFile(file, "utf-8");
       const doc = TextDocument.create(`file://${file}`, "motoko", 0, original);
-
-      let result: string;
-      try {
-        result = TextDocument.applyEdits(
-          doc,
-          fixes.map((f) => f.edit),
-        );
-      } catch (err) {
-        console.warn(`Warning: could not apply fixes to ${file}: ${err}`);
-        continue;
-      }
+      const { text: result, appliedCodes } = applyDiagnosticFixes(doc, fixes);
 
       if (result === original) {
         continue;
@@ -143,9 +215,7 @@ export async function autofixMotoko(
       progress = true;
 
       const existing = fixedFilesCodes.get(file) ?? [];
-      for (const fix of fixes) {
-        existing.push(fix.code);
-      }
+      existing.push(...appliedCodes);
       fixedFilesCodes.set(file, existing);
     }
 

package/mops.ts

@@ -8,6 +8,7 @@ import prompts from "prompts";
 import fetch from "node-fetch";
 
 import { decodeFile } from "./pem.js";
+import { cliError } from "./error.js";
 import { Config, Dependency } from "./types.js";
 import { mainActor, storageActor } from "./api/actors.js";
 import { getNetwork } from "./api/network.js";
@@ -204,6 +205,18 @@ export function readConfig(configFile = getClosestConfigFile()): Config {
   return config;
 }
 
+export function getGlobalMocArgs(config: Config): string[] {
+  if (!config.moc?.args) {
+    return [];
+  }
+  if (typeof config.moc.args === "string") {
+    cliError(
+      `[moc] config 'args' should be an array of strings in mops.toml config file`,
+    );
+  }
+  return config.moc.args;
+}
+
 export function writeConfig(
   config: Config,
   configFile = getClosestConfigFile(),

package/package.json

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

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

@@ -37,9 +37,9 @@ persistent actor {
 `;
 
 exports[`check --fix M0236: fix output 1`] = `
-"Fixed run/M0236.mo (2 fixes: M0236)
+"Fixed run/M0236.mo (1 fix: M0236)
 
-✓ 2 fixes applied to 1 file"
+✓ 1 fix applied to 1 file"
 `;
 
 exports[`check --fix M0237 1`] = `
@@ -203,16 +203,35 @@ do {
 `;
 
 exports[`check --fix edit-suggestions: fix output 1`] = `
-"Fixed run/edit-suggestions.mo (41 fixes: M0223, M0236, M0237)
+"Fixed run/edit-suggestions.mo (30 fixes: M0223, M0236, M0237)
+
+✓ 30 fixes applied to 1 file"
+`;
+
+exports[`check --fix overlapping edits 1`] = `
+"import Array "mo:core/Array";
+
+// Overlapping fixable errors (nested calls produce overlapping M0223 + M0236 edits)
+do {
+  let ar = [1, 2, 3];
+  let _ = ar.filter(func(x) { x > 0 }).filter(
+    func(x) { x > 0 },
+  );
+};
+"
+`;
+
+exports[`check --fix overlapping edits: fix output 1`] = `
+"Fixed run/overlapping.mo (4 fixes: M0223, M0236)
 
-✓ 41 fixes applied to 1 file"
+✓ 4 fixes applied to 1 file"
 `;
 
 exports[`check --fix transitive imports: fix output 1`] = `
-"Fixed run/transitive-lib.mo (2 fixes: M0236)
+"Fixed run/transitive-lib.mo (1 fix: M0236)
 Fixed run/transitive-main.mo (1 fix: M0223)
 
-✓ 3 fixes applied to 2 files"
+✓ 2 fixes applied to 2 files"
 `;
 
 exports[`check --fix transitive imports: lib file 1`] = `

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

@@ -1,5 +1,14 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
+exports[`check [moc] args are passed to moc 1`] = `
+{
+  "exitCode": 1,
+  "stderr": "Warning.mo:3.9-3.15: warning [M0194], unused identifier unused (delete or rename to wildcard \`_\` or \`_unused\`)
+✗ Check failed for file Warning.mo (exit code: 1)",
+  "stdout": "moc < 1.3.0: some diagnostic hints may be missing",
+}
+`;
+
 exports[`check error 1`] = `
 {
   "exitCode": 1,

package/tests/check/fix/overlapping.mo

@@ -0,0 +1,10 @@
+import Array "mo:core/Array";
+
+// Overlapping fixable errors (nested calls produce overlapping M0223 + M0236 edits)
+do {
+  let ar = [1, 2, 3];
+  let _ = Array.filter<Nat>(
+    Array.filter<Nat>(ar, func(x) { x > 0 }),
+    func(x) { x > 0 },
+  );
+};

package/tests/check/moc-args/Warning.mo

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

package/tests/check/moc-args/mops.toml

@@ -0,0 +1,2 @@
+[moc]
+args = ["-Werror"]

package/tests/check-fix.test.ts

@@ -80,6 +80,10 @@ describe("check --fix", () => {
     });
   });
 
+  test("overlapping edits", async () => {
+    await testCheckFix("overlapping.mo", { M0223: 1, M0236: 2 });
+  });
+
   test("transitive imports", async () => {
     const runMainPath = copyFixture("transitive-main.mo");
     const runLibPath = copyFixture("transitive-lib.mo");
@@ -100,6 +104,25 @@ describe("check --fix", () => {
     expect(countCodes(afterResult.stdout)).toEqual({});
   });
 
+  test("--error-format=human does not break --fix", async () => {
+    const runFilePath = copyFixture("M0223.mo");
+
+    const fixResult = await cli(
+      [
+        "check",
+        runFilePath,
+        "--fix",
+        "--",
+        warningFlags,
+        "--error-format=human",
+      ],
+      { cwd: fixDir },
+    );
+
+    expect(fixResult.stdout).toContain("1 fix applied");
+    expect(readFileSync(runFilePath, "utf-8")).not.toContain("<Nat>");
+  });
+
   test("verbose", async () => {
     const result = await cli(["check", "Ok.mo", "--fix", "--verbose"], {
       cwd: fixDir,

package/tests/check.test.ts

@@ -43,4 +43,9 @@ describe("check", () => {
     expect(result.stderr).toMatch(/warning \[M0194\]/);
     expect(result.stderr).toMatch(/unused identifier/);
   });
+
+  test("[moc] args are passed to moc", async () => {
+    const cwd = path.join(import.meta.dirname, "check/moc-args");
+    await cliSnapshot(["check", "Warning.mo"], { cwd }, 1);
+  });
 });

package/tests/moc-args.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, test } from "@jest/globals";
+import path from "path";
+import { cli } from "./helpers";
+
+describe("moc-args", () => {
+  test("prints moc args from [moc] config", async () => {
+    const cwd = path.join(import.meta.dirname, "check/moc-args");
+    const result = await cli(["moc-args"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toBe("-Werror");
+  });
+
+  test("prints nothing when no [moc] config", async () => {
+    const cwd = path.join(import.meta.dirname, "check/success");
+    const result = await cli(["moc-args"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stdout).toBe("");
+  });
+});

package/types.ts

@@ -19,6 +19,9 @@ export type Config = {
   "dev-dependencies"?: Dependencies;
   toolchain?: Toolchain;
   requirements?: Requirements;
+  moc?: {
+    args?: string[];
+  };
   canisters?: Record<string, string | CanisterConfig>;
   build?: {
     outputDir?: string;