@reliverse/rempts 1.7.45 → 1.7.47

package/dist-npm/bin/mod.mjs

@@ -3119,17 +3119,96 @@ const jiti = createJiti(import.meta.url, {
 });
 const COMMAND_EXTENSIONS = [".ts", ".js"];
 const COMMAND_FILENAMES = ["cmd.ts", "cmd.js"];
-const getCallerDirectory = () => {
+const getCallerDirectory = async () => {
   const stack = new Error().stack?.split("\n") ?? [];
+  const cwd = process$1.cwd();
+  if (process$1.env.NODE_ENV === "development") {
+    relinka("verbose", "Stack trace for getCallerDirectory:");
+    stack.forEach((line, index) => {
+      relinka("verbose", `  [${index}]: ${line.trim()}`);
+    });
+  }
   for (const line of stack) {
     const match = /\((.*):(\d+):(\d+)\)/.exec(line) || /at (.*):(\d+):(\d+)/.exec(line);
     if (match?.[1]) {
       const filePath = match[1];
-      if (!filePath.includes("run-command") && !filePath.includes("@reliverse/rempts") && !filePath.includes("node_modules") && !filePath.includes("command-runner") && !filePath.includes("command-typed") && !filePath.includes("launcher-mod") && !filePath.includes("launcher-types")) {
-        return dirname(filePath);
+      if (process$1.env.NODE_ENV === "development") {
+        relinka("verbose", `Checking file path: ${filePath}`);
+      }
+      if (!filePath.includes("node_modules") && !filePath.includes("command-runner") && !filePath.includes("command-typed") && !filePath.includes("launcher-mod") && !filePath.includes("launcher-types") && !filePath.includes("mod.mjs") && // Skip compiled output
+      !filePath.includes("mod.js") && // Skip compiled output
+      !filePath.includes("mod.ts")) {
+        try {
+          const fileDir = dirname(filePath);
+          const resolvedFileDir = resolve(fileDir);
+          const resolvedCwd = resolve(cwd);
+          if (process$1.env.NODE_ENV === "development") {
+            relinka("verbose", `File dir: ${fileDir}, resolved: ${resolvedFileDir}, cwd: ${resolvedCwd}`);
+          }
+          if (resolvedFileDir !== resolvedCwd && !resolvedFileDir.startsWith(resolvedCwd)) {
+            relinka("verbose", `Using caller directory: ${fileDir}`);
+            return fileDir;
+          }
+          if (resolvedFileDir === resolvedCwd) {
+            let currentDir2 = fileDir;
+            while (currentDir2 !== dirname(currentDir2)) {
+              try {
+                const packageJsonPath = resolve(currentDir2, "package.json");
+                if (await fs.pathExists(packageJsonPath)) {
+                  const cwdPackageJsonPath = resolve(cwd, "package.json");
+                  if (await fs.pathExists(cwdPackageJsonPath)) {
+                    const callerPackageJson = await fs.readFile(packageJsonPath, "utf-8");
+                    const cwdPackageJson = await fs.readFile(cwdPackageJsonPath, "utf-8");
+                    if (callerPackageJson !== cwdPackageJson) {
+                      relinka("verbose", `Found different package.json at: ${currentDir2}, using caller directory: ${fileDir}`);
+                      return fileDir;
+                    }
+                  }
+                  break;
+                }
+              } catch {
+              }
+              currentDir2 = dirname(currentDir2);
+            }
+          }
+        } catch {
+          continue;
+        }
+      }
+    }
+  }
+  let currentDir = cwd;
+  while (currentDir !== dirname(currentDir)) {
+    try {
+      const packageJsonPath = resolve(currentDir, "package.json");
+      if (await fs.pathExists(packageJsonPath)) {
+        relinka("verbose", `Found package.json at: ${currentDir}`);
+        return currentDir;
       }
+    } catch {
     }
+    currentDir = dirname(currentDir);
   }
+  try {
+    const possibleCommandPaths = [
+      resolve(cwd, "src", "build", "cmd.ts"),
+      resolve(cwd, "src", "build", "cmd.js"),
+      resolve(cwd, "src-ts", "build", "cmd.ts"),
+      resolve(cwd, "src-ts", "build", "cmd.js"),
+      resolve(cwd, "build", "cmd.ts"),
+      resolve(cwd, "build", "cmd.js"),
+      resolve(cwd, "app", "build", "cmd.ts"),
+      resolve(cwd, "app", "build", "cmd.js")
+    ];
+    for (const path of possibleCommandPaths) {
+      if (await fs.pathExists(path)) {
+        relinka("verbose", `Found command file at: ${path}, using cwd: ${cwd}`);
+        return cwd;
+      }
+    }
+  } catch {
+  }
+  relinka("verbose", `No suitable caller found, using cwd: ${cwd}`);
   return process$1.cwd();
 };
 const tryLoadCommand = async (path) => {
@@ -3151,6 +3230,39 @@ const generateCandidatePaths = async (resolvedPath) => {
   }
   return [resolvedPath];
 };
+const generateAlternativePaths = async (cmdPath, callerDir) => {
+  const normalizedCmdPath = cmdPath.replace(/^\.\//, "");
+  const paths = [];
+  const commonCommandLocations = [
+    // Direct command file
+    resolve(callerDir, `${normalizedCmdPath}.ts`),
+    resolve(callerDir, `${normalizedCmdPath}.js`),
+    // Command in cmd subdirectory
+    resolve(callerDir, normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, normalizedCmdPath, "cmd.js"),
+    // Command in app subdirectory
+    resolve(callerDir, "app", normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, "app", normalizedCmdPath, "cmd.js"),
+    // Command in src subdirectory
+    resolve(callerDir, "src", normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, "src", normalizedCmdPath, "cmd.js"),
+    // Command in src-ts subdirectory
+    resolve(callerDir, "src-ts", normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, "src-ts", normalizedCmdPath, "cmd.js"),
+    // Command in bin subdirectory
+    resolve(callerDir, "bin", normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, "bin", normalizedCmdPath, "cmd.js"),
+    // Command in bin/app subdirectory (common for CLI tools)
+    resolve(callerDir, "bin", "app", normalizedCmdPath, "cmd.ts"),
+    resolve(callerDir, "bin", "app", normalizedCmdPath, "cmd.js")
+  ];
+  for (const path of commonCommandLocations) {
+    if (await fs.pathExists(path)) {
+      paths.push(path);
+    }
+  }
+  return paths;
+};
 const createCommandNotFoundError = (cmdPath, searchedPaths) => new Error(
   `No command file found for "${cmdPath}". Expected to find either:
   - A valid command file at the specified path
@@ -3172,13 +3284,42 @@ Original error: ${originalError instanceof Error ? originalError.message : Strin
 );
 async function loadCommand(cmdPath) {
   try {
-    const callerDir = getCallerDirectory();
+    const callerDir = await getCallerDirectory();
     const normalizedPath = cmdPath.replace(/^\.\//, "");
     const resolvedPath = resolve(callerDir, normalizedPath);
+    if (process$1.env.NODE_ENV === "development") {
+      relinka("verbose", `Loading command: ${cmdPath}`);
+      relinka("verbose", `Caller directory: ${callerDir}`);
+      relinka("verbose", `Normalized path: ${normalizedPath}`);
+      relinka("verbose", `Resolved path: ${resolvedPath}`);
+    }
     const candidatePaths = await generateCandidatePaths(resolvedPath);
+    if (process$1.env.NODE_ENV === "development") {
+      relinka("verbose", `Candidate paths: ${candidatePaths.join(", ")}`);
+    }
     for (const path of candidatePaths) {
       const command = await tryLoadCommand(path);
-      if (command) return command;
+      if (command) {
+        if (process$1.env.NODE_ENV === "development") {
+          relinka("verbose", `Successfully loaded command from: ${path}`);
+        }
+        return command;
+      }
+    }
+    if (callerDir !== process$1.cwd()) {
+      const alternativePaths = await generateAlternativePaths(cmdPath, callerDir);
+      if (process$1.env.NODE_ENV === "development") {
+        relinka("verbose", `Trying alternative paths: ${alternativePaths.join(", ")}`);
+      }
+      for (const path of alternativePaths) {
+        const command = await tryLoadCommand(path);
+        if (command) {
+          if (process$1.env.NODE_ENV === "development") {
+            relinka("verbose", `Successfully loaded command from alternative path: ${path}`);
+          }
+          return command;
+        }
+      }
     }
     throw createCommandNotFoundError(cmdPath, candidatePaths);
   } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@reliverse/rempts",
   "author": "reliverse",
-  "version": "1.7.45",
+  "version": "1.7.47",
   "type": "module",
   "license": "MIT",
   "main": "./dist-npm/bin/mod.mjs",
@@ -36,16 +36,14 @@
   ],
   "description": "@reliverse/rempts is a modern, type-safe toolkit for building delightful cli experiences. it's fast, flexible, and made for developer happiness. file-based commands keep things simple.",
   "scripts": {
-    "build": "unbuild",
-    "prepack": "unbuild",
-    "pub": "bun run build && bun publish",
+    "pub": "bun unbuild && bun publish",
     "dev": "node -e 'console.log(`👉 bun dev:[prompts,modern,classic]`)'",
     "dev:prompts": "bun example/prompts/mod.ts",
     "dev:modern": "bun example/launcher/modern.ts",
     "dev:classic": "bun example/launcher/classic.ts",
     "dev:trpc": "bun example/trpc-orpc/commander/main.ts",
     "latest": "bun update --latest && bun check",
-    "check": "tsc --noEmit && biome check --fix --unsafe .",
+    "check": "tsc --noEmit && biome check --fix --unsafe",
     "agg": "rse tools --tool agg --input src/libs/core/core-impl --out src/libs/core/core-main.ts --recursive --named --strip src/libs/core",
     "tests": "bun test ./.tests"
   },
@@ -56,7 +54,7 @@
     "@orpc/server": "^1.8.3",
     "@reliverse/pathkit": "^1.3.4",
     "@reliverse/reliarg": "^1.0.3",
-    "@reliverse/relico": "^1.3.4",
+    "@reliverse/relico": "^1.3.5",
     "@reliverse/relifso": "^1.4.5",
     "@reliverse/relinka": "^1.5.5",
     "@reliverse/runtime": "^1.0.3",
@@ -67,7 +65,7 @@
     "cli-spinners": "^3.2.0",
     "commander": "^14.0.0",
     "detect-package-manager": "^3.0.2",
-    "effect": "^3.17.8",
+    "effect": "^3.17.9",
     "enquirer": "^2.4.1",
     "figlet": "^1.8.2",
     "gradient-string": "^3.0.0",
@@ -91,9 +89,9 @@
     "zod-to-json-schema": "^3.24.6"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.0",
+    "@biomejs/biome": "^2.2.0",
     "@orpc/contract": "^1.8.3",
-    "@reliverse/dler": "1.7.92",
+    "@reliverse/dler": "1.7.96",
     "@reliverse/rse": "^1.7.12",
     "@total-typescript/ts-reset": "^0.6.1",
     "@types/bun": "^1.2.20",