@origin-1/eslint-config 0.11.0 → 0.13.0

package/README.md

@@ -1,9 +1,6 @@
 # @origin-1/eslint-config · [![npm version][npm badge]][npm url]
 
-[ESLint](https://eslint.org/) configuration generator with [Origin₁](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
-
-[npm url]:
-https://www.npmjs.com/package/@origin-1/eslint-config
+[npm badge]: https://img.shields.io/npm/v/@origin-1%2Feslint-config.svg?logo=npm
+[npm url]: https://www.npmjs.com/package/@origin-1/eslint-config

package/lib/create-config.d.ts

@@ -5,6 +5,7 @@ export interface ConfigData extends Linter.HasRules {
     extends?: string | string[] | undefined;
     globals?: Linter.BaseConfig['globals'];
     jsVersion?: JSVersion | undefined;
+    parser?: string | undefined;
     parserOptions?: Linter.ParserOptions | undefined;
     plugins?: string[] | undefined;
     tsVersion?: TSVersion | undefined;

package/lib/create-config.js

@@ -33,7 +33,7 @@ function createBaseConfig(configData) {
         reportUnusedDisableDirectives: true,
         rules,
     };
-    if (lang != null)
+    if (parser != null)
         baseConfig.parser = parser;
     return baseConfig;
 }
@@ -43,8 +43,8 @@ function createBaseOverride(configData) {
     const plugins = configPlugins == null ? [] : [...configPlugins];
     const lang = getLanguage(configData);
     let ecmaVersion;
+    let { parser } = configData;
     let envKey;
-    let parser;
     const jsVersion = (0, normalize_version_js_1.normalizeJSVersion)(configData.jsVersion);
     if (jsVersion === 2015)
         envKey = 'es6';
@@ -54,11 +54,11 @@ function createBaseOverride(configData) {
     switch (lang) {
         case 'js':
             ecmaVersion = jsVersion;
-            parser = 'espree';
+            parser ??= 'espree';
             break;
         case 'ts':
             ecmaVersion = 'latest';
-            parser = '@typescript-eslint/parser';
+            parser ??= '@typescript-eslint/parser';
             break;
         default:
             break;
@@ -68,8 +68,9 @@ function createBaseOverride(configData) {
     const parserOptions = { ecmaVersion, ...configData.parserOptions };
     const rules = {};
     const baseOverride = { env, parserOptions, plugins, rules };
-    if (lang != null) {
+    if (parser != null)
         baseOverride.parser = parser;
+    if (lang != null) {
         const setOverrideRule = (ruleKey, ruleLangSettings) => {
             const ruleEntry = isVersionedList(ruleLangSettings) ?
                 findRuleEntry(ruleLangSettings, jsVersion, tsVersion) : ruleLangSettings;

package/lib/rules.js

@@ -232,14 +232,6 @@ exports.RULES = {
         'jsx-quotes': ['error'],
         'line-comment-position': 'off',
         'linebreak-style': ['error'],
-        'lines-around-comment': jsts([
-            'error',
-            {
-                allowBlockStart: true,
-                allowObjectStart: true,
-                applyDefaultIgnorePatterns: false,
-            },
-        ], 'off'),
         'max-len': ['error', { code: 100 }],
         'max-statements-per-line': ['error'],
         'multiline-ternary': 'off',
@@ -263,7 +255,7 @@ exports.RULES = {
         'space-unary-ops': ['error'],
         'switch-colon-spacing': ['error', { after: true, before: false }],
         'template-curly-spacing': ['error'],
-        'template-tag-spacing': ['error', 'always'],
+        'template-tag-spacing': 'off',
         'unicode-bom': ['error'],
         'wrap-iife': 'off',
         'wrap-regex': 'off',
@@ -299,6 +291,14 @@ exports.RULES = {
         'indent': 'off',
         'key-spacing': 'off',
         'keyword-spacing': ['error'],
+        'lines-around-comment': [
+            'error',
+            {
+                allowBlockStart: true,
+                allowObjectStart: true,
+                applyDefaultIgnorePatterns: false,
+            },
+        ],
         'lines-between-class-members': 'off',
         'no-extra-parens': ['error'],
         'object-curly-spacing': ['error', 'always'],
@@ -341,6 +341,7 @@ exports.RULES = {
         'no-invalid-void-type': 'off',
         'no-misused-new': ['error'],
         'no-misused-promises': ['error'],
+        'no-mixed-enums': ['error'],
         'no-non-null-asserted-nullish-coalescing': ['error'],
         'no-non-null-asserted-optional-chain': ['error'],
         'no-non-null-assertion': 'off',
@@ -374,6 +375,7 @@ exports.RULES = {
         'method-signature-style': 'off',
         'naming-convention': 'off',
         'no-base-to-string': ['error'],
+        'no-duplicate-type-constituents': ['error'],
         'no-dynamic-delete': 'off',
         'no-empty-interface': ['error', { allowSingleExtends: true }],
         'no-explicit-any': 'off',
@@ -421,6 +423,7 @@ exports.RULES = {
         'indent': ['error'],
         'nice-space-before-function-paren': ['error'],
         'no-spaces-in-call-expression': ['error'],
+        'no-spaces-in-tagged-template': ['error'],
         'property-colon-spacing': ['error'],
     },
     'eslint-plugin-n': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@origin-1/eslint-config",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "description": "ESLint configuration generator with Origin₁ presets",
   "homepage": "https://github.com/origin-1/eslint-config#readme",
   "license": "ISC",
@@ -11,10 +11,10 @@
     "semver": "7"
   },
   "peerDependencies": {
-    "@origin-1/eslint-plugin": ">=0.10",
-    "@typescript-eslint/eslint-plugin": "^5.52",
-    "@typescript-eslint/parser": "^5.52",
-    "eslint": "^8.28",
+    "@origin-1/eslint-plugin": ">=0.13",
+    "@typescript-eslint/eslint-plugin": "^5.57",
+    "@typescript-eslint/parser": "^5.57",
+    "eslint": "^8.37",
     "eslint-plugin-n": "15"
   },
   "engines": {