@mainset/cli 0.2.0 → 0.2.1-rc.2

package/dist/esm/runtime/resolve-host-package.mjs

@@ -3,20 +3,18 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { runtimePathById } from './path.mjs';
 function resolveHostPackageNodeModulesPath(hostPackageName, dependencyPackageName) {
-    const hostPackageNodeModulesPath = path.resolve(runtimePathById.root, `node_modules/${hostPackageName}/node_modules`);
-    const hostPackageDependencyPackagePath = path.join(hostPackageNodeModulesPath, dependencyPackageName);
-    const isNodeModulesLinkedOrWorkspace = fs.existsSync(hostPackageDependencyPackagePath);
+    const hostPackageDependencyPackagePath = path.resolve(runtimePathById.root, `node_modules/${hostPackageName}/node_modules/${dependencyPackageName}`);
     // If the package is linked or part of a workspace, return the full path
     // Otherwise, return just the package name (for packages installed from the registry)
-    return isNodeModulesLinkedOrWorkspace
+    return fs.existsSync(hostPackageDependencyPackagePath)
         ? hostPackageDependencyPackagePath
         : fileURLToPath(import.meta.resolve(dependencyPackageName));
 }
 function resolveHostPackageBinForCLICommandPath(hostPackageName, 
 // dependencyPackageName: string,
 cliCommandName) {
-    /* Previous implementation
-    // Pnpm node_modules structure
+    /*
+    * ========== V1 implementation using pnpm node_modules structure ==========
     const dependencyPackageNodeModulesPath = resolveHostPackageNodeModulesPath(
       hostPackageName,
       dependencyPackageName,
@@ -33,12 +31,13 @@ cliCommandName) {
   
     return path.join(dependencyPackageNodeModulesPath, binPath);
     */
-    // installed from the registry
-    const dependencyPackageNodeModulesPath = path.resolve(runtimePathById.root, `node_modules/.bin/${cliCommandName}`);
-    // linked / workspace:^ package
-    const dependencyWorkspacePackageNodeModulesPath = path.resolve(runtimePathById.root, `node_modules/${hostPackageName}/node_modules/.bin/${cliCommandName}`);
-    return fs.existsSync(dependencyPackageNodeModulesPath)
-        ? dependencyPackageNodeModulesPath
-        : dependencyWorkspacePackageNodeModulesPath;
+    const hostPackageDependencyBinCLICommandPath = path.resolve(runtimePathById.root, `node_modules/${hostPackageName}/node_modules/.bin/${cliCommandName}`);
+    // Return the full path if the dependency is linked or part of a workspace (nested under the host package)
+    if (fs.existsSync(hostPackageDependencyBinCLICommandPath)) {
+        return fileURLToPath(import.meta.resolve(hostPackageDependencyBinCLICommandPath));
+    }
+    // Otherwise, return the path to the dependency in the root node_modules (for registry-installed packages)
+    const dependencyBinCLICommandPath = path.resolve(runtimePathById.root, `node_modules/.bin/${cliCommandName}`);
+    return fileURLToPath(import.meta.resolve(dependencyBinCLICommandPath));
 }
 export { resolveHostPackageBinForCLICommandPath, resolveHostPackageNodeModulesPath, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mainset/cli",
-  "version": "0.2.0",
+  "version": "0.2.1-rc.2",
   "description": "A unified CLI tool for accelerating development, based on mainset vision of front-end infrastructure",
   "homepage": "https://github.com/mainset/dev-stack-fe/tree/main/packages/cli",
   "bugs": {