@travetto/eslint 7.0.0-rc.0 → 7.0.0-rc.2

package/README.md

@@ -36,8 +36,11 @@ process.env.TRV_MANIFEST = './.trv/output/node_modules/@travetto/mono-repo';
 const { buildConfig } = require('./.trv/output/node_modules/@travetto/eslint/support/bin/eslint-config.js');
 const { RuntimeIndex } = require('./.trv/output/node_modules/@travetto/runtime/__index__.js');
 
-const pluginFiles = RuntimeIndex.find({ folder: f => f === 'support', file: f => /support\/eslint[.]/.test(f.relativeFile) });
-const plugins = pluginFiles.map(x => require(x.outputFile));
+const pluginFiles = RuntimeIndex.find({
+  folder: folder => folder === 'support',
+  file: file => /support\/eslint[.]/.test(file.relativeFile)
+});
+const plugins = pluginFiles.map(plugin => require(plugin.outputFile));
 const config = buildConfig(plugins);
 
 module.exports = config;
@@ -109,7 +112,7 @@ export const ImportOrder: TrvEslintPlugin = {
           let groupType: (keyof typeof groupTypeMap) | undefined;
           let groupSize = 0;
           let contiguous = false;
-          let prev: eslint.AST.Program['body'][number] | undefined;
+          let previous: eslint.AST.Program['body'][number] | undefined;
 
           for (const node of body) {
 
@@ -120,13 +123,13 @@ export const ImportOrder: TrvEslintPlugin = {
                 from = node.source.value;
               }
             } else if (node.type === 'VariableDeclaration' && node.kind === 'const') {
-              const [decl] = node.declarations;
+              const [declaration] = node.declarations;
               let call: Expression | undefined;
-              const initType = decl?.init?.type;
+              const initType = declaration?.init?.type;
               if (initType === 'CallExpression') {
-                call = decl.init;
+                call = declaration.init;
               } else if (initType === 'TSAsExpression') { // tslint support
-                call = decl.init.expression;
+                call = declaration.init.expression;
               }
               if (
                 call?.type === 'CallExpression' && call.callee.type === 'Identifier' &&
@@ -155,7 +158,7 @@ export const ImportOrder: TrvEslintPlugin = {
 
             if (groupType === lineType) {
               groupSize += 1;
-            } else if (((node.loc?.end.line ?? 0) - (prev?.loc?.end.line ?? 0)) > 1) {
+            } else if (((node.loc?.end.line ?? 0) - (previous?.loc?.end.line ?? 0)) > 1) {
               // Newlines
               contiguous = false;
               groupSize = 0;
@@ -172,7 +175,7 @@ export const ImportOrder: TrvEslintPlugin = {
             } else { // Contiguous diff, count > 1
               context.report({ message: `Invalid contiguous groups ${groupType} and ${lineType}`, node });
             }
-            prev = node;
+            previous = node;
           }
         }
         return { Program: check };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/eslint",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.2",
   "description": "ES Linting Rules",
   "keywords": [
     "eslint",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@eslint/js": "^9.35.0",
     "@stylistic/eslint-plugin": "^5.6.1",
-    "@travetto/runtime": "^7.0.0-rc.0",
+    "@travetto/runtime": "^7.0.0-rc.2",
     "@types/eslint": "^9.6.1",
     "@typescript-eslint/eslint-plugin": "^8.48.0",
     "@typescript-eslint/parser": "^8.48.0",
@@ -34,7 +34,7 @@
     "eslint-plugin-unused-imports": "^4.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.0"
+    "@travetto/cli": "^7.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/resources/eslint-config-file.cjs

@@ -3,8 +3,11 @@ process.env.TRV_MANIFEST = '%MANIFEST_FILE%';
 const { buildConfig } = require('@travetto/eslint/support/bin/eslint-config');
 const { RuntimeIndex } = require('@travetto/runtime/__index__');
 
-const pluginFiles = RuntimeIndex.find({ folder: f => f === 'support', file: f => /support\/eslint[.]/.test(f.relativeFile) });
-const plugins = pluginFiles.map(x => require(x.outputFile));
+const pluginFiles = RuntimeIndex.find({
+  folder: folder => folder === 'support',
+  file: file => /support\/eslint[.]/.test(file.relativeFile)
+});
+const plugins = pluginFiles.map(plugin => require(plugin.outputFile));
 const config = buildConfig(plugins);
 
 module.exports = config;

package/resources/eslint-config-file.mjs

@@ -3,8 +3,11 @@ process.env.TRV_MANIFEST = '%MANIFEST_FILE%';
 const { buildConfig } = await import('@travetto/eslint/support/bin/eslint-config');
 const { RuntimeIndex } = await import('@travetto/runtime/__index__');
 
-const pluginFiles = RuntimeIndex.find({ folder: f => f === 'support', file: f => /support\/eslint[.]/.test(f.relativeFile) });
-const plugins = await Promise.all(pluginFiles.map(x => import(x.outputFile)))
+const pluginFiles = RuntimeIndex.find({
+  folder: folder => folder === 'support',
+  file: file => /support\/eslint[.]/.test(file.relativeFile)
+});
+const plugins = await Promise.all(pluginFiles.map(plugin => import(plugin.outputFile)))
 const config = buildConfig(plugins);
 
 export default config;

package/support/bin/eslint-config-file.ts

@@ -17,6 +17,6 @@ export async function buildEslintConfig(): Promise<string> {
   );
 
   return tpl
-    .replace(/'(@travetto\/[^']+)'/g, (_, v) => `'${RuntimeIndex.resolveFileImport(v)}'`)
+    .replace(/'(@travetto\/[^']+)'/g, (_, mod) => `'${RuntimeIndex.resolveFileImport(mod)}'`)
     .replace('%MANIFEST_FILE%', outputPath);
 }

package/support/bin/eslint-config.ts

@@ -38,7 +38,7 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
           rules: tsEslintPlugin.rules,
         },
         'unused-imports': unusedImports,
-        ...(Object.fromEntries(plugins.map(x => [x.name, x])))
+        ...(Object.fromEntries(plugins.map(plugin => [plugin.name, plugin])))
       },
       rules: {
         ...STD_RULES,
@@ -58,7 +58,7 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
         'unused-imports': unusedImports,
       },
       rules: {
-        ...Object.fromEntries(Object.entries(STD_RULES).filter(x => !x[0].startsWith('@typescript'))),
+        ...Object.fromEntries(Object.entries(STD_RULES).filter(rule => !rule[0].startsWith('@typescript'))),
       }
     },
     {