@travetto/eslint 5.0.0-rc.1 → 5.0.0-rc.10

package/README.md

@@ -34,7 +34,7 @@ This is the file the linter will use, and any other tooling (e.g. IDEs).
 process.env.TRV_MANIFEST = './.trv/output/node_modules/@travetto/eslint';
 
 const { buildConfig } = require('./.trv/output/node_modules/@travetto/eslint/support/bin/eslint-config.js');
-const { RuntimeIndex } = require('./.trv/output/node_modules/@travetto/manifest/__index__.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) });
 const plugins = pluginFiles.map(x => require(x.outputFile));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/eslint",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.10",
   "description": "ES Linting Rules",
   "keywords": [
     "eslint",
@@ -24,17 +24,17 @@
     "directory": "module/eslint"
   },
   "dependencies": {
-    "@eslint/js": "^8.56.0",
-    "@travetto/base": "^5.0.0-rc.1",
-    "@types/eslint": "^8.56.10",
+    "@eslint/js": "^9.9.0",
+    "@stylistic/eslint-plugin": "^2.6.2",
+    "@travetto/runtime": "^5.0.0-rc.10",
+    "@types/eslint": "^9.6.0",
     "@types/eslint__js": "^8.42.3",
-    "@typescript-eslint/eslint-plugin": "^7.15.0",
-    "@typescript-eslint/parser": "^7.15.0",
-    "eslint": "^8.57.0",
-    "eslint-plugin-unused-imports": "^3.2.0"
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
+    "eslint": "^9.9.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.11"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/resources/eslint-config-file.cjs

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

package/resources/eslint-config-file.mjs

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

package/support/bin/eslint-common.ts

@@ -1,106 +1,94 @@
 import * as parser from '@typescript-eslint/parser';
 
-import { RuntimeContext } from '@travetto/base';
-
-export const RULE_COMMON = {
-  languageOptions: {
-    ecmaVersion: 'latest',
-    sourceType: RuntimeContext.workspace.type,
-    globals: {
-      AbortController: false,
-      AbortSignal: false,
-      AggregateError: false,
-      Array: false,
-      ArrayBuffer: false,
-      Atomics: false,
-      BigInt: false,
-      BigInt64Array: false,
-      BigUint64Array: false,
-      Boolean: false,
-      Buffer: false,
-      clearImmediate: false,
-      clearInterval: false,
-      clearTimeout: false,
-      console: false,
-      DataView: false,
-      Date: false,
-      decodeURI: false,
-      decodeURIComponent: false,
-      DOMException: false,
-      encodeURI: false,
-      encodeURIComponent: false,
-      Error: false,
-      EvalError: false,
-      Event: false,
-      EventTarget: false,
-      fetch: false,
-      FinalizationRegistry: false,
-      Float32Array: false,
-      Float64Array: false,
-      FormData: false,
-      Function: false,
-      global: false,
-      globalThis: false,
-      Headers: false,
-      Infinity: false,
-      Int16Array: false,
-      Int32Array: false,
-      Int8Array: false,
-      Intl: false,
-      isFinite: false,
-      isNaN: false,
-      JSON: false,
-      Map: false,
-      Math: false,
-      MessageChannel: false,
-      MessageEvent: false,
-      MessagePort: false,
-      NaN: false,
-      Number: false,
-      Object: false,
-      parseFloat: false,
-      parseInt: false,
-      performance: false,
-      process: false,
-      Promise: false,
-      propertyIsEnumerable: false,
-      Proxy: false,
-      queueMicrotask: false,
-      RangeError: false,
-      ReferenceError: false,
-      Reflect: false,
-      RegExp: false,
-      Request: false,
-      require: false,
-      Response: false,
-      Set: false,
-      setImmediate: false,
-      setInterval: false,
-      setTimeout: false,
-      SharedArrayBuffer: false,
-      String: false,
-      structuredClone: false,
-      Symbol: false,
-      SyntaxError: false,
-      TextDecoder: false,
-      TextEncoder: false,
-      TypeError: false,
-      Uint16Array: false,
-      Uint32Array: false,
-      Uint8Array: false,
-      Uint8ClampedArray: false,
-      undefined: false,
-      unescape: false,
-      URIError: false,
-      WeakMap: false,
-      WeakRef: false,
-      WeakSet: false,
-    },
-    parser,
-    parserOptions: {
-      project: 'tsconfig.json'
-    },
-  },
+export const GLOBALS = {
+  AbortController: false,
+  AbortSignal: false,
+  AggregateError: false,
+  Array: false,
+  ArrayBuffer: false,
+  Atomics: false,
+  BigInt: false,
+  BigInt64Array: false,
+  BigUint64Array: false,
+  Boolean: false,
+  Buffer: false,
+  clearImmediate: false,
+  clearInterval: false,
+  clearTimeout: false,
+  console: false,
+  DataView: false,
+  Date: false,
+  decodeURI: false,
+  decodeURIComponent: false,
+  DOMException: false,
+  encodeURI: false,
+  encodeURIComponent: false,
+  Error: false,
+  EvalError: false,
+  Event: false,
+  EventTarget: false,
+  fetch: false,
+  FinalizationRegistry: false,
+  Float32Array: false,
+  Float64Array: false,
+  FormData: false,
+  Function: false,
+  global: false,
+  globalThis: false,
+  Headers: false,
+  Infinity: false,
+  Int16Array: false,
+  Int32Array: false,
+  Int8Array: false,
+  Intl: false,
+  isFinite: false,
+  isNaN: false,
+  JSON: false,
+  Map: false,
+  Math: false,
+  MessageChannel: false,
+  MessageEvent: false,
+  MessagePort: false,
+  NaN: false,
+  Number: false,
+  Object: false,
+  parseFloat: false,
+  parseInt: false,
+  performance: false,
+  process: false,
+  Promise: false,
+  propertyIsEnumerable: false,
+  Proxy: false,
+  queueMicrotask: false,
+  RangeError: false,
+  ReferenceError: false,
+  Reflect: false,
+  RegExp: false,
+  Request: false,
+  require: false,
+  Response: false,
+  Set: false,
+  setImmediate: false,
+  setInterval: false,
+  setTimeout: false,
+  SharedArrayBuffer: false,
+  String: false,
+  structuredClone: false,
+  Symbol: false,
+  SyntaxError: false,
+  TextDecoder: false,
+  TextEncoder: false,
+  TypeError: false,
+  Uint16Array: false,
+  Uint32Array: false,
+  Uint8Array: false,
+  Uint8ClampedArray: false,
+  undefined: false,
+  unescape: false,
+  URIError: false,
+  WeakMap: false,
+  WeakRef: false,
+  WeakSet: false,
 };
 
 export const IGNORES = [
@@ -110,4 +98,14 @@ export const IGNORES = [
   '**/*.d.ts',
   '**/fixtures/**/*',
   '**/resources/**/*'
-];
+];
+
+export const TS_OPTIONS = {
+  languageOptions: {
+    globals: GLOBALS,
+    ecmaVersion: 'latest',
+    parser,
+    sourceType: 'module',
+    parserOptions: { project: 'tsconfig.json' },
+  },
+};

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

@@ -1,12 +1,11 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { RuntimeContext } from '@travetto/base';
-import { RuntimeIndex } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
 export async function buildEslintConfig(): Promise<string> {
   const root = RuntimeIndex.getModule('@travetto/eslint')!.sourcePath;
-  const ext = RuntimeContext.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
+  const ext = Runtime.workspace.type === 'commonjs' ? '.cjs' : '.mjs';
   const tpl = await fs.readFile(path.resolve(root, 'resources', `eslint-config-file${ext}`), 'utf8');
 
   return tpl

package/support/bin/eslint-config.ts

@@ -1,13 +1,12 @@
 import { existsSync, readFileSync } from 'node:fs';
 
-// @ts-expect-error
-import unused from 'eslint-plugin-unused-imports';
 import { configs } from '@eslint/js';
 import tsEslintPlugin from '@typescript-eslint/eslint-plugin';
+import stylisticPlugin from '@stylistic/eslint-plugin';
 
-import { RuntimeContext } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 
-import { IGNORES, RULE_COMMON } from './eslint-common';
+import { IGNORES, GLOBALS, TS_OPTIONS } from './eslint-common';
 import { STD_RULES } from './eslint-std-rules';
 import { TrvEslintPlugin } from './types';
 
@@ -20,7 +19,7 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
     }
   }
 
-  const overrides = RuntimeContext.workspaceRelative('eslint-overrides.json');
+  const overrides = Runtime.workspaceRelative('eslint-overrides.json');
 
   const extra: (typeof STD_RULES)[] = existsSync(overrides) ? JSON.parse(readFileSync(overrides, 'utf8')) : [];
 
@@ -28,15 +27,15 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
     configs.recommended,
     { ignores: IGNORES, },
     {
-      ...RULE_COMMON,
-      files: ['**/*.ts', '**/*.tsx', '**/*.js'],
+      ...TS_OPTIONS,
+      files: ['**/*.ts', '**/*.tsx', '**/*.cts', '**/*.mts'],
       plugins: {
+        '@stylistic': {
+          rules: stylisticPlugin.rules
+        },
         '@typescript-eslint': {
           rules: tsEslintPlugin.rules,
         },
-        'unused-imports': {
-          rules: unused.rules,
-        },
         ...(Object.fromEntries(plugins.map(x => [x.name, x])))
       },
       rules: {
@@ -45,7 +44,21 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
       }
     },
     {
-      ...RULE_COMMON,
+      languageOptions: {
+        globals: GLOBALS,
+        ecmaVersion: 'latest',
+      },
+      files: ['**/*.js', '**/*.mjs', '**/*.cjs'],
+      plugins: {
+        '@stylistic': {
+          rules: stylisticPlugin.rules
+        }
+      },
+      rules: {
+        ...Object.fromEntries(Object.entries(STD_RULES).filter(x => !x[0].startsWith('@typescript'))),
+      }
+    },
+    {
       files: ['**/*.ts', '**/*.tsx'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': 'warn',
@@ -53,19 +66,14 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
       }
     },
     {
-      ...RULE_COMMON,
       files: ['**/DOC.ts', '**/DOC.tsx', '**/doc/**/*.ts', '**/doc/**/*.tsx'],
       rules: {
         'max-len': 0,
         'no-unused-private-class-members': 0,
-        '@typescript-eslint/quotes': 'warn',
-        '@typescript-eslint/indent': 0,
-        '@typescript-eslint/consistent-type-assertions': 0,
         '@typescript-eslint/explicit-function-return-type': 0
       }
     },
     {
-      ...RULE_COMMON,
       files: [
         'module/compiler/**/*.ts', 'module/transformer/**/*.ts',
         '**/support/transformer/**/*.ts', '**/support/transformer/**/*.tsx',
@@ -76,17 +84,14 @@ export function buildConfig(pluginMaps: Record<string, TrvEslintPlugin>[]): read
       }
     },
     {
-      ...RULE_COMMON,
       files: ['**/test/**/*.ts', '**/test/**/*.tsx', '**/support/test/**/*.ts', '**/support/test/**/*.tsx'],
       ignores: [...IGNORES, 'module/test/src/**'],
       rules: {
-        '@typescript-eslint/consistent-type-assertions': 0,
-        'no-unused-private-class-members': 0,
         '@typescript-eslint/explicit-function-return-type': 0
       }
     },
     ...extra.map(ex => ({
-      ...RULE_COMMON,
+      ...TS_OPTIONS,
       ...ex
     }))
   ] as const;

package/support/bin/eslint-std-rules.ts

@@ -1,6 +1,5 @@
 export const STD_RULES = {
   'no-loss-of-precision': 0,
-  'unused-imports/no-unused-imports': 'error',
   'no-unused-vars': 0,
   'no-dupe-class-members': 0,
   '@typescript-eslint/array-type': 'error',
@@ -9,7 +8,7 @@ export const STD_RULES = {
   '@typescript-eslint/no-explicit-any': 'warn',
   '@typescript-eslint/explicit-member-accessibility': [0, { accessibility: 'explicit' }],
   indent: 0,
-  '@typescript-eslint/indent': [
+  '@stylistic/indent': [
     'error',
     2,
     {
@@ -24,7 +23,7 @@ export const STD_RULES = {
       SwitchCase: 1
     }
   ],
-  '@typescript-eslint/member-delimiter-style': [
+  '@stylistic/member-delimiter-style': [
     'error',
     {
       multiline: { delimiter: 'semi', requireLast: true },
@@ -65,12 +64,12 @@ export const STD_RULES = {
     'error',
     { varsIgnorePattern: '^(_|[A-Z])[A-Za-z0-9]*', args: 'none' }
   ],
-  '@typescript-eslint/quotes': [
+  '@stylistic/quotes': [
     'error',
     'single',
     { avoidEscape: true, allowTemplateLiterals: false }
   ],
-  '@typescript-eslint/semi': [
+  '@stylistic/semi': [
     'error',
     'always'
   ],
@@ -83,7 +82,7 @@ export const STD_RULES = {
   'no-ex-assign': 0,
   '@typescript-eslint/ban-types': 0,
   '@typescript-eslint/ban-ts-comment': 0,
-  '@typescript-eslint/type-annotation-spacing': 'error',
+  '@stylistic/type-annotation-spacing': 'error',
   '@typescript-eslint/explicit-module-boundary-types': 0,
   'arrow-body-style': ['error', 'as-needed'],
   '@typescript-eslint/naming-convention': [

package/support/cli.lint.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process';
 
-import { Env, ExecUtil, RuntimeContext } from '@travetto/base';
+import { Env, ExecUtil, Runtime } from '@travetto/runtime';
 import { CliCommandShape, CliCommand, CliModuleUtil, CliScmUtil } from '@travetto/cli';
 
 /**
@@ -27,23 +27,30 @@ export class LintCommand implements CliCommandShape {
 
   async main(): Promise<void> {
     let files: string[];
-    if (this.since) {
-      files = (await CliScmUtil.findChangedFiles(this.since, 'HEAD', true))
-        .filter(x => !x.endsWith('package.json') && !x.endsWith('package-lock.json'));
-    } else {
-      const mods = await CliModuleUtil.findModules(this.changed ? 'changed' : 'all', undefined, 'HEAD', true);
-      files = mods.filter(x => x.workspace).map(x => x.sourcePath);
+    try {
+      if (this.since) {
+        files = (await CliScmUtil.findChangedFiles(this.since, 'HEAD'))
+          .filter(x => !x.endsWith('package.json') && !x.endsWith('package-lock.json'));
+      } else {
+        const mods = await CliModuleUtil.findModules(this.changed ? 'changed' : 'all', undefined, 'HEAD');
+        files = mods.filter(x => x.workspace).map(x => x.sourcePath);
+      }
+    } catch (err) {
+      if (err instanceof Error) {
+        console.error(err.message);
+      }
+      files = [];
     }
 
     const res = await ExecUtil.getResult(spawn('npx', [
       'eslint',
       '--cache',
-      '--cache-location', RuntimeContext.toolPath('.eslintcache'),
+      '--cache-location', Runtime.toolPath('.eslintcache'),
       ...(this.format ? ['--format', this.format] : []),
       ...(this.fix ? ['--fix'] : []),
       ...files
     ], {
-      cwd: RuntimeContext.workspace.path,
+      cwd: Runtime.workspace.path,
       stdio: 'inherit',
       shell: false
     }), { catch: true });

package/support/cli.lint_register.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs/promises';
 
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { RuntimeContext } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 
 import { buildEslintConfig } from './bin/eslint-config-file';
 
@@ -13,8 +13,8 @@ export class LintConfigureCommand implements CliCommandShape {
 
   async main(): Promise<void> {
     const content = await buildEslintConfig();
-    const output = RuntimeContext.workspaceRelative('eslint.config.js');
-    await fs.writeFile(output, content.replaceAll(RuntimeContext.workspace.path, '.').trim());
+    const output = Runtime.workspaceRelative('eslint.config.js');
+    await fs.writeFile(output, content.replaceAll(Runtime.workspace.path, '.').trim());
 
     console.log(`Wrote eslint config to ${output}`);
   }