@plugjs/eslint-plugin 0.2.1 → 0.2.2

package/bundles/eslint-plugin-import-x.cjs

@@ -180,7 +180,7 @@ var require_package = __commonJS({
   "node_modules/eslint-plugin-import-x/package.json"(exports2, module2) {
     module2.exports = {
       name: "eslint-plugin-import-x",
-      version: "0.5.2",
+      version: "0.5.3",
       description: "Import with sanity.",
       repository: "git+https://github.com/un-ts/eslint-plugin-import-x",
       author: "JounQin <admin@1stg.me> (https://www.1stG.me)",
@@ -236,6 +236,7 @@ var require_package = __commonJS({
         "is-glob": "^4.0.3",
         minimatch: "^9.0.3",
         semver: "^7.6.0",
+        "stable-hash": "^0.0.4",
         tslib: "^2.6.2"
       },
       devDependencies: {
@@ -964,6 +965,7 @@ var require_export_map = __commonJS({
     var doctrine_1 = tslib_12.__importDefault(require("doctrine"));
     var eslint_1 = require("eslint");
     var get_tsconfig_1 = require("get-tsconfig");
+    var stable_hash_1 = tslib_12.__importDefault(require("stable-hash"));
     var get_value_1 = require_get_value();
     var hash_1 = require_hash();
     var ignore_1 = require_ignore();
@@ -1621,29 +1623,28 @@ var require_export_map = __commonJS({
       }
     }
     exports2.recursivePatternCapture = recursivePatternCapture;
-    var parserOptionsHash = "";
-    var prevParserOptions = "";
-    var settingsHash = "";
-    var prevSettings = "";
     function childContext(path, context) {
-      const { settings, parserOptions, parserPath } = context;
-      if (JSON.stringify(settings) !== prevSettings) {
-        settingsHash = (0, hash_1.hashObject)({ settings }).digest("hex");
-        prevSettings = JSON.stringify(settings);
-      }
-      if (JSON.stringify(parserOptions) !== prevParserOptions) {
-        parserOptionsHash = (0, hash_1.hashObject)({ parserOptions }).digest("hex");
-        prevParserOptions = JSON.stringify(parserOptions);
-      }
+      const { settings, parserOptions, parserPath, languageOptions } = context;
       return {
-        cacheKey: String(parserPath) + parserOptionsHash + settingsHash + String(path),
+        cacheKey: makeContextCacheKey(context) + String(path),
         settings,
         parserOptions,
         parserPath,
+        languageOptions,
         path,
         filename: "physicalFilename" in context ? context.physicalFilename : context.filename
       };
     }
+    function makeContextCacheKey(context) {
+      var _a, _b, _c;
+      const { settings, parserPath, parserOptions, languageOptions } = context;
+      let hash = (0, stable_hash_1.default)(settings) + (0, stable_hash_1.default)((_a = languageOptions === null || languageOptions === void 0 ? void 0 : languageOptions.parserOptions) !== null && _a !== void 0 ? _a : parserOptions);
+      if (languageOptions) {
+        hash += String(languageOptions.ecmaVersion) + String(languageOptions.sourceType);
+      }
+      hash += (0, stable_hash_1.default)((_c = parserPath !== null && parserPath !== void 0 ? parserPath : (_b = languageOptions === null || languageOptions === void 0 ? void 0 : languageOptions.parser) === null || _b === void 0 ? void 0 : _b.meta) !== null && _c !== void 0 ? _c : languageOptions === null || languageOptions === void 0 ? void 0 : languageOptions.parser);
+      return hash;
+    }
     function makeSourceCode(text, ast) {
       if (eslint_1.SourceCode.length > 1) {
         return new eslint_1.SourceCode(text, ast);
@@ -2295,6 +2296,7 @@ var require_dynamic_import_chunkname = __commonJS({
           category: "Style guide",
           description: "Enforce a leading comment with the webpackChunkName for dynamic imports."
         },
+        hasSuggestions: true,
         schema: [
           {
             type: "object",
@@ -2320,16 +2322,21 @@ var require_dynamic_import_chunkname = __commonJS({
           blockComment: "dynamic imports require a /* foo */ style comment, not a // foo comment",
           paddedSpaces: "dynamic imports require a block comment padded with spaces - /* foo */",
           webpackComment: 'dynamic imports require a "webpack" comment with valid syntax',
-          chunknameFormat: "dynamic imports require a leading comment in the form /*{{format}}*/"
+          chunknameFormat: "dynamic imports require a leading comment in the form /* {{format}} */",
+          webpackEagerModeNoChunkName: "dynamic imports using eager mode do not need a webpackChunkName",
+          webpackRemoveEagerMode: "Remove webpackMode",
+          webpackRemoveChunkName: "Remove webpackChunkName"
         }
       },
       defaultOptions: [],
       create(context) {
         const { importFunctions = [], allowEmpty = false, webpackChunknameFormat = "([0-9a-zA-Z-_/.]|\\[(request|index)\\])+" } = context.options[0] || {};
         const paddedCommentRegex = /^ (\S[\S\s]+\S) $/;
-        const commentStyleRegex = /^( ((webpackChunkName: .+)|((webpackPrefetch|webpackPreload): (true|false|-?\d+))|(webpackIgnore: (true|false))|((webpackInclude|webpackExclude): \/.*\/)|(webpackMode: ["'](lazy|lazy-once|eager|weak)["'])|(webpackExports: (["']\w+["']|\[(["']\w+["'], *)+(["']\w+["']*)]))),?)+ $/;
-        const chunkSubstrFormat = ` webpackChunkName: ["']${webpackChunknameFormat}["'],? `;
+        const commentStyleRegex = /^( (((webpackChunkName|webpackFetchPriority): .+)|((webpackPrefetch|webpackPreload): (true|false|-?\d+))|(webpackIgnore: (true|false))|((webpackInclude|webpackExclude): \/.+\/)|(webpackMode: ["'](lazy|lazy-once|eager|weak)["'])|(webpackExports: (["']\w+["']|\[(["']\w+["'], *)+(["']\w+["']*)]))),?)+ $/;
+        const chunkSubstrFormat = `webpackChunkName: ["']${webpackChunknameFormat}["'],?`;
         const chunkSubstrRegex = new RegExp(chunkSubstrFormat);
+        const eagerModeFormat = `webpackMode: ["']eager["'],?`;
+        const eagerModeRegex = new RegExp(eagerModeFormat);
         function run(node, arg) {
           const { sourceCode } = context;
           const leadingComments = sourceCode.getCommentsBefore(arg);
@@ -2341,6 +2348,7 @@ var require_dynamic_import_chunkname = __commonJS({
             return;
           }
           let isChunknamePresent = false;
+          let isEagerModePresent = false;
           for (const comment of leadingComments) {
             if (comment.type !== "Block") {
               context.report({
@@ -2372,11 +2380,60 @@ var require_dynamic_import_chunkname = __commonJS({
               });
               return;
             }
+            if (eagerModeRegex.test(comment.value)) {
+              isEagerModePresent = true;
+            }
             if (chunkSubstrRegex.test(comment.value)) {
               isChunknamePresent = true;
             }
           }
-          if (!isChunknamePresent && !allowEmpty) {
+          const removeCommentsAndLeadingSpaces = (fixer, comment) => {
+            const leftToken = sourceCode.getTokenBefore(comment);
+            const leftComments = sourceCode.getCommentsBefore(comment);
+            if (leftToken) {
+              if (leftComments.length > 0) {
+                return fixer.removeRange([
+                  Math.max(leftToken.range[1], leftComments[leftComments.length - 1].range[1]),
+                  comment.range[1]
+                ]);
+              }
+              return fixer.removeRange([leftToken.range[1], comment.range[1]]);
+            }
+            return fixer.remove(comment);
+          };
+          if (isChunknamePresent && isEagerModePresent) {
+            context.report({
+              node,
+              messageId: "webpackEagerModeNoChunkName",
+              suggest: [
+                {
+                  messageId: "webpackRemoveChunkName",
+                  fix(fixer) {
+                    for (const comment of leadingComments) {
+                      if (chunkSubstrRegex.test(comment.value)) {
+                        const replacement = comment.value.replace(chunkSubstrRegex, "").trim().replace(/,$/, "");
+                        return replacement === "" ? removeCommentsAndLeadingSpaces(fixer, comment) : fixer.replaceText(comment, `/* ${replacement} */`);
+                      }
+                    }
+                    return null;
+                  }
+                },
+                {
+                  messageId: "webpackRemoveEagerMode",
+                  fix(fixer) {
+                    for (const comment of leadingComments) {
+                      if (eagerModeRegex.test(comment.value)) {
+                        const replacement = comment.value.replace(eagerModeRegex, "").trim().replace(/,$/, "");
+                        return replacement === "" ? removeCommentsAndLeadingSpaces(fixer, comment) : fixer.replaceText(comment, `/* ${replacement} */`);
+                      }
+                    }
+                    return null;
+                  }
+                }
+              ]
+            });
+          }
+          if (!isChunknamePresent && !allowEmpty && !isEagerModePresent) {
             context.report({
               node,
               messageId: "chunknameFormat",
@@ -4863,8 +4920,11 @@ var require_no_extraneous_dependencies = __commonJS({
     }
     function getPackageDepFields(packageJsonPath, throwAtRead) {
       if (!depFieldCache.has(packageJsonPath)) {
-        const depFields = extractDepFields(readJSON(packageJsonPath, throwAtRead));
-        depFieldCache.set(packageJsonPath, depFields);
+        const packageJson = readJSON(packageJsonPath, throwAtRead);
+        if (packageJson) {
+          const depFields = extractDepFields(packageJson);
+          depFieldCache.set(packageJsonPath, depFields);
+        }
       }
       return depFieldCache.get(packageJsonPath);
     }
@@ -4884,10 +4944,12 @@ var require_no_extraneous_dependencies = __commonJS({
         if (paths.length > 0) {
           for (const dir of paths) {
             const packageJsonPath = node_path_1.default.resolve(dir, "package.json");
-            const packageContent_ = getPackageDepFields(packageJsonPath, true);
-            for (const depsKey of Object.keys(packageContent)) {
-              const key = depsKey;
-              Object.assign(packageContent[key], packageContent_[key]);
+            const packageContent_ = getPackageDepFields(packageJsonPath, paths.length === 1);
+            if (packageContent_) {
+              for (const depsKey of Object.keys(packageContent)) {
+                const key = depsKey;
+                Object.assign(packageContent[key], packageContent_[key]);
+              }
             }
           }
         } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugjs/eslint-plugin",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Shared ESLint configurations and extras",
   "main": "./eslint.config.mjs",
   "type": "module",
@@ -10,7 +10,7 @@
     "build": "eslint build.mjs eslint.config.mjs configs"
   },
   "peerDependencies": {
-    "eslint": "^9.5.0"
+    "eslint": "^9.6.0"
   },
   "files": [
     "*.md",
@@ -19,12 +19,12 @@
     "configs/"
   ],
   "dependencies": {
-    "@eslint/js": "9.5.0",
-    "@typescript-eslint/utils": "8.0.0-alpha.33",
+    "@eslint/js": "9.6.0",
+    "@typescript-eslint/utils": "8.0.0-alpha.40",
     "debug": "4.3.5",
     "doctrine": "2.1.0",
     "enhanced-resolve": "5.17.0",
-    "eslint": "9.5.0",
+    "eslint": "9.6.0",
     "eslint-module-utils": "2.8.1",
     "eslint-plugin-unicorn": "54.0.0",
     "eslint-visitor-keys": "4.0.0",
@@ -32,15 +32,16 @@
     "estraverse": "5.3.0",
     "fast-glob": "3.3.2",
     "get-tsconfig": "4.7.5",
-    "globals": "15.6.0",
+    "globals": "15.8.0",
     "is-core-module": "2.14.0",
     "is-glob": "4.0.3",
-    "minimatch": "9.0.4",
+    "minimatch": "9.0.5",
     "picomatch": "4.0.2",
     "resolve": "1.22.8",
     "semver": "7.6.2",
+    "stable-hash": "0.0.4",
     "tslib": "2.6.3",
-    "typescript": "5.5.2",
-    "typescript-eslint": "8.0.0-alpha.33"
+    "typescript": "5.5.3",
+    "typescript-eslint": "8.0.0-alpha.39"
   }
 }