@ntnyq/eslint-config 2.6.3 → 2.7.0

package/dist/index.cjs

@@ -90,12 +90,6 @@ __export(src_exports, {
   pluginUnusedImports: () => import_eslint_plugin_unused_imports.default,
   pluginVue: () => import_eslint_plugin_vue.default,
   pluginYaml: () => import_eslint_plugin_yml.default,
-  presetAll: () => presetAll,
-  presetBasic: () => presetBasic,
-  presetCommon: () => presetCommon,
-  presetJavaScript: () => presetJavaScript,
-  presetJsonc: () => presetJsonc,
-  presetLanguageExtensions: () => presetLanguageExtensions,
   prettier: () => prettier,
   regexp: () => regexp,
   sortPackageJson: () => sortPackageJson,
@@ -434,6 +428,19 @@ var prettier = defineConfig([
       ...import_eslint_plugin_prettier.default.configs.recommended.rules,
       "prettier/prettier": "warn"
     }
+  },
+  /**
+   * Languages that prettier currently does not support
+   */
+  {
+    name: "ntnyq/prettier/ignore",
+    files: [GLOB_TOML],
+    plugins: {
+      prettier: import_eslint_plugin_prettier.default
+    },
+    rules: {
+      "prettier/prettier": "off"
+    }
   }
 ]);
 
@@ -1015,8 +1022,6 @@ var toml = defineConfig([
       toml: import_eslint_plugin_toml.default
     },
     rules: {
-      // Prettier do not have official support for TOML currently
-      "prettier/prettier": "off",
       // Avoid conflicts with js comment
       "spaced-comment": "off",
       "toml/comma-style": "error",
@@ -1597,23 +1602,7 @@ var vue = defineConfig([
   }
 ]);
 
-// src/presets.ts
-var presetJavaScript = [
-  ...ignores,
-  ...jsdoc,
-  ...jsx,
-  ...node,
-  ...imports,
-  ...unicorn,
-  ...comments,
-  ...javascript,
-  ...regexp
-];
-var presetBasic = [...presetJavaScript, ...typescript];
-var presetJsonc = [...jsonc, ...sortPackageJson, ...sortTsConfig];
-var presetLanguageExtensions = [...presetJsonc, ...yml, ...toml, ...markdown];
-var presetCommon = [...presetBasic, ...presetLanguageExtensions, ...prettier];
-var presetAll = [...presetCommon, ...vue, ...unocss];
+// src/core.ts
 function ntnyq(config = [], {
   vue: enableVue = hasVue,
   unocss: enableUnoCSS = hasUnoCSS,
@@ -1621,22 +1610,44 @@ function ntnyq(config = [], {
   markdown: enableMarkdown = true,
   command: enableCommand = true
 } = {}) {
-  const configs = defineConfig([...presetBasic, ...yml, ...toml, ...presetJsonc]);
+  const configs = defineConfig([
+    /**
+     * Basic
+     */
+    ...ignores,
+    ...jsdoc,
+    ...jsx,
+    ...node,
+    ...imports,
+    ...unicorn,
+    ...comments,
+    ...javascript,
+    ...regexp,
+    ...typescript,
+    /**
+     * Language extensions
+     */
+    ...yml,
+    ...toml,
+    ...jsonc,
+    ...sortPackageJson,
+    ...sortTsConfig
+  ]);
   if (enableVue) {
     configs.push(...vue);
   }
   if (enableUnoCSS) {
     configs.push(...unocss);
   }
-  if (enablePrettier) {
-    configs.push(...prettier);
-  }
   if (enableMarkdown) {
     configs.push(...markdown);
   }
   if (enableCommand) {
     configs.push(...command);
   }
+  if (enablePrettier) {
+    configs.push(...prettier);
+  }
   if (Object.keys(config).length > 0) {
     configs.push(...Array.isArray(config) ? config : [config]);
   }
@@ -1704,12 +1715,6 @@ function ntnyq(config = [], {
   pluginUnusedImports,
   pluginVue,
   pluginYaml,
-  presetAll,
-  presetBasic,
-  presetCommon,
-  presetJavaScript,
-  presetJsonc,
-  presetLanguageExtensions,
   prettier,
   regexp,
   sortPackageJson,

package/dist/index.d.cts

@@ -24,17 +24,6 @@ export { vueEslintParser as parserVue };
 import * as jsoncEslintParser from 'jsonc-eslint-parser';
 export { jsoncEslintParser as parserJsonc };
 
-declare const hasTypeScript: boolean;
-declare const hasVue: boolean;
-declare const hasUnoCSS: boolean;
-
-/**
- * Load an ESLint plugin by name.
- * @param name - The name of the plugin
- * @returns The plugin module
- */
-declare function loadPlugin<T = unknown>(name: string): Promise<T>;
-
 /* eslint-disable */
 /* prettier-ignore */
 
@@ -6695,7 +6684,7 @@ type TypescriptEslintRestrictTemplateExpressions = []|[{
   allowNever?: boolean
 }]
 // ----- @typescript-eslint/return-await -----
-type TypescriptEslintReturnAwait = []|[("in-try-catch" | "always" | "never")]
+type TypescriptEslintReturnAwait = []|[("in-try-catch" | "always" | "never" | "error-handling-correctness-only")]
 // ----- @typescript-eslint/sort-type-constituents -----
 type TypescriptEslintSortTypeConstituents = []|[{
   
@@ -11221,6 +11210,32 @@ type Awaitable<T> = T | Promise<T>
 
 type InteropModuleDefault<T> = T extends { default: infer U } ? U : T
 
+/**
+ * @file presets
+ */
+
+/**
+ * Custom framework support
+ */
+declare function ntnyq(config?: TypedConfigItem | TypedConfigItem[], { vue: enableVue, unocss: enableUnoCSS, prettier: enablePrettier, markdown: enableMarkdown, command: enableCommand, }?: {
+    vue?: boolean | undefined;
+    unocss?: boolean | undefined;
+    prettier?: boolean | undefined;
+    markdown?: boolean | undefined;
+    command?: boolean | undefined;
+}): TypedConfigItem[];
+
+declare const hasTypeScript: boolean;
+declare const hasVue: boolean;
+declare const hasUnoCSS: boolean;
+
+/**
+ * Load an ESLint plugin by name.
+ * @param name - The name of the plugin
+ * @returns The plugin module
+ */
+declare function loadPlugin<T = unknown>(name: string): Promise<T>;
+
 /**
  * Define ESLint config
  */
@@ -11261,42 +11276,6 @@ declare const GLOB_DIST = "**/dist/**";
 declare const GLOB_LOCKFILE: string[];
 declare const GLOB_EXCLUDE: string[];
 
-/**
- * @file presets
- */
-
-/**
- * JavaScript preset
- */
-declare const presetJavaScript: TypedConfigItem[];
-/**
- * JavaScript & TypeScript
- */
-declare const presetBasic: TypedConfigItem[];
-/**
- * JSON and sort json keys
- */
-declare const presetJsonc: TypedConfigItem[];
-/**
- * JSON YAML Markdown
- */
-declare const presetLanguageExtensions: TypedConfigItem[];
-declare const presetCommon: TypedConfigItem[];
-/**
- * All supported framework
- */
-declare const presetAll: TypedConfigItem[];
-/**
- * Custom framework support
- */
-declare function ntnyq(config?: TypedConfigItem | TypedConfigItem[], { vue: enableVue, unocss: enableUnoCSS, prettier: enablePrettier, markdown: enableMarkdown, command: enableCommand, }?: {
-    vue?: boolean | undefined;
-    unocss?: boolean | undefined;
-    prettier?: boolean | undefined;
-    markdown?: boolean | undefined;
-    command?: boolean | undefined;
-}): TypedConfigItem[];
-
 /**
  * @see https://eslint.org/docs/latest/use/configure/configuration-files-new#globally-ignoring-files-with-ignores
  */
@@ -11342,4 +11321,4 @@ declare const markdown: TypedConfigItem[];
 declare function getVueVersion(): number;
 declare const vue: TypedConfigItem[];
 
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_DTS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, command, comments, defineConfig, getVueVersion, hasTypeScript, hasUnoCSS, hasVue, ignores, imports, interopDefault, javascript, jsdoc, jsonc, jsx, loadPlugin, markdown, node, ntnyq, presetAll, presetBasic, presetCommon, presetJavaScript, presetJsonc, presetLanguageExtensions, prettier, regexp, sortPackageJson, sortTsConfig, toml, typescript, typescriptCore, unicorn, unocss, unusedImports, vue, yml };
+export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_DTS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, command, comments, defineConfig, getVueVersion, hasTypeScript, hasUnoCSS, hasVue, ignores, imports, interopDefault, javascript, jsdoc, jsonc, jsx, loadPlugin, markdown, node, ntnyq, prettier, regexp, sortPackageJson, sortTsConfig, toml, typescript, typescriptCore, unicorn, unocss, unusedImports, vue, yml };

package/dist/index.d.ts

@@ -24,17 +24,6 @@ export { vueEslintParser as parserVue };
 import * as jsoncEslintParser from 'jsonc-eslint-parser';
 export { jsoncEslintParser as parserJsonc };
 
-declare const hasTypeScript: boolean;
-declare const hasVue: boolean;
-declare const hasUnoCSS: boolean;
-
-/**
- * Load an ESLint plugin by name.
- * @param name - The name of the plugin
- * @returns The plugin module
- */
-declare function loadPlugin<T = unknown>(name: string): Promise<T>;
-
 /* eslint-disable */
 /* prettier-ignore */
 
@@ -6695,7 +6684,7 @@ type TypescriptEslintRestrictTemplateExpressions = []|[{
   allowNever?: boolean
 }]
 // ----- @typescript-eslint/return-await -----
-type TypescriptEslintReturnAwait = []|[("in-try-catch" | "always" | "never")]
+type TypescriptEslintReturnAwait = []|[("in-try-catch" | "always" | "never" | "error-handling-correctness-only")]
 // ----- @typescript-eslint/sort-type-constituents -----
 type TypescriptEslintSortTypeConstituents = []|[{
   
@@ -11221,6 +11210,32 @@ type Awaitable<T> = T | Promise<T>
 
 type InteropModuleDefault<T> = T extends { default: infer U } ? U : T
 
+/**
+ * @file presets
+ */
+
+/**
+ * Custom framework support
+ */
+declare function ntnyq(config?: TypedConfigItem | TypedConfigItem[], { vue: enableVue, unocss: enableUnoCSS, prettier: enablePrettier, markdown: enableMarkdown, command: enableCommand, }?: {
+    vue?: boolean | undefined;
+    unocss?: boolean | undefined;
+    prettier?: boolean | undefined;
+    markdown?: boolean | undefined;
+    command?: boolean | undefined;
+}): TypedConfigItem[];
+
+declare const hasTypeScript: boolean;
+declare const hasVue: boolean;
+declare const hasUnoCSS: boolean;
+
+/**
+ * Load an ESLint plugin by name.
+ * @param name - The name of the plugin
+ * @returns The plugin module
+ */
+declare function loadPlugin<T = unknown>(name: string): Promise<T>;
+
 /**
  * Define ESLint config
  */
@@ -11261,42 +11276,6 @@ declare const GLOB_DIST = "**/dist/**";
 declare const GLOB_LOCKFILE: string[];
 declare const GLOB_EXCLUDE: string[];
 
-/**
- * @file presets
- */
-
-/**
- * JavaScript preset
- */
-declare const presetJavaScript: TypedConfigItem[];
-/**
- * JavaScript & TypeScript
- */
-declare const presetBasic: TypedConfigItem[];
-/**
- * JSON and sort json keys
- */
-declare const presetJsonc: TypedConfigItem[];
-/**
- * JSON YAML Markdown
- */
-declare const presetLanguageExtensions: TypedConfigItem[];
-declare const presetCommon: TypedConfigItem[];
-/**
- * All supported framework
- */
-declare const presetAll: TypedConfigItem[];
-/**
- * Custom framework support
- */
-declare function ntnyq(config?: TypedConfigItem | TypedConfigItem[], { vue: enableVue, unocss: enableUnoCSS, prettier: enablePrettier, markdown: enableMarkdown, command: enableCommand, }?: {
-    vue?: boolean | undefined;
-    unocss?: boolean | undefined;
-    prettier?: boolean | undefined;
-    markdown?: boolean | undefined;
-    command?: boolean | undefined;
-}): TypedConfigItem[];
-
 /**
  * @see https://eslint.org/docs/latest/use/configure/configuration-files-new#globally-ignoring-files-with-ignores
  */
@@ -11342,4 +11321,4 @@ declare const markdown: TypedConfigItem[];
 declare function getVueVersion(): number;
 declare const vue: TypedConfigItem[];
 
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_DTS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, command, comments, defineConfig, getVueVersion, hasTypeScript, hasUnoCSS, hasVue, ignores, imports, interopDefault, javascript, jsdoc, jsonc, jsx, loadPlugin, markdown, node, ntnyq, presetAll, presetBasic, presetCommon, presetJavaScript, presetJsonc, presetLanguageExtensions, prettier, regexp, sortPackageJson, sortTsConfig, toml, typescript, typescriptCore, unicorn, unocss, unusedImports, vue, yml };
+export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DIST, GLOB_DTS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_LOCKFILE, GLOB_MARKDOWN, GLOB_NODE_MODULES, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_YAML, command, comments, defineConfig, getVueVersion, hasTypeScript, hasUnoCSS, hasVue, ignores, imports, interopDefault, javascript, jsdoc, jsonc, jsx, loadPlugin, markdown, node, ntnyq, prettier, regexp, sortPackageJson, sortTsConfig, toml, typescript, typescriptCore, unicorn, unocss, unusedImports, vue, yml };

package/dist/index.js

@@ -320,6 +320,19 @@ var prettier = defineConfig([
       ...default11.configs.recommended.rules,
       "prettier/prettier": "warn"
     }
+  },
+  /**
+   * Languages that prettier currently does not support
+   */
+  {
+    name: "ntnyq/prettier/ignore",
+    files: [GLOB_TOML],
+    plugins: {
+      prettier: default11
+    },
+    rules: {
+      "prettier/prettier": "off"
+    }
   }
 ]);
 
@@ -901,8 +914,6 @@ var toml = defineConfig([
       toml: default5
     },
     rules: {
-      // Prettier do not have official support for TOML currently
-      "prettier/prettier": "off",
       // Avoid conflicts with js comment
       "spaced-comment": "off",
       "toml/comma-style": "error",
@@ -1483,23 +1494,7 @@ var vue = defineConfig([
   }
 ]);
 
-// src/presets.ts
-var presetJavaScript = [
-  ...ignores,
-  ...jsdoc,
-  ...jsx,
-  ...node,
-  ...imports,
-  ...unicorn,
-  ...comments,
-  ...javascript,
-  ...regexp
-];
-var presetBasic = [...presetJavaScript, ...typescript];
-var presetJsonc = [...jsonc, ...sortPackageJson, ...sortTsConfig];
-var presetLanguageExtensions = [...presetJsonc, ...yml, ...toml, ...markdown];
-var presetCommon = [...presetBasic, ...presetLanguageExtensions, ...prettier];
-var presetAll = [...presetCommon, ...vue, ...unocss];
+// src/core.ts
 function ntnyq(config = [], {
   vue: enableVue = hasVue,
   unocss: enableUnoCSS = hasUnoCSS,
@@ -1507,22 +1502,44 @@ function ntnyq(config = [], {
   markdown: enableMarkdown = true,
   command: enableCommand = true
 } = {}) {
-  const configs = defineConfig([...presetBasic, ...yml, ...toml, ...presetJsonc]);
+  const configs = defineConfig([
+    /**
+     * Basic
+     */
+    ...ignores,
+    ...jsdoc,
+    ...jsx,
+    ...node,
+    ...imports,
+    ...unicorn,
+    ...comments,
+    ...javascript,
+    ...regexp,
+    ...typescript,
+    /**
+     * Language extensions
+     */
+    ...yml,
+    ...toml,
+    ...jsonc,
+    ...sortPackageJson,
+    ...sortTsConfig
+  ]);
   if (enableVue) {
     configs.push(...vue);
   }
   if (enableUnoCSS) {
     configs.push(...unocss);
   }
-  if (enablePrettier) {
-    configs.push(...prettier);
-  }
   if (enableMarkdown) {
     configs.push(...markdown);
   }
   if (enableCommand) {
     configs.push(...command);
   }
+  if (enablePrettier) {
+    configs.push(...prettier);
+  }
   if (Object.keys(config).length > 0) {
     configs.push(...Array.isArray(config) ? config : [config]);
   }
@@ -1589,12 +1606,6 @@ export {
   default13 as pluginUnusedImports,
   default3 as pluginVue,
   default4 as pluginYaml,
-  presetAll,
-  presetBasic,
-  presetCommon,
-  presetJavaScript,
-  presetJsonc,
-  presetLanguageExtensions,
   prettier,
   regexp,
   sortPackageJson,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@ntnyq/eslint-config",
   "type": "module",
-  "version": "2.6.3",
-  "packageManager": "pnpm@9.5.0",
+  "version": "2.7.0",
+  "packageManager": "pnpm@9.6.0",
   "description": "ESLint flat config of ntnyq",
   "keywords": [
     "eslint",
@@ -79,7 +79,7 @@
     "local-pkg": "^0.5.0",
     "prettier": "^3.3.3",
     "toml-eslint-parser": "^0.10.0",
-    "typescript-eslint": "^8.0.0-alpha.47",
+    "typescript-eslint": "^8.0.0-alpha.49",
     "vue-eslint-parser": "^9.4.3",
     "yaml-eslint-parser": "^1.2.3"
   },