@lage-run/cli 0.23.1 → 0.23.3

package/CHANGELOG.json

@@ -2,7 +2,37 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Fri, 04 Oct 2024 23:41:31 GMT",
+      "date": "Tue, 08 Oct 2024 20:03:26 GMT",
+      "version": "0.23.3",
+      "tag": "@lage-run/cli_v0.23.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "e0b1d9352f881fd802d982231471152127c65d39",
+            "comment": "uses the shell scripts to have a different executable name"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 07 Oct 2024 19:33:13 GMT",
+      "version": "0.23.2",
+      "tag": "@lage-run/cli_v0.23.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "43e4f422ae3436c5dedaa961469420ee683098b1",
+            "comment": "Fixing the action command generation to handle the case of launching as server without --server"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 04 Oct 2024 23:41:44 GMT",
       "version": "0.23.1",
       "tag": "@lage-run/cli_v0.23.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,28 @@
 # Change Log - @lage-run/cli
 
-<!-- This log was last generated on Fri, 04 Oct 2024 23:41:31 GMT and should not be manually modified. -->
+<!-- This log was last generated on Tue, 08 Oct 2024 20:03:26 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.23.3
+
+Tue, 08 Oct 2024 20:03:26 GMT
+
+### Patches
+
+- uses the shell scripts to have a different executable name (kchau@microsoft.com)
+
+## 0.23.2
+
+Mon, 07 Oct 2024 19:33:13 GMT
+
+### Patches
+
+- Fixing the action command generation to handle the case of launching as server without --server (kchau@microsoft.com)
+
 ## 0.23.1
 
-Fri, 04 Oct 2024 23:41:31 GMT
+Fri, 04 Oct 2024 23:41:44 GMT
 
 ### Patches
 

package/lib/commands/exec/executeRemotely.js

@@ -15,6 +15,7 @@ const _filterArgsForTasks = require("../run/filterArgsForTasks.js");
 const _simulateFileAccess = require("./simulateFileAccess.js");
 const _execa = /*#__PURE__*/ _interop_require_default(require("execa"));
 const _getBinPaths = require("../../getBinPaths.js");
+const _parseServerOption = require("../parseServerOption.js");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -74,12 +75,9 @@ async function executeOnServer(args, client, logger) {
 async function executeRemotely(options, command) {
     // launch a 'lage-server.js' process, detached if it is not already running
     // send the command to the server process
-    const { server ="localhost:5332"  } = options;
+    const { server  } = options;
     const timeout = options.timeout ?? 120;
-    const serverString = typeof options.server === "boolean" && options.server ? "localhost:5332" : !server ? "localhost:5332" : server;
-    const parts = serverString.split(":");
-    const host = parts[0];
-    const port = parseInt(parts[1] ?? "5332");
+    const { host , port  } = (0, _parseServerOption.parseServerOption)(server);
     const logger = (0, _logger.default)();
     options.logLevel = options.logLevel ?? "info";
     options.reporter = options.reporter ?? "json";
@@ -91,7 +89,6 @@ async function executeRemotely(options, command) {
         const binPaths = (0, _getBinPaths.getBinPaths)();
         const lageServerBinPath = binPaths["lage-server"];
         const lageServerArgs = [
-            lageServerBinPath,
             "--host",
             host,
             "--port",
@@ -100,8 +97,8 @@ async function executeRemotely(options, command) {
             timeout,
             ...args
         ];
-        logger.info(`Launching lage-server with these parameters: "${process.execPath}" ${lageServerArgs.join(" ")}`);
-        const child = (0, _execa.default)(process.execPath, lageServerArgs, {
+        logger.info(`Launching lage-server with these parameters: ${lageServerArgs.join(" ")}`);
+        const child = (0, _execa.default)(lageServerBinPath, lageServerArgs, {
             detached: true,
             stdio: "ignore"
         });

package/lib/commands/info/action.js

@@ -20,6 +20,7 @@ const _initializeReporters = require("../initializeReporters.js");
 const _runners = require("@lage-run/runners");
 const _getBinPaths = require("../../getBinPaths.js");
 const _runnerPickerOptions = require("../../runnerPickerOptions.js");
+const _parseServerOption = require("../parseServerOption.js");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -110,12 +111,12 @@ function generateCommand(target, taskArgs, config, options, binPaths) {
         ];
         return command;
     } else if (target.type === "worker" && shouldRunWorkersAsService) {
+        const { host , port  } = (0, _parseServerOption.parseServerOption)(options.server);
         const command = [
-            process.execPath,
             binPaths["lage"],
             "exec",
             "--server",
-            options.server
+            `${host}:${port}`
         ];
         if (options.concurrency) {
             command.push("--concurrency", options.concurrency.toString());
@@ -130,7 +131,6 @@ function generateCommand(target, taskArgs, config, options, binPaths) {
         return command;
     } else if (target.type === "worker") {
         const command = [
-            process.execPath,
             binPaths.lage,
             "exec"
         ];

package/lib/commands/parseServerOption.d.ts

@@ -0,0 +1,4 @@
+export declare function parseServerOption(server: boolean | string | undefined): {
+    host: string;
+    port: number;
+};

package/lib/commands/parseServerOption.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "parseServerOption", {
+    enumerable: true,
+    get: function() {
+        return parseServerOption;
+    }
+});
+function parseServerOption(server) {
+    const isBooleanAndTrue = typeof server === "boolean" && server;
+    const isEmptyServer = typeof server === "undefined" || server === false;
+    const serverString = isBooleanAndTrue ? "localhost:5332" : isEmptyServer ? "localhost:5332" : server;
+    if (serverString.includes(":")) {
+        const parts = serverString.split(":");
+        const host = parts[0];
+        const port = parseInt(parts[1] ?? "5332");
+        return {
+            host,
+            port
+        };
+    } else if (serverString.length === 0) {
+        return {
+            host: "localhost",
+            port: 5332
+        };
+    } else {
+        return {
+            host: serverString,
+            port: 5332
+        };
+    }
+}

package/lib/getBinPaths.js

@@ -10,24 +10,37 @@ Object.defineProperty(exports, "getBinPaths", {
 });
 const _path = /*#__PURE__*/ _interop_require_default(require("path"));
 const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
+const _os = /*#__PURE__*/ _interop_require_default(require("os"));
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
     };
 }
-function getBinPaths() {
-    let dir = __dirname;
-    let packageJsonPath = "";
-    while(dir !== "/"){
-        packageJsonPath = _path.default.join(dir, "package.json");
-        if (_fs.default.existsSync(packageJsonPath)) {
-            break;
+function findUp(name, dir) {
+    let currentDir = dir;
+    while(currentDir !== "/"){
+        const fullPath = _path.default.join(currentDir, name);
+        if (_fs.default.existsSync(fullPath)) {
+            return fullPath;
         }
-        dir = _path.default.dirname(dir);
+        currentDir = _path.default.dirname(currentDir);
+    }
+    return undefined;
+}
+function getBinPaths() {
+    const bins = _os.default.platform() === "win32" ? [
+        "lage.cmd",
+        "lage-server.cmd"
+    ] : [
+        "lage",
+        "lage-server"
+    ];
+    const binPaths = bins.map((bin)=>findUp("node_modules/.bin/" + bin, __dirname));
+    if (binPaths.some((binPath)=>binPath === undefined)) {
+        throw new Error("Could not find bin paths for lage or lage-server");
     }
-    const packageJson = JSON.parse(_fs.default.readFileSync(_path.default.join(dir, "package.json"), "utf8"));
     return {
-        lage: _path.default.join(dir, packageJson.bin.lage),
-        "lage-server": _path.default.join(dir, packageJson.bin["lage-server"])
+        lage: binPaths[0],
+        "lage-server": binPaths[1]
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsc",
     "start": "tsc -w --preserveWatchOutput",
-    "test": "jest",
+    "test": "monorepo-scripts jest",
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {