eslint-plugin-node-dependencies 0.9.0 → 0.10.0

package/dist/rules/compat-engines.js

@@ -10,15 +10,17 @@ const ast_utils_1 = require("../utils/ast-utils");
 const semver_2 = require("../utils/semver");
 const meta_1 = require("../utils/meta");
 class EnginesContext {
-    constructor(engineNames) {
+    constructor(engineNames, validDependencies = new Set()) {
         this.unprocessedEngines = new Set();
         this.invalidEngines = new Map();
         this.validEngines = new Set();
+        this.validDependencies = new Set();
         this.engines = new Set(engineNames);
         this.unprocessedEngines = new Set(this.engines);
+        this.validDependencies = validDependencies;
     }
     nextContext() {
-        return new EnginesContext(this.unprocessedEngines);
+        return new EnginesContext(this.unprocessedEngines, this.validDependencies);
     }
     markAsProcessed(module) {
         this.unprocessedEngines.delete(module);
@@ -48,6 +50,12 @@ class EnginesContext {
     getInvalid() {
         return this.invalidEngines;
     }
+    markAsValidDependency(name, ver) {
+        this.validDependencies.add(`${name}@${ver}`);
+    }
+    isValidDependency(name, ver) {
+        return this.validDependencies.has(`${name}@${ver}`);
+    }
 }
 function buildAdjustRangeForSelf(comparisonType, original) {
     const adjustVers = [];
@@ -198,11 +206,13 @@ exports.default = (0, utils_1.createRule)("compat-engines", {
             if (ctx.isAllProcessed()) {
                 return;
             }
+            ctx.markAsValidDependency(name, ver);
             if (deep) {
                 for (const [n, ranges] of extractDependencies(metaList)) {
                     const v = (0, semver_2.normalizeSemverRange)(...ranges);
-                    if (v)
+                    if (v && !ctx.isValidDependency(n, v.raw)) {
                         processDependencyModule(ctx.nextContext(), n, v.raw, currModules, node);
+                    }
                 }
             }
         }

package/dist/rules/no-deprecated.js

@@ -35,9 +35,7 @@ exports.default = (0, utils_1.createRule)("no-deprecated", {
                 : "dependencies, peerDependencies"](node) {
                 const name = (0, ast_utils_1.getKeyFromJSONProperty)(node);
                 const ver = (0, jsonc_eslint_parser_1.getStaticJSONValue)(node.value);
-                if (typeof name !== "string" ||
-                    typeof ver !== "string" ||
-                    !ver) {
+                if (typeof name !== "string" || typeof ver !== "string" || !ver) {
                     return;
                 }
                 const meta = (0, meta_1.getMetaFromNpm)(name, ver).get();

package/dist/rules/no-restricted-deps.js

@@ -218,9 +218,7 @@ exports.default = (0, utils_1.createRule)("no-restricted-deps", {
                 };
             }
             const regexp = (0, regexp_1.toRegExp)(option.package);
-            const version = option.version
-                ? (0, semver_2.getSemverRange)(option.version)
-                : null;
+            const version = option.version ? (0, semver_2.getSemverRange)(option.version) : null;
             const validator = (n, v) => {
                 if (regexp.test(n) && matchVersions(v, version)) {
                     return {

package/dist/rules/prefer-caret-range-version.js

@@ -74,8 +74,7 @@ exports.default = (0, utils_1.createRule)("prefer-caret-range-version", {
                 if (!lowerRange.startsWith("~")) {
                     if (lowerRange.startsWith("^") ||
                         /^\d+$/u.test(range.value) ||
-                        ((range.value.endsWith(".x") ||
-                            range.value.endsWith(".*")) &&
+                        ((range.value.endsWith(".x") || range.value.endsWith(".*")) &&
                             !/\s+-\s+/u.test(range.value)))
                         continue;
                 }

package/dist/rules/prefer-tilde-range-version.js

@@ -75,8 +75,7 @@ exports.default = (0, utils_1.createRule)("prefer-tilde-range-version", {
                     if (lowerRange.startsWith("~") ||
                         /^\d+$/u.test(range.value) ||
                         /^\d+\.\d+$/u.test(range.value) ||
-                        ((range.value.endsWith(".x") ||
-                            range.value.endsWith(".*")) &&
+                        ((range.value.endsWith(".x") || range.value.endsWith(".*")) &&
                             !/\s+-\s+/u.test(range.value)))
                         continue;
                 }

package/dist/rules/valid-engines.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const compat_engines_1 = __importDefault(require("./compat-engines"));
 exports.default = (0, utils_1.createRule)("valid-engines", {
-    meta: Object.assign(Object.assign({}, compat_engines_1.default.meta), { docs: Object.assign(Object.assign({}, compat_engines_1.default.meta.docs), { replacedBy: ["compat-engines"] }), deprecated: true }),
+    meta: Object.assign(Object.assign({}, compat_engines_1.default.meta), { docs: Object.assign({}, compat_engines_1.default.meta.docs), deprecated: true, replacedBy: ["compat-engines"] }),
     create: compat_engines_1.default.create,
 });

package/dist/utils/meta.js

@@ -196,7 +196,7 @@ function getMetaFromNameWithoutCache(name, cachedFilePath) {
             };
         });
     }
-    catch (e) {
+    catch (_e) {
         return null;
     }
     const timestamp = Date.now();

package/dist/utils/package-json/worker.js

@@ -8,11 +8,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const synckit_1 = require("synckit");
+const tunnel_agent_1 = __importDefault(require("tunnel-agent"));
 const dynamicImport = new Function("m", "return import(m)");
 (0, synckit_1.runAsWorker)((packageName, options) => __awaiter(void 0, void 0, void 0, function* () {
     const m = yield dynamicImport("package-json");
     const packageJson = (m === null || m === void 0 ? void 0 : m.default) || m;
-    return packageJson(packageName, options);
+    return packageJson(packageName, withAutoProxy(options));
 }));
+function withAutoProxy(options) {
+    const PROXY_ENV = [
+        "https_proxy",
+        "HTTPS_PROXY",
+        "http_proxy",
+        "HTTP_PROXY",
+        "npm_config_https_proxy",
+        "npm_config_http_proxy",
+    ];
+    const proxyStr = PROXY_ENV.map((k) => process.env[k]).find((v) => v);
+    if (proxyStr) {
+        const proxyUrl = new URL(proxyStr);
+        const tunnelOption = {
+            proxy: {
+                host: proxyUrl.hostname,
+                port: Number(proxyUrl.port),
+                proxyAuth: proxyUrl.username || proxyUrl.password
+                    ? `${proxyUrl.username}:${proxyUrl.password}`
+                    : undefined,
+            },
+        };
+        const httpAgent = tunnel_agent_1.default[`httpOverHttp${proxyUrl.protocol === "https:" ? "s" : ""}`](tunnelOption);
+        const httpsAgent = tunnel_agent_1.default[`httpsOverHttp${proxyUrl.protocol === "https:" ? "s" : ""}`](tunnelOption);
+        return Object.assign({ agent: { http: httpAgent, https: httpsAgent } }, options);
+    }
+    return options;
+}

package/dist/utils/semver.js

@@ -126,10 +126,8 @@ function joinComparators(a, b) {
 }
 function toRangeComparator(comparators) {
     if (comparators.length === 2) {
-        if (comparators[0].operator === ">" ||
-            comparators[0].operator === ">=") {
-            if (comparators[1].operator === "<" ||
-                comparators[1].operator === "<=") {
+        if (comparators[0].operator === ">" || comparators[0].operator === ">=") {
+            if (comparators[1].operator === "<" || comparators[1].operator === "<=") {
                 return {
                     min: comparators[0],
                     max: comparators[1],
@@ -138,8 +136,7 @@ function toRangeComparator(comparators) {
         }
         else if (comparators[0].operator === "<" ||
             comparators[0].operator === "<=") {
-            if (comparators[1].operator === ">" ||
-                comparators[1].operator === ">=") {
+            if (comparators[1].operator === ">" || comparators[1].operator === ">=") {
                 return {
                     min: comparators[1],
                     max: comparators[0],
@@ -148,8 +145,7 @@ function toRangeComparator(comparators) {
         }
     }
     if (comparators.length === 1) {
-        if (comparators[0].operator === ">" ||
-            comparators[0].operator === ">=") {
+        if (comparators[0].operator === ">" || comparators[0].operator === ">=") {
             return {
                 min: comparators[0],
                 max: null,
@@ -185,8 +181,7 @@ function maxNextVersion(range) {
                     max = compVer;
                 }
             }
-            else if (comparator.operator === ">=" ||
-                comparator.operator === ">") {
+            else if (comparator.operator === ">=" || comparator.operator === ">") {
                 hasMin = true;
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-node-dependencies",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "ESLint plugin to check Node.js dependencies.",
   "engines": {
     "node": ">=14.17.0"
@@ -25,8 +25,11 @@
     "new": "ts-node ./tools/new-rule.ts",
     "docs:watch": "export NODE_OPTIONS=--openssl-legacy-provider && vuepress dev --debug docs",
     "docs:build": "export NODE_OPTIONS=--openssl-legacy-provider && npm run build && vuepress build docs --no-cache",
+    "prerelease": "npm run test && npm run build",
+    "release": "changeset publish",
     "preversion": "npm test && git add .",
-    "version": "env-cmd -e version npm run update && git add ."
+    "version": "env-cmd -e version npm run update && git add .",
+    "version:ci": "env-cmd -e version-ci npm run  update && changeset version"
   },
   "repository": {
     "type": "git",
@@ -51,14 +54,16 @@
     "eslint": ">=6.0.0"
   },
   "devDependencies": {
-    "@ota-meshi/eslint-plugin": "^0.11.0",
+    "@changesets/changelog-github": "^0.4.6",
+    "@changesets/cli": "^2.24.2",
+    "@ota-meshi/eslint-plugin": "^0.13.0",
     "@types/chai": "^4.2.18",
     "@types/eslint": "^8.0.0",
     "@types/eslint-scope": "^3.7.0",
     "@types/eslint-visitor-keys": "^1.0.0",
-    "@types/estree": "^0.0.52",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.0.0",
+    "@types/estree": "^1.0.0",
+    "@types/mocha": "^10.0.0",
+    "@types/node": "^18.0.0",
     "@types/npm-package-arg": "^6.1.1",
     "@types/semver": "^7.3.8",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
@@ -68,11 +73,11 @@
     "eslint": "^8.0.0",
     "eslint-config-prettier": "^8.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-eslint-plugin": "^4.0.0",
-    "eslint-plugin-json-schema-validator": "^3.0.0",
+    "eslint-plugin-eslint-plugin": "^5.0.0",
+    "eslint-plugin-json-schema-validator": "^4.0.0",
     "eslint-plugin-jsonc": "^2.0.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-node-dependencies": "^0.8.0",
+    "eslint-plugin-node-dependencies": "^0.9.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-regexp": "^1.0.0",
     "eslint-plugin-vue": "^9.0.0",
@@ -85,8 +90,8 @@
     "raw-loader": "^4.0.1",
     "stylelint": "^14.0.0",
     "stylelint-config-recommended-vue": "^1.0.0",
-    "stylelint-config-standard": "^26.0.0",
-    "stylelint-stylus": "^0.16.0",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-stylus": "^0.17.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.0.0",
     "vue-eslint-editor": "^1.1.0",
@@ -95,9 +100,13 @@
   },
   "dependencies": {
     "jsonc-eslint-parser": "^2.0.2",
-    "npm-package-arg": "^9.0.0",
+    "npm-package-arg": "^10.0.0",
     "package-json": "^8.1.0",
     "semver": "^7.3.5",
-    "synckit": "^0.7.1"
+    "synckit": "^0.7.1",
+    "tunnel-agent": "^0.6.0"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }