@t09tanaka/test-gates 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -691,14 +691,17 @@ function parseImports(source) {
     const clause = match[3];
     const module2 = match[5];
     const braces = /\{([^}]*)\}/.exec(clause);
-    const names = braces ? braces[1].split(",").map((part) => part.trim()).filter((part) => part !== "" && !/^type\s/.test(part)).map((part) => part.split(/\s+as\s+/)[0].trim()) : [];
+    const entries = braces ? braces[1].split(",").map((part) => part.trim()).filter((part) => part !== "") : [];
+    const names = entries.filter((part) => !/^type\s/.test(part)).map((part) => part.split(/\s+as\s+/)[0].trim());
     const outsideBraces = clause.replace(/\{[^}]*\}/, "").replace(/,/g, "").trim();
     found.push({
       module: module2,
       line: lineAt(source, match.index + match[0].lastIndexOf(module2)),
       typeOnly: match[2] !== void 0,
       names,
-      whole: outsideBraces !== ""
+      whole: outsideBraces !== "",
+      ...match[2] === void 0 && outsideBraces === "" && entries.length > 0 && // `type as kind` imports the value named `type`.
+      entries.every((part) => /^type\s+(?!as\s)[\w$]/.test(part)) ? { inlineTypes: true } : {}
     });
   }
   for (const match of source.matchAll(SIDE_EFFECT_IMPORT)) {
@@ -713,6 +716,9 @@ function parseImports(source) {
   }
   for (const match of source.matchAll(CALL_IMPORT)) {
     const module2 = match[2];
+    if (match[1] === "`" && module2.includes("${")) {
+      continue;
+    }
     found.push({
       module: module2,
       line: lineAt(source, match.index + match[0].lastIndexOf(module2)),
@@ -723,7 +729,7 @@ function parseImports(source) {
   }
   return found.sort((a, b) => a.line - b.line);
 }
-var COMPUTED_CALL_IMPORT = /(?<![.\w$])(?:require|import)\s*\(\s*(?!['"`\s)])/g;
+var COMPUTED_CALL_IMPORT = /(?<![.\w$])(?:require|import)\s*\((?!\s*(?:\)|(?:'(?:[^'\\\n]|\\.)*'|"(?:[^"\\\n]|\\.)*"|`(?:[^`\\$]|\\.|\$(?!\{))*`)\s*\)))/g;
 function findUncheckableImports(source) {
   return [...source.matchAll(COMPUTED_CALL_IMPORT)].map((match) => lineAt(source, match.index));
 }
@@ -750,7 +756,11 @@ function resolveSpecifier(specifier, fromFile, aliases) {
   const segments = [];
   for (const segment of joined.split("/")) {
     if (segment === "..") {
-      segments.pop();
+      if (segments.length === 0 || segments[segments.length - 1] === "..") {
+        segments.push(segment);
+      } else {
+        segments.pop();
+      }
     } else if (segment !== "." && segment !== "") {
       segments.push(segment);
     }
@@ -1121,6 +1131,41 @@ function sliceByLocation(source, location) {
 function keyOf(mutator, original, replacement) {
   return JSON.stringify([mutator, normalizeCode(original), normalizeCode(replacement)]);
 }
+function locateMutants(source, mutants) {
+  const located = [];
+  const byKey = /* @__PURE__ */ new Map();
+  const outside = [];
+  const sorted = [...mutants].sort(
+    (a, b) => a.location.start.line - b.location.start.line || a.location.start.column - b.location.start.column
+  );
+  for (const mutant of sorted) {
+    const original = sliceByLocation(normalizeNewlines(source), mutant.location);
+    if (original === null) {
+      outside.push(mutant);
+      continue;
+    }
+    const replacement = mutant.replacement ?? "";
+    const key = keyOf(mutant.mutatorName, original, replacement);
+    const group = byKey.get(key) ?? [];
+    const entry = { mutant, original, replacement, occurrence: group.length + 1, sameKeyCount: 0 };
+    group.push(entry);
+    byKey.set(key, group);
+    located.push(entry);
+  }
+  for (const group of byKey.values()) {
+    for (const entry of group) {
+      entry.sameKeyCount = group.length;
+    }
+  }
+  return { located, byKey, outside };
+}
+function resolveEntry(entry, byKey) {
+  const group = byKey.get(keyOf(entry.mutator, entry.original, entry.replacement)) ?? [];
+  if (entry.occurrence === void 0 && group.length > 1) {
+    return { ambiguous: group.length };
+  }
+  return { target: group[(entry.occurrence ?? 1) - 1] };
+}
 function describeMutant(file, entry) {
   const { mutant } = entry;
   return {
@@ -1194,43 +1239,15 @@ function judgeMutationReport(input) {
       });
       continue;
     }
-    const located = [];
-    const byKey = /* @__PURE__ */ new Map();
-    const sorted = [...result.mutants].sort(
-      (a, b) => a.location.start.line - b.location.start.line || a.location.start.column - b.location.start.column
-    );
-    let locationsValid = true;
-    for (const mutant of sorted) {
-      const original = sliceByLocation(normalizeNewlines(source), mutant.location);
-      if (original === null) {
-        violations.push({
-          file: gate.path,
-          line: mutant.location.start.line,
-          message: `the report location of a ${mutant.mutatorName} mutant is outside the source`
-        });
-        locationsValid = false;
-        continue;
-      }
-      const replacement = mutant.replacement ?? "";
-      const key = keyOf(mutant.mutatorName, original, replacement);
-      const group = byKey.get(key) ?? [];
-      const entry = {
-        mutant,
-        original,
-        replacement,
-        occurrence: group.length + 1,
-        sameKeyCount: 0
-      };
-      group.push(entry);
-      byKey.set(key, group);
-      located.push(entry);
-    }
-    for (const group of byKey.values()) {
-      for (const entry of group) {
-        entry.sameKeyCount = group.length;
-      }
+    const { located, byKey, outside } = locateMutants(source, result.mutants);
+    for (const mutant of outside) {
+      violations.push({
+        file: gate.path,
+        line: mutant.location.start.line,
+        message: `the report location of a ${mutant.mutatorName} mutant is outside the source`
+      });
     }
-    if (!locationsValid) {
+    if (outside.length > 0) {
       continue;
     }
     const claim = (field, entries, noun, accept) => {
@@ -1243,15 +1260,15 @@ function judgeMutationReport(input) {
           return;
         }
         const at = `${gate.path}: ${field}[${index}] (${describeAllowance(entry)})`;
-        const group = byKey.get(keyOf(entry.mutator, entry.original, entry.replacement)) ?? [];
-        if (entry.occurrence === void 0 && group.length > 1) {
+        const found = resolveEntry(entry, byKey);
+        if ("ambiguous" in found) {
           violations.push({
             file: MANIFEST_FILE,
-            message: `${at}: matches ${group.length} mutants in the file. Add "occurrence" (1-based) to pick one`
+            message: `${at}: matches ${found.ambiguous} mutants in the file. Add "occurrence" (1-based) to pick one`
           });
           return;
         }
-        const target = group[(entry.occurrence ?? 1) - 1];
+        const target = found.target;
         const refusal = target ? accept(target.mutant.status) : `stale ${noun} (no such mutant in this run). Remove it`;
         if (!target || refusal !== null) {
           violations.push({ file: MANIFEST_FILE, message: `${at}: ${refusal}` });

package/dist/index.js

@@ -45,14 +45,17 @@ function parseImports(source) {
     const clause = match[3];
     const module = match[5];
     const braces = /\{([^}]*)\}/.exec(clause);
-    const names = braces ? braces[1].split(",").map((part) => part.trim()).filter((part) => part !== "" && !/^type\s/.test(part)).map((part) => part.split(/\s+as\s+/)[0].trim()) : [];
+    const entries = braces ? braces[1].split(",").map((part) => part.trim()).filter((part) => part !== "") : [];
+    const names = entries.filter((part) => !/^type\s/.test(part)).map((part) => part.split(/\s+as\s+/)[0].trim());
     const outsideBraces = clause.replace(/\{[^}]*\}/, "").replace(/,/g, "").trim();
     found.push({
       module,
       line: lineAt(source, match.index + match[0].lastIndexOf(module)),
       typeOnly: match[2] !== void 0,
       names,
-      whole: outsideBraces !== ""
+      whole: outsideBraces !== "",
+      ...match[2] === void 0 && outsideBraces === "" && entries.length > 0 && // `type as kind` imports the value named `type`.
+      entries.every((part) => /^type\s+(?!as\s)[\w$]/.test(part)) ? { inlineTypes: true } : {}
     });
   }
   for (const match of source.matchAll(SIDE_EFFECT_IMPORT)) {
@@ -67,6 +70,9 @@ function parseImports(source) {
   }
   for (const match of source.matchAll(CALL_IMPORT)) {
     const module = match[2];
+    if (match[1] === "`" && module.includes("${")) {
+      continue;
+    }
     found.push({
       module,
       line: lineAt(source, match.index + match[0].lastIndexOf(module)),
@@ -77,7 +83,7 @@ function parseImports(source) {
   }
   return found.sort((a, b) => a.line - b.line);
 }
-var COMPUTED_CALL_IMPORT = /(?<![.\w$])(?:require|import)\s*\(\s*(?!['"`\s)])/g;
+var COMPUTED_CALL_IMPORT = /(?<![.\w$])(?:require|import)\s*\((?!\s*(?:\)|(?:'(?:[^'\\\n]|\\.)*'|"(?:[^"\\\n]|\\.)*"|`(?:[^`\\$]|\\.|\$(?!\{))*`)\s*\)))/g;
 function findUncheckableImports(source) {
   return [...source.matchAll(COMPUTED_CALL_IMPORT)].map((match) => lineAt(source, match.index));
 }
@@ -104,7 +110,11 @@ function resolveSpecifier(specifier, fromFile, aliases) {
   const segments = [];
   for (const segment of joined.split("/")) {
     if (segment === "..") {
-      segments.pop();
+      if (segments.length === 0 || segments[segments.length - 1] === "..") {
+        segments.push(segment);
+      } else {
+        segments.pop();
+      }
     } else if (segment !== "." && segment !== "") {
       segments.push(segment);
     }
@@ -475,6 +485,41 @@ function sliceByLocation(source, location) {
 function keyOf(mutator, original, replacement) {
   return JSON.stringify([mutator, normalizeCode(original), normalizeCode(replacement)]);
 }
+function locateMutants(source, mutants) {
+  const located = [];
+  const byKey = /* @__PURE__ */ new Map();
+  const outside = [];
+  const sorted = [...mutants].sort(
+    (a, b) => a.location.start.line - b.location.start.line || a.location.start.column - b.location.start.column
+  );
+  for (const mutant of sorted) {
+    const original = sliceByLocation(normalizeNewlines(source), mutant.location);
+    if (original === null) {
+      outside.push(mutant);
+      continue;
+    }
+    const replacement = mutant.replacement ?? "";
+    const key = keyOf(mutant.mutatorName, original, replacement);
+    const group = byKey.get(key) ?? [];
+    const entry = { mutant, original, replacement, occurrence: group.length + 1, sameKeyCount: 0 };
+    group.push(entry);
+    byKey.set(key, group);
+    located.push(entry);
+  }
+  for (const group of byKey.values()) {
+    for (const entry of group) {
+      entry.sameKeyCount = group.length;
+    }
+  }
+  return { located, byKey, outside };
+}
+function resolveEntry(entry, byKey) {
+  const group = byKey.get(keyOf(entry.mutator, entry.original, entry.replacement)) ?? [];
+  if (entry.occurrence === void 0 && group.length > 1) {
+    return { ambiguous: group.length };
+  }
+  return { target: group[(entry.occurrence ?? 1) - 1] };
+}
 function describeMutant(file, entry) {
   const { mutant } = entry;
   return {
@@ -548,43 +593,15 @@ function judgeMutationReport(input) {
       });
       continue;
     }
-    const located = [];
-    const byKey = /* @__PURE__ */ new Map();
-    const sorted = [...result.mutants].sort(
-      (a, b) => a.location.start.line - b.location.start.line || a.location.start.column - b.location.start.column
-    );
-    let locationsValid = true;
-    for (const mutant of sorted) {
-      const original = sliceByLocation(normalizeNewlines(source), mutant.location);
-      if (original === null) {
-        violations.push({
-          file: gate.path,
-          line: mutant.location.start.line,
-          message: `the report location of a ${mutant.mutatorName} mutant is outside the source`
-        });
-        locationsValid = false;
-        continue;
-      }
-      const replacement = mutant.replacement ?? "";
-      const key = keyOf(mutant.mutatorName, original, replacement);
-      const group = byKey.get(key) ?? [];
-      const entry = {
-        mutant,
-        original,
-        replacement,
-        occurrence: group.length + 1,
-        sameKeyCount: 0
-      };
-      group.push(entry);
-      byKey.set(key, group);
-      located.push(entry);
-    }
-    for (const group of byKey.values()) {
-      for (const entry of group) {
-        entry.sameKeyCount = group.length;
-      }
+    const { located, byKey, outside } = locateMutants(source, result.mutants);
+    for (const mutant of outside) {
+      violations.push({
+        file: gate.path,
+        line: mutant.location.start.line,
+        message: `the report location of a ${mutant.mutatorName} mutant is outside the source`
+      });
     }
-    if (!locationsValid) {
+    if (outside.length > 0) {
       continue;
     }
     const claim = (field, entries, noun, accept) => {
@@ -597,15 +614,15 @@ function judgeMutationReport(input) {
           return;
         }
         const at = `${gate.path}: ${field}[${index}] (${describeAllowance(entry)})`;
-        const group = byKey.get(keyOf(entry.mutator, entry.original, entry.replacement)) ?? [];
-        if (entry.occurrence === void 0 && group.length > 1) {
+        const found = resolveEntry(entry, byKey);
+        if ("ambiguous" in found) {
           violations.push({
             file: MANIFEST_FILE,
-            message: `${at}: matches ${group.length} mutants in the file. Add "occurrence" (1-based) to pick one`
+            message: `${at}: matches ${found.ambiguous} mutants in the file. Add "occurrence" (1-based) to pick one`
           });
           return;
         }
-        const target = group[(entry.occurrence ?? 1) - 1];
+        const target = found.target;
         const refusal = target ? accept(target.mutant.status) : `stale ${noun} (no such mutant in this run). Remove it`;
         if (!target || refusal !== null) {
           violations.push({ file: MANIFEST_FILE, message: `${at}: ${refusal}` });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t09tanaka/test-gates",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Test gates for the code that must not be wrong: per-file 100% coverage as the floor, mutation testing with a per-mutant allow list as the real check.",
   "author": "t09tanaka",
   "license": "MIT",