@origin-1/eslint-config 0.3.2 → 0.5.0

package/README.md

@@ -1,6 +1,6 @@
 # @origin-1/eslint-config · [![npm version][npm badge]][npm url]
 
-ESLint configuration generator with [origin-1](https://github.com/origin-1) presets.
+[ESLint](https://eslint.org/) configuration generator with [Origin₁](https://github.com/origin-1) presets
 
 [npm badge]:
 https://badge.fury.io/js/@origin-1%2Feslint-config.svg

package/index.d.ts

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

package/index.js

@@ -13,6 +13,11 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-require("./lib/patch-tslib.js");
+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

@@ -173,7 +173,7 @@ exports.RULES = {
         'no-useless-escape': 'error',
         'no-useless-rename': 'error',
         'no-useless-return': 'error',
-        'no-var': 'error',
+        'no-var': jsts(beforeOrElse(2015, 'off', 'error'), 'error'),
         'no-void': 'off',
         'no-warning-comments': 'off',
         'no-with': 'error',
@@ -413,7 +413,7 @@ exports.RULES = {
         'unified-signatures': 'error',
         'type-annotation-spacing': 'error',
     },
-    '@fasttime/eslint-plugin': {
+    '@origin-1/eslint-plugin': {
         'nice-space-before-function-paren': 'error',
         'no-spaces-in-call-expression': 'error',
     },
@@ -423,8 +423,8 @@ exports.RULES = {
         '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-missing-import': 'off',
+        'no-missing-require': 'off',
         'no-unpublished-bin': 'error',
         'no-unpublished-import': 'error',
         'no-unpublished-require': 'error',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@origin-1/eslint-config",
-  "version": "0.3.2",
-  "description": "ESLint configuration generator with origin-1 presets",
+  "version": "0.5.0",
+  "description": "ESLint configuration generator with Origin₁ presets",
   "homepage": "https://github.com/origin-1/eslint-config#readme",
   "license": "ISC",
   "author": "Francesco Trotta <ft@fasttime.org> (https://github.com/fasttime)",
@@ -11,18 +11,19 @@
     "semver": "7"
   },
   "peerDependencies": {
-    "@fasttime/eslint-plugin": "0.6",
+    "@origin-1/eslint-plugin": "0.7",
     "@typescript-eslint/eslint-plugin": "5",
     "@typescript-eslint/parser": "5",
     "eslint": "^8.14.0",
     "eslint-plugin-n": "15"
   },
   "engines": {
-    "node": ">=18"
+    "node": "18 >=18.1"
   },
   "exports": {
     ".": "./index.js",
     "./no-parser": "./no-parser.js",
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./patch-tslib": "./patch-tslib.js"
   }
 }

package/patch-tslib.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_module_1 = require("node:module");
+function patchTslib(require) {
+    let tsutilsPath;
+    const { resolve } = require;
+    try {
+        tsutilsPath = resolve('tsutils');
+    }
+    catch {
+        return;
+    }
+    const tsutilsRequire = (0, node_module_1.createRequire)(tsutilsPath);
+    const originalGlobal = globalThis.global;
+    globalThis.global = {};
+    try {
+        tsutilsRequire('tslib');
+    }
+    finally {
+        globalThis.global = originalGlobal;
+    }
+}
+exports.default = patchTslib;

package/lib/patch-tslib.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_module_1 = require("node:module");
-const tsutilsPath = require.resolve('tsutils');
-const tsutilsRequire = (0, node_module_1.createRequire)(tsutilsPath);
-const originalGlobal = globalThis.global;
-globalThis.global = {};
-try {
-    tsutilsRequire('tslib');
-}
-finally {
-    globalThis.global = originalGlobal;
-}