@lvce-editor/eslint-plugin-nvmrc 11.2.0 → 12.1.0

package/dist/index.js

@@ -1,30 +1,32 @@
+import semver from 'semver';
+
 const createProgram = () => {
   return {
-    type: 'Program',
     body: [],
-    sourceType: 'script',
-    range: [0, 0],
+    comments: [],
     loc: {
-      start: {
-        line: 1,
-        column: 0
-      },
       end: {
-        line: 1,
-        column: 0
+        column: 0,
+        line: 1
+      },
+      start: {
+        column: 0,
+        line: 1
       }
     },
-    comments: [],
-    tokens: []
+    range: [0, 0],
+    sourceType: 'script',
+    tokens: [],
+    type: 'Program'
   };
 };
 const parseForESLint = () => {
   return {
     ast: createProgram(),
+    scopeManager: null,
     services: {
       isNvmrc: true
     },
-    scopeManager: null,
     visitorKeys: {
       Program: ['body']
     }
@@ -45,72 +47,62 @@ const defaultMinimumVersion = '20.0.0';
 const defaultMaximumVersion = '24.15.0';
 const defaultBadVersions = ['24.16.0'];
 const versionPattern = String.raw`^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$`;
-const versionRegex = new RegExp(versionPattern);
 const parseVersion = value => {
-  const match = versionRegex.exec(value.trim());
-  if (!match) {
+  const version = semver.parse(value.trim());
+  if (!version || version.prerelease.length > 0 || version.build.length > 0) {
     return undefined;
   }
-  return {
-    major: Number(match[1]),
-    minor: Number(match[2]),
-    patch: Number(match[3]),
-    text: `${Number(match[1])}.${Number(match[2])}.${Number(match[3])}`
-  };
+  return version;
 };
 const compareVersion = (a, b) => {
-  if (a.major !== b.major) {
-    return a.major - b.major;
-  }
-  if (a.minor !== b.minor) {
-    return a.minor - b.minor;
-  }
-  return a.patch - b.patch;
+  return semver.compare(a, b);
 };
 const getRuleOptions = context => {
   const [options = {}] = context.options;
   return {
-    minimumVersion: options.minimumVersion ?? defaultMinimumVersion,
+    badVersions: options.badVersions ?? defaultBadVersions,
     maximumVersion: options.maximumVersion ?? defaultMaximumVersion,
-    badVersions: options.badVersions ?? defaultBadVersions
+    minimumVersion: options.minimumVersion ?? defaultMinimumVersion
   };
 };
 const meta = {
-  type: 'problem',
   docs: {
     description: 'Disallow invalid or unsupported .nvmrc versions'
   },
+  messages: {
+    badVersion: '.nvmrc version {{value}} is not allowed',
+    invalidVersion: 'Invalid .nvmrc version: {{value}}',
+    versionTooNew: '.nvmrc version {{value}} is newer than {{maximumVersion}}',
+    versionTooOld: '.nvmrc version {{value}} is older than {{minimumVersion}}'
+  },
   schema: [{
-    type: 'object',
     additionalProperties: false,
     properties: {
-      minimumVersion: {
-        type: 'string',
-        pattern: versionPattern
-      },
-      maximumVersion: {
-        type: 'string',
-        pattern: versionPattern
-      },
       badVersions: {
-        type: 'array',
         items: {
-          type: 'string',
-          pattern: versionPattern
+          pattern: versionPattern,
+          type: 'string'
         },
+        type: 'array',
         uniqueItems: true
+      },
+      maximumVersion: {
+        pattern: versionPattern,
+        type: 'string'
+      },
+      minimumVersion: {
+        pattern: versionPattern,
+        type: 'string'
       }
-    }
+    },
+    type: 'object'
   }],
-  messages: {
-    invalidVersion: 'Invalid .nvmrc version: {{value}}',
-    versionTooOld: '.nvmrc version {{value}} is older than {{minimumVersion}}',
-    versionTooNew: '.nvmrc version {{value}} is newer than {{maximumVersion}}',
-    badVersion: '.nvmrc version {{value}} is not allowed'
-  }
+  type: 'problem'
 };
 const create = context => {
-  const parserServices = context.sourceCode.parserServices;
+  const {
+    parserServices
+  } = context.sourceCode;
   if (!parserServices?.isNvmrc) {
     return {};
   }
@@ -120,49 +112,48 @@ const create = context => {
       const version = parseVersion(value);
       if (!version) {
         context.report({
-          node,
-          messageId: 'invalidVersion',
           data: {
             value
-          }
+          },
+          messageId: 'invalidVersion',
+          node
         });
         return;
       }
       const options = getRuleOptions(context);
       const minimumVersion = parseVersion(options.minimumVersion) ?? parseVersion(defaultMinimumVersion);
       const maximumVersion = parseVersion(options.maximumVersion) ?? parseVersion(defaultMaximumVersion);
-      const badVersions = new Set(options.badVersions.map(badVersion => parseVersion(badVersion)?.text ?? badVersion));
-      if (badVersions.has(version.text)) {
+      const badVersions = new Set(options.badVersions.map(badVersion => parseVersion(badVersion)?.version ?? badVersion));
+      if (badVersions.has(version.version)) {
         context.report({
-          node,
-          messageId: 'badVersion',
           data: {
-            value: version.text
-          }
+            value: version.version
+          },
+          messageId: 'badVersion',
+          node
         });
         return;
       }
       if (compareVersion(version, minimumVersion) < 0) {
         context.report({
-          node,
-          messageId: 'versionTooOld',
           data: {
-            value: version.text,
-            minimumVersion: minimumVersion.text
-          }
+            minimumVersion: minimumVersion.version,
+            value: version.version
+          },
+          messageId: 'versionTooOld',
+          node
         });
         return;
       }
       if (compareVersion(version, maximumVersion) > 0) {
         context.report({
-          node,
-          messageId: 'versionTooNew',
           data: {
-            value: version.text,
-            maximumVersion: maximumVersion.text
-          }
+            maximumVersion: maximumVersion.version,
+            value: version.version
+          },
+          messageId: 'versionTooNew',
+          node
         });
-        return;
       }
     }
   };
@@ -175,23 +166,23 @@ const validVersion = {
 };
 
 const plugin = {
+  configs: {},
   meta: {
     name: 'nvmrc',
     version: '0.0.1'
   },
   rules: {
     'valid-version': validVersion
-  },
-  configs: {}
+  }
 };
 const recommended = [{
   files: ['**/.nvmrc'],
-  plugins: {
-    nvmrc: plugin
-  },
   languageOptions: {
     parser
   },
+  plugins: {
+    nvmrc: plugin
+  },
   rules: {
     'nvmrc/valid-version': 'error'
   }

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@lvce-editor/eslint-plugin-nvmrc",
-  "version": "11.2.0",
+  "version": "12.1.0",
   "main": "dist/index.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/lvce-editor/eslint-config.git"
   },
   "type": "module",
-  "keywords": [],
   "license": "MIT",
-  "description": "Lint .nvmrc files."
+  "description": "Lint .nvmrc files.",
+  "dependencies": {
+    "semver": "^7.8.4"
+  }
 }