ic-mops 2.5.0 → 2.6.0

package/tests/lint-extends/src/NoBoolSwitch.mo

@@ -0,0 +1,8 @@
+module {
+  public func boolSwitch(b : Bool) : Bool {
+    switch (b) {
+      case false { false };
+      case true { true };
+    };
+  };
+};

package/tests/lint-extends-all/mops.toml

@@ -0,0 +1,8 @@
+[dependencies]
+my-pkg = "../lint-extends/my-pkg"
+
+[toolchain]
+lintoko = "0.7.0"
+
+[lint]
+extends = true

package/tests/lint-extends-all/src/NoBoolSwitch.mo

@@ -0,0 +1,8 @@
+module {
+  public func boolSwitch(b : Bool) : Bool {
+    switch (b) {
+      case false { false };
+      case true { true };
+    };
+  };
+};

package/tests/lint-extends-ignored/mops.toml

@@ -0,0 +1,8 @@
+[dependencies]
+my-pkg = "../lint-extends/my-pkg"
+
+[toolchain]
+lintoko = "0.7.0"
+
+[lint]
+extends = ["other-pkg"]

package/tests/lint-extends-ignored/src/NoBoolSwitch.mo

@@ -0,0 +1,8 @@
+module {
+  public func boolSwitch(b : Bool) : Bool {
+    switch (b) {
+      case false { false };
+      case true { true };
+    };
+  };
+};

package/tests/lint.test.ts

@@ -1,6 +1,6 @@
-import { describe, test } from "@jest/globals";
+import { describe, expect, test } from "@jest/globals";
 import path from "path";
-import { cliSnapshot } from "./helpers";
+import { cli, cliSnapshot } from "./helpers";
 
 describe("lint", () => {
   test("ok", async () => {
@@ -14,4 +14,34 @@ describe("lint", () => {
     await cliSnapshot(["lint", "NoBoolSwitch", "--verbose"], { cwd }, 1);
     await cliSnapshot(["lint", "DoesNotExist"], { cwd }, 1);
   });
+
+  test("[lint] rules - additional config rules directory is used", async () => {
+    const cwd = path.join(import.meta.dirname, "lint-config-rules");
+    const result = await cli(["lint"], { cwd });
+    expect(result.exitCode).toBe(1);
+    expect(result.stderr).toMatch(/no-bool-switch/);
+  });
+
+  test("[lint] extends - picks up rules/ from named dependency", async () => {
+    const cwd = path.join(import.meta.dirname, "lint-extends");
+    const result = await cli(["lint"], { cwd });
+    expect(result.exitCode).toBe(1);
+    expect(result.stderr).toMatch(/no-bool-switch/);
+  });
+
+  test("[lint] extends true - picks up rules/ from all dependencies", async () => {
+    const cwd = path.join(import.meta.dirname, "lint-extends-all");
+    const result = await cli(["lint"], { cwd });
+    expect(result.exitCode).toBe(1);
+    expect(result.stderr).toMatch(/no-bool-switch/);
+  });
+
+  test("[lint] extends - dep not in extends list is ignored", async () => {
+    // my-pkg has rules/ but extends only lists "other-pkg" (which doesn't exist),
+    // so no dep rules are loaded and NoBoolSwitch.mo passes with exit 0.
+    const cwd = path.join(import.meta.dirname, "lint-extends-ignored");
+    const result = await cli(["lint"], { cwd });
+    expect(result.exitCode).toBe(0);
+    expect(result.stderr).toMatch(/not found in dependencies/);
+  });
 });

package/types.ts

@@ -29,6 +29,8 @@ export type Config = {
   };
   lint?: {
     args?: string[];
+    rules?: string[];
+    extends?: string[] | true;
   };
 };
 

package/vessel.ts

@@ -181,7 +181,7 @@ export const installFromGithub = async (
     silent = false,
     ignoreTransitive = false,
   } = {},
-) => {
+): Promise<boolean> => {
   let cacheName = getGithubDepCacheName(name, repo);
   let cacheDir = getDepCacheDir(cacheName);
 
@@ -205,7 +205,7 @@ export const installFromGithub = async (
       await downloadFromGithub(repo, cacheDir, progress);
     } catch (err) {
       deleteSync([cacheDir], { force: true });
-      process.exit(1);
+      return false;
     }
   }
 
@@ -216,7 +216,7 @@ export const installFromGithub = async (
   }
 
   if (ignoreTransitive) {
-    return;
+    return true;
   }
 
   const config = await readVesselConfig(cacheDir, { silent });
@@ -228,4 +228,6 @@ export const installFromGithub = async (
       }
     }
   }
+
+  return true;
 };