@pezkuwi/dev 0.85.11 → 0.86.0

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@pezkuwi/dev', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.85.4' };
+exports.packageInfo = { name: '@pezkuwi/dev', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.86.0' };

package/cjs/rootJs/index.js

@@ -23,7 +23,6 @@ async function dynamic(a, b) {
     // NOTE we go via this path so it points to the same location in both ESM
     // and CJS output (a './dynamic' import would be different otherwise)
     const { sum } = await import('@pezkuwi/dev/rootJs/dynamic.mjs');
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return sum(a, b);
 }
 /** Function to ensure we have json correctly imported */

package/config/eslint.js

@@ -1,36 +1,44 @@
 // Copyright 2017-2026 @pezkuwi/dev authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// @ts-expect-error No definition for this one
+import { fixupPluginRules } from '@eslint/compat';
 import eslintJs from '@eslint/js';
+import stylisticPlugin from '@stylistic/eslint-plugin';
 import tsPlugin from '@typescript-eslint/eslint-plugin';
 import tsParser from '@typescript-eslint/parser';
 // @ts-expect-error No definition for this one
-import standardConfig from 'eslint-config-standard';
-import deprecationPlugin from 'eslint-plugin-deprecation';
-// @ts-expect-error No definition for this one
 import headerPlugin from 'eslint-plugin-header';
 // @ts-expect-error No definition for this one
-import importPlugin from 'eslint-plugin-import';
-// @ts-expect-error No definition for this one
 import importNewlinesPlugin from 'eslint-plugin-import-newlines';
-// @ts-expect-error No definition for this one
+import importPlugin from 'eslint-plugin-import-x';
 import jestPlugin from 'eslint-plugin-jest';
-// @ts-expect-error No definition for this one
 import nPlugin from 'eslint-plugin-n';
 // @ts-expect-error No definition for this one
 import promisePlugin from 'eslint-plugin-promise';
-// @ts-expect-error No definition for this one
 import reactPlugin from 'eslint-plugin-react';
-// @ts-expect-error No definition for this one
 import reactHooksPlugin from 'eslint-plugin-react-hooks';
-// @ts-expect-error No definition for this one
 import simpleImportSortPlugin from 'eslint-plugin-simple-import-sort';
 // @ts-expect-error No definition for this one
 import sortDestructureKeysPlugin from 'eslint-plugin-sort-destructure-keys';
 import globals from 'globals';
 
 import { overrideAll, overrideJs, overrideJsx, overrideSpec } from './eslint.rules.js';
+import { standardRules } from './eslint.standard.js';
+
+/**
+ * eslint-plugin-header declares no options schema, and eslint 9+ rejects
+ * options for a rule without one. `schema: false` is how a rule says it
+ * validates its own options; the rule itself is unchanged.
+ */
+const headerPluginFixed = {
+  ...headerPlugin,
+  rules: {
+    header: {
+      ...headerPlugin.rules.header,
+      meta: { ...headerPlugin.rules.header.meta, schema: false }
+    }
+  }
+};
 
 const EXT_JS = ['.cjs', '.js', '.mjs'];
 const EXT_TS = ['.ts', '.tsx'];
@@ -84,23 +92,27 @@ export default [
       }
     },
     plugins: {
+      '@stylistic': stylisticPlugin,
       '@typescript-eslint': tsPlugin,
-      deprecation: deprecationPlugin,
-      header: headerPlugin,
-      import: importPlugin,
+      // eslint-plugin-header reports at the first token after the leading
+      // comments, so a generated file's /* eslint-disable */ covers it; the
+      // maintained fork reports at line 1 instead. The compat layer supplies the
+      // context methods eslint 10 removed; headerPluginFixed, the options schema.
+      header: fixupPluginRules(headerPluginFixed),
       'import-newlines': importNewlinesPlugin,
+      'import-x': importPlugin,
       n: nPlugin,
       promise: promisePlugin,
       'simple-import-sort': simpleImportSortPlugin,
       'sort-destructure-keys': sortDestructureKeysPlugin
     },
     settings: {
-      'import/extensions': EXT_ALL,
-      'import/parsers': {
+      'import-x/extensions': EXT_ALL,
+      'import-x/parsers': {
         '@typescript-eslint/parser': EXT_TS,
         espree: EXT_JS
       },
-      'import/resolver': {
+      'import-x/resolver': {
         node: {
           extensions: EXT_ALL
         },
@@ -114,7 +126,7 @@ export default [
     files: extsToGlobs(EXT_ALL),
     rules: {
       ...eslintJs.configs.recommended.rules,
-      ...standardConfig.rules,
+      ...standardRules,
       ...tsPlugin.configs['recommended-type-checked'].rules,
       ...tsPlugin.configs['stylistic-type-checked'].rules,
       ...overrideAll
@@ -132,7 +144,9 @@ export default [
       '**/use*.ts'
     ],
     plugins: {
-      react: reactPlugin,
+      // eslint-plugin-react still calls context methods eslint 10 removed
+      // (getFilename and others); the compat layer provides them.
+      react: fixupPluginRules(reactPlugin),
       'react-hooks': reactHooksPlugin
     },
     rules: {

package/config/eslint.rules.js

@@ -59,12 +59,56 @@ function getHeaderPattern () {
 
 export const overrideAll = {
   ...FIXME,
+  '@stylistic/arrow-parens': ['error', 'always'],
+  '@stylistic/brace-style': ['error', '1tbs'],
+  '@stylistic/function-call-argument-newline': ['error', 'consistent'],
+  '@stylistic/indent': ['error', 2],
+  '@stylistic/no-extra-semi': 'error',
+  '@stylistic/object-curly-newline': ['error', {
+    ExportDeclaration: { minProperties: 2048 },
+    ImportDeclaration: { minProperties: 2048 },
+    ObjectPattern: { minProperties: 2048 }
+  }],
+  '@stylistic/padding-line-between-statements': [
+    'error',
+    { blankLine: 'always', next: '*', prev: ['const', 'let', 'var'] },
+    { blankLine: 'any', next: ['const', 'let', 'var'], prev: ['const', 'let', 'var'] },
+    { blankLine: 'always', next: 'block-like', prev: '*' },
+    { blankLine: 'always', next: '*', prev: 'block-like' },
+    { blankLine: 'always', next: 'function', prev: '*' },
+    { blankLine: 'always', next: '*', prev: 'function' },
+    { blankLine: 'always', next: 'try', prev: '*' },
+    { blankLine: 'always', next: '*', prev: 'try' },
+    { blankLine: 'always', next: 'return', prev: '*' },
+    { blankLine: 'always', next: 'import', prev: '*' },
+    { blankLine: 'always', next: '*', prev: 'import' },
+    { blankLine: 'any', next: 'import', prev: 'import' }
+  ],
+  '@stylistic/semi': ['error', 'always'],
+  '@stylistic/spaced-comment': ['error', 'always', {
+    block: {
+      // pure export helpers
+      markers: ['#__PURE__']
+    },
+    line: {
+      // TS reference types
+      markers: ['/ <reference']
+    }
+  }],
+  '@stylistic/type-annotation-spacing': 'error',
   // the next 2 enforce isolatedModules & verbatimModuleSyntax
   '@typescript-eslint/consistent-type-exports': 'error',
   '@typescript-eslint/consistent-type-imports': 'error',
   '@typescript-eslint/dot-notation': 'error',
-  '@typescript-eslint/indent': ['error', 2],
+  '@typescript-eslint/no-deprecated': 'error',
   '@typescript-eslint/no-non-null-assertion': 'error',
+  // standard's options for the core rule, which the TypeScript preset turns off
+  // in favour of this one (with defaults that reject a && b() and a ? b() : c())
+  '@typescript-eslint/no-unused-expressions': ['error', {
+    allowShortCircuit: true,
+    allowTaggedTemplates: true,
+    allowTernary: true
+  }],
   // ts itself checks and ignores those starting with _, align the linting
   '@typescript-eslint/no-unused-vars': ['error', {
     args: 'all',
@@ -75,20 +119,15 @@ export const overrideAll = {
     vars: 'all',
     varsIgnorePattern: '^_'
   }],
-  '@typescript-eslint/type-annotation-spacing': 'error',
-  'arrow-parens': ['error', 'always'],
-  'brace-style': ['error', '1tbs'],
   curly: ['error', 'all'],
   'default-param-last': 'off', // conflicts with TS version
-  'deprecation/deprecation': 'error',
   'dot-notation': 'off', // conflicts with TS version
   'func-style': ['error', 'declaration', {
     allowArrowFunctions: true
   }],
   // this does help with declarations, but also
   // applies to invocations, which is an issue...
-  // 'function-paren-newline': ['error', 'never'],
-  'function-call-argument-newline': ['error', 'consistent'],
+  // '@stylistic/function-paren-newline': ['error', 'never'],
   'header/header': ['error', 'line', [
     { pattern: getHeaderPattern() },
     ' SPDX-License-Identifier: Apache-2.0'
@@ -97,8 +136,8 @@ export const overrideAll = {
     forceSingleLine: true,
     items: 2048
   }],
-  'import/export': 'error',
-  'import/extensions': ['error', 'ignorePackages', {
+  'import-x/export': 'error',
+  'import-x/extensions': ['error', 'ignorePackages', {
     cjs: 'always',
     js: 'always',
     json: 'always',
@@ -107,35 +146,12 @@ export const overrideAll = {
     ts: 'never',
     tsx: 'never'
   }],
-  'import/first': 'error',
-  'import/newline-after-import': 'error',
-  'import/no-duplicates': 'error',
-  'import/order': 'off', // conflicts with simple-import-sort
-  indent: 'off', // required as 'off' since typescript-eslint has own versions
-  'no-extra-semi': 'error',
+  'import-x/first': 'error',
+  'import-x/newline-after-import': 'error',
+  'import-x/no-duplicates': 'error',
+  'import-x/order': 'off', // conflicts with simple-import-sort
   'no-unused-vars': 'off',
   'no-use-before-define': 'off',
-  'object-curly-newline': ['error', {
-    ExportDeclaration: { minProperties: 2048 },
-    ImportDeclaration: { minProperties: 2048 },
-    ObjectPattern: { minProperties: 2048 }
-  }],
-  'padding-line-between-statements': [
-    'error',
-    { blankLine: 'always', next: '*', prev: ['const', 'let', 'var'] },
-    { blankLine: 'any', next: ['const', 'let', 'var'], prev: ['const', 'let', 'var'] },
-    { blankLine: 'always', next: 'block-like', prev: '*' },
-    { blankLine: 'always', next: '*', prev: 'block-like' },
-    { blankLine: 'always', next: 'function', prev: '*' },
-    { blankLine: 'always', next: '*', prev: 'function' },
-    { blankLine: 'always', next: 'try', prev: '*' },
-    { blankLine: 'always', next: '*', prev: 'try' },
-    { blankLine: 'always', next: 'return', prev: '*' },
-    { blankLine: 'always', next: 'import', prev: '*' },
-    { blankLine: 'always', next: '*', prev: 'import' },
-    { blankLine: 'any', next: 'import', prev: 'import' }
-  ],
-  semi: ['error', 'always'],
   'simple-import-sort/exports': 'error',
   'simple-import-sort/imports': ['error', {
     groups: [
@@ -150,55 +166,45 @@ export const overrideAll = {
   'sort-destructure-keys/sort-destructure-keys': ['error', {
     caseSensitive: true
   }],
-  'sort-keys': 'error',
-  'spaced-comment': ['error', 'always', {
-    block: {
-      // pure export helpers
-      markers: ['#__PURE__']
-    },
-    line: {
-      // TS reference types
-      markers: ['/ <reference']
-    }
-  }]
+  'sort-keys': 'error'
 };
 
 export const overrideJsx = {
-  'jsx-quotes': ['error', 'prefer-single'],
-  // swap from recommended warning to error
-  'react-hooks/exhaustive-deps': 'error',
-  'react/jsx-closing-bracket-location': ['warn', 'tag-aligned'],
-  'react/jsx-first-prop-new-line': ['warn', 'multiline-multiprop'],
-  'react/jsx-fragments': 'error',
-  'react/jsx-max-props-per-line': ['warn', {
+  '@stylistic/jsx-closing-bracket-location': ['warn', 'tag-aligned'],
+  '@stylistic/jsx-first-prop-new-line': ['warn', 'multiline-multiprop'],
+  '@stylistic/jsx-max-props-per-line': ['warn', {
     maximum: 1,
     when: 'always'
   }],
-  'react/jsx-newline': ['error', {
+  '@stylistic/jsx-newline': ['error', {
     prevent: true
   }],
-  'react/jsx-no-bind': 'error',
-  'react/jsx-props-no-multi-spaces': 'error',
-  'react/jsx-sort-props': ['warn', {
+  '@stylistic/jsx-props-no-multi-spaces': 'error',
+  '@stylistic/jsx-quotes': ['error', 'prefer-single'],
+  '@stylistic/jsx-sort-props': ['warn', {
     noSortAlphabetically: false
   }],
-  'react/jsx-tag-spacing': ['error', {
+  '@stylistic/jsx-tag-spacing': ['error', {
     afterOpening: 'never',
     beforeClosing: 'never',
     beforeSelfClosing: 'always',
     closingSlash: 'never'
   }],
+  // swap from recommended warning to error
+  'react-hooks/exhaustive-deps': 'error',
+  'react/jsx-fragments': 'error',
+  'react/jsx-no-bind': 'error',
   'react/prop-types': 'off' // this is a completely broken rule
 };
 
 export const overrideJs = {
   '@typescript-eslint/explicit-function-return-type': 'off',
+  '@typescript-eslint/no-require-imports': 'off',
   '@typescript-eslint/no-unsafe-argument': 'off',
   '@typescript-eslint/no-unsafe-assignment': 'off',
   '@typescript-eslint/no-unsafe-call': 'off',
   '@typescript-eslint/no-unsafe-member-access': 'off',
   '@typescript-eslint/no-unsafe-return': 'off',
-  '@typescript-eslint/no-var-requires': 'off',
   '@typescript-eslint/restrict-plus-operands': 'off',
   '@typescript-eslint/restrict-template-expressions': 'off'
 };