@avi2dg/checks 0.43.0 → 0.44.0

package/src/testing/test-layout.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env bun
 import { Console, Effect, FileSystem, Path, Schema } from "effect";
-import { git } from "../core/git.ts";
+import { workingTreeFiles } from "../core/git.ts";
 import { runMain } from "../core/main.ts";
 import { ENTRY_POINT, TEST_ENTRY_POINT } from "../core/gates.ts";
 import { identifierName, isRecord, lineOf, parseTypeScript, spanStart, stringValue } from "../core/swc.ts";
-import { testOptions, type TestOptions } from "./test.ts";
+import { scriptOptions } from "./test.ts";
 
 export type Violation = {
   readonly file: string;
@@ -61,7 +61,6 @@ const ACCEPTED_IGNORES: readonly (readonly string[])[] = [
 export const LAYOUT_CHECK_MARK = "src/testing/test-layout.ts";
 export const LAYOUT_CHECK_BIN = "checks-test-layout";
 const OWN_ENTRY_POINT = `src/${ENTRY_POINT.script}`;
-const TEST_SCRIPTS: readonly string[] = [TEST_ENTRY_POINT.bin, `bun src/${TEST_ENTRY_POINT.script}`];
 const PARALLEL_OPTION = "optionally with --parallel=<workers>";
 
 export class LayoutError extends Schema.TaggedError<LayoutError>()("LayoutError", {
@@ -231,12 +230,6 @@ export const isolationViolations = Effect.fn("isolationViolations")(function* (f
   return violations;
 });
 
-function entryOptions(script: unknown): TestOptions | undefined {
-  if (typeof script !== "string") return undefined;
-  const entry = TEST_SCRIPTS.find((candidate) => script === candidate || script.startsWith(`${candidate} `));
-  return entry === undefined ? undefined : testOptions(script.slice(entry.length).split(" ").filter((arg) => arg !== ""));
-}
-
 function tierScriptViolation(scripts: unknown, files: readonly string[], tier: (typeof TEST_TIERS)[number]): Violation | undefined {
   const file = "package.json";
   const key = `test:${tier}`;
@@ -244,7 +237,7 @@ function tierScriptViolation(scripts: unknown, files: readonly string[], tier: (
   const expected = `${TEST_ENTRY_POINT.bin} --tier=${tier}`;
   const hasTests = files.some((candidate) => candidate.startsWith(`tests/${tier}/`) && TEST_FILE.test(candidate));
   if (!hasTests && found === undefined) return undefined;
-  if (entryOptions(found)?.tier === tier) return undefined;
+  if (scriptOptions(found)?.tier === tier) return undefined;
   return {
     file,
     line: undefined,
@@ -258,7 +251,7 @@ export function scriptViolations(manifest: unknown, files: readonly string[] = [
   const test = isRecord(scripts) ? scripts["test"] : undefined;
   const lint = isRecord(scripts) ? scripts["lint"] : undefined;
   const violations: Violation[] = [];
-  const options = entryOptions(test);
+  const options = scriptOptions(test);
   if (options === undefined || options.tier !== undefined) {
     violations.push({
       file,
@@ -308,15 +301,6 @@ export function bunfigViolations(consumer: unknown, preset: unknown): readonly V
   return violations;
 }
 
-const workingTreeFiles = Effect.fn("workingTreeFiles")(function* (root: string) {
-  const fs = yield* FileSystem.FileSystem;
-  const path = yield* Path.Path;
-  const listed = yield* git(["ls-files", "-z", "--cached", "--others", "--exclude-standard"], root);
-  return yield* Effect.filter(listed.split("\0").filter(Boolean), (file) => fs.exists(path.join(root, file)), {
-    concurrency: "unbounded",
-  });
-});
-
 const parsedToml = Effect.fn("parsedToml")(function* (file: string) {
   const text = yield* (yield* FileSystem.FileSystem).readFileString(file);
   return yield* Effect.try({

package/src/testing/test-skips.ts

@@ -2,7 +2,7 @@ import { Effect, FileSystem, Path, Schema } from "effect";
 import { identifierName, isRecord, lineOf, parseTypeScript, spanStart, stringValue } from "../core/swc.ts";
 
 export type Environment = "ci" | "local";
-export type TestTier = "live" | "pixel";
+export type TestTier = "live" | "pixel" | "unit" | "e2e";
 export type SkipDeclaration = {
   readonly file: string;
   readonly line: number;

package/src/testing/test.ts

@@ -26,10 +26,12 @@ export type TestOptions = {
 };
 
 const NAME = TEST_ENTRY_POINT.bin;
-const USAGE = `usage: ${NAME} [--tier=live | --tier=pixel] [--parallel=<workers>], and it refuses test filters`;
+const USAGE = `usage: ${NAME} [--tier=live | --tier=pixel | --tier=unit | --tier=e2e] [--parallel=<workers>], and it refuses test filters`;
 const TIERS = new Map<string, TestTier>([
   ["--tier=live", "live"],
   ["--tier=pixel", "pixel"],
+  ["--tier=unit", "unit"],
+  ["--tier=e2e", "e2e"],
 ]);
 const PARALLEL = /^--parallel=([1-9][0-9]*)$/;
 
@@ -50,6 +52,14 @@ export function testOptions(args: readonly string[]): TestOptions | undefined {
   return options;
 }
 
+const TEST_SCRIPTS: readonly string[] = [NAME, `bun src/${TEST_ENTRY_POINT.script}`];
+
+export function scriptOptions(script: unknown): TestOptions | undefined {
+  if (typeof script !== "string") return undefined;
+  const entry = TEST_SCRIPTS.find((candidate) => script === candidate || script.startsWith(`${candidate} `));
+  return entry === undefined ? undefined : testOptions(script.slice(entry.length).split(" ").filter((arg) => arg !== ""));
+}
+
 function matches(declaration: SkipDeclaration, result: TestResult): boolean {
   const { name } = declaration;
   return (
@@ -136,11 +146,17 @@ const environmentOf = Config.Boolean("CI").pipe(
   Effect.mapError((cause) => new SkipGateError({ message: `cannot tell a ci run from a local one: ${cause.message}` })),
 );
 
+function tierArgs(tier: TestTier | undefined): readonly string[] {
+  if (tier === undefined) return [];
+  // The preset ignores tests/live and tests/pixel, so only those tiers clear the ignore list.
+  if (tier === "live" || tier === "pixel") return ["--path-ignore-patterns", "", `./tests/${tier}`];
+  return [`./tests/${tier}`];
+}
+
 const runSuite = Effect.fn("runSuite")(function* (outfile: string, { tier, workers }: TestOptions) {
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-  const tierArgs = tier === undefined ? [] : ["--path-ignore-patterns", "", `./tests/${tier}`];
   const parallelArgs = workers === undefined ? [] : [`--parallel=${workers}`];
-  const args = ["test", "--randomize", ...parallelArgs, ...tierArgs, ...reporterArgs(outfile)];
+  const args = ["test", "--randomize", ...parallelArgs, ...tierArgs(tier), ...reporterArgs(outfile)];
   return yield* spawner.exitCode(
     ChildProcess.make(process.execPath, args, {
       stdin: "ignore",

package/stryker.preset.js

@@ -1,8 +1,8 @@
 import { readdirSync } from "node:fs";
 import { availableParallelism } from "node:os";
 import { fileURLToPath } from "node:url";
-import { GUARD_IGNORER } from "./src/testing/mutation-guard-plugin.js";
-import { fullRunRefusal } from "./src/testing/mutation-scope.js";
+import { GUARD_IGNORER } from "./dist/mutation/mutation-guard-plugin.js";
+import { fullRunRefusal } from "./dist/mutation/mutation-refusal.js";
 
 const [, , command, ...args] = process.argv;
 const refusal = command === "run" ? fullRunRefusal(args, process.env.CI ?? "") : undefined;
@@ -22,7 +22,7 @@ export default {
   plugins: [
     "@stryker-mutator/*",
     "@hughescr/stryker-bun-runner",
-    fileURLToPath(new URL("./src/testing/mutation-guard-plugin.js", import.meta.url)),
+    fileURLToPath(new URL("./dist/mutation/mutation-guard-plugin.js", import.meta.url)),
   ],
   ignorers: [GUARD_IGNORER],
   testRunner: "bun",

package/src/testing/mutation-guard-plugin.js

@@ -1,13 +0,0 @@
-import { missingReportRefusal } from "./mutation-scope.js";
-
-export const GUARD_IGNORER = "checks-incremental-report-guard";
-
-// An ignorer is built before instrumentation from the resolved options, so a throw here stops the run before any mutant.
-function incrementalReportGuard(options) {
-  const refusal = missingReportRefusal(process.argv.slice(3), process.env.CI ?? "", options.incrementalFile);
-  if (refusal !== undefined) throw new Error(refusal);
-  return { shouldIgnore: () => undefined };
-}
-incrementalReportGuard.inject = ["options"];
-
-export const strykerPlugins = [{ kind: "Ignore", name: GUARD_IGNORER, factory: incrementalReportGuard }];