@ota-meshi/eslint-plugin 0.17.0 → 0.17.1

package/lib/config-builder/+astro-with-ts.js

@@ -9,7 +9,12 @@ const fallback_js_1 = require("./fallback.js");
 const any_parser_js_1 = require("../parsers/any-parser.js");
 const _astro_js_2 = require("./+astro.js");
 function buildAstroTs() {
-    return (0, module_js_1.requireOf)(["eslint-plugin-astro", "astro-eslint-parser", "@typescript-eslint/parser"], () => {
+    return (0, module_js_1.requireOf)([
+        "eslint-plugin-astro",
+        "astro-eslint-parser",
+        "typescript-eslint",
+        "@typescript-eslint/parser",
+    ], () => {
         return [
             ...(0, index_js_1.buildTS)(_astro_js_1.astroFiles),
             {
@@ -26,13 +31,12 @@ function buildAstroTs() {
             ...(0, _astro_js_2.buildAstro)(),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _astro_js_1.astroFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildAstroTs = buildAstroTs;

package/lib/config-builder/+astro.js

@@ -18,13 +18,12 @@ function buildAstro() {
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _astro_js_1.astroFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildAstro = buildAstro;

package/lib/config-builder/+json.js

@@ -20,13 +20,12 @@ function buildJson() {
             ...(0, json_schema_js_1.buildJsonSchema)(_json_js_1.jsonFiles),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _json_js_1.jsonFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildJson = buildJson;

package/lib/config-builder/+md.js

@@ -32,13 +32,12 @@ function buildMd() {
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _md_js_1.mdFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildMd = buildMd;

package/lib/config-builder/+node.js

@@ -21,9 +21,6 @@ function buildNode() {
                 },
             },
         ];
-    }, (missingList) => (0, fallback_js_1.buildFallback)(missingList).map((config) => ({
-        ...config,
-        files: _node_js_1.nodeFiles,
-    })));
+    }, (missingList) => (0, fallback_js_1.buildFallback)(missingList, { files: _node_js_1.nodeFiles }));
 }
 exports.buildNode = buildNode;

package/lib/config-builder/+package-json.js

@@ -17,13 +17,12 @@ function buildPackageJson() {
             ...nodeDependenciesPlugin.configs["flat/recommended"],
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _package_json_js_1.packageJsonFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildPackageJson = buildPackageJson;

package/lib/config-builder/+svelte-with-ts.js

@@ -12,6 +12,7 @@ function buildSvelteTs() {
     return (0, module_js_1.requireOf)([
         "eslint-plugin-svelte",
         "svelte-eslint-parser",
+        "typescript-eslint",
         "@typescript-eslint/parser",
     ], () => {
         return [
@@ -30,13 +31,12 @@ function buildSvelteTs() {
             ...(0, _svelte_js_2.buildSvelte)(),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _svelte_js_1.svelteFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildSvelteTs = buildSvelteTs;

package/lib/config-builder/+svelte.js

@@ -15,16 +15,24 @@ function buildSvelte() {
                 rules: {
                     ..._svelte_js_1.svelteExtendRules,
                 },
+                ...((0, module_js_1.has)("@typescript-eslint/parser")
+                    ? {
+                        languageOptions: {
+                            parserOptions: {
+                                parser: { ts: (0, module_js_1.requireFromCwd)("@typescript-eslint/parser") },
+                            },
+                        },
+                    }
+                    : {}),
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _svelte_js_1.svelteFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildSvelte = buildSvelte;

package/lib/config-builder/+toml.js

@@ -20,13 +20,12 @@ function buildToml() {
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _toml_js_1.tomlFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildToml = buildToml;

package/lib/config-builder/+vue2-with-ts.js

@@ -9,7 +9,12 @@ const base_config_js_1 = require("../config-helpers/plugins/ts/base-config.js");
 const any_parser_js_1 = require("../parsers/any-parser.js");
 const fallback_js_1 = require("./fallback.js");
 function buildVue2Ts() {
-    return (0, module_js_1.requireOf)(["eslint-plugin-vue", "vue-eslint-parser", "@typescript-eslint/parser"], () => {
+    return (0, module_js_1.requireOf)([
+        "eslint-plugin-vue",
+        "vue-eslint-parser",
+        "typescript-eslint",
+        "@typescript-eslint/parser",
+    ], () => {
         return [
             ...(0, index_js_1.buildTS)(_vue_js_1.vueFiles),
             {
@@ -26,13 +31,12 @@ function buildVue2Ts() {
             ...(0, _vue2_js_1.buildVue2)(),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _vue_js_1.vueFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildVue2Ts = buildVue2Ts;

package/lib/config-builder/+vue2.js

@@ -15,16 +15,24 @@ function buildVue2() {
                 rules: {
                     ..._vue_js_1.vueExtendRules,
                 },
+                ...((0, module_js_1.has)("@typescript-eslint/parser")
+                    ? {
+                        languageOptions: {
+                            parserOptions: {
+                                parser: { ts: (0, module_js_1.requireFromCwd)("@typescript-eslint/parser") },
+                            },
+                        },
+                    }
+                    : {}),
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _vue_js_1.vueFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildVue2 = buildVue2;

package/lib/config-builder/+vue3-with-ts.js

@@ -9,7 +9,12 @@ const any_parser_js_1 = require("../parsers/any-parser.js");
 const fallback_js_1 = require("./fallback.js");
 const _vue3_js_1 = require("./+vue3.js");
 function buildVue3Ts() {
-    return (0, module_js_1.requireOf)(["eslint-plugin-vue", "vue-eslint-parser", "@typescript-eslint/parser"], () => {
+    return (0, module_js_1.requireOf)([
+        "eslint-plugin-vue",
+        "vue-eslint-parser",
+        "typescript-eslint",
+        "@typescript-eslint/parser",
+    ], () => {
         return [
             ...(0, index_js_1.buildTS)(_vue_js_1.vueFiles),
             {
@@ -26,13 +31,12 @@ function buildVue3Ts() {
             ...(0, _vue3_js_1.buildVue3)(),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _vue_js_1.vueFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildVue3Ts = buildVue3Ts;

package/lib/config-builder/+vue3.js

@@ -15,16 +15,24 @@ function buildVue3() {
                 rules: {
                     ..._vue_js_1.vueExtendRules,
                 },
+                ...((0, module_js_1.has)("@typescript-eslint/parser")
+                    ? {
+                        languageOptions: {
+                            parserOptions: {
+                                parser: { ts: (0, module_js_1.requireFromCwd)("@typescript-eslint/parser") },
+                            },
+                        },
+                    }
+                    : {}),
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _vue_js_1.vueFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildVue3 = buildVue3;

package/lib/config-builder/+yaml.js

@@ -20,13 +20,12 @@ function buildYaml() {
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files: _yaml_js_1.yamlFiles,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildYaml = buildYaml;

package/lib/config-builder/fallback.d.ts

@@ -2,4 +2,7 @@ import type { Linter } from "eslint";
 /**
  * Fallback Legacy config builder
  */
-export declare function buildFallback(missingList: string[], files?: string[]): Linter.FlatConfig[];
+export declare function buildFallback(missingList: string[], options?: {
+    files?: string[];
+    languageOptions?: Linter.FlatConfig["languageOptions"];
+}): Linter.FlatConfig[];

package/lib/config-builder/fallback.js

@@ -4,7 +4,7 @@ exports.buildFallback = void 0;
 /**
  * Fallback Legacy config builder
  */
-function buildFallback(missingList, files) {
+function buildFallback(missingList, options) {
     return [
         {
             plugins: {
@@ -15,7 +15,7 @@ function buildFallback(missingList, files) {
             rules: {
                 "@ota-meshi/missing-module-for-config": ["error", missingList],
             },
-            ...(files ? { files } : {}),
+            ...(options ?? {}),
         },
     ];
 }

package/lib/config-builder/index.d.ts

@@ -3,10 +3,18 @@ export type BuildConfigOptions = {
     node?: boolean;
     packageJson?: boolean;
     eslintPlugin?: boolean;
-    vue3?: boolean;
-    vue2?: boolean;
-    svelte?: boolean;
-    astro?: boolean;
+    vue3?: boolean | {
+        withTs?: boolean;
+    };
+    vue2?: boolean | {
+        withTs?: boolean;
+    };
+    svelte?: boolean | {
+        withTs?: boolean;
+    };
+    astro?: boolean | {
+        withTs?: boolean;
+    };
     ts?: boolean;
     json?: boolean;
     yaml?: boolean;

package/lib/config-builder/index.js

@@ -23,28 +23,30 @@ const _astro_with_ts_js_1 = require("./+astro-with-ts.js");
  * Build config
  */
 function buildConfig(options) {
-    return [
+    const configs = [
         ...(0, recommended_js_1.buildRecommended)(),
         ...(options?.node ? (0, _node_js_1.buildNode)() : []),
         ...(options?.packageJson ? (0, _package_json_js_1.buildPackageJson)() : []),
-        // kind of package
+        // Kind of package
         ...(options?.eslintPlugin ? (0, _eslint_plugin_js_1.buildESLintPlugin)() : []),
-        // languages
-        ...(options?.vue3 ? (0, _vue3_js_1.buildVue3)() : []),
-        ...(options?.vue3 && options?.ts ? (0, _vue3_with_ts_js_1.buildVue3Ts)() : []),
-        ...(options?.vue2 ? (0, _vue2_js_1.buildVue2)() : []),
-        ...(options?.vue2 && options?.ts ? (0, _vue2_with_ts_js_1.buildVue2Ts)() : []),
-        ...(options?.svelte ? (0, _svelte_js_1.buildSvelte)() : []),
-        ...(options?.svelte && options?.ts ? (0, _svelte_with_ts_js_1.buildSvelteTs)() : []),
-        ...(options?.astro ? (0, _astro_js_1.buildAstro)() : []),
-        ...(options?.astro && options?.ts ? (0, _astro_with_ts_js_1.buildAstroTs)() : []),
-        ...(options?.ts ? (0, _typescript_js_1.buildTs)() : []),
-        ...(options?.json ? (0, _json_js_1.buildJson)() : []),
-        ...(options?.yaml ? (0, _yaml_js_1.buildYaml)() : []),
-        ...(options?.toml ? (0, _toml_js_1.buildToml)() : []),
-        ...(options?.md ? (0, _md_js_1.buildMd)() : []),
-        // format
-        ...(options?.prettier ? (0, _prettier_js_1.buildPrettier)() : []),
     ];
+    // Frameworks
+    applyFw(options.vue3, _vue3_js_1.buildVue3, _vue3_with_ts_js_1.buildVue3Ts);
+    applyFw(options.vue2, _vue2_js_1.buildVue2, _vue2_with_ts_js_1.buildVue2Ts);
+    applyFw(options.svelte, _svelte_js_1.buildSvelte, _svelte_with_ts_js_1.buildSvelteTs);
+    applyFw(options.astro, _astro_js_1.buildAstro, _astro_with_ts_js_1.buildAstroTs);
+    configs.push(
+    // Languages
+    ...(options?.ts ? (0, _typescript_js_1.buildTs)() : []), ...(options?.json ? (0, _json_js_1.buildJson)() : []), ...(options?.yaml ? (0, _yaml_js_1.buildYaml)() : []), ...(options?.toml ? (0, _toml_js_1.buildToml)() : []), ...(options?.md ? (0, _md_js_1.buildMd)() : []), 
+    // Format
+    ...(options?.prettier ? (0, _prettier_js_1.buildPrettier)() : []));
+    return configs;
+    function applyFw(option, builder, tsBuilder) {
+        configs.push(...builder());
+        const ts = (typeof option === "object" ? option.withTs : null) ?? options?.ts;
+        if (ts) {
+            configs.push(...tsBuilder());
+        }
+    }
 }
 exports.buildConfig = buildConfig;

package/lib/config-builder/plugins/json-schema.js

@@ -18,13 +18,12 @@ function buildJsonSchema(files) {
             },
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildJsonSchema = buildJsonSchema;

package/lib/config-builder/plugins/ts/base-config.js

@@ -36,13 +36,12 @@ function buildTS(files) {
             }),
         ];
     }, (missingList) => [
-        {
+        ...(0, fallback_js_1.buildFallback)(missingList, {
             files,
             languageOptions: {
                 parser: any_parser_js_1.anyParser,
             },
-            ...(0, fallback_js_1.buildFallback)(missingList),
-        },
+        }),
     ]);
 }
 exports.buildTS = buildTS;

package/lib/config-helpers/+svelte.js

@@ -13,4 +13,5 @@ exports.svelteExtendRules = {
     "svelte/prefer-class-directive": "warn",
     "svelte/prefer-style-directive": "warn",
     "svelte/spaced-html-comment": "warn",
+    "no-use-before-define": "off",
 };

package/lib/parsers/any-parser.d.ts

@@ -1,5 +1,13 @@
 import type { Linter } from "eslint";
+export declare const meta: {
+    name: string;
+    version: any;
+};
 export declare function parseForESLint(text: string, _options?: any): Linter.ESLintParseResult;
 export declare const anyParser: {
     parseForESLint: typeof parseForESLint;
+    meta: {
+        name: string;
+        version: any;
+    };
 };

package/lib/parsers/any-parser.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.anyParser = exports.parseForESLint = void 0;
+exports.anyParser = exports.parseForESLint = exports.meta = void 0;
 const lineBreakPattern = /\r\n|[\n\r\u2028\u2029]/u;
+exports.meta = {
+    name: __filename,
+    version: require("../../package.json").version,
+};
 function parseForESLint(text, _options) {
     const lines = text.split(lineBreakPattern);
     return {
@@ -26,4 +30,4 @@ function parseForESLint(text, _options) {
     };
 }
 exports.parseForESLint = parseForESLint;
-exports.anyParser = { parseForESLint };
+exports.anyParser = { parseForESLint, meta: exports.meta };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ota-meshi/eslint-plugin",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "ESLint configuration plugin for me.",
   "repository": "git+https://github.com/ota-meshi/eslint-plugin.git",
   "homepage": "https://github.com/ota-meshi/eslint-plugin#readme",