@averay/codeformat 0.1.5 → 0.1.7

package/eslint.config.js

@@ -1,64 +1,3 @@
-import typescriptPlugin from '@typescript-eslint/eslint-plugin';
-import typescriptParser from '@typescript-eslint/parser';
-import prettierConfig from 'eslint-config-prettier';
-import eslintCommentsPlugin from 'eslint-plugin-eslint-comments';
-import importPlugin from 'eslint-plugin-import';
-import promisePlugin from 'eslint-plugin-promise';
-import regexpPlugin from 'eslint-plugin-regexp';
-import sonarjsPlugin from 'eslint-plugin-sonarjs';
-import unicornPlugin from 'eslint-plugin-unicorn';
+import { makeEslintConfig } from './index.js';
 
-import convertWarnsToErrors from './lib/convertWarnsToErrors.js';
-import rulesetShared from './rulesets/ruleset-shared.js';
-import rulesetTypescript from './rulesets/ruleset-typescript.js';
-
-export const extensions = {
-  js: ['js', 'jsx', 'cjs', 'cjs', 'mjs', 'mjsx'],
-  ts: ['ts', 'tsx', 'cts', 'cts', 'mts', 'mtsx'],
-};
-
-export default [
-  // JavaScript & TypeScript
-  {
-    files: [`**/*.{${[...extensions.js, ...extensions.ts].join(',')}}`],
-    plugins: {
-      'eslint-comments': eslintCommentsPlugin,
-      import: importPlugin,
-      promise: promisePlugin,
-      regexp: regexpPlugin,
-      sonarjs: sonarjsPlugin,
-      unicorn: unicornPlugin,
-    },
-    languageOptions: {
-      parserOptions: {
-        ...importPlugin.configs.recommended.parserOptions,
-      },
-    },
-    settings: {
-      'import/parsers': {
-        espree: extensions.js.map((extension) => `.${extension}`),
-      },
-    },
-    rules: convertWarnsToErrors(rulesetShared),
-  },
-
-  // TypeScript
-  {
-    files: [`**/*.{${extensions.ts.join(',')}}`],
-    languageOptions: {
-      parser: typescriptParser,
-    },
-    plugins: {
-      '@typescript-eslint': typescriptPlugin,
-    },
-    settings: {
-      ...importPlugin.configs.typescript.settings,
-      'import/parsers': {
-        '@typescript-eslint/parser': extensions.ts.map((extension) => `.${extension}`),
-      },
-    },
-    rules: convertWarnsToErrors(rulesetTypescript),
-  },
-
-  prettierConfig,
-];
+export default makeEslintConfig();

package/index.js

@@ -1,15 +1,71 @@
-import eslintConfig, { extensions } from './eslint.config.js';
+/* eslint sort-keys: "error" -- Organise rules */
 
-export { default as eslintConfig, extensions } from './eslint.config.js';
+import typescriptPlugin from '@typescript-eslint/eslint-plugin';
+import typescriptParser from '@typescript-eslint/parser';
+import prettierConfig from 'eslint-config-prettier';
+import eslintCommentsPlugin from 'eslint-plugin-eslint-comments';
+import importPlugin from 'eslint-plugin-import';
+import promisePlugin from 'eslint-plugin-promise';
+import regexpPlugin from 'eslint-plugin-regexp';
+import sonarjsPlugin from 'eslint-plugin-sonarjs';
+import unicornPlugin from 'eslint-plugin-unicorn';
 
-export function makeEslintConfig(options) {
+import convertWarnsToErrors from './lib/convertWarnsToErrors.js';
+import rulesetShared from './rulesets/ruleset-shared.js';
+import rulesetTypescript from './rulesets/ruleset-typescript.js';
+
+export { default as globals } from 'globals';
+
+export const extensions = {
+  js: ['js', 'jsx', 'cjs', 'cjs', 'mjs', 'mjsx'],
+  ts: ['ts', 'tsx', 'cts', 'cts', 'mts', 'mtsx'],
+};
+
+export function makeEslintConfig(options = {}) {
   return [
-    ...eslintConfig,
+    // JavaScript & TypeScript
+    {
+      files: [`**/*.{${[...extensions.js, ...extensions.ts].join(',')}}`],
+      languageOptions: {
+        parserOptions: {
+          ...importPlugin.configs.recommended.parserOptions,
+        },
+      },
+      plugins: {
+        'eslint-comments': eslintCommentsPlugin,
+        import: importPlugin,
+        promise: promisePlugin,
+        regexp: regexpPlugin,
+        sonarjs: sonarjsPlugin,
+        unicorn: unicornPlugin,
+      },
+      rules: convertWarnsToErrors(rulesetShared),
+      settings: {
+        'import/parsers': {
+          espree: extensions.js.map((extension) => `.${extension}`),
+        },
+      },
+    },
+
+    // TypeScript
     {
       files: [`**/*.{${extensions.ts.join(',')}}`],
       languageOptions: {
+        parser: typescriptParser,
         parserOptions: { project: options.tsconfigPath },
       },
+      plugins: {
+        '@typescript-eslint': typescriptPlugin,
+      },
+      rules: convertWarnsToErrors(rulesetTypescript),
+      settings: {
+        ...importPlugin.configs.typescript.settings,
+        'import/parsers': {
+          '@typescript-eslint/parser': extensions.ts.map((extension) => `.${extension}`),
+        },
+      },
     },
+
+    prettierConfig,
   ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@averay/codeformat",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "author": "Adam Averay (https://adamaveray.com.au/)",
   "homepage": "https://github.com/adamaveray/codeformat",
   "repository": {
@@ -43,6 +43,7 @@
     "eslint-plugin-regexp": "^1.12.0",
     "eslint-plugin-sonarjs": "^0.18.0",
     "eslint-plugin-unicorn": "^46.0.0",
+    "globals": "^13.20.0",
     "prettier": "^2.8.4"
   },
   "devDependencies": {

package/rulesets/ruleset-shared.js

@@ -29,7 +29,7 @@ export default {
     'global-require': 'error',
     'grouped-accessor-pairs': ['error', 'getBeforeSet'],
     'guard-for-in': 'error',
-    'id-denylist': ['error', 'e', 'err', 'evt', 'cb'],
+    'id-denylist': ['error', 'cb', 'e', 'enc', 'err', 'evt'],
     'lines-between-class-members': 'error',
     'logical-assignment-operators': ['error', 'always'],
     'max-classes-per-file': ['error', 1],
@@ -165,7 +165,14 @@ export default {
     'no-unused-expressions': 'error',
     'no-unused-labels': 'error',
     'no-unused-private-class-members': 'error',
-    'no-unused-vars': 'error',
+    'no-unused-vars': [
+      'error',
+      {
+        argsIgnorePattern: '^_\\w*$',
+        caughtErrorsIgnorePattern: '^_\\w*$',
+        varsIgnorePattern: '^(_\\d*|React)$',
+      },
+    ],
     'no-use-before-define': 'error',
     'no-useless-backreference': 'error',
     'no-useless-call': 'error',
@@ -238,7 +245,7 @@ export default {
   'import/no-self-import': 'error',
   'import/no-unresolved': ['error', { caseSensitiveStrict: true }],
   'import/no-unused-modules': 'error',
-  'import/no-useless-path-segments': ['error', { noUselessIndex: true }],
+  'import/no-useless-path-segments': 'error',
   'import/no-webpack-loader-syntax': 'error',
   'import/order': [
     'error',
@@ -250,7 +257,6 @@ export default {
     },
   ],
   'import/prefer-default-export': 'error',
-  'import/unambiguous': 'error',
 
   ...promisePlugin.configs.recommended.rules,
   'promise/no-multiple-resolved': 'error',
@@ -284,7 +290,9 @@ export default {
 
   ...unicornPlugin.configs.recommended.rules,
   'unicorn/filename-case': 'off',
+  'unicorn/no-null': 'off',
   'unicorn/no-unsafe-regex': 'error',
   'unicorn/prefer-event-target': 'error',
+  'unicorn/prevent-abbreviations': 'off',
   'unicorn/require-post-message-target-origin': 'error',
 };

package/rulesets/ruleset-typescript.js

@@ -12,6 +12,31 @@ export default {
   ...typescriptPlugin.configs['recommended-requiring-type-checking'].rules,
   ...typescriptPlugin.configs.strict.rules,
 
+  // eslint-disable-next-line unicorn/no-useless-spread -- Keeps the unprefixed core rules together
+  ...{
+    'default-param-last': 'off',
+    'dot-notation': 'off',
+    'lines-between-class-members': 'off',
+    'no-array-constructor': 'off',
+    'no-dupe-class-members': 'off',
+    'no-empty-function': 'off',
+    'no-implied-eval': 'off',
+    'no-invalid-this': 'off',
+    'no-loop-func': 'off',
+    'no-loss-of-precision': 'off',
+    'no-magic-numbers': 'off',
+    'no-redeclare': 'off',
+    'no-restricted-imports': 'off',
+    'no-return-await': 'off',
+    'no-shadow': 'off',
+    'no-throw-literal': 'off',
+    'no-unused-expressions': 'off',
+    'no-unused-vars': 'off',
+    'no-use-before-define': 'off',
+    'no-useless-constructor': 'off',
+    'padding-line-between-statements': 'off',
+  },
+
   '@typescript-eslint/adjacent-overload-signatures': 'error',
   '@typescript-eslint/array-type': 'error',
   '@typescript-eslint/await-thenable': 'error',
@@ -112,6 +137,17 @@ export default {
   '@typescript-eslint/no-invalid-void-type': 'error',
   '@typescript-eslint/no-loop-func': 'error',
   '@typescript-eslint/no-loss-of-precision': 'error',
+  '@typescript-eslint/no-magic-numbers': [
+    'error',
+    {
+      detectObjects: true,
+      enforceConst: true,
+      ignore: [-1, 0, 1],
+      ignoreArrayIndexes: true,
+      ignoreClassFieldInitialValues: true,
+      ignoreDefaultValues: true,
+    },
+  ],
   '@typescript-eslint/no-meaningless-void-operator': 'error',
   '@typescript-eslint/no-misused-new': 'error',
   '@typescript-eslint/no-misused-promises': 'error',
@@ -122,7 +158,7 @@ export default {
   '@typescript-eslint/no-redeclare': 'error',
   '@typescript-eslint/no-require-imports': 'error',
   '@typescript-eslint/no-restricted-imports': 'error',
-  '@typescript-eslint/no-shadow': 'error',
+  '@typescript-eslint/no-shadow': ['error', { hoist: 'all' }],
   '@typescript-eslint/no-this-alias': 'error',
   '@typescript-eslint/no-throw-literal': 'error',
   '@typescript-eslint/no-unnecessary-boolean-literal-compare': 'error',