@so1ve/eslint-config 1.0.0-alpha.15 → 1.0.0-alpha.17

package/dist/index.cjs

@@ -935,7 +935,6 @@ const toml = ({ overrides } = {}) => [
   }
 ];
 
-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)) {
@@ -979,8 +978,7 @@ function warnUnnecessaryOffRules() {
 function typescript({
   componentExts = [],
   parserOptions,
-  overrides,
-  tsconfigPath
+  overrides
 } = {}) {
   const typeAwareRules = {
     "etc/no-assign-mutated-array": "error",
@@ -1033,12 +1031,7 @@ function typescript({
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
-          // Disable this because it doesn't work well with vue
-          // EXPERIMENTAL_useProjectService: true,
-          ...tsconfigPath ? {
-            project: [tsconfigPath],
-            tsconfigRootDir: process.cwd()
-          } : {},
+          EXPERIMENTAL_useProjectService: true,
           // eslint-disable-next-line ts/no-unnecessary-type-assertion
           ...parserOptions
         }
@@ -1184,7 +1177,7 @@ function typescript({
         "ts/no-non-null-asserted-nullish-coalescing": "error",
         // handled by unused-imports/no-unused-imports
         "ts/no-unused-vars": "off",
-        ...tsconfigPath ? typeAwareRules : {},
+        ...typeAwareRules,
         ...overrides
       }
     },
@@ -1501,11 +1494,11 @@ function so1ve(options = {}, ...userConfigs) {
   const {
     vue: enableVue = VuePackages.some((i) => localPkg.isPackageExists(i)),
     solid: enableSolid = localPkg.isPackageExists("solid-js"),
+    typescript: enableTypeScript = localPkg.isPackageExists("typescript"),
     gitignore: enableGitignore = true,
     overrides = {},
     componentExts = []
   } = options;
-  let { typescript: enableTypeScript = localPkg.isPackageExists("typescript") } = options;
   const configs = [];
   if (enableGitignore) {
     if (typeof enableGitignore === "boolean") {
@@ -1533,16 +1526,10 @@ function so1ve(options = {}, ...userConfigs) {
     componentExts.push("vue");
   }
   if (enableTypeScript) {
-    if (typeof enableTypeScript !== "object") {
-      enableTypeScript = {
-        tsconfigPath: "tsconfig.json"
-      };
-    }
     configs.push(
       typescript({
         componentExts,
-        overrides: overrides.typescript,
-        ...enableTypeScript
+        overrides: overrides.typescript
       })
     );
   }
@@ -1606,7 +1593,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;
 }
 
@@ -1764,7 +1751,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

@@ -36,18 +36,16 @@ export { default as parserVue } from 'vue-eslint-parser';
 export { default as parserYaml } from 'yaml-eslint-parser';
 
 interface OptionsComponentExts {
-    /** Additional extensions for components. */
+    /**
+     * Additional extensions for components.
+     */
     componentExts?: string[];
 }
-interface OptionsTypeScript {
-    /** Additional parser options for TypeScript. */
-    parserOptions?: Partial<ParserOptions>;
+interface OptionsTypeScriptParserOptions {
     /**
-     * Path to `tsconfig.json`.
-     *
-     * @default "tsconfig.json"
+     * Additional parser options for TypeScript.
      */
-    tsconfigPath?: string;
+    parserOptions?: Partial<ParserOptions>;
 }
 interface OptionsHasTypeScript {
     typescript?: boolean;
@@ -72,7 +70,7 @@ interface Options extends OptionsComponentExts {
      *
      * @default auto-detect based on the dependencies
      */
-    typescript?: boolean | OptionsTypeScript;
+    typescript?: boolean;
     /**
      * Enable test support.
      *
@@ -121,7 +119,9 @@ interface Options extends OptionsComponentExts {
      * @default true
      */
     formatting?: boolean;
-    /** Provide overrides for rules for each integration. */
+    /**
+     * Provide overrides for rules for each integration.
+     */
     overrides?: {
         javascript?: ConfigItem["rules"];
         typescript?: ConfigItem["rules"];
@@ -180,7 +180,7 @@ declare const test: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
 declare const toml: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
-declare function typescript({ componentExts, parserOptions, overrides, tsconfigPath, }?: OptionsTypeScript & OptionsComponentExts & OptionsOverrides): ConfigItem[];
+declare function typescript({ componentExts, parserOptions, overrides, }?: OptionsTypeScriptParserOptions & OptionsComponentExts & OptionsOverrides): ConfigItem[];
 
 declare const unicorn: () => ConfigItem[];
 
@@ -188,7 +188,9 @@ declare const vue: ({ overrides, typescript, }?: OptionsHasTypeScript & OptionsO
 
 declare const yaml: ({ overrides }?: OptionsOverrides) => ConfigItem[];
 
-/** Construct an array of ESLint flat config items. */
+/**
+ * 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)";
@@ -218,8 +220,6 @@ 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: (ConfigItem | ConfigItem[])[]) => ConfigItem[];
 declare const renameRules: (rules: Record<string, any>, from: string, to: string) => {
     [k: string]: any;
 };
@@ -227,4 +227,4 @@ declare function recordRulesStateConfigs(configs: ConfigItem[]): ConfigItem[];
 declare function recordRulesState(rules: ConfigItem["rules"]): ConfigItem["rules"];
 declare function warnUnnecessaryOffRules(): void;
 
-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, OptionsTypeScript, RenamedRules, 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

@@ -924,7 +924,6 @@ const toml = ({ overrides } = {}) => [
   }
 ];
 
-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)) {
@@ -968,8 +967,7 @@ function warnUnnecessaryOffRules() {
 function typescript({
   componentExts = [],
   parserOptions,
-  overrides,
-  tsconfigPath
+  overrides
 } = {}) {
   const typeAwareRules = {
     "etc/no-assign-mutated-array": "error",
@@ -1022,12 +1020,7 @@ function typescript({
         parserOptions: {
           sourceType: "module",
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
-          // Disable this because it doesn't work well with vue
-          // EXPERIMENTAL_useProjectService: true,
-          ...tsconfigPath ? {
-            project: [tsconfigPath],
-            tsconfigRootDir: process.cwd()
-          } : {},
+          EXPERIMENTAL_useProjectService: true,
           // eslint-disable-next-line ts/no-unnecessary-type-assertion
           ...parserOptions
         }
@@ -1173,7 +1166,7 @@ function typescript({
         "ts/no-non-null-asserted-nullish-coalescing": "error",
         // handled by unused-imports/no-unused-imports
         "ts/no-unused-vars": "off",
-        ...tsconfigPath ? typeAwareRules : {},
+        ...typeAwareRules,
         ...overrides
       }
     },
@@ -1490,11 +1483,11 @@ function so1ve(options = {}, ...userConfigs) {
   const {
     vue: enableVue = VuePackages.some((i) => isPackageExists(i)),
     solid: enableSolid = isPackageExists("solid-js"),
+    typescript: enableTypeScript = isPackageExists("typescript"),
     gitignore: enableGitignore = true,
     overrides = {},
     componentExts = []
   } = options;
-  let { typescript: enableTypeScript = isPackageExists("typescript") } = options;
   const configs = [];
   if (enableGitignore) {
     if (typeof enableGitignore === "boolean") {
@@ -1522,16 +1515,10 @@ function so1ve(options = {}, ...userConfigs) {
     componentExts.push("vue");
   }
   if (enableTypeScript) {
-    if (typeof enableTypeScript !== "object") {
-      enableTypeScript = {
-        tsconfigPath: "tsconfig.json"
-      };
-    }
     configs.push(
       typescript({
         componentExts,
-        overrides: overrides.typescript,
-        ...enableTypeScript
+        overrides: overrides.typescript
       })
     );
   }
@@ -1595,8 +1582,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.15",
+  "version": "1.0.0-alpha.17",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "description": "Ray's eslint config.",
   "keywords": [
@@ -70,8 +70,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.15",
-    "@so1ve/eslint-plugin-sort-imports": "1.0.0-alpha.15"
+    "@so1ve/eslint-plugin": "1.0.0-alpha.17",
+    "@so1ve/eslint-plugin-sort-imports": "1.0.0-alpha.17"
   },
   "devDependencies": {
     "eslint": "^8.46.0"