@so1ve/eslint-config 1.0.0-alpha.9 → 1.0.1

package/dist/index.cjs

@@ -19,6 +19,7 @@ var pluginJsonSchemaValidator = require('eslint-plugin-json-schema-validator');
 var pluginJsonc = require('eslint-plugin-jsonc');
 var pluginMdx = require('eslint-plugin-mdx');
 var pluginNode = require('eslint-plugin-n');
+var pluginNoAwaitInPromise = require('eslint-plugin-no-await-in-promise');
 var pluginNoOnlyTests = require('eslint-plugin-no-only-tests');
 var pluginOnlyError = require('eslint-plugin-only-error');
 var pluginPromise = require('eslint-plugin-promise');
@@ -41,6 +42,24 @@ var localPkg = require('local-pkg');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
+function _interopNamespace(e) {
+	if (e && e.__esModule) return e;
+	var n = Object.create(null);
+	if (e) {
+		Object.keys(e).forEach(function (k) {
+			if (k !== 'default') {
+				var d = Object.getOwnPropertyDescriptor(e, k);
+				Object.defineProperty(n, k, d.get ? d : {
+					enumerable: true,
+					get: function () { return e[k]; }
+				});
+			}
+		});
+	}
+	n["default"] = e;
+	return Object.freeze(n);
+}
+
 var pluginComments__default = /*#__PURE__*/_interopDefaultLegacy(pluginComments);
 var pluginHtml__default = /*#__PURE__*/_interopDefaultLegacy(pluginHtml);
 var parserHtml__default = /*#__PURE__*/_interopDefaultLegacy(parserHtml);
@@ -58,6 +77,7 @@ var pluginJsonSchemaValidator__default = /*#__PURE__*/_interopDefaultLegacy(plug
 var pluginJsonc__default = /*#__PURE__*/_interopDefaultLegacy(pluginJsonc);
 var pluginMdx__default = /*#__PURE__*/_interopDefaultLegacy(pluginMdx);
 var pluginNode__default = /*#__PURE__*/_interopDefaultLegacy(pluginNode);
+var pluginNoAwaitInPromise__namespace = /*#__PURE__*/_interopNamespace(pluginNoAwaitInPromise);
 var pluginNoOnlyTests__default = /*#__PURE__*/_interopDefaultLegacy(pluginNoOnlyTests);
 var pluginOnlyError__default = /*#__PURE__*/_interopDefaultLegacy(pluginOnlyError);
 var pluginPromise__default = /*#__PURE__*/_interopDefaultLegacy(pluginPromise);
@@ -251,7 +271,6 @@ const formatting = (options) => {
                 "moduleResolution",
                 "moduleSuffixes",
                 "noResolve",
-                "paths",
                 "resolveJsonModule",
                 "resolvePackageJsonExports",
                 "resolvePackageJsonImports",
@@ -317,7 +336,9 @@ const formatting = (options) => {
                 "verbatimModuleSyntax",
                 /* Completeness */
                 "skipDefaultLibCheck",
-                "skipLibCheck"
+                "skipLibCheck",
+                /* Alias */
+                "paths"
               ],
               pathPattern: "^compilerOptions$"
             }
@@ -334,6 +355,46 @@ const formatting = (options) => {
   ].flat().filter(Boolean);
 };
 
+const renameRules = (rules, from, to) => Object.fromEntries(
+  Object.entries(rules).map(([key, value]) => {
+    if (key.startsWith(from)) {
+      return [to + key.slice(from.length), value];
+    }
+    return [key, value];
+  })
+);
+const rulesOn = /* @__PURE__ */ new Set();
+const rulesOff = /* @__PURE__ */ new Set();
+function recordRulesStateConfigs(configs) {
+  var _a;
+  for (const config of configs) {
+    recordRulesState((_a = config.rules) != null ? _a : {});
+  }
+  return configs;
+}
+function recordRulesState(rules) {
+  for (const [key, value] of Object.entries(rules != null ? rules : {})) {
+    const firstValue = Array.isArray(value) ? value[0] : value;
+    if (firstValue == null) {
+      continue;
+    }
+    if (firstValue === "off" || firstValue === 0) {
+      rulesOff.add(key);
+    } else {
+      rulesOn.add(key);
+    }
+  }
+  return rules;
+}
+function warnUnnecessaryOffRules() {
+  const unnecessaryOffRules = [...rulesOff].filter((key) => !rulesOn.has(key));
+  for (const off of unnecessaryOffRules) {
+    console.warn(
+      `[eslint] rule \`${off}\` is never turned on, you can remove the rule from your config`
+    );
+  }
+}
+
 const html = () => [
   {
     plugins: {
@@ -350,7 +411,11 @@ const html = () => [
     },
     files: [GLOB_HTML],
     rules: {
-      ...pluginHtml__default["default"].configs.recommended.rules,
+      ...renameRules(
+        pluginHtml__default["default"].configs.recommended.rules,
+        "@html-eslint/",
+        "html/"
+      ),
       "html/indent": "off",
       "html/no-trailing-spaces": "off",
       "html/require-closing-tags": "off",
@@ -360,9 +425,7 @@ const html = () => [
   }
 ];
 
-const ignores = () => [
-  { ignores: GLOB_EXCLUDE }
-];
+const ignores = () => [{ ignores: GLOB_EXCLUDE }];
 
 const imports = (options = {}) => [
   {
@@ -422,7 +485,8 @@ const javascript = ({
       "sort-imports": pluginSortImports__default["default"],
       "array-func": pluginArrayFunc__default["default"],
       "json-schema-validator": pluginJsonSchemaValidator__default["default"],
-      "regexp": pluginRegexp__default["default"]
+      "regexp": pluginRegexp__default["default"],
+      "no-await-in-promise": pluginNoAwaitInPromise__namespace
     }
   },
   {
@@ -727,10 +791,19 @@ const javascript = ({
       "sort-imports/exports": "error",
       // array-func
       "array-func/prefer-array-from": "off",
+      "array-func/prefer-flat": "off",
+      // Handled by unicorn
+      "array-func/from-map": "off",
+      // Conflicts with unicorn/prefer-spread
+      "array-func/no-unnecessary-this-arg": "error",
+      "array-func/avoid-reverse": "error",
+      "array-func/prefer-flat-map": "error",
       // json-schema-validator
       "json-schema-validator/no-invalid": "warn",
       // regexp
       "regexp/no-unused-capturing-group": "warn",
+      // no-await-in-promise
+      "no-await-in-promise/no-await-in-promise": "error",
       ...overrides
     }
   },
@@ -883,9 +956,7 @@ const sortImports = () => [
   }
 ];
 
-const test = ({
-  overrides
-} = {}) => [
+const test = ({ overrides } = {}) => [
   {
     plugins: {
       "no-only-tests": pluginNoOnlyTests__default["default"],
@@ -919,9 +990,7 @@ const test = ({
   }
 ];
 
-const toml = ({
-  overrides
-} = {}) => [
+const toml = ({ overrides } = {}) => [
   {
     plugins: {
       toml: pluginToml__default["default"]
@@ -941,47 +1010,6 @@ const toml = ({
   }
 ];
 
-const combine = (...configs) => configs.flatMap((config) => Array.isArray(config) ? config : [config]);
-const renameRules = (rules, from, to) => Object.fromEntries(
-  Object.entries(rules).map(([key, value]) => {
-    if (key.startsWith(from)) {
-      return [to + key.slice(from.length), value];
-    }
-    return [key, value];
-  })
-);
-const rulesOn = /* @__PURE__ */ new Set();
-const rulesOff = /* @__PURE__ */ new Set();
-function recordRulesStateConfigs(configs) {
-  var _a;
-  for (const config of configs) {
-    recordRulesState((_a = config.rules) != null ? _a : {});
-  }
-  return configs;
-}
-function recordRulesState(rules) {
-  for (const [key, value] of Object.entries(rules != null ? rules : {})) {
-    const firstValue = Array.isArray(value) ? value[0] : value;
-    if (firstValue == null) {
-      continue;
-    }
-    if (firstValue === "off" || firstValue === 0) {
-      rulesOff.add(key);
-    } else {
-      rulesOn.add(key);
-    }
-  }
-  return rules;
-}
-function warnUnnecessaryOffRules() {
-  const unnecessaryOffRules = [...rulesOff].filter((key) => !rulesOn.has(key));
-  for (const off of unnecessaryOffRules) {
-    console.warn(
-      `[eslint] rule \`${off}\` is never turned on, you can remove the rule from your config`
-    );
-  }
-}
-
 function typescript({
   componentExts = [],
   parserOptions,
@@ -1038,7 +1066,9 @@ function typescript({
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
-          EXPERIMENTAL_useProjectService: true,
+          // EXPERIMENTAL_useProjectService: true,
+          project: true,
+          tsconfigRootDir: process.cwd(),
           ...parserOptions
         }
       },
@@ -1131,6 +1161,15 @@ function typescript({
         "ts/prefer-ts-expect-error": "error",
         "ts/no-require-imports": "error",
         "ts/method-signature-style": ["error", "property"],
+        "ts/explicit-member-accessibility": [
+          "error",
+          {
+            accessibility: "explicit",
+            overrides: {
+              constructors: "no-public"
+            }
+          }
+        ],
         // Override JS
         "no-useless-constructor": "off",
         "no-invalid-this": "off",
@@ -1161,7 +1200,6 @@ function typescript({
         // off
         "ts/camelcase": "off",
         "ts/explicit-function-return-type": "off",
-        "ts/explicit-member-accessibility": "off",
         "ts/no-explicit-any": "off",
         "ts/no-parameter-properties": "off",
         "ts/no-empty-interface": "off",
@@ -1457,9 +1495,7 @@ const vue = ({
   }
 ];
 
-const yaml = ({
-  overrides
-} = {}) => [
+const yaml = ({ overrides } = {}) => [
   {
     plugins: {
       yaml: pluginYaml__default["default"]
@@ -1520,7 +1556,8 @@ function so1ve(options = {}, ...userConfigs) {
     promise(),
     sortImports(),
     imports(),
-    unicorn()
+    unicorn(),
+    html()
   );
   if (enableVue) {
     componentExts.push("vue");
@@ -1593,7 +1630,7 @@ function so1ve(options = {}, ...userConfigs) {
   if (Object.keys(fusedConfig).length > 0) {
     configs.push([fusedConfig]);
   }
-  const merged = combine(...configs, ...userConfigs);
+  const merged = [...configs, ...userConfigs].flat();
   return merged;
 }
 
@@ -1665,6 +1702,7 @@ Object.defineProperty(exports, 'pluginNode', {
 	enumerable: true,
 	get: function () { return pluginNode__default["default"]; }
 });
+exports.pluginNoAwaitInPromise = pluginNoAwaitInPromise__namespace;
 Object.defineProperty(exports, 'pluginNoOnlyTests', {
 	enumerable: true,
 	get: function () { return pluginNoOnlyTests__default["default"]; }
@@ -1751,7 +1789,6 @@ exports.GLOB_TSCONFIG = GLOB_TSCONFIG;
 exports.GLOB_TSX = GLOB_TSX;
 exports.GLOB_VUE = GLOB_VUE;
 exports.GLOB_YAML = GLOB_YAML;
-exports.combine = combine;
 exports.comments = comments;
 exports.formatting = formatting;
 exports.html = html;

package/dist/index.d.ts

@@ -1,11 +1,12 @@
-import { FlatESLintConfigItem } from 'eslint-define-config';
+import so1vePlugin from '@so1ve/eslint-plugin';
+export { default as pluginSo1ve } from '@so1ve/eslint-plugin';
 import { ParserOptions } from '@typescript-eslint/parser';
 export { default as parserTs } from '@typescript-eslint/parser';
 import { FlatGitignoreOptions } from 'eslint-config-flat-gitignore';
+import { Rules, FlatESLintConfigItem } from 'eslint-define-config';
 export { default as pluginComments } from '@eslint-community/eslint-plugin-eslint-comments';
 export { default as pluginHtml } from '@html-eslint/eslint-plugin';
 export { default as parserHtml } from '@html-eslint/parser';
-export { default as pluginSo1ve } from '@so1ve/eslint-plugin';
 export { default as pluginSortImports } from '@so1ve/eslint-plugin-sort-imports';
 export { default as pluginTs } from '@typescript-eslint/eslint-plugin';
 export { default as parserMdx } from 'eslint-mdx';
@@ -18,6 +19,8 @@ export { default as pluginJsonSchemaValidator } from 'eslint-plugin-json-schema-
 export { default as pluginJsonc } from 'eslint-plugin-jsonc';
 export { default as pluginMdx } from 'eslint-plugin-mdx';
 export { default as pluginNode } from 'eslint-plugin-n';
+import * as eslintPluginNoAwaitInPromise from 'eslint-plugin-no-await-in-promise';
+export { eslintPluginNoAwaitInPromise as pluginNoAwaitInPromise };
 export { default as pluginNoOnlyTests } from 'eslint-plugin-no-only-tests';
 export { default as pluginOnlyError } from 'eslint-plugin-only-error';
 export { default as pluginPromise } from 'eslint-plugin-promise';
@@ -34,21 +37,23 @@ export { default as parserToml } from 'toml-eslint-parser';
 export { default as parserVue } from 'vue-eslint-parser';
 export { default as parserYaml } from 'yaml-eslint-parser';
 
-declare const comments: () => FlatESLintConfigItem[];
-
 interface OptionsComponentExts {
-    /** Additional extensions for components. */
+    /**
+     * Additional extensions for components.
+     */
     componentExts?: string[];
 }
 interface OptionsTypeScriptParserOptions {
-    /** Additional parser options for TypeScript. */
+    /**
+     * Additional parser options for TypeScript.
+     */
     parserOptions?: Partial<ParserOptions>;
 }
 interface OptionsHasTypeScript {
     typescript?: boolean;
 }
 interface OptionsOverrides {
-    overrides?: FlatESLintConfigItem["rules"];
+    overrides?: ConfigItem["rules"];
 }
 interface Options extends OptionsComponentExts {
     /**
@@ -116,58 +121,79 @@ interface Options extends OptionsComponentExts {
      * @default true
      */
     formatting?: boolean;
-    /** Provide overrides for rules for each integration. */
+    /**
+     * Provide overrides for rules for each integration.
+     */
     overrides?: {
-        javascript?: FlatESLintConfigItem["rules"];
-        typescript?: FlatESLintConfigItem["rules"];
-        test?: FlatESLintConfigItem["rules"];
-        vue?: FlatESLintConfigItem["rules"];
-        solid?: FlatESLintConfigItem["rules"];
-        jsonc?: FlatESLintConfigItem["rules"];
-        mdx?: FlatESLintConfigItem["rules"];
-        yaml?: FlatESLintConfigItem["rules"];
-        toml?: FlatESLintConfigItem["rules"];
+        javascript?: ConfigItem["rules"];
+        typescript?: ConfigItem["rules"];
+        test?: ConfigItem["rules"];
+        vue?: ConfigItem["rules"];
+        solid?: ConfigItem["rules"];
+        jsonc?: ConfigItem["rules"];
+        mdx?: ConfigItem["rules"];
+        yaml?: ConfigItem["rules"];
+        toml?: ConfigItem["rules"];
     };
 }
+type Unprefix<T extends Record<string, any>, Pre extends string> = {
+    [K in keyof T as K extends `${Pre}${infer U}` ? U : never]: T[K];
+};
+type Prefix<T extends Record<string, any>, Pre extends string> = {
+    [K in keyof T as `${Pre}${K & string}`]: T[K];
+};
+type RenamePrefix<T extends Record<string, any>, Old extends string, New extends string> = Prefix<Unprefix<T, Old>, New>;
+type MergeIntersection<T extends Record<any, any>> = {
+    [K in keyof T]: T[K];
+};
+type RenamedRules = MergeIntersection<Rules & RenamePrefix<Rules, "@typescript-eslint/", "ts/"> & RenamePrefix<Rules, "yml/", "yaml/"> & RenamePrefix<Rules, "n/", "node/"> & Prefix<Partial<(typeof so1vePlugin)["rules"]>, "so1ve/">>;
+type ConfigItem = Omit<FlatESLintConfigItem, "plugins" | "rules"> & {
+    plugins?: Record<string, any>;
+    rules?: RenamedRules | Record<string, any>;
+};
+
+declare const comments: () => ConfigItem[];
 
-declare const formatting: (options: Options) => FlatESLintConfigItem[];
+declare const formatting: (options: Options) => ConfigItem[];
 
-declare const html: () => FlatESLintConfigItem[];
+declare const html: () => ConfigItem[];
 
-declare const ignores: () => FlatESLintConfigItem[];
+declare const ignores: () => ConfigItem[];
 
-declare const imports: (options?: Options) => FlatESLintConfigItem[];
+declare const imports: (options?: Options) => ConfigItem[];
 
-declare const javascript: ({ overrides, }?: OptionsOverrides) => FlatESLintConfigItem[];
+declare const javascript: ({ overrides, }?: OptionsOverrides) => ConfigItem[];
 
-declare const jsonc: () => FlatESLintConfigItem[];
+declare const jsonc: () => ConfigItem[];
 
-declare const mdx: ({ componentExts, overrides, }?: OptionsComponentExts & OptionsOverrides) => FlatESLintConfigItem[];
+declare const mdx: ({ componentExts, overrides, }?: OptionsComponentExts & OptionsOverrides) => ConfigItem[];
 
-declare const node: () => FlatESLintConfigItem[];
+declare const node: () => ConfigItem[];
 
-declare const onlyError: () => FlatESLintConfigItem[];
+declare const onlyError: () => ConfigItem[];
 
-declare const promise: () => FlatESLintConfigItem[];
+declare const promise: () => ConfigItem[];
 
-declare const solid: ({ overrides, typescript, }?: OptionsHasTypeScript & OptionsOverrides) => FlatESLintConfigItem[];
+declare const solid: ({ overrides, typescript, }?: OptionsHasTypeScript & OptionsOverrides) => ConfigItem[];
 
-declare const sortImports: () => FlatESLintConfigItem[];
+declare const sortImports: () => ConfigItem[];
 
-declare const test: ({ overrides, }?: OptionsOverrides) => FlatESLintConfigItem[];
+declare const test: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
-declare const toml: ({ overrides, }?: OptionsOverrides) => FlatESLintConfigItem[];
+declare const toml: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
-declare function typescript({ componentExts, parserOptions, overrides, }?: OptionsTypeScriptParserOptions & OptionsComponentExts & OptionsOverrides): FlatESLintConfigItem[];
+declare function typescript({ componentExts, parserOptions, overrides, }?: OptionsTypeScriptParserOptions & OptionsComponentExts & OptionsOverrides): ConfigItem[];
 
-declare const unicorn: () => FlatESLintConfigItem[];
+declare const unicorn: () => ConfigItem[];
 
-declare const vue: ({ overrides, typescript, }?: OptionsHasTypeScript & OptionsOverrides) => FlatESLintConfigItem[];
+declare const vue: ({ overrides, typescript, }?: OptionsHasTypeScript & OptionsOverrides) => ConfigItem[];
 
-declare const yaml: ({ overrides, }?: OptionsOverrides) => FlatESLintConfigItem[];
+declare const yaml: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
-/** Construct an array of ESLint flat config items. */
-declare function so1ve(options?: Options, ...userConfigs: (FlatESLintConfigItem | FlatESLintConfigItem[])[]): FlatESLintConfigItem[];
+/**
+ * Construct an array of ESLint flat config items.
+ */
+declare function so1ve(options?: Options, ...userConfigs: (ConfigItem | ConfigItem[])[]): ConfigItem[];
 
 declare const GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
 declare const GLOB_SRC = "**/*.?([cm])[jt]s?(x)";
@@ -196,13 +222,11 @@ declare const GLOB_TESTS: string[];
 declare const GLOB_ALL_SRC: string[];
 declare const GLOB_EXCLUDE: string[];
 
-/** Combine array and non-array configs into a single array. */
-declare const combine: (...configs: (FlatESLintConfigItem | FlatESLintConfigItem[])[]) => FlatESLintConfigItem[];
 declare const renameRules: (rules: Record<string, any>, from: string, to: string) => {
     [k: string]: any;
 };
-declare function recordRulesStateConfigs(configs: FlatESLintConfigItem[]): FlatESLintConfigItem[];
-declare function recordRulesState(rules: FlatESLintConfigItem["rules"]): FlatESLintConfigItem["rules"];
+declare function recordRulesStateConfigs(configs: ConfigItem[]): ConfigItem[];
+declare function recordRulesState(rules: ConfigItem["rules"]): ConfigItem["rules"];
 declare function warnUnnecessaryOffRules(): void;
 
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, Options, OptionsComponentExts, OptionsHasTypeScript, OptionsOverrides, OptionsTypeScriptParserOptions, combine, comments, formatting, html, ignores, imports, javascript, jsonc, mdx, node, onlyError, promise, recordRulesState, recordRulesStateConfigs, renameRules, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, warnUnnecessaryOffRules, yaml };
+export { ConfigItem, GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, Options, OptionsComponentExts, OptionsHasTypeScript, OptionsOverrides, OptionsTypeScriptParserOptions, RenamedRules, comments, formatting, html, ignores, imports, javascript, jsonc, mdx, node, onlyError, promise, recordRulesState, recordRulesStateConfigs, renameRules, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, warnUnnecessaryOffRules, yaml };

package/dist/index.mjs

@@ -31,6 +31,8 @@ import pluginMdx from 'eslint-plugin-mdx';
 export { default as pluginMdx } from 'eslint-plugin-mdx';
 import pluginNode from 'eslint-plugin-n';
 export { default as pluginNode } from 'eslint-plugin-n';
+import * as pluginNoAwaitInPromise from 'eslint-plugin-no-await-in-promise';
+export { pluginNoAwaitInPromise };
 import pluginNoOnlyTests from 'eslint-plugin-no-only-tests';
 export { default as pluginNoOnlyTests } from 'eslint-plugin-no-only-tests';
 import pluginOnlyError from 'eslint-plugin-only-error';
@@ -240,7 +242,6 @@ const formatting = (options) => {
                 "moduleResolution",
                 "moduleSuffixes",
                 "noResolve",
-                "paths",
                 "resolveJsonModule",
                 "resolvePackageJsonExports",
                 "resolvePackageJsonImports",
@@ -306,7 +307,9 @@ const formatting = (options) => {
                 "verbatimModuleSyntax",
                 /* Completeness */
                 "skipDefaultLibCheck",
-                "skipLibCheck"
+                "skipLibCheck",
+                /* Alias */
+                "paths"
               ],
               pathPattern: "^compilerOptions$"
             }
@@ -323,6 +326,46 @@ const formatting = (options) => {
   ].flat().filter(Boolean);
 };
 
+const renameRules = (rules, from, to) => Object.fromEntries(
+  Object.entries(rules).map(([key, value]) => {
+    if (key.startsWith(from)) {
+      return [to + key.slice(from.length), value];
+    }
+    return [key, value];
+  })
+);
+const rulesOn = /* @__PURE__ */ new Set();
+const rulesOff = /* @__PURE__ */ new Set();
+function recordRulesStateConfigs(configs) {
+  var _a;
+  for (const config of configs) {
+    recordRulesState((_a = config.rules) != null ? _a : {});
+  }
+  return configs;
+}
+function recordRulesState(rules) {
+  for (const [key, value] of Object.entries(rules != null ? rules : {})) {
+    const firstValue = Array.isArray(value) ? value[0] : value;
+    if (firstValue == null) {
+      continue;
+    }
+    if (firstValue === "off" || firstValue === 0) {
+      rulesOff.add(key);
+    } else {
+      rulesOn.add(key);
+    }
+  }
+  return rules;
+}
+function warnUnnecessaryOffRules() {
+  const unnecessaryOffRules = [...rulesOff].filter((key) => !rulesOn.has(key));
+  for (const off of unnecessaryOffRules) {
+    console.warn(
+      `[eslint] rule \`${off}\` is never turned on, you can remove the rule from your config`
+    );
+  }
+}
+
 const html = () => [
   {
     plugins: {
@@ -339,7 +382,11 @@ const html = () => [
     },
     files: [GLOB_HTML],
     rules: {
-      ...pluginHtml.configs.recommended.rules,
+      ...renameRules(
+        pluginHtml.configs.recommended.rules,
+        "@html-eslint/",
+        "html/"
+      ),
       "html/indent": "off",
       "html/no-trailing-spaces": "off",
       "html/require-closing-tags": "off",
@@ -349,9 +396,7 @@ const html = () => [
   }
 ];
 
-const ignores = () => [
-  { ignores: GLOB_EXCLUDE }
-];
+const ignores = () => [{ ignores: GLOB_EXCLUDE }];
 
 const imports = (options = {}) => [
   {
@@ -411,7 +456,8 @@ const javascript = ({
       "sort-imports": pluginSortImports,
       "array-func": pluginArrayFunc,
       "json-schema-validator": pluginJsonSchemaValidator,
-      "regexp": pluginRegexp
+      "regexp": pluginRegexp,
+      "no-await-in-promise": pluginNoAwaitInPromise
     }
   },
   {
@@ -716,10 +762,19 @@ const javascript = ({
       "sort-imports/exports": "error",
       // array-func
       "array-func/prefer-array-from": "off",
+      "array-func/prefer-flat": "off",
+      // Handled by unicorn
+      "array-func/from-map": "off",
+      // Conflicts with unicorn/prefer-spread
+      "array-func/no-unnecessary-this-arg": "error",
+      "array-func/avoid-reverse": "error",
+      "array-func/prefer-flat-map": "error",
       // json-schema-validator
       "json-schema-validator/no-invalid": "warn",
       // regexp
       "regexp/no-unused-capturing-group": "warn",
+      // no-await-in-promise
+      "no-await-in-promise/no-await-in-promise": "error",
       ...overrides
     }
   },
@@ -872,9 +927,7 @@ const sortImports = () => [
   }
 ];
 
-const test = ({
-  overrides
-} = {}) => [
+const test = ({ overrides } = {}) => [
   {
     plugins: {
       "no-only-tests": pluginNoOnlyTests,
@@ -908,9 +961,7 @@ const test = ({
   }
 ];
 
-const toml = ({
-  overrides
-} = {}) => [
+const toml = ({ overrides } = {}) => [
   {
     plugins: {
       toml: pluginToml
@@ -930,47 +981,6 @@ const toml = ({
   }
 ];
 
-const combine = (...configs) => configs.flatMap((config) => Array.isArray(config) ? config : [config]);
-const renameRules = (rules, from, to) => Object.fromEntries(
-  Object.entries(rules).map(([key, value]) => {
-    if (key.startsWith(from)) {
-      return [to + key.slice(from.length), value];
-    }
-    return [key, value];
-  })
-);
-const rulesOn = /* @__PURE__ */ new Set();
-const rulesOff = /* @__PURE__ */ new Set();
-function recordRulesStateConfigs(configs) {
-  var _a;
-  for (const config of configs) {
-    recordRulesState((_a = config.rules) != null ? _a : {});
-  }
-  return configs;
-}
-function recordRulesState(rules) {
-  for (const [key, value] of Object.entries(rules != null ? rules : {})) {
-    const firstValue = Array.isArray(value) ? value[0] : value;
-    if (firstValue == null) {
-      continue;
-    }
-    if (firstValue === "off" || firstValue === 0) {
-      rulesOff.add(key);
-    } else {
-      rulesOn.add(key);
-    }
-  }
-  return rules;
-}
-function warnUnnecessaryOffRules() {
-  const unnecessaryOffRules = [...rulesOff].filter((key) => !rulesOn.has(key));
-  for (const off of unnecessaryOffRules) {
-    console.warn(
-      `[eslint] rule \`${off}\` is never turned on, you can remove the rule from your config`
-    );
-  }
-}
-
 function typescript({
   componentExts = [],
   parserOptions,
@@ -1027,7 +1037,9 @@ function typescript({
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
-          EXPERIMENTAL_useProjectService: true,
+          // EXPERIMENTAL_useProjectService: true,
+          project: true,
+          tsconfigRootDir: process.cwd(),
           ...parserOptions
         }
       },
@@ -1120,6 +1132,15 @@ function typescript({
         "ts/prefer-ts-expect-error": "error",
         "ts/no-require-imports": "error",
         "ts/method-signature-style": ["error", "property"],
+        "ts/explicit-member-accessibility": [
+          "error",
+          {
+            accessibility: "explicit",
+            overrides: {
+              constructors: "no-public"
+            }
+          }
+        ],
         // Override JS
         "no-useless-constructor": "off",
         "no-invalid-this": "off",
@@ -1150,7 +1171,6 @@ function typescript({
         // off
         "ts/camelcase": "off",
         "ts/explicit-function-return-type": "off",
-        "ts/explicit-member-accessibility": "off",
         "ts/no-explicit-any": "off",
         "ts/no-parameter-properties": "off",
         "ts/no-empty-interface": "off",
@@ -1446,9 +1466,7 @@ const vue = ({
   }
 ];
 
-const yaml = ({
-  overrides
-} = {}) => [
+const yaml = ({ overrides } = {}) => [
   {
     plugins: {
       yaml: pluginYaml
@@ -1509,7 +1527,8 @@ function so1ve(options = {}, ...userConfigs) {
     promise(),
     sortImports(),
     imports(),
-    unicorn()
+    unicorn(),
+    html()
   );
   if (enableVue) {
     componentExts.push("vue");
@@ -1582,8 +1601,8 @@ function so1ve(options = {}, ...userConfigs) {
   if (Object.keys(fusedConfig).length > 0) {
     configs.push([fusedConfig]);
   }
-  const merged = combine(...configs, ...userConfigs);
+  const merged = [...configs, ...userConfigs].flat();
   return merged;
 }
 
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, combine, comments, formatting, html, ignores, imports, javascript, jsonc, mdx, node, onlyError, promise, recordRulesState, recordRulesStateConfigs, renameRules, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, warnUnnecessaryOffRules, yaml };
+export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, comments, formatting, html, ignores, imports, javascript, jsonc, mdx, node, onlyError, promise, recordRulesState, recordRulesStateConfigs, renameRules, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, warnUnnecessaryOffRules, yaml };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-config",
-  "version": "1.0.0-alpha.9",
+  "version": "1.0.1",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "description": "Ray's eslint config.",
   "keywords": [
@@ -46,12 +46,13 @@
     "eslint-plugin-case-police": "^0.6.1",
     "eslint-plugin-etc": "^2.0.3",
     "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-i": "2.28.1",
+    "eslint-plugin-i": "2.29.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-json-schema-validator": "^4.6.0",
     "eslint-plugin-jsonc": "^2.9.0",
     "eslint-plugin-mdx": "^2.2.0",
     "eslint-plugin-n": "^16.0.1",
+    "eslint-plugin-no-await-in-promise": "^1.1.5",
     "eslint-plugin-no-explicit-type-exports": "^0.12.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-only-error": "^1.0.2",
@@ -70,8 +71,8 @@
     "toml-eslint-parser": "^0.6.0",
     "vue-eslint-parser": "^9.3.1",
     "yaml-eslint-parser": "^1.2.2",
-    "@so1ve/eslint-plugin": "1.0.0-alpha.9",
-    "@so1ve/eslint-plugin-sort-imports": "1.0.0-alpha.9"
+    "@so1ve/eslint-plugin": "1.0.1",
+    "@so1ve/eslint-plugin-sort-imports": "1.0.1"
   },
   "devDependencies": {
     "eslint": "^8.46.0"