@utoo/lint 0.4.7 → 0.4.9

package/bin/migrate.js

@@ -7,6 +7,7 @@ import { Legacy } from "@eslint/eslintrc";
 import eslintJs from "@eslint/js";
 
 import { Linter } from "../index.js";
+import { nativeRuleConfig } from "../lib/native-rule-options.cjs";
 
 const ESLINT_CONFIG_FILENAMES = [
   "eslint.config.js",
@@ -37,11 +38,23 @@ const MIGRATION_SOURCE = Symbol("migrationSource");
 const JAVASCRIPT_CONFIG_LOADER_SCRIPT = `
 import { writeFileSync } from "node:fs";
 import { pathToFileURL } from "node:url";
+import { nativeRuleConfig } from ${JSON.stringify(new URL("../lib/native-rule-options.cjs", import.meta.url).href)};
 
 const loaded = await import(pathToFileURL(process.argv[1]).href);
+const nativeRuleIds = new Map(JSON.parse(process.argv[2]));
 const seen = new Set();
 
-function strip(value) {
+function nativeOptions(rules) {
+  if (!rules || typeof rules !== "object" || Array.isArray(rules)) {
+    return rules;
+  }
+  return Object.fromEntries(Object.entries(rules).map(([ruleId, ruleConfig]) => [
+    ruleId,
+    nativeRuleIds.has(ruleId) ? nativeRuleConfig(nativeRuleIds.get(ruleId), ruleConfig) : ruleConfig
+  ]));
+}
+
+function strip(value, configEntry = false) {
   if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
     return value;
   }
@@ -56,13 +69,19 @@ function strip(value) {
   }
   seen.add(value);
   if (Array.isArray(value)) {
-    const items = value.map(strip).filter((item) => item !== undefined);
+    const items = value.map((item) => strip(item, configEntry)).filter((item) => item !== undefined);
     seen.delete(value);
     return items;
   }
   const object = {};
   for (const [key, item] of Object.entries(value)) {
-    const stripped = strip(item);
+    // Preserve native unlimited spellings before this subprocess serializes
+    // the config. Only rules that will be migrated need native JSON options;
+    // ignored and unsupported plugin rules retain the usual report behavior.
+    const stripped = strip(
+      configEntry && key === "rules" ? nativeOptions(item) : item,
+      configEntry && key === "overrides"
+    );
     if (stripped !== undefined) {
       object[key] = stripped;
     }
@@ -71,7 +90,7 @@ function strip(value) {
   return object;
 }
 
-const json = JSON.stringify(strip(loaded.default ?? loaded));
+const json = JSON.stringify(strip(loaded.default ?? loaded, true));
 if (json === undefined) {
   throw new TypeError("config did not export a migratable value");
 }
@@ -192,8 +211,8 @@ function migrateEslintConfig(options) {
     throw new Error("utoo-lint migrate eslint: no ESLint config found; pass --from PATH");
   }
 
-  const eslintConfig = loadEslintConfig(sourcePath, options.cwd);
   const supportedRuleIds = new Set(new Linter().getRules().keys());
+  const eslintConfig = loadEslintConfig(sourcePath, options.cwd, supportedRuleIds);
   const migrationInput = migrationInputFromConfig(
     eslintConfig,
     sourcePath,
@@ -224,7 +243,7 @@ function migrateEslintConfig(options) {
           unsupportedRules.push({ ruleId, scope: migrationRuleScope(entry), source });
           continue;
         }
-        rules[migratedRuleId] = migratableRuleConfig(ruleConfig);
+        rules[migratedRuleId] = nativeRuleConfig(migratedRuleId, ruleConfig);
         supportedRules.push(migratedRuleId);
         if (migratedRuleId !== ruleId) {
           translatedRules.push({ sourceRuleId: ruleId, targetRuleId: migratedRuleId });
@@ -665,9 +684,17 @@ function findEslintConfig(cwd) {
   }
 }
 
-function loadEslintConfig(path, cwd) {
+function loadEslintConfig(path, cwd, supportedRuleIds) {
   if (JAVASCRIPT_CONFIG_EXTENSIONS.has(extname(path))) {
-    const result = spawnSync(process.execPath, ["--input-type=module", "--eval", JAVASCRIPT_CONFIG_LOADER_SCRIPT, path], {
+    const nativeRuleIds = new Map([...supportedRuleIds]
+      .filter((ruleId) => !IGNORED_RULES.has(ruleId))
+      .map((ruleId) => [ruleId, ruleId]));
+    for (const [sourceRuleId, targetRuleId] of REVIEWED_RULE_ALIASES) {
+      if (supportedRuleIds.has(targetRuleId)) {
+        nativeRuleIds.set(sourceRuleId, targetRuleId);
+      }
+    }
+    const result = spawnSync(process.execPath, ["--input-type=module", "--eval", JAVASCRIPT_CONFIG_LOADER_SCRIPT, path, JSON.stringify([...nativeRuleIds])], {
       cwd,
       encoding: "utf8",
       stdio: ["ignore", "pipe", "pipe", "pipe"]
@@ -761,10 +788,6 @@ function isGlobalIgnoreEntry(entry) {
   return Boolean(entry.ignores) && Object.keys(entry).every((key) => key === "name" || key === "ignores");
 }
 
-function migratableRuleConfig(ruleConfig) {
-  return Array.isArray(ruleConfig) ? [...ruleConfig] : ruleConfig;
-}
-
 function isRuleDisabled(ruleConfig) {
   const severity = Array.isArray(ruleConfig) ? ruleConfig[0] : ruleConfig;
   return severity === "off" || severity === 0 || severity === false;

package/lib/estree-parser.cjs

@@ -178,32 +178,6 @@ function forEachChild(node, callback) {
   }
 }
 
-const JSX_ENTITIES = {
-  amp: "&", lt: "<", gt: ">", quot: "\"", apos: "'", nbsp: "\u00a0", copy: "\u00a9", reg: "\u00ae",
-  trade: "\u2122", hellip: "\u2026", mdash: "\u2014", ndash: "\u2013", laquo: "\u00ab", raquo: "\u00bb",
-  lsquo: "\u2018", rsquo: "\u2019", ldquo: "\u201c", rdquo: "\u201d", times: "\u00d7", divide: "\u00f7",
-  euro: "\u20ac", pound: "\u00a3", yen: "\u00a5", cent: "\u00a2", deg: "\u00b0", plusmn: "\u00b1",
-  middot: "\u00b7", bull: "\u2022", larr: "\u2190", rarr: "\u2192", uarr: "\u2191", darr: "\u2193",
-  hearts: "\u2665", sect: "\u00a7", para: "\u00b6", iexcl: "\u00a1", iquest: "\u00bf", frac12: "\u00bd",
-  frac14: "\u00bc", frac34: "\u00be", micro: "\u00b5", ensp: "\u2002", emsp: "\u2003", thinsp: "\u2009",
-  zwnj: "\u200c", zwj: "\u200d", shy: "\u00ad", infin: "\u221e", ne: "\u2260", le: "\u2264", ge: "\u2265"
-};
-
-// ESLint's parsers expose entity-decoded JSX text and attribute values while
-// keeping `raw` intact; mirror that for the common entities.
-function decodeJsxEntities(value) {
-  if (typeof value !== "string" || !value.includes("&")) {
-    return value;
-  }
-  return value.replace(/&(#x[0-9a-fA-F]+|#[0-9]+|[a-zA-Z][a-zA-Z0-9]*);/gu, (match, entity) => {
-    if (entity[0] === "#") {
-      const codePoint = entity[1] === "x" || entity[1] === "X" ? Number.parseInt(entity.slice(2), 16) : Number.parseInt(entity.slice(1), 10);
-      return Number.isFinite(codePoint) && codePoint <= 0x10ffff ? String.fromCodePoint(codePoint) : match;
-    }
-    return Object.hasOwn(JSX_ENTITIES, entity) ? JSX_ENTITIES[entity] : match;
-  });
-}
-
 function setParent(node, parent) {
   Object.defineProperty(node, "parent", {
     value: parent,
@@ -230,9 +204,6 @@ function normalizeTree(program, text, locate) {
     }
     decorateNode(node, locate);
     setParent(node, parent);
-    if (node.type === "JSXText" || (node.type === "Literal" && parent?.type === "JSXAttribute")) {
-      node.value = decodeJsxEntities(node.value);
-    }
     forEachChild(node, (child) => stack.push([child, node]));
   }
   program.start = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/lint",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "High-performance JavaScript and TypeScript linter powered by Yuku",
   "license": "MIT",
   "repository": {
@@ -74,11 +74,11 @@
     "use-at-your-own-risk.js"
   ],
   "optionalDependencies": {
-    "@utoo/lint-darwin-arm64": "0.4.7",
-    "@utoo/lint-darwin-x64": "0.4.7",
-    "@utoo/lint-linux-arm64": "0.4.7",
-    "@utoo/lint-linux-x64": "0.4.7",
-    "@utoo/lint-win32-x64": "0.4.7"
+    "@utoo/lint-darwin-arm64": "0.4.9",
+    "@utoo/lint-darwin-x64": "0.4.9",
+    "@utoo/lint-linux-arm64": "0.4.9",
+    "@utoo/lint-linux-x64": "0.4.9",
+    "@utoo/lint-win32-x64": "0.4.9"
   },
   "dependencies": {
     "@eslint/eslintrc": "2.1.4",
@@ -88,7 +88,7 @@
     "eslint-scope": "9.1.2",
     "esquery": "1.7.0",
     "jiti": "2.7.0",
-    "yuku-parser": "0.10.1"
+    "yuku-parser": "0.18.0"
   },
   "publishConfig": {
     "access": "public",