@exbotanical/eslint-config 1.0.0 → 1.0.1

package/dist/index.d.ts

@@ -1952,6 +1952,7 @@ type Rules = RuleOptions;
 type FlatConfigRecord = Omit<Linter.Config<Linter.RulesRecord & Rules>, 'plugins'> & {
     plugins?: Record<string, any>;
 };
+type Awaitable<T> = T | Promise<T>;
 
 interface OptionsIgnores extends AllOptions {
     files?: string[];
@@ -2101,6 +2102,6 @@ interface OptionsStyle {
 }
 
 type LinterOptions = OptionsConfig;
-declare function exbotanical({ javascript: optionsJavascript, ignores: optionsIgnore, jsonc: optionsJsonc, markdown: optionsMarkdown, toml: optionsToml, yaml: optionsYaml, test: optionsTest, formatter, typescript: optionsTypescript, style: optionsStyle, react: optionsReact, vue: optionsVue, ...otherOptions }: LinterOptions): Promise<FlatConfigRecord[]>;
+declare function exbotanical({ javascript: optionsJavascript, ignores: optionsIgnore, jsonc: optionsJsonc, markdown: optionsMarkdown, toml: optionsToml, yaml: optionsYaml, test: optionsTest, formatter, typescript: optionsTypescript, style: optionsStyle, react: optionsReact, vue: optionsVue, type, }: LinterOptions, ...userConfigs: Awaitable<FlatConfigRecord | FlatConfigRecord[] | Linter.Config[]>[]): Promise<FlatConfigRecord[]>;
 
-export { type AllOptions, type FlatConfigRecord, type OptionsConfig, type OptionsFiles, type OptionsHasTypeScript, type OptionsOverrides, type OptionsProjectType, type OptionsStyle, type OptionsTypeScriptParser, type Rules, exbotanical as default };
+export { type AllOptions, type Awaitable, type FlatConfigRecord, type OptionsConfig, type OptionsFiles, type OptionsHasTypeScript, type OptionsOverrides, type OptionsProjectType, type OptionsStyle, type OptionsTypeScriptParser, type Rules, exbotanical as default };

package/dist/index.js

@@ -254,7 +254,8 @@ async function javascript({ overrides = {} } = {}) {
         "no-dupe-else-if": ["error"],
         "no-dupe-keys": ["error"],
         "no-duplicate-case": ["error"],
-        "no-duplicate-imports": ["error"],
+        // See `import` ruleset
+        "no-duplicate-imports": ["off"],
         "no-empty-character-class": ["error"],
         "no-empty-pattern": ["error"],
         "no-unsafe-finally": ["error"],
@@ -2050,19 +2051,19 @@ async function exbotanical({
   style: optionsStyle = STYLE_DEFAULTS,
   react: optionsReact,
   vue: optionsVue,
-  ...otherOptions
-}) {
+  type
+}, ...userConfigs) {
   const configs2 = [
     perfectionist(),
     unicorn(),
     comments(),
     imports(),
-    javascript({ ...optionsJavascript, ...otherOptions }),
+    javascript({ ...optionsJavascript, type }),
     jsdoc(),
     jsx(),
     node(),
     regexpr(),
-    test({ ...factoryConfig(optionsTest), ...otherOptions })
+    test({ ...factoryConfig(optionsTest) })
   ];
   if (optionsJsonc) {
     configs2.push(
@@ -2070,41 +2071,38 @@ async function exbotanical({
       tsconfig(),
       jsonc({
         ...factoryConfig(optionsJsonc),
-        ...optionsStyle,
-        ...otherOptions
+        ...optionsStyle
       })
     );
   }
   if (optionsMarkdown) {
-    configs2.push(
-      markdown({ ...factoryConfig(optionsMarkdown), ...otherOptions })
-    );
+    configs2.push(markdown({ ...factoryConfig(optionsMarkdown) }));
   }
   if (optionsReact) {
-    configs2.push(react({ ...factoryConfig(optionsReact), ...otherOptions }));
+    configs2.push(react({ ...factoryConfig(optionsReact) }));
   }
   if (optionsToml) {
-    configs2.push(
-      toml({ ...factoryConfig(optionsToml), ...optionsStyle, ...otherOptions })
-    );
+    configs2.push(toml({ ...factoryConfig(optionsToml), ...optionsStyle }));
   }
   if (optionsTypescript) {
-    configs2.push(
-      typescript({ ...factoryConfig(optionsTypescript), ...otherOptions })
-    );
+    configs2.push(typescript({ ...factoryConfig(optionsTypescript), type }));
   }
   if (optionsVue) {
-    configs2.push(vue({ ...factoryConfig(optionsVue), ...otherOptions }));
+    configs2.push(vue({ ...factoryConfig(optionsVue) }));
   }
   if (optionsYaml) {
-    configs2.push(
-      yaml({ ...factoryConfig(optionsYaml), ...optionsStyle, ...otherOptions })
-    );
+    configs2.push(yaml({ ...factoryConfig(optionsYaml), ...optionsStyle }));
   }
   if (formatter) {
     configs2.push(prettier());
   }
-  configs2.push(disables(), ignores({ ...optionsIgnore, ...otherOptions }));
+  configs2.push(disables(), ignores({ ...optionsIgnore }));
+  if (userConfigs.length > 0) {
+    const resolved2 = await Promise.all(userConfigs);
+    configs2.push(
+      ...resolved2.map((r) => Promise.resolve(Array.isArray(r) ? r : [r]))
+    );
+  }
   const resolved = await Promise.all(configs2);
   return resolved.flat();
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exbotanical/eslint-config",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": false,
   "description": "Zito's eslint config",
   "author": "Matthew Zito <exbotanical@protonmail.com> (https://github.com/exbotanical/)",
@@ -34,7 +34,7 @@
     "prepack": "npm run build",
     "prepare": "simple-git-hooks",
     "typecheck": "tsc --noEmit",
-    "release": "npm publish"
+    "release": "bumpp && npm publish"
   },
   "peerDependencies": {
     "@eslint-react/eslint-plugin": "^1.30.1",