@luxass/eslint-config 4.9.0 → 4.10.1

package/dist/index.js

@@ -105,6 +105,7 @@ var GLOB_YAML = "**/*.y?(a)ml";
 var GLOB_TOML = "**/*.toml";
 var GLOB_HTML = "**/*.htm?(l)";
 var GLOB_ASTRO = "**/*.astro";
+var GLOB_ASTRO_TS = "**/*.astro/*.ts";
 var GLOB_GRAPHQL = "**/*.{g,graph}ql";
 var GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
 var GLOB_TESTS = [
@@ -222,6 +223,7 @@ function sortPackageJson() {
               "type",
               "private",
               "author",
+              "contributors",
               "publisher",
               "packageManager",
               "license",
@@ -409,6 +411,7 @@ function sortTsconfig() {
               "allowSyntheticDefaultImports",
               "esModuleInterop",
               "forceConsistentCasingInFileNames",
+              "isolatedDeclarations",
               "isolatedModules",
               "preserveSymlinks",
               "verbatimModuleSyntax",
@@ -467,13 +470,16 @@ async function imports(options = {}) {
 
 // src/configs/javascript.ts
 import globals from "globals";
-import pluginUnusedImports from "eslint-plugin-unused-imports";
+import { default as pluginUnusedImports } from "eslint-plugin-unused-imports";
 import pluginAntfu2 from "eslint-plugin-antfu";
 async function javascript(options = {}) {
-  const { editor = false, overrides = {} } = options;
+  const {
+    editor = false,
+    overrides = {}
+  } = options;
   return [
     {
-      name: "luxass/javascript",
+      name: "luxass/javascript/setup",
       languageOptions: {
         ecmaVersion: 2022,
         globals: {
@@ -495,7 +501,10 @@ async function javascript(options = {}) {
       },
       linterOptions: {
         reportUnusedDisableDirectives: true
-      },
+      }
+    },
+    {
+      name: "luxass/javascript/rules",
       plugins: {
         "antfu": pluginAntfu2,
         "unused-imports": pluginUnusedImports
@@ -750,16 +759,37 @@ async function combine(...configs2) {
   const resolved = await Promise.all(configs2);
   return resolved.flat();
 }
-function renameRules(rules, from, to) {
+function renameRules(rules, map) {
   return Object.fromEntries(
     Object.entries(rules).map(([key, value]) => {
-      if (key.startsWith(from)) {
-        return [to + key.slice(from.length), value];
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`)) {
+          return [to + key.slice(from.length), value];
+        }
       }
       return [key, value];
     })
   );
 }
+function renamePluginInConfigs(configs2, map) {
+  return configs2.map((i) => {
+    const clone = { ...i };
+    if (clone.rules) {
+      clone.rules = renameRules(clone.rules, map);
+    }
+    if (clone.plugins) {
+      clone.plugins = Object.fromEntries(
+        Object.entries(clone.plugins).map(([key, value]) => {
+          if (key in map) {
+            return [map[key], value];
+          }
+          return [key, value];
+        })
+      );
+    }
+    return clone;
+  });
+}
 function toArray(value) {
   return Array.isArray(value) ? value : [value];
 }
@@ -802,7 +832,7 @@ async function jsdoc(options = {}) {
   } = options;
   return [
     {
-      name: "luxass/jsdoc",
+      name: "luxass/jsdoc/rules",
       plugins: {
         jsdoc: await interop(import("eslint-plugin-jsdoc"))
       },
@@ -968,36 +998,24 @@ async function markdown(options = {}) {
         "import/newline-after-import": "off",
         "no-alert": "off",
         "no-console": "off",
+        "no-labels": "off",
+        "no-lone-blocks": "off",
+        "no-restricted-syntax": "off",
         "no-undef": "off",
         "no-unused-expressions": "off",
+        "no-unused-labels": "off",
         "no-unused-vars": "off",
         "node/prefer-global/process": "off",
         "style/comma-dangle": "off",
         "style/eol-last": "off",
-        // Type aware rules
-        "ts/await-thenable": "off",
         "ts/consistent-type-imports": "off",
-        "ts/dot-notation": "off",
-        "ts/no-floating-promises": "off",
-        "ts/no-for-in-array": "off",
-        "ts/no-implied-eval": "off",
-        "ts/no-misused-promises": "off",
         "ts/no-namespace": "off",
         "ts/no-redeclare": "off",
         "ts/no-require-imports": "off",
-        "ts/no-throw-literal": "off",
-        "ts/no-unnecessary-type-assertion": "off",
-        "ts/no-unsafe-argument": "off",
-        "ts/no-unsafe-assignment": "off",
-        "ts/no-unsafe-call": "off",
-        "ts/no-unsafe-member-access": "off",
-        "ts/no-unsafe-return": "off",
+        "ts/no-unused-expressions": "off",
         "ts/no-unused-vars": "off",
         "ts/no-use-before-define": "off",
         "ts/no-var-requires": "off",
-        "ts/restrict-plus-operands": "off",
-        "ts/restrict-template-expressions": "off",
-        "ts/unbound-method": "off",
         "unicode-bom": "off",
         "unused-imports/no-unused-imports": "off",
         "unused-imports/no-unused-vars": "off",
@@ -1063,14 +1081,20 @@ async function typescript(options = {}) {
   const {
     exts = [],
     overrides = {},
-    parserOptions = {}
+    parserOptions = {},
+    type = "app"
   } = options ?? {};
   const files = options.files ?? [
-    GLOB_SRC,
+    GLOB_TS,
+    GLOB_TSX,
     ...exts.map((ext) => `**/*.${ext}`)
   ];
-  const filesTypeAware = options.typeAwareFileS ?? [GLOB_TS, GLOB_TSX];
-  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
+  const ignoresTypeAware = options.ignoresTypeAware ?? [
+    `${GLOB_MARKDOWN}/**`,
+    GLOB_ASTRO_TS
+  ];
+  const tsconfigPath = options?.tsconfigPath ? options.tsconfigPath : void 0;
   const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
     "dot-notation": "off",
@@ -1134,7 +1158,7 @@ async function typescript(options = {}) {
       }
     },
     ...isTypeAware ? [
-      makeParser(true, filesTypeAware),
+      makeParser(true, filesTypeAware, ignoresTypeAware),
       makeParser(false, files, filesTypeAware)
     ] : [makeParser(false, files)],
     {
@@ -1143,13 +1167,15 @@ async function typescript(options = {}) {
       rules: {
         ...renameRules(
           pluginTs.configs["eslint-recommended"].overrides[0].rules,
-          "@typescript-eslint/",
-          "ts/"
+          {
+            "@typescript-eslint": "ts"
+          }
         ),
         ...renameRules(
           pluginTs.configs.strict.rules,
-          "@typescript-eslint/",
-          "ts/"
+          {
+            "@typescript-eslint": "ts"
+          }
         ),
         "no-dupe-class-members": "off",
         "no-invalid-this": "off",
@@ -1191,20 +1217,25 @@ async function typescript(options = {}) {
         "ts/no-wrapper-object-types": "error",
         "ts/triple-slash-reference": "off",
         "ts/unified-signatures": "off",
+        ...type === "lib" ? {
+          "ts/explicit-function-return-type": ["error", {
+            allowExpressions: true,
+            allowHigherOrderFunctions: true,
+            allowIIFEs: true
+          }]
+        } : {},
         ...overrides
       }
     },
-    {
-      name: "luxass/typescript/rules-type-aware",
+    ...isTypeAware ? [{
       files: filesTypeAware,
-      rules: {
-        ...tsconfigPath ? typeAwareRules : {},
-        ...overrides
-      }
-    },
+      ignores: ignoresTypeAware,
+      name: "luxass/typescript/rules-type-aware",
+      rules: typeAwareRules
+    }] : [],
     {
       name: "luxass/typescript/disables/dts",
-      files: ["**/*.d.ts"],
+      files: ["**/*.d.?([cm])ts"],
       rules: {
         "eslint-comments/no-unlimited-disable": "off",
         "import/no-duplicates": "off",
@@ -1213,21 +1244,14 @@ async function typescript(options = {}) {
       }
     },
     {
-      name: "luxass/typescript/disables/tests",
       files: ["**/*.{test,spec}.ts?(x)"],
+      name: "luxass/typescript/disables/test",
       rules: {
         "no-unused-expressions": "off"
       }
     },
     {
-      name: "luxass/typescript/disables/playground",
-      files: [`**/playground.${GLOB_SRC_EXT}`],
-      rules: {
-        "no-console": "off"
-      }
-    },
-    {
-      name: "luxass/typescript/disables/javascript",
+      name: "luxass/typescript/disables/cjs",
       files: ["**/*.js", "**/*.cjs"],
       rules: {
         "ts/no-require-imports": "off",
@@ -1530,6 +1554,7 @@ async function test(options = {}) {
         "test/no-focused-tests": editor ? "off" : "error",
         "test/prefer-hooks-in-order": "error",
         "test/prefer-lowercase-title": "error",
+        "ts/explicit-function-return-type": "off",
         ...overrides
       }
     }
@@ -2184,7 +2209,8 @@ function luxass(options = {}, ...userConfigs) {
     typescript: enableTypeScript = isPackageExists4("typescript"),
     unocss: enableUnoCSS = false,
     tailwindcss: enableTailwindCSS = false,
-    vue: enableVue = VuePackages.some((i) => isPackageExists4(i))
+    vue: enableVue = VuePackages.some((i) => isPackageExists4(i)),
+    type: projectType = "app"
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions && !("jsx" in stylisticOptions)) {
@@ -2228,7 +2254,8 @@ function luxass(options = {}, ...userConfigs) {
     configs2.push(typescript({
       ...typescriptOptions,
       exts,
-      overrides: getOverrides(options, "typescript")
+      overrides: getOverrides(options, "typescript"),
+      type: projectType
     }));
   }
   if (stylisticOptions) {
@@ -2346,6 +2373,7 @@ function luxass(options = {}, ...userConfigs) {
 var src_default = luxass;
 export {
   GLOB_ASTRO,
+  GLOB_ASTRO_TS,
   GLOB_CSS,
   GLOB_EXCLUDE,
   GLOB_GRAPHQL,
@@ -2393,6 +2421,7 @@ export {
   parserPlain,
   react,
   regexp,
+  renamePluginInConfigs,
   renameRules,
   resolveSubOptions,
   sortPackageJson,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luxass/eslint-config",
-  "version": "4.9.0",
+  "version": "4.10.1",
   "description": "ESLint config for @luxass",
   "type": "module",
   "author": {
@@ -8,11 +8,11 @@
     "email": "lucasnrgaard@gmail.com",
     "url": "https://luxass.dev"
   },
-  "packageManager": "pnpm@9.5.0",
+  "packageManager": "pnpm@9.6.0",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/luxass/eslint-config.git"
+    "url": "git+https://github.com/luxass/eslint-config.git"
   },
   "keywords": [
     "eslint",
@@ -92,22 +92,22 @@
     "@antfu/install-pkg": "^0.3.3",
     "@clack/prompts": "^0.7.0",
     "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
-    "@stylistic/eslint-plugin": "^2.6.0-beta.0",
-    "@typescript-eslint/eslint-plugin": "8.0.0-alpha.40",
-    "@typescript-eslint/parser": "8.0.0-alpha.40",
-    "eslint-config-flat-gitignore": "^0.1.6",
-    "eslint-flat-config-utils": "^0.2.5",
+    "@stylistic/eslint-plugin": "^2.6.0-beta.1",
+    "@typescript-eslint/eslint-plugin": "8.0.0-alpha.54",
+    "@typescript-eslint/parser": "8.0.0-alpha.54",
+    "eslint-config-flat-gitignore": "^0.1.8",
+    "eslint-flat-config-utils": "^0.3.0",
     "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-antfu": "^2.3.4",
-    "eslint-plugin-import-x": "^0.5.3",
-    "eslint-plugin-jsdoc": "^48.5.2",
+    "eslint-plugin-import-x": "^3.1.0",
+    "eslint-plugin-jsdoc": "^48.8.3",
     "eslint-plugin-jsonc": "^2.16.0",
-    "eslint-plugin-markdown": "^5.0.0",
-    "eslint-plugin-n": "^17.9.0",
+    "eslint-plugin-markdown": "^5.1.0",
+    "eslint-plugin-n": "^17.10.1",
     "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-toml": "^0.11.1",
-    "eslint-plugin-unicorn": "^54.0.0",
-    "eslint-plugin-unused-imports": "^4.0.0",
+    "eslint-plugin-unicorn": "^55.0.0",
+    "eslint-plugin-unused-imports": "^4.0.1",
     "eslint-plugin-vitest": "^0.5.4",
     "eslint-plugin-vue": "^9.27.0",
     "eslint-plugin-yml": "^1.14.0",
@@ -121,37 +121,29 @@
     "yaml-eslint-parser": "^1.2.3"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^1.5.23",
-    "@eslint/config-inspector": "^0.5.1",
-    "@stylistic/eslint-plugin-migrate": "^2.3.0",
-    "@types/eslint": "^8.56.10",
+    "@eslint-react/eslint-plugin": "^1.6.0",
+    "@eslint/config-inspector": "^0.5.2",
+    "@stylistic/eslint-plugin-migrate": "^2.4.0",
+    "@types/eslint": "^9.6.0",
     "@types/estree": "^1.0.5",
-    "@types/node": "^20.14.9",
-    "@typescript-eslint/rule-tester": "^7.15.0",
-    "@unocss/eslint-plugin": "^0.61.3",
+    "@types/node": "^20.14.12",
+    "@typescript-eslint/rule-tester": "^7.17.0",
+    "@unocss/eslint-plugin": "^0.61.6",
     "astro-eslint-parser": "^1.0.2",
-    "eslint": "^9.6.0",
-    "eslint-plugin-astro": "^1.2.2",
+    "eslint": "^9.8.0",
+    "eslint-plugin-astro": "^1.2.3",
     "eslint-plugin-format": "^0.1.2",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.7",
+    "eslint-plugin-react-refresh": "^0.4.9",
     "eslint-plugin-tailwindcss": "^3.17.4",
-    "eslint-typegen": "^0.2.4",
+    "eslint-typegen": "^0.3.0",
     "jiti": "^1.21.6",
-    "lint-staged": "^15.2.7",
-    "prettier-plugin-astro": "^0.14.0",
-    "simple-git-hooks": "^2.11.1",
-    "tailwindcss": "^3.4.4",
-    "tsup": "^8.1.0",
-    "typescript": "^5.5.3",
-    "unocss": "^0.61.3",
-    "vitest": "^1.6.0",
-    "vue": "^3.4.31"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
+    "prettier-plugin-astro": "^0.14.1",
+    "tailwindcss": "^3.4.7",
+    "tsup": "^8.2.3",
+    "typescript": "^5.5.4",
+    "unocss": "^0.61.6",
+    "vitest": "^2.0.4",
+    "vue": "^3.4.34"
   }
 }