@origin-1/eslint-config 0.4.1 → 0.5.2

package/index.d.ts

@@ -1 +1,2 @@
 export * from './lib/create-config.js';
+export * from './lib/normalize-version.js';

package/index.js

@@ -20,3 +20,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const patch_tslib_js_1 = __importDefault(require("./patch-tslib.js"));
 (0, patch_tslib_js_1.default)(require);
 __exportStar(require("./lib/create-config.js"), exports);
+__exportStar(require("./lib/normalize-version.js"), exports);

package/lib/create-config.d.ts

@@ -1,4 +1,4 @@
-import type { JSVersion } from './rules.js';
+import type { JSVersion, TSVersion } from './normalize-version.js';
 import type { Linter } from 'eslint';
 export interface ConfigData extends Linter.HasRules {
     env?: Record<string, boolean> | undefined;
@@ -7,7 +7,7 @@ export interface ConfigData extends Linter.HasRules {
     jsVersion?: JSVersion | undefined;
     parserOptions?: Linter.ParserOptions | undefined;
     plugins?: string[] | undefined;
-    tsVersion?: string | undefined;
+    tsVersion?: TSVersion | undefined;
 }
 export interface ConfigDataWithFiles extends ConfigData {
     excludedFiles?: string | string[] | undefined;

package/lib/create-config.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createConfig = exports.createBaseConfig = void 0;
+const normalize_version_js_1 = require("./normalize-version.js");
 const rules_js_1 = require("./rules.js");
 const semver_1 = __importDefault(require("semver"));
 function cloneRuleEntry(ruleEntry) {
@@ -34,12 +35,12 @@ function createBaseOverride(configData) {
     let ecmaVersion;
     let envKey;
     let parser;
-    const jsVersion = getJSVersion(configData);
+    const jsVersion = (0, normalize_version_js_1.normalizeJSVersion)(configData.jsVersion);
     if (jsVersion === 2015)
         envKey = 'es6';
     else if (jsVersion > 2015)
         envKey = `es${jsVersion}`;
-    const tsVersion = getTSVersion(configData);
+    const tsVersion = (0, normalize_version_js_1.normalizeTSVersion)(configData.tsVersion);
     if (lang === 'ts') {
         ecmaVersion = 'latest';
         parser = '@typescript-eslint/parser';
@@ -134,6 +135,7 @@ function createCommonEntries() {
 function createConfig(...configDataList) {
     const { plugins, rules } = createCommonEntries();
     const overrides = configDataList.map(createOverride);
+    overrides.unshift({ files: ['*.js', '*.cjs', '*.mjs', '*.ts', '*.cts', '*.mts'] });
     const config = {
         overrides,
         parser: '@origin-1/eslint-config/no-parser',
@@ -169,22 +171,9 @@ function findRuleEntry(versionedList, jsVersion, tsVersion) {
         }
     }
 }
-function getJSVersion(configData) {
-    const { jsVersion } = configData;
-    return Number.isInteger(jsVersion) ? jsVersion : 5;
-}
 function getLanguage(configData) {
     return configData.tsVersion == null ? 'js' : 'ts';
 }
-function getTSVersion(configData) {
-    const { tsVersion } = configData;
-    if (tsVersion != null) {
-        const cleanVersion = semver_1.default.clean(tsVersion);
-        if (cleanVersion != null)
-            return cleanVersion;
-    }
-    return 'latest';
-}
 function isJSTSEntry(ruleSettings) {
     return typeof ruleSettings === 'object' && 'js' in ruleSettings && 'ts' in ruleSettings;
 }

package/lib/normalize-version.d.ts

@@ -0,0 +1,6 @@
+declare const JS_VERSION_SET: Set<5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022>;
+export declare type JSVersion = typeof JS_VERSION_SET extends Set<infer T> ? T : never;
+export declare type TSVersion = 'latest' | `${number}.${number}.${number}` | `${number}.${number}.${number}-${string}`;
+export declare function normalizeJSVersion(jsVersion?: JSVersion): JSVersion;
+export declare function normalizeTSVersion(tsVersion?: TSVersion): TSVersion;
+export {};

package/lib/normalize-version.js

@@ -0,0 +1,27 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeTSVersion = exports.normalizeJSVersion = void 0;
+const node_util_1 = require("node:util");
+const semver_1 = __importDefault(require("semver"));
+const JS_VERSION_SET = new Set([5, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022]);
+function normalizeJSVersion(jsVersion = 5) {
+    if (JS_VERSION_SET.has(jsVersion))
+        return jsVersion;
+    const validValuesList = new Intl.ListFormat('en').format([...JS_VERSION_SET].map(String));
+    const message = `jsVersion ${(0, node_util_1.inspect)(jsVersion)} is not supported. Valid values are ${validValuesList}`;
+    throw TypeError(message);
+}
+exports.normalizeJSVersion = normalizeJSVersion;
+function normalizeTSVersion(tsVersion = 'latest') {
+    if (tsVersion === 'latest')
+        return tsVersion;
+    const normalTSVersion = semver_1.default.clean(tsVersion);
+    if (normalTSVersion != null)
+        return normalTSVersion;
+    const message = `tsVersion ${(0, node_util_1.inspect)(tsVersion)} is not supported`;
+    throw TypeError(message);
+}
+exports.normalizeTSVersion = normalizeTSVersion;

package/lib/rules.js

@@ -4,6 +4,9 @@ exports.RULES = exports.getRulePrefix = exports.getRuleKey = exports.HYBRID = ex
 exports.FOR_LANG = Symbol('For one language only');
 exports.UNIQUE = Symbol('Unique built-in rules');
 exports.HYBRID = Symbol('Hybrid rules');
+function beforeJSOrElse(version, before, else_) {
+    return jsts(beforeOrElse(version, before, else_), else_);
+}
 function beforeOrElse(version, before, else_) {
     const beforeEntry = { minVersion: undefined, ruleEntry: before };
     const elseEntry = { minVersion: version, ruleEntry: else_ };
@@ -51,7 +54,7 @@ exports.RULES = {
         'no-fallthrough': 'error',
         'no-func-assign': 'error',
         'no-import-assign': 'error',
-        'no-inner-declarations': 'error',
+        'no-inner-declarations': beforeJSOrElse(2015, 'error', 'off'),
         'no-invalid-regexp': 'error',
         'no-irregular-whitespace': 'error',
         'no-misleading-character-class': 'error',
@@ -133,7 +136,7 @@ exports.RULES = {
         'no-iterator': 'error',
         'no-label-var': 'error',
         'no-labels': ['error', { allowLoop: true, allowSwitch: true }],
-        'no-lone-blocks': 'error',
+        'no-lone-blocks': beforeJSOrElse(2015, 'error', 'off'),
         'no-lonely-if': 'off',
         'no-mixed-operators': 'off',
         'no-multi-assign': 'off',
@@ -173,27 +176,27 @@ exports.RULES = {
         'no-useless-escape': 'error',
         'no-useless-rename': 'error',
         'no-useless-return': 'error',
-        'no-var': 'error',
+        'no-var': beforeJSOrElse(2015, 'off', 'error'),
         'no-void': 'off',
         'no-warning-comments': 'off',
         'no-with': 'error',
-        'object-shorthand': 'error',
+        'object-shorthand': beforeJSOrElse(2015, 'off', 'error'),
         'one-var': ['error', 'never'],
         'one-var-declaration-per-line': 'error',
         'operator-assignment': 'error',
-        'prefer-arrow-callback': 'error',
+        'prefer-arrow-callback': beforeJSOrElse(2015, 'off', 'error'),
         'prefer-const': ['error', { ignoreReadBeforeAssign: true }],
-        'prefer-destructuring': 'error',
-        'prefer-exponentiation-operator': jsts('error', 'off'),
+        'prefer-destructuring': beforeJSOrElse(2015, 'off', 'error'),
+        'prefer-exponentiation-operator': jsts(beforeOrElse(2016, 'off', 'error'), 'off'),
         'prefer-named-capture-group': 'off',
         'prefer-numeric-literals': 'error',
         'prefer-object-has-own': 'error',
         'prefer-object-spread': 'off',
         'prefer-promise-reject-errors': 'off',
         'prefer-regex-literals': 'off',
-        'prefer-rest-params': 'error',
-        'prefer-spread': 'error',
-        'prefer-template': 'error',
+        'prefer-rest-params': beforeJSOrElse(2015, 'off', 'error'),
+        'prefer-spread': beforeJSOrElse(2015, 'off', 'error'),
+        'prefer-template': beforeJSOrElse(2015, 'off', 'error'),
         'quote-props': 'off',
         'radix': 'error',
         'require-unicode-regexp': 'off',
@@ -257,7 +260,7 @@ exports.RULES = {
     [exports.HYBRID]: {
         'no-dupe-class-members': 'error',
         'no-loss-of-precision': 'error',
-        'no-unused-vars': jsts(beforeOrElse(2019, ['error', { ignoreRestSiblings: true, vars: 'local' }], ['error', { caughtErrors: 'all', ignoreRestSiblings: true, vars: 'local' }]), ['error', { caughtErrors: 'all', ignoreRestSiblings: true, vars: 'local' }]),
+        'no-unused-vars': beforeJSOrElse(2019, ['error', { ignoreRestSiblings: true, vars: 'local' }], ['error', { caughtErrors: 'all', ignoreRestSiblings: true, vars: 'local' }]),
         'no-use-before-define': 'off',
         'default-param-last': 'off',
         'dot-notation': 'error',
@@ -394,7 +397,7 @@ exports.RULES = {
         'prefer-enum-initializers': 'off',
         'prefer-for-of': 'error',
         'prefer-function-type': 'off',
-        'prefer-includes': 'error',
+        'prefer-includes': 'off',
         'prefer-literal-enum-member': 'off',
         'prefer-namespace-keyword': 'off',
         'prefer-nullish-coalescing': 'error',
@@ -421,10 +424,10 @@ exports.RULES = {
         'no-callback-literal': 'off',
         'no-deprecated-api': 'error',
         'no-exports-assign': 'error',
-        'no-extraneous-import': jsts('error', 'off'),
-        'no-extraneous-require': 'error',
-        'no-missing-import': jsts('error', 'off'),
-        'no-missing-require': 'error',
+        'no-extraneous-import': 'off',
+        'no-extraneous-require': 'off',
+        'no-missing-import': 'off',
+        'no-missing-require': 'off',
         'no-unpublished-bin': 'error',
         'no-unpublished-import': 'error',
         'no-unpublished-require': 'error',
@@ -443,8 +446,8 @@ exports.RULES = {
         'no-path-concat': 'error',
         'no-process-env': 'off',
         'no-process-exit': 'off',
-        'no-restricted-import': 'error',
-        'no-restricted-require': 'error',
+        'no-restricted-import': 'off',
+        'no-restricted-require': 'off',
         'no-sync': 'off',
         'prefer-global/buffer': 'error',
         'prefer-global/console': 'error',
@@ -453,7 +456,7 @@ exports.RULES = {
         'prefer-global/text-encoder': 'error',
         'prefer-global/url': 'error',
         'prefer-global/url-search-params': 'error',
-        'prefer-promises/dns': 'error',
-        'prefer-promises/fs': 'off',
+        'prefer-promises/dns': beforeJSOrElse(2015, 'off', 'error'),
+        'prefer-promises/fs': beforeJSOrElse(2015, 'off', 'error'),
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@origin-1/eslint-config",
-  "version": "0.4.1",
+  "version": "0.5.2",
   "description": "ESLint configuration generator with Origin₁ presets",
   "homepage": "https://github.com/origin-1/eslint-config#readme",
   "license": "ISC",
@@ -18,7 +18,7 @@
     "eslint-plugin-n": "15"
   },
   "engines": {
-    "node": "18 >=18.1"
+    "node": ">=18.1"
   },
   "exports": {
     ".": "./index.js",