@eslint-config-snapshot/cli 0.8.0 → 0.9.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @eslint-config-snapshot/cli
 
+## 0.9.0
+
+### Minor Changes
+
+- Release minor version with robust CLI version resolution and improved runtime log UX.
+
+### Patch Changes
+
+- Updated dependencies
+  - @eslint-config-snapshot/api@0.9.0
+
 ## 0.8.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -41,6 +41,7 @@ var import_commander = require("commander");
 var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_node_fs = require("fs");
 var import_promises = require("fs/promises");
+var import_node_module = require("module");
 var import_node_path = __toESM(require("path"), 1);
 var import_node_readline = require("readline");
 var SNAPSHOT_DIR = ".eslint-config-snapshot";
@@ -924,22 +925,45 @@ function readCliVersion() {
   if (cachedCliVersion !== void 0) {
     return cachedCliVersion;
   }
+  const envPackageName = process.env.npm_package_name;
+  const envPackageVersion = process.env.npm_package_version;
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === "string" && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion;
+    return cachedCliVersion;
+  }
   const scriptPath = process.argv[1];
   if (!scriptPath) {
     cachedCliVersion = "unknown";
     return cachedCliVersion;
   }
+  try {
+    const req = (0, import_node_module.createRequire)(import_node_path.default.resolve(scriptPath));
+    const resolvedCliEntry = req.resolve("@eslint-config-snapshot/cli");
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry);
+    if (resolvedVersion !== void 0) {
+      cachedCliVersion = resolvedVersion;
+      return cachedCliVersion;
+    }
+  } catch {
+  }
   let current = import_node_path.default.resolve(import_node_path.default.dirname(scriptPath));
+  let fallbackVersion;
   while (true) {
     const packageJsonPath = import_node_path.default.join(current, "package.json");
     if ((0, import_node_fs.existsSync)(packageJsonPath)) {
       try {
         const raw = (0, import_node_fs.readFileSync)(packageJsonPath, "utf8");
         const parsed = JSON.parse(raw);
-        cachedCliVersion = parsed.version ?? "unknown";
-        return cachedCliVersion;
+        if (typeof parsed.version === "string" && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version;
+            return cachedCliVersion;
+          }
+          if (fallbackVersion === void 0) {
+            fallbackVersion = parsed.version;
+          }
+        }
       } catch {
-        break;
       }
     }
     const parent = import_node_path.default.dirname(current);
@@ -948,9 +972,34 @@ function readCliVersion() {
     }
     current = parent;
   }
-  cachedCliVersion = "unknown";
+  cachedCliVersion = fallbackVersion ?? "unknown";
   return cachedCliVersion;
 }
+function isCliPackageName(value) {
+  return value === "@eslint-config-snapshot/cli" || value === "eslint-config-snapshot";
+}
+function readVersionFromResolvedEntry(entryAbs) {
+  let current = import_node_path.default.resolve(import_node_path.default.dirname(entryAbs));
+  while (true) {
+    const packageJsonPath = import_node_path.default.join(current, "package.json");
+    if ((0, import_node_fs.existsSync)(packageJsonPath)) {
+      try {
+        const raw = (0, import_node_fs.readFileSync)(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        if (isCliPackageName(parsed.name) && typeof parsed.version === "string" && parsed.version.length > 0) {
+          return parsed.version;
+        }
+      } catch {
+      }
+    }
+    const parent = import_node_path.default.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return void 0;
+}
 function writeRunContextHeader(cwd, commandLabel, configPath, storedSnapshots) {
   if (!shouldShowRunLogs()) {
     return;

package/dist/index.js

@@ -22,6 +22,7 @@ import { Command, CommanderError, InvalidArgumentError } from "commander";
 import fg from "fast-glob";
 import { existsSync, readFileSync } from "fs";
 import { access, mkdir, readFile, writeFile } from "fs/promises";
+import { createRequire } from "module";
 import path from "path";
 import { createInterface } from "readline";
 var SNAPSHOT_DIR = ".eslint-config-snapshot";
@@ -905,22 +906,45 @@ function readCliVersion() {
   if (cachedCliVersion !== void 0) {
     return cachedCliVersion;
   }
+  const envPackageName = process.env.npm_package_name;
+  const envPackageVersion = process.env.npm_package_version;
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === "string" && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion;
+    return cachedCliVersion;
+  }
   const scriptPath = process.argv[1];
   if (!scriptPath) {
     cachedCliVersion = "unknown";
     return cachedCliVersion;
   }
+  try {
+    const req = createRequire(path.resolve(scriptPath));
+    const resolvedCliEntry = req.resolve("@eslint-config-snapshot/cli");
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry);
+    if (resolvedVersion !== void 0) {
+      cachedCliVersion = resolvedVersion;
+      return cachedCliVersion;
+    }
+  } catch {
+  }
   let current = path.resolve(path.dirname(scriptPath));
+  let fallbackVersion;
   while (true) {
     const packageJsonPath = path.join(current, "package.json");
     if (existsSync(packageJsonPath)) {
       try {
         const raw = readFileSync(packageJsonPath, "utf8");
         const parsed = JSON.parse(raw);
-        cachedCliVersion = parsed.version ?? "unknown";
-        return cachedCliVersion;
+        if (typeof parsed.version === "string" && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version;
+            return cachedCliVersion;
+          }
+          if (fallbackVersion === void 0) {
+            fallbackVersion = parsed.version;
+          }
+        }
       } catch {
-        break;
       }
     }
     const parent = path.dirname(current);
@@ -929,9 +953,34 @@ function readCliVersion() {
     }
     current = parent;
   }
-  cachedCliVersion = "unknown";
+  cachedCliVersion = fallbackVersion ?? "unknown";
   return cachedCliVersion;
 }
+function isCliPackageName(value) {
+  return value === "@eslint-config-snapshot/cli" || value === "eslint-config-snapshot";
+}
+function readVersionFromResolvedEntry(entryAbs) {
+  let current = path.resolve(path.dirname(entryAbs));
+  while (true) {
+    const packageJsonPath = path.join(current, "package.json");
+    if (existsSync(packageJsonPath)) {
+      try {
+        const raw = readFileSync(packageJsonPath, "utf8");
+        const parsed = JSON.parse(raw);
+        if (isCliPackageName(parsed.name) && typeof parsed.version === "string" && parsed.version.length > 0) {
+          return parsed.version;
+        }
+      } catch {
+      }
+    }
+    const parent = path.dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return void 0;
+}
 function writeRunContextHeader(cwd, commandLabel, configPath, storedSnapshots) {
   if (!shouldShowRunLogs()) {
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-config-snapshot/cli",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "@inquirer/prompts": "^8.2.0",
     "commander": "^14.0.3",
     "fast-glob": "^3.3.3",
-    "@eslint-config-snapshot/api": "0.8.0"
+    "@eslint-config-snapshot/api": "0.9.0"
   }
 }

package/src/index.ts

@@ -20,6 +20,7 @@ import { Command, CommanderError, InvalidArgumentError } from 'commander'
 import fg from 'fast-glob'
 import { existsSync, readFileSync } from 'node:fs'
 import { access, mkdir, readFile, writeFile } from 'node:fs/promises'
+import { createRequire } from 'node:module'
 import path from 'node:path'
 import { createInterface } from 'node:readline'
 
@@ -1129,23 +1130,51 @@ function readCliVersion(): string {
     return cachedCliVersion
   }
 
+  const envPackageName = process.env.npm_package_name
+  const envPackageVersion = process.env.npm_package_version
+  if (isCliPackageName(envPackageName) && typeof envPackageVersion === 'string' && envPackageVersion.length > 0) {
+    cachedCliVersion = envPackageVersion
+    return cachedCliVersion
+  }
+
   const scriptPath = process.argv[1]
   if (!scriptPath) {
     cachedCliVersion = 'unknown'
     return cachedCliVersion
   }
 
+  try {
+    const req = createRequire(path.resolve(scriptPath))
+    const resolvedCliEntry = req.resolve('@eslint-config-snapshot/cli')
+    const resolvedVersion = readVersionFromResolvedEntry(resolvedCliEntry)
+    if (resolvedVersion !== undefined) {
+      cachedCliVersion = resolvedVersion
+      return cachedCliVersion
+    }
+  } catch {
+    // continue to path-walk fallback
+  }
+
   let current = path.resolve(path.dirname(scriptPath))
+  let fallbackVersion: string | undefined
   while (true) {
     const packageJsonPath = path.join(current, 'package.json')
     if (existsSync(packageJsonPath)) {
       try {
         const raw = readFileSync(packageJsonPath, 'utf8')
-        const parsed = JSON.parse(raw) as { version?: string }
-        cachedCliVersion = parsed.version ?? 'unknown'
-        return cachedCliVersion
+        const parsed = JSON.parse(raw) as { name?: string; version?: string }
+        if (typeof parsed.version === 'string' && parsed.version.length > 0) {
+          if (isCliPackageName(parsed.name)) {
+            cachedCliVersion = parsed.version
+            return cachedCliVersion
+          }
+
+          if (fallbackVersion === undefined) {
+            fallbackVersion = parsed.version
+          }
+        }
       } catch {
-        break
+        // continue walking up
       }
     }
 
@@ -1156,10 +1185,41 @@ function readCliVersion(): string {
     current = parent
   }
 
-  cachedCliVersion = 'unknown'
+  cachedCliVersion = fallbackVersion ?? 'unknown'
   return cachedCliVersion
 }
 
+function isCliPackageName(value: string | undefined): boolean {
+  return value === '@eslint-config-snapshot/cli' || value === 'eslint-config-snapshot'
+}
+
+function readVersionFromResolvedEntry(entryAbs: string): string | undefined {
+  let current = path.resolve(path.dirname(entryAbs))
+
+  while (true) {
+    const packageJsonPath = path.join(current, 'package.json')
+    if (existsSync(packageJsonPath)) {
+      try {
+        const raw = readFileSync(packageJsonPath, 'utf8')
+        const parsed = JSON.parse(raw) as { name?: string; version?: string }
+        if (isCliPackageName(parsed.name) && typeof parsed.version === 'string' && parsed.version.length > 0) {
+          return parsed.version
+        }
+      } catch {
+        // continue walking up
+      }
+    }
+
+    const parent = path.dirname(current)
+    if (parent === current) {
+      break
+    }
+    current = parent
+  }
+
+  return undefined
+}
+
 function writeRunContextHeader(
   cwd: string,
   commandLabel: string,