@ivanmaxlogiudice/eslint-config 3.0.0-beta.4 → 3.0.0-beta.5

package/dist/cli.js

@@ -11,7 +11,7 @@ import c from "picocolors";
 // package.json
 var package_default = {
   name: "@ivanmaxlogiudice/eslint-config",
-  version: "3.0.0-beta.4",
+  version: "3.0.0-beta.5",
   packageManager: "bun@1.1.24",
   description: "Personal ESLint config",
   type: "module",
@@ -101,6 +101,7 @@ var package_default = {
     "eslint-plugin-unused-imports": "^4.1.3",
     globals: "^15.9.0",
     "jsonc-eslint-parser": "^2.4.0",
+    "local-pkg": "^0.5.0",
     picocolors: "^1.0.1",
     yargs: "^17.7.2"
   },
@@ -351,15 +352,12 @@ async function run(options = {}) {
   };
   if (!argSkipPrompt) {
     result = await p4.group({
-      extra: ({ results }) => {
-        const isArgExtraValid = argExtra?.length && !argExtra.filter((element) => !extra.includes(element)).length;
-        if (!results.uncommittedConfirmed || isArgExtraValid)
-          return;
-        const message = !isArgExtraValid && argExtra ? `"${argExtra}" isn't a valid extra util. Please choose from below: ` : "Select a extra utils:";
-        return p4.multiselect({
-          message: c5.reset(message),
-          options: extraOptions,
-          required: false
+      uncommittedConfirmed: () => {
+        if (argSkipPrompt || isGitClean())
+          return Promise.resolve(true);
+        return p4.confirm({
+          initialValue: false,
+          message: "There are uncommitted changes in the current repository, are you sure to continue?"
         });
       },
       frameworks: ({ results }) => {
@@ -373,12 +371,15 @@ async function run(options = {}) {
           required: false
         });
       },
-      uncommittedConfirmed: () => {
-        if (argSkipPrompt || isGitClean())
-          return Promise.resolve(true);
-        return p4.confirm({
-          initialValue: false,
-          message: "There are uncommitted changes in the current repository, are you sure to continue?"
+      extra: ({ results }) => {
+        const isArgExtraValid = argExtra?.length && !argExtra.filter((element) => !extra.includes(element)).length;
+        if (!results.uncommittedConfirmed || isArgExtraValid)
+          return;
+        const message = !isArgExtraValid && argExtra ? `"${argExtra}" isn't a valid extra util. Please choose from below: ` : "Select a extra utils:";
+        return p4.multiselect({
+          message: c5.reset(message),
+          options: extraOptions,
+          required: false
         });
       },
       updateVscodeSettings: ({ results }) => {

package/dist/index.d.ts

@@ -13483,10 +13483,9 @@ declare const GLOB_EXCLUDE: string[];
  */
 declare function combine(...configs: Awaitable<Linter.Config | Linter.Config[]>[]): Promise<Linter.Config[]>;
 declare function renameRules(rules: Record<string, any>, from: string, to: string): Record<string, any>;
-declare function clearPackageCache(): void;
 declare function hasSomePackage(names: string[]): boolean;
+declare function isPackageInScope(name: string): boolean;
 declare function findUp(file: string, cwd?: string, depth?: number): string | null;
-declare function packageExists(name: string): boolean;
 declare function ensurePackages(packages: string[]): Promise<void>;
 declare function interopDefault<T>(m: Awaitable<T>): Promise<T extends {
     default: infer U;
@@ -13497,4 +13496,4 @@ declare function spawnAsync(command: string, args?: readonly string[], options?:
     stderr: string;
 }>;
 
-export { GLOB_ALL_SRC, GLOB_EXCLUDE, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_SRC, GLOB_SRC_EXT, GLOB_TESTS, GLOB_TS, GLOB_VUE, GLOB_YAML, type ResolvedOptions, clearPackageCache, combine, comments, config, config as default, ensurePackages, findUp, getOverrides, hasSomePackage, ignores, imports, interopDefault, isInEditorEnv, javascript, jsdoc, jsonc, markdown, node, packageExists, perfectionist, regexp, renameRules, resolveSubOptions, restrictedSyntaxJs, sortPackageJson, sortTsconfig, spawnAsync, stylistic, test, typescript, unicorn, unocss, vue, yaml };
+export { GLOB_ALL_SRC, GLOB_EXCLUDE, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_SRC, GLOB_SRC_EXT, GLOB_TESTS, GLOB_TS, GLOB_VUE, GLOB_YAML, type ResolvedOptions, combine, comments, config, config as default, ensurePackages, findUp, getOverrides, hasSomePackage, ignores, imports, interopDefault, isInEditorEnv, isPackageInScope, javascript, jsdoc, jsonc, markdown, node, perfectionist, regexp, renameRules, resolveSubOptions, restrictedSyntaxJs, sortPackageJson, sortTsconfig, spawnAsync, stylistic, test, typescript, unicorn, unocss, vue, yaml };

package/dist/index.js

@@ -85,7 +85,10 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
-var cachePkg;
+import { fileURLToPath } from "node:url";
+import { isPackageExists } from "local-pkg";
+var scopeUrl = fileURLToPath(new URL(".", import.meta.url));
+var isCwdInScope = isPackageExists("@ivanmaxlogiudice/eslint-config");
 async function combine(...configs) {
   const resolved = await Promise.all(configs);
   return resolved.flat();
@@ -101,11 +104,11 @@ function renameRules(rules, from, to) {
   }
   return renamed;
 }
-function clearPackageCache() {
-  cachePkg = void 0;
-}
 function hasSomePackage(names) {
-  return names.some((name) => packageExists(name));
+  return names.some((name) => isPackageInScope(name));
+}
+function isPackageInScope(name) {
+  return isPackageExists(name, { paths: [scopeUrl] });
 }
 function findUp(file, cwd = process.cwd(), depth = 3) {
   let currentPath = cwd;
@@ -118,21 +121,10 @@ function findUp(file, cwd = process.cwd(), depth = 3) {
   }
   return null;
 }
-function packageExists(name) {
-  if (!cachePkg) {
-    const pkgPath = findUp("package.json");
-    if (!pkgPath) {
-      throw new Error('Can not found "package.json".');
-    }
-    const pkgContent = fs.readFileSync(pkgPath, "utf-8");
-    cachePkg = JSON.parse(pkgContent);
-  }
-  return cachePkg?.dependencies?.[name] !== void 0 || cachePkg?.devDependencies?.[name] !== void 0;
-}
 async function ensurePackages(packages) {
-  if (process.env.CI || process.stdout.isTTY === false)
+  if (process.env.CI || process.stdout.isTTY === false || isCwdInScope === false)
     return;
-  const missingPackages = packages.filter((i) => i && !packageExists(i));
+  const missingPackages = packages.filter((i) => i && !isPackageInScope(i));
   if (missingPackages.length === 0)
     return;
   console.log(`
@@ -1332,12 +1324,11 @@ async function yaml(options = {}) {
 
 // src/factory.ts
 async function config2(options = {}, ...userConfigs) {
-  clearPackageCache();
   const {
     componentExts = [],
     isInEditor = isInEditorEnv(),
     regexp: enableRegexp = false,
-    typescript: enableTypeScript = packageExists("typescript"),
+    typescript: enableTypeScript = isPackageInScope("typescript"),
     unocss: enableUnoCSS = hasSomePackage(["unocss", "@unocss/nuxt"]),
     vue: enableVue = hasSomePackage(["vue", "nuxt", "vitepress", "@slidev/cli"])
   } = options;
@@ -1443,7 +1434,6 @@ export {
   GLOB_TS,
   GLOB_VUE,
   GLOB_YAML,
-  clearPackageCache,
   combine,
   comments,
   config2 as config,
@@ -1456,12 +1446,12 @@ export {
   imports,
   interopDefault,
   isInEditorEnv,
+  isPackageInScope,
   javascript,
   jsdoc,
   jsonc,
   markdown,
   node,
-  packageExists,
   perfectionist,
   regexp,
   renameRules,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ivanmaxlogiudice/eslint-config",
-    "version": "3.0.0-beta.4",
+    "version": "3.0.0-beta.5",
     "packageManager": "bun@1.1.24",
     "description": "Personal ESLint config",
     "type": "module",
@@ -90,6 +90,7 @@
         "eslint-plugin-unused-imports": "^4.1.3",
         "globals": "^15.9.0",
         "jsonc-eslint-parser": "^2.4.0",
+        "local-pkg": "^0.5.0",
         "picocolors": "^1.0.1",
         "yargs": "^17.7.2"
     },