@isentinel/eslint-config 1.2.3 → 1.2.5

package/README.md

@@ -81,6 +81,8 @@ export default style(
 > Note that `.eslintignore` no longer works in Flat config, see
 > [customization](#customization) for more details.
 
+</details>
+
 ### Add script for package.json
 
 For example:

package/dist/{chunk-YSIDNL3J.js → chunk-2HV5XKT7.js}

@@ -10,10 +10,6 @@ var __esm = (fn, res) => function __init() {
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -40,7 +36,6 @@ var init_esm_shims = __esm({
 
 export {
   __commonJS,
-  __export,
   __toESM,
   init_esm_shims
 };

package/dist/cli.js

@@ -1,6 +1,6 @@
 import {
   init_esm_shims
-} from "./chunk-YSIDNL3J.js";
+} from "./chunk-2HV5XKT7.js";
 
 // src/cli.ts
 init_esm_shims();
@@ -18,7 +18,7 @@ init_esm_shims();
 import ansis from "ansis";
 
 // package.json
-var version = "1.2.3";
+var version = "1.2.5";
 var package_default = {
   name: "@isentinel/eslint-config",
   version,
@@ -54,7 +54,7 @@ var package_default = {
     build: "nr gen && tsup --clean --dts",
     "build:inspector": "pnpm build && npx @eslint/config-inspector build",
     dev: "npx @eslint/config-inspector --config eslint.config.ts",
-    gen: "NODE_OPTIONS='--import ./scripts/register-stylua-loader.mjs' tsx scripts/typegen.ts && NODE_OPTIONS='--import ./scripts/register-stylua-loader.mjs' tsx scripts/versiongen.ts",
+    gen: "tsx scripts/typegen.ts && tsx scripts/versiongen.ts",
     postgen: "echo 'Generation complete!'",
     lint: "eslint",
     prepack: "nr build",
@@ -329,7 +329,7 @@ var versionsMap = {
 };
 
 // src/cli/stages/update-package-json.ts
-async function updatePackageJson() {
+async function updatePackageJson(result) {
   const cwd = process2.cwd();
   const pathPackageJSON = path2.join(cwd, "package.json");
   log2.step(ansis3.cyan(`Bumping @isentinel/eslint-config to v${version}`));
@@ -339,9 +339,13 @@ async function updatePackageJson() {
   parsedPackage.devDependencies["@isentinel/eslint-config"] = `^${version}`;
   parsedPackage.devDependencies.eslint ??= versionsMap.eslint;
   const addedPackages = [];
-  for (const dep of dependenciesMap["react"]) {
-    parsedPackage.devDependencies[dep] = versionsMap[dep];
-    addedPackages.push(dep);
+  for (const framework of result.frameworks) {
+    if (framework in dependenciesMap) {
+      for (const dep of dependenciesMap[framework]) {
+        parsedPackage.devDependencies[dep] = versionsMap[dep];
+        addedPackages.push(dep);
+      }
+    }
   }
   if (addedPackages.length) {
     note2(`${ansis3.dim(addedPackages.join(", "))}`, "Added packages");
@@ -386,41 +390,42 @@ async function updateVscodeSettings(result) {
 // src/cli/run.ts
 async function run(options = {}) {
   const argumentSkipPrompt = !!process4.env.SKIP_PROMPT || options.yes;
-  const argumentTemplate = options.frameworks?.map((framework) => framework?.trim()).filter(Boolean);
+  const argumentTemplate = options.frameworks?.map((framework) => framework.trim());
   const eslintConfigFiles = fs3.readdirSync(process4.cwd()).filter((file) => file.startsWith("eslint.config."));
   if (eslintConfigFiles.length > 0) {
     log4.warn(ansis5.yellow(`${eslintConfigFiles[0]} already exists, migration wizard exited.`));
     return process4.exit(1);
   }
   let result = {
-    frameworks: argumentTemplate,
+    frameworks: argumentTemplate ?? [],
     uncommittedConfirmed: false,
     updateVscodeSettings: true
   };
   if (!argumentSkipPrompt) {
     result = await group(
       {
+        uncommittedConfirmed: () => {
+          if (argumentSkipPrompt || isGitClean()) {
+            return Promise.resolve(true);
+          }
+          return confirm({
+            initialValue: false,
+            message: "There are uncommitted changes in the current repository, are you sure to continue?"
+          });
+        },
+        // eslint-disable-next-line perfectionist/sort-objects -- keep the order of prompts
         frameworks: ({ results }) => {
-          const isArgumentTemplateValid = typeof argumentTemplate === "string" && !!frameworks.includes(argumentTemplate);
+          const isArgumentTemplateValid = argumentTemplate && argumentTemplate.length > 0 && argumentTemplate.every((template) => frameworks.includes(template));
           if (!results.uncommittedConfirmed || isArgumentTemplateValid) {
             return;
           }
-          const message = !isArgumentTemplateValid && argumentTemplate ? `"${argumentTemplate}" isn't a valid template. Please choose from below: ` : "Select a framework:";
+          const message = argumentTemplate && argumentTemplate.length > 0 && !isArgumentTemplateValid ? `"${argumentTemplate.join(", ")}" isn't a valid template. Please choose from below: ` : "Select a framework:";
           return multiselect({
             message: ansis5.reset(message),
             options: frameworkOptions,
             required: false
           });
         },
-        uncommittedConfirmed: () => {
-          if (argumentSkipPrompt || isGitClean()) {
-            return Promise.resolve(true);
-          }
-          return confirm({
-            initialValue: false,
-            message: "There are uncommitted changes in the current repository, are you sure to continue?"
-          });
-        },
         updateVscodeSettings: ({ results }) => {
           if (!results.uncommittedConfirmed) {
             return;
@@ -442,7 +447,7 @@ async function run(options = {}) {
       return process4.exit(1);
     }
   }
-  await updatePackageJson();
+  await updatePackageJson(result);
   await updateEslintFiles(result);
   await updateVscodeSettings(result);
   log4.success(ansis5.green("Setup completed"));
@@ -469,14 +474,17 @@ var instance = yargs(hideBin(process5.argv)).scriptName("@isentinel/eslint-confi
       type: "boolean"
     }).option("template", {
       alias: "t",
-      description: "Use the framework template for optimal customization: react",
+      description: "Use the framework template for optimal customization: react, jest",
       type: "string"
     }).help();
   },
   async (args) => {
     header();
     try {
-      await run(args);
+      await run({
+        ...args,
+        frameworks: args.template ? [args.template] : void 0
+      });
     } catch (err) {
       log5.error(ansis6.inverse(ansis6.red(" Failed to migrate ")));
       log5.error(ansis6.red(`\u2718 ${String(err)}`));

package/dist/{eslint-plugin-simple-import-sort-DVWQC4YV.js → eslint-plugin-simple-import-sort-FWMVSWU4.js}

@@ -1,7 +1,7 @@
 import {
   __commonJS,
   init_esm_shims
-} from "./chunk-YSIDNL3J.js";
+} from "./chunk-2HV5XKT7.js";
 
 // node_modules/.pnpm/eslint-plugin-simple-import-sort@12.1.1_eslint@9.25.1_jiti@2.4.2_/node_modules/eslint-plugin-simple-import-sort/shared.js
 var require_shared = __commonJS({

package/dist/index.d.ts

@@ -14989,7 +14989,7 @@ type Yoda = []|[("always" | "never")]|[("always" | "never"), {
   onlyEquality?: boolean
 }]
 // Names of all the configs
-type ConfigNames = 'style/eslint/comments' | 'style/formatters/setup' | 'style/ignores' | 'style/imports' | 'style/import-sort' | 'style/imports/game' | 'style/javascript/setup' | 'style/javascript/rules' | 'style/jsdoc' | 'style/jsonc/setup' | 'style/jsonc/rules' | 'style/markdown/setup' | 'style/markdown/processor' | 'style/markdown/parser' | 'style/markdown/disables' | 'style/package-json' | 'style/perfectionist' | 'style/pnpm/package-json' | 'style/pnpm/pnpm-workspace-yaml' | 'style/prettier' | 'style/promise' | 'style/react/setup' | 'style/react/rules' | 'style/react/type-aware-rules' | 'style/roblox' | 'style/shopify' | 'style/sonarjs' | 'style/sort-tsconfig' | 'style/spelling' | 'style/stylistic' | 'style/test/setup' | 'style/test/rules' | 'style/typescript/setup' | 'style/typescript/parser' | 'style/typescript/type-aware-parser' | 'style/typescript/rules' | 'style/unicorn' | 'style/yaml:setup' | 'style/yaml/rules'
+type ConfigNames = 'style/eslint/comments' | 'style/formatters/setup' | 'style/ignores' | 'style/imports' | 'style/import-sort' | 'style/imports/game' | 'style/javascript/setup' | 'style/javascript/rules' | 'style/jsdoc' | 'style/jsonc/setup' | 'style/jsonc/rules' | 'style/markdown/setup' | 'style/markdown/processor' | 'style/markdown/parser' | 'style/markdown/disables' | 'style/package-json' | 'style/perfectionist' | 'style/pnpm/package-json' | 'style/pnpm/pnpm-workspace-yaml' | 'style/prettier' | 'style/promise' | 'style/react/setup' | 'style/react/rules' | 'style/react/type-aware-rules' | 'style/roblox' | 'style/shopify' | 'style/sonarjs' | 'style/sort-tsconfig' | 'style/spelling' | 'style/stylistic' | 'style/test/setup' | 'style/test/rules' | 'style/typescript/setup' | 'style/typescript/parser' | 'style/typescript/type-aware-parser' | 'style/typescript/rules' | 'style/typescript/rules-type-aware' | 'style/unicorn' | 'style/yaml:setup' | 'style/yaml/rules'
 
 type Awaitable<T> = Promise<T> | T;
 interface JsDocOptions {
@@ -15223,6 +15223,8 @@ interface OptionsTypeScriptParserOptions {
     parserOptions?: Partial<ParserOptions>;
 }
 interface OptionsTypeScriptWithTypes {
+    /** Override type aware rules. */
+    overridesTypeAware?: TypedFlatConfigItem["rules"];
     /**
      * Provide a path to the TypeScript configuration file to use a different
      * default to 'tsconfig.json'.

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   __commonJS,
   __toESM,
   init_esm_shims
-} from "./chunk-YSIDNL3J.js";
+} from "./chunk-2HV5XKT7.js";
 
 // node_modules/.pnpm/globals@15.15.0/node_modules/globals/globals.json
 var require_globals = __commonJS({
@@ -3632,7 +3632,7 @@ async function imports(options = {}) {
   const { stylistic: stylistic2 = true, type = "game" } = options;
   const [pluginImport, pluginSimpleImportSort, pluginAntfu] = await Promise.all([
     interopDefault(import("eslint-plugin-import-x")),
-    interopDefault(import("./eslint-plugin-simple-import-sort-DVWQC4YV.js")),
+    interopDefault(import("./eslint-plugin-simple-import-sort-FWMVSWU4.js")),
     interopDefault(import("eslint-plugin-antfu"))
   ]);
   return [
@@ -4362,7 +4362,7 @@ async function prettier(options) {
     interopDefault(import("eslint-plugin-format"))
   ]);
   const defaultPrettierOptions = {
-    arrowParens: "avoid",
+    arrowParens: "always",
     jsdocPreferCodeFences: true,
     jsdocPrintWidth: 80,
     plugins: [require2.resolve("prettier-plugin-jsdoc")],
@@ -4702,7 +4702,7 @@ async function roblox(options = {}, formatLua = true) {
   });
   if (formatLua) {
     const [pluginFormatLua] = await Promise.all([
-      interopDefault(import("./dist-3XXODFPQ.js"))
+      interopDefault(import("eslint-plugin-format-lua"))
     ]);
     configs.push({
       files: [GLOB_LUA],
@@ -5064,6 +5064,7 @@ async function typescript(options = {}) {
     componentExts: componentExtensions = [],
     isInEditor = false,
     overrides = {},
+    overridesTypeAware = {},
     parserOptions = {},
     stylistic: stylistic2 = true,
     typeAware = true
@@ -5361,10 +5362,20 @@ async function typescript(options = {}) {
           ],
           "yoda": ["error", "never"]
         } : {},
-        ...tsconfigPath ? typeAwareRules : {},
         ...overrides
       }
-    }
+    },
+    ...isTypeAware ? [
+      {
+        files: filesTypeAware,
+        ignores: ignoresTypeAware,
+        name: "style/typescript/rules-type-aware",
+        rules: {
+          ...typeAwareRules,
+          ...overridesTypeAware
+        }
+      }
+    ] : []
   ];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isentinel/eslint-config",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "iSentinel's ESLint config",
   "keywords": [
     "eslint-config",
@@ -59,7 +59,7 @@
     "eslint-plugin-comment-length": "2.2.1",
     "eslint-plugin-de-morgan": "1.2.1",
     "eslint-plugin-format": "1.0.1",
-    "eslint-plugin-format-lua": "1.0.0",
+    "eslint-plugin-format-lua": "1.0.1-beta.2",
     "eslint-plugin-import-x": "4.10.6",
     "eslint-plugin-jsdoc": "50.6.9",
     "eslint-plugin-jsonc": "2.20.0",
@@ -93,7 +93,7 @@
     "@types/node": "22.14.1",
     "@types/prompts": "2.4.9",
     "@types/yargs": "17.0.33",
-    "bumpp": "10.1.0",
+    "bumpp": "10.2.0",
     "eslint": "9.25.1",
     "eslint-plugin-jest": "28.11.0",
     "eslint-plugin-react-roblox-hooks": "5.1.0-rbx.1",
@@ -110,7 +110,7 @@
     "simple-git-hooks": "2.12.1",
     "tsup": "8.4.0",
     "typescript": "5.8.3",
-    "@isentinel/eslint-config": "1.2.3"
+    "@isentinel/eslint-config": "1.2.5"
   },
   "peerDependencies": {
     "@eslint-react/eslint-plugin": "^1.45.0",
@@ -136,7 +136,7 @@
     "build": "nr gen && tsup --clean --dts",
     "build:inspector": "pnpm build && npx @eslint/config-inspector build",
     "dev": "npx @eslint/config-inspector --config eslint.config.ts",
-    "gen": "NODE_OPTIONS='--import ./scripts/register-stylua-loader.mjs' tsx scripts/typegen.ts && NODE_OPTIONS='--import ./scripts/register-stylua-loader.mjs' tsx scripts/versiongen.ts",
+    "gen": "tsx scripts/typegen.ts && tsx scripts/versiongen.ts",
     "postgen": "echo 'Generation complete!'",
     "lint": "eslint",
     "release": "bumpp",