@reliverse/rempts 1.7.46 → 1.7.47

package/dist-npm/bin/mod.mjs

@@ -3143,15 +3143,34 @@ const getCallerDirectory = async () => {
           const resolvedFileDir = resolve(fileDir);
           const resolvedCwd = resolve(cwd);
           if (process$1.env.NODE_ENV === "development") {
-            relinka(
-              "verbose",
-              `File dir: ${fileDir}, resolved: ${resolvedFileDir}, cwd: ${resolvedCwd}`
-            );
+            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;
         }
@@ -3211,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
@@ -3254,6 +3306,21 @@ async function loadCommand(cmdPath) {
         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) {
     if (error instanceof Error && error.message.includes("No command file found")) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@reliverse/rempts",
   "author": "reliverse",
-  "version": "1.7.46",
+  "version": "1.7.47",
   "type": "module",
   "license": "MIT",
   "main": "./dist-npm/bin/mod.mjs",