@oxlint/migrate 1.28.0 → 1.30.0

package/README.md

@@ -4,7 +4,7 @@
 [![NPM Version](https://img.shields.io/npm/v/%40oxlint%2Fmigrate)](https://www.npmjs.com/package/@oxlint/migrate)
 [![NPM Downloads](https://img.shields.io/npm/dm/%40oxlint%2Fmigrate)](https://www.npmjs.com/package/@oxlint/migrate)
 
-Generates a `.oxlintrc.json` from a existing eslint flat config.
+Generates a `.oxlintrc.json` from an existing eslint flat config.
 
 ## Usage
 

package/dist/bin/project-loader.mjs

@@ -2,7 +2,7 @@ import { glob } from "tinyglobby";
 const getAllProjectFiles = () => {
   return glob(
     [
-      "**/*.{js,cjs,mjs,ts,cts,mts,vue,astro,svelte}",
+      "**/*.{js,cjs,mjs,ts,cts,mts,jsx,tsx,vue,astro,svelte}",
       "!**/node_modules/**",
       "!**/dist/**"
     ],

package/dist/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "1.28.0";
+const version = "1.30.0";
 const packageJson = {
   version
 };

package/dist/src/cleanup.mjs

@@ -1,4 +1,4 @@
-import { removeGlobalsWithAreCoveredByEnv, transformBoolGlobalToString, ES_VERSIONS, cleanUpUselessOverridesEnv } from "./env_globals.mjs";
+import { removeGlobalsWithAreCoveredByEnv, transformBoolGlobalToString, ES_VERSIONS, cleanUpUselessOverridesEnv, cleanUpSupersetEnvs } from "./env_globals.mjs";
 import { replaceTypescriptAliasRules, replaceNodePluginName, cleanUpRulesWhichAreCoveredByCategory, cleanUpDisabledRootRules, cleanUpUselessOverridesRules, cleanUpUselessOverridesPlugins } from "./plugins_rules.mjs";
 import { isEqualDeep } from "./utilities.mjs";
 const TS_ESLINT_DEFAULT_OVERRIDE = {
@@ -42,6 +42,7 @@ const cleanUpUselessOverridesEntries = (config) => {
   cleanUpUselessOverridesRules(config);
   cleanUpUselessOverridesPlugins(config);
   cleanUpUselessOverridesEnv(config);
+  cleanUpSupersetEnvs(config);
   if (config.overrides === void 0) {
     return;
   }
@@ -53,6 +54,8 @@ const cleanUpUselessOverridesEntries = (config) => {
   config.overrides = config.overrides.filter(
     (overrides) => Object.keys(overrides).length > 0
   );
+  mergeConsecutiveIdenticalOverrides(config);
+  mergeConsecutiveOverridesWithDifferingFiles(config);
   if (config.overrides.length === 0) {
     delete config.overrides;
   }
@@ -84,6 +87,68 @@ const cleanUpOxlintConfig = (config) => {
     cleanUpDisabledRootRules(config);
   }
 };
+function mergeConsecutiveIdenticalOverrides(config) {
+  if (config.overrides === void 0) {
+    return;
+  }
+  if (config.overrides.length <= 1) {
+    return;
+  }
+  const mergedOverrides = [];
+  let i = 0;
+  while (i < config.overrides.length) {
+    const current = config.overrides[i];
+    if (i + 1 < config.overrides.length && isEqualDeep(current, config.overrides[i + 1])) {
+      mergedOverrides.push(current);
+      while (i + 1 < config.overrides.length && isEqualDeep(current, config.overrides[i + 1])) {
+        i++;
+      }
+    } else {
+      mergedOverrides.push(current);
+    }
+    i++;
+  }
+  config.overrides = mergedOverrides;
+}
+function mergeConsecutiveOverridesWithDifferingFiles(config) {
+  if (config.overrides === void 0) {
+    return;
+  }
+  if (config.overrides.length <= 1) {
+    return;
+  }
+  const mergedOverrides = [];
+  let i = 0;
+  while (i < config.overrides.length) {
+    const current = config.overrides[i];
+    const currentFiles = current.files;
+    const { files: _, ...currentWithoutFiles } = current;
+    let j = i + 1;
+    const filesToMerge = [...currentFiles];
+    while (j < config.overrides.length) {
+      const next = config.overrides[j];
+      const { files: __, ...nextWithoutFiles } = next;
+      if (isEqualDeep(currentWithoutFiles, nextWithoutFiles)) {
+        filesToMerge.push(...next.files);
+        j++;
+      } else {
+        break;
+      }
+    }
+    if (j > i + 1) {
+      const uniqueFiles = [...new Set(filesToMerge)];
+      mergedOverrides.push({
+        ...current,
+        files: uniqueFiles
+      });
+      i = j;
+    } else {
+      mergedOverrides.push(current);
+      i++;
+    }
+  }
+  config.overrides = mergedOverrides;
+}
 export {
   cleanUpOxlintConfig
 };

package/dist/src/cleanup.test.d.ts

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

package/dist/src/env_globals.d.ts

@@ -6,3 +6,11 @@ export declare const transformBoolGlobalToString: (config: OxlintConfigOrOverrid
 export declare const detectEnvironmentByGlobals: (config: OxlintConfigOrOverride) => void;
 export declare const transformEnvAndGlobals: (eslintConfig: Linter.Config, targetConfig: OxlintConfigOrOverride, options?: Options) => void;
 export declare const cleanUpUselessOverridesEnv: (config: OxlintConfig) => void;
+/**
+ * Cleans up superset environments in the config and its overrides.
+ * If a superset environment is present, its subset environments are removed, e.g. all globals from `shared-node-browser` are also in `browser` and `node`.
+ *
+ * This also applies for overrides, where if a superset env is defined in the override or main config,
+ * the subset envs can be removed from the override if the override has the same value as the superset.
+ */
+export declare const cleanUpSupersetEnvs: (config: OxlintConfig) => void;

package/dist/src/env_globals.mjs

@@ -21,6 +21,7 @@ const OTHER_SUPPORTED_ENVS = [
   "serviceworker",
   "amd",
   "applescript",
+  "astro",
   "atomtest",
   "commonjs",
   "embertest",
@@ -36,9 +37,11 @@ const OTHER_SUPPORTED_ENVS = [
   "prototypejs",
   "phantomjs",
   "shelljs",
+  "svelte",
   "webextensions",
   "qunit",
-  "vitest"
+  "vitest",
+  "vue"
 ];
 const SUPPORTED_ESLINT_PARSERS = ["typescript-eslint/parser"];
 const normalizeGlobValue = (value) => {
@@ -79,6 +82,7 @@ const transformBoolGlobalToString = (config) => {
     }
   }
 };
+const THRESHOLD_ENVS = ["browser", "node", "serviceworker", "worker"];
 const detectEnvironmentByGlobals = (config) => {
   if (config.globals === void 0) {
     return;
@@ -93,12 +97,14 @@ const detectEnvironmentByGlobals = (config) => {
     let search = Object.keys(entries);
     let matches = search.filter(
       (entry) => (
-        // @ts-ignore -- we already checked for undefined
-        entry in config.globals && // @ts-ignore -- filtering makes the key to any
+        // @ts-expect-error -- we already checked for undefined
+        entry in config.globals && // @ts-expect-error -- filtering makes the key to any
         normalizeGlobValue(config.globals[entry]) === entries[entry]
       )
     );
-    if (search.length === matches.length) {
+    const useThreshold = THRESHOLD_ENVS.includes(env);
+    const withinThreshold = useThreshold && matches.length / search.length >= 0.97;
+    if (withinThreshold || !useThreshold && matches.length === search.length) {
       if (config.env === void 0) {
         config.env = {};
       }
@@ -108,11 +114,11 @@ const detectEnvironmentByGlobals = (config) => {
 };
 const transformEnvAndGlobals = (eslintConfig, targetConfig, options) => {
   if (eslintConfig.languageOptions?.parser !== void 0 && eslintConfig.languageOptions?.parser !== null && typeof eslintConfig.languageOptions.parser === "object" && "meta" in eslintConfig.languageOptions.parser && !SUPPORTED_ESLINT_PARSERS.includes(
-    // @ts-ignore
+    // @ts-expect-error
     eslintConfig.languageOptions.parser.meta?.name
   )) {
     options?.reporter?.report(
-      "special parser detected: " + // @ts-ignore
+      "special parser detected: " + // @ts-expect-error
       eslintConfig.languageOptions.parser.meta?.name
     );
   }
@@ -172,8 +178,53 @@ const cleanUpUselessOverridesEnv = (config) => {
     }
   }
 };
+const SUPERSET_ENVS = {
+  node: ["nodeBuiltin", "shared-node-browser", "commonjs"],
+  browser: ["shared-node-browser"]
+};
+const cleanUpSupersetEnvs = (config) => {
+  if (config.env !== void 0) {
+    for (const [supersetEnv, subsetEnvs] of Object.entries(SUPERSET_ENVS)) {
+      if (!(supersetEnv in config.env)) {
+        continue;
+      }
+      for (const subsetEnv of subsetEnvs) {
+        if (config.env[subsetEnv] === config.env[supersetEnv]) {
+          delete config.env[subsetEnv];
+        }
+      }
+    }
+  }
+  if (config.overrides !== void 0) {
+    for (const override of config.overrides) {
+      if (override.env === void 0) {
+        continue;
+      }
+      for (const [supersetEnv, subsetEnvs] of Object.entries(SUPERSET_ENVS)) {
+        const supersetInOverride = supersetEnv in override.env;
+        const supersetInMain = config.env !== void 0 && supersetEnv in config.env;
+        for (const subsetEnv of subsetEnvs) {
+          if (!(subsetEnv in override.env)) {
+            continue;
+          }
+          if (supersetInOverride && override.env[subsetEnv] === override.env[supersetEnv]) {
+            delete override.env[subsetEnv];
+            continue;
+          }
+          if (supersetInMain && !supersetInOverride && config.env[supersetEnv] === override.env[subsetEnv]) {
+            delete override.env[subsetEnv];
+          }
+        }
+      }
+      if (Object.keys(override.env).length === 0) {
+        delete override.env;
+      }
+    }
+  }
+};
 export {
   ES_VERSIONS,
+  cleanUpSupersetEnvs,
   cleanUpUselessOverridesEnv,
   detectEnvironmentByGlobals,
   removeGlobalsWithAreCoveredByEnv,

package/dist/src/generated/rules.mjs

@@ -53,6 +53,7 @@ const pedanticRules = [
   "@typescript-eslint/no-unsafe-return",
   "@typescript-eslint/only-throw-error",
   "@typescript-eslint/prefer-enum-initializers",
+  "@typescript-eslint/prefer-includes",
   "@typescript-eslint/prefer-promise-reject-errors",
   "@typescript-eslint/prefer-ts-expect-error",
   "@typescript-eslint/related-getter-setter-pairs",
@@ -251,6 +252,8 @@ const styleRules = [
   "unicorn/numeric-separators-style",
   "unicorn/prefer-classlist-toggle",
   "unicorn/prefer-class-fields",
+  "unicorn/prefer-bigint-literals",
+  "unicorn/prefer-response-static-json",
   "unicorn/prefer-global-this",
   "unicorn/prefer-object-from-entries",
   "unicorn/prefer-array-index-of",

package/dist/src/plugins_rules.mjs

@@ -6,8 +6,8 @@ const allRules = Object.values(rules).flat();
 const isValueInSet = (value, validSet) => validSet.includes(value) || Array.isArray(value) && validSet.includes(value[0]);
 const isActiveValue = (value) => isValueInSet(value, ["error", "warn", 1, 2]);
 const isOffValue = (value) => isValueInSet(value, ["off", 0]);
-const isErrorValue = (value) => isValueInSet(value, ["error", 1]);
-const isWarnValue = (value) => isValueInSet(value, ["warn", 2]);
+const isWarnValue = (value) => isValueInSet(value, ["warn", 1]);
+const isErrorValue = (value) => isValueInSet(value, ["error", 2]);
 const normalizeSeverityValue = (value) => {
   if (value === void 0) {
     return value;
@@ -120,17 +120,42 @@ const cleanUpUselessOverridesRules = (config) => {
   if (config.rules === void 0 || config.overrides === void 0) {
     return;
   }
-  for (const override of config.overrides) {
-    if (override.rules === void 0) {
+  const filesPatternMap = /* @__PURE__ */ new Map();
+  for (const [i, override] of config.overrides.entries()) {
+    if (override.files === void 0) {
       continue;
     }
-    for (const [rule, settings] of Object.entries(override.rules)) {
-      if (config.rules[rule] === settings) {
-        delete override.rules[rule];
+    const filesKey = JSON.stringify(override.files);
+    let entry = filesPatternMap.get(filesKey);
+    if (!entry) {
+      entry = {
+        firstIndex: i,
+        finalRules: {},
+        indicesToRemove: []
+      };
+      filesPatternMap.set(filesKey, entry);
+    } else {
+      entry.indicesToRemove.push(i);
+    }
+    if (override.rules) {
+      Object.assign(entry.finalRules, override.rules);
+    }
+  }
+  for (const entry of filesPatternMap.values()) {
+    const firstOverride = config.overrides[entry.firstIndex];
+    firstOverride.rules = entry.finalRules;
+    if (firstOverride.rules) {
+      for (const [rule, settings] of Object.entries(firstOverride.rules)) {
+        if (config.rules[rule] === settings) {
+          delete firstOverride.rules[rule];
+        }
+      }
+      if (Object.keys(firstOverride.rules).length === 0) {
+        delete firstOverride.rules;
       }
     }
-    if (Object.keys(override.rules).length === 0) {
-      delete override.rules;
+    for (const indexToRemove of entry.indicesToRemove) {
+      delete config.overrides[indexToRemove].rules;
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxlint/migrate",
-  "version": "1.28.0",
+  "version": "1.30.0",
   "description": "Generates a `.oxlintrc.json` from a existing eslint flat config",
   "type": "module",
   "bin": {
@@ -63,14 +63,14 @@
     "eslint-plugin-react-hooks": "^7.0.1",
     "eslint-plugin-react-perf": "^3.3.3",
     "eslint-plugin-regexp": "^2.9.0",
-    "eslint-plugin-tsdoc": "^0.4.0",
+    "eslint-plugin-tsdoc": "^0.5.0",
     "eslint-plugin-unicorn": "^62.0.0",
     "husky": "^9.1.7",
     "jiti": "^2.4.2",
     "lint-staged": "^16.1.2",
     "next": "^16.0.0",
-    "oxlint": "^1.28.0",
-    "oxlint-tsgolint": "^0.2.0",
+    "oxlint": "^1.30.0",
+    "oxlint-tsgolint": "^0.8.0",
     "prettier": "^3.6.1",
     "typescript": "^5.8.3",
     "typescript-eslint": "^8.35.0",
@@ -84,11 +84,11 @@
   "dependencies": {
     "commander": "^14.0.0",
     "globals": "^16.3.0",
-    "oxc-parser": "^0.96.0",
+    "oxc-parser": "^0.98.0",
     "tinyglobby": "^0.2.14"
   },
   "peerDependencies": {
     "jiti": "*"
   },
-  "packageManager": "pnpm@10.21.0"
+  "packageManager": "pnpm@10.23.0"
 }