@cedarjs/telemetry 5.0.7-next.310 → 5.0.7-next.336

package/dist/telemetry.d.ts

@@ -1,3 +1,17 @@
+/**
+ * Quotes a single argument for a Windows shell command string.
+ *
+ * On Windows we spawn with `shell: true` and a command string, so every
+ * argument is re-parsed by the shell. Without quoting, anything containing a
+ * space is split: a project at `C:\Users\Ada Lovelace\app` makes node try to
+ * load `C:\Users\Ada`, and the process dies with MODULE_NOT_FOUND. The JSON
+ * payloads passed below need it too, since they contain double quotes.
+ *
+ * Follows the usual Windows argument-encoding rules: backslashes immediately
+ * before a double quote are doubled, the quote itself is escaped, and trailing
+ * backslashes are doubled so they can't escape the closing quote.
+ */
+export declare function quoteForWindowsShell(arg: string): string;
 export declare const timedTelemetry: (argv: string[], options: Record<string, unknown>, func: (...args: any[]) => any) => Promise<any>;
 export declare const errorTelemetry: (argv: string[], error: any) => Promise<void>;
 export declare const telemetryMiddleware: () => Promise<void>;

package/dist/telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAsDA,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,iBAuB9B,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,MAAM,MAAM,EAAE,EAAE,OAAO,GAAG,kBAS9D,CAAA;AAGD,eAAO,MAAM,mBAAmB,qBAS/B,CAAA"}
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../src/telemetry.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,UAuB/C;AAsDD,eAAO,MAAM,cAAc,GACzB,MAAM,MAAM,EAAE,EACd,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,MAAM,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,iBAuB9B,CAAA;AAED,eAAO,MAAM,cAAc,GAAU,MAAM,MAAM,EAAE,EAAE,OAAO,GAAG,kBAS9D,CAAA;AAGD,eAAO,MAAM,mBAAmB,qBAS/B,CAAA"}

package/dist/telemetry.js

@@ -1,9 +1,25 @@
 import { spawn } from "child_process";
 import os from "os";
 import path from "path";
+function quoteForWindowsShell(arg) {
+  let quoted = '"';
+  let backslashes = 0;
+  for (const char of arg) {
+    if (char === "\\") {
+      backslashes += 1;
+      continue;
+    }
+    if (char === '"') {
+      quoted += "\\".repeat(backslashes * 2 + 1) + '"';
+    } else {
+      quoted += "\\".repeat(backslashes) + char;
+    }
+    backslashes = 0;
+  }
+  return quoted + "\\".repeat(backslashes * 2) + '"';
+}
 const spawnProcess = (...args) => {
   const isWindows = os.type() === "Windows_NT";
-  const execPath = isWindows ? `"${process.execPath}"` : process.execPath;
   const spawnOptions = isWindows ? {
     stdio: process.env.CEDAR_VERBOSE_TELEMETRY || process.env.REDWOOD_VERBOSE_TELEMETRY ? ["ignore", "inherit", "inherit"] : "ignore",
     // The following options run the process in the background without a console window, even though they don't look like they would.
@@ -21,7 +37,8 @@ const spawnProcess = (...args) => {
     ...args
   ];
   if (isWindows) {
-    spawn([execPath, ...scriptArgs].join(" "), [], spawnOptions).unref();
+    const command = [process.execPath, ...scriptArgs].map(quoteForWindowsShell).join(" ");
+    spawn(command, [], spawnOptions).unref();
   } else {
     spawn(process.execPath, scriptArgs, spawnOptions).unref();
   }
@@ -57,6 +74,7 @@ const telemetryMiddleware = async () => {
 };
 export {
   errorTelemetry,
+  quoteForWindowsShell,
   telemetryMiddleware,
   timedTelemetry
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/telemetry",
-  "version": "5.0.7-next.310",
+  "version": "5.0.7-next.336",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -22,12 +22,12 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/project-config": "5.0.7-next.310",
-    "@cedarjs/structure": "5.0.7-next.310",
+    "@cedarjs/project-config": "5.0.7-next.336",
+    "@cedarjs/structure": "5.0.7-next.336",
     "@whatwg-node/fetch": "0.10.13",
     "ci-info": "4.4.0",
     "envinfo": "7.21.0",
-    "systeminformation": "5.31.7",
+    "systeminformation": "5.33.1",
     "uuid": "11.1.0",
     "yargs": "17.7.3"
   },