@project-ajax/cli 0.0.12 → 0.0.13

package/dist/commands/auth.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAyElE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,iBA0FrE;AAED,eAAO,MAAM,KAAK,+GAMhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}
+{"version":3,"file":"auth.impl.d.ts","sourceRoot":"","sources":["../../src/commands/auth.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAiIlE,wBAAsB,QAAQ,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,EAAE,MAAM,iBA8GrE;AAED,eAAO,MAAM,KAAK,+GAMhB,CAAC;AAEH,eAAO,MAAM,IAAI,mFAEf,CAAC;AAEH,eAAO,MAAM,MAAM,mFAIjB,CAAC"}

package/dist/commands/auth.impl.js

@@ -30,6 +30,44 @@ async function pollLoginRedeem(baseUrl, sessionId, timeoutMs = 3e5, intervalMs =
   }
   return { status: "expired" };
 }
+async function waitForEnterOrRedeem(context, browserUrl, redeemOutcomePromise) {
+  if (!process.stdin.isTTY) {
+    context.io.writeErr(
+      `Please visit this URL to authenticate:
+  ${browserUrl}`
+    );
+    process.exit(1);
+  }
+  context.io.writeErr(
+    `Press Enter to open the browser, or visit: ${browserUrl}`
+  );
+  return new Promise((resolve) => {
+    let settled = false;
+    const cleanup = () => {
+      process.stdin.off("data", onData);
+      process.stdin.pause();
+    };
+    const settle = (value) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      cleanup();
+      resolve(value);
+    };
+    const onData = (data) => {
+      const hasNewline = typeof data === "string" ? data.includes("\n") || data.includes("\r") : data.includes(10) || data.includes(13);
+      if (hasNewline) {
+        settle("enter");
+      }
+    };
+    process.stdin.resume();
+    process.stdin.on("data", onData);
+    void redeemOutcomePromise.then(() => {
+      settle("redeem");
+    });
+  });
+}
 async function runLogin(context, token) {
   const environment = context.config.environment;
   const baseUrl = context.config.baseUrl;
@@ -65,23 +103,39 @@ async function runLogin(context, token) {
   );
   context.io.writeErr(`  ${verificationCode}
 `);
-  await context.io.input({
-    message: `Press Enter to open the browser, or visit: ${browserUrl}`,
-    noTTY: `Please visit this URL to authenticate:
+  const redeemPromise = pollLoginRedeem(baseUrl, sessionId);
+  const redeemOutcomePromise = redeemPromise.then(
+    (value) => ({ ok: true, value }),
+    (error) => ({ ok: false, error })
+  );
+  const nextStep = await waitForEnterOrRedeem(
+    context,
+    browserUrl,
+    redeemOutcomePromise
+  );
+  if (nextStep === "enter") {
+    try {
+      await openNotionUrl(environment, browserUrl);
+    } catch (_error) {
+      context.io.writeErr(
+        `Could not open browser automatically. Please visit:
   ${browserUrl}`
-  });
-  try {
-    await openNotionUrl(environment, browserUrl);
-  } catch (_error) {
+      );
+    }
+  }
+  if (nextStep !== "redeem") {
+    context.io.writeErr("");
+    context.io.writeErr("Waiting for browser confirmation...");
+    context.io.writeErr("(Press Ctrl+C to cancel)\n");
+  }
+  const redeemOutcome = await redeemOutcomePromise;
+  if (!redeemOutcome.ok) {
     context.io.writeErr(
-      `Could not open browser automatically. Please visit:
-  ${browserUrl}`
+      `Login failed: ${redeemOutcome.error instanceof Error ? redeemOutcome.error.message : String(redeemOutcome.error)}`
     );
+    process.exit(1);
   }
-  context.io.writeErr("");
-  context.io.writeErr("Waiting for browser confirmation...");
-  context.io.writeErr("(Press Ctrl+C to cancel)\n");
-  const redeemResponse = await pollLoginRedeem(baseUrl, sessionId);
+  const redeemResponse = redeemOutcome.value;
   if (redeemResponse.status === "expired") {
     context.io.writeErr("Login session expired. Please try again.");
     process.exit(1);

package/dist/commands/deploy.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.impl.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.impl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,MAAM,iGAqFjB,CAAC"}
+{"version":3,"file":"deploy.impl.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.impl.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,UAAU,WAAW;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAED,eAAO,MAAM,MAAM,iGAoFjB,CAAC"}

package/dist/commands/deploy.impl.js

@@ -5,7 +5,6 @@ import { buildHandler } from "../handler.js";
 import { runLogin } from "./auth.impl.js";
 const deploy = buildHandler(async function(flags) {
   if (!this.config.token) {
-    this.io.writeErr("No authentication token found. Starting login flow...");
     await runLogin(this);
   }
   const { token, cellId } = this.config.tokenInfo;

package/dist/commands/secrets.impl.d.ts

@@ -2,4 +2,11 @@ import type { FormatFlags, GlobalFlags } from "../flags.js";
 export declare const setSecrets: (this: import("../context.js").LocalContext, flags: GlobalFlags, ...args: string[]) => Promise<void>;
 export declare const listSecrets: (this: import("../context.js").LocalContext, flags: GlobalFlags & FormatFlags) => Promise<void>;
 export declare const removeSecret: (this: import("../context.js").LocalContext, flags: GlobalFlags, key: string) => Promise<void>;
+/**
+ * Parse secret arguments from CLI, supporting "key=value" format.
+ */
+export declare function parseSecretArgs(args: readonly string[]): Array<{
+    key: string;
+    value: string;
+}>;
 //# sourceMappingURL=secrets.impl.d.ts.map

package/dist/commands/secrets.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secrets.impl.d.ts","sourceRoot":"","sources":["../../src/commands/secrets.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK5D,eAAO,MAAM,UAAU,sGA0BrB,CAAC;AAEH,eAAO,MAAM,WAAW,iGAkCtB,CAAC;AAEH,eAAO,MAAM,YAAY,gGAwBvB,CAAC"}
+{"version":3,"file":"secrets.impl.d.ts","sourceRoot":"","sources":["../../src/commands/secrets.impl.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI5D,eAAO,MAAM,UAAU,sGA0BrB,CAAC;AAEH,eAAO,MAAM,WAAW,iGAkCtB,CAAC;AAEH,eAAO,MAAM,YAAY,gGAwBvB,CAAC;AAQH;;GAEG;AACH,wBAAgB,eAAe,CAC9B,IAAI,EAAE,SAAS,MAAM,EAAE,GACrB,KAAK,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAoBvC"}

package/dist/commands/secrets.impl.js

@@ -1,6 +1,5 @@
 import { Result } from "../api/result.js";
 import { buildAuthedHandler } from "../handler.js";
-import { chunkEvery } from "../utils/array.js";
 import { pluralize } from "../utils/string.js";
 const setSecrets = buildAuthedHandler(async function(_flags, ...args) {
   const secrets = parseSecretArgs(args);
@@ -70,24 +69,29 @@ const removeSecret = buildAuthedHandler(async function(_flags, key) {
 });
 function usageError() {
   return new Error(
-    "Invalid secrets provided. Usage: workers secrets set <key> <value> [<key2> <value2>...] or <key>=<value> [<key2>=<value2>...]"
+    "Invalid secrets provided. Usage: workers secrets set <key>=<value> [<key2>=<value2>...]"
   );
 }
 function parseSecretArgs(args) {
   if (args.length === 0) {
     throw usageError();
   }
-  const tokens = args.flatMap((arg) => arg.split(/[=:]/));
-  const secrets = chunkEvery(tokens, 2).map(([key, value]) => {
+  return args.map((arg) => {
+    const separatorIndex = arg.indexOf("=");
+    if (separatorIndex <= 0 || separatorIndex === arg.length - 1) {
+      throw usageError();
+    }
+    const key = arg.slice(0, separatorIndex);
+    const value = arg.slice(separatorIndex + 1);
     if (!key || !value) {
       throw usageError();
     }
     return { key, value };
   });
-  return secrets;
 }
 export {
   listSecrets,
+  parseSecretArgs,
   removeSecret,
   setSecrets
 };

package/dist/commands/secrets.impl.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=secrets.impl.test.d.ts.map

package/dist/commands/secrets.impl.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"secrets.impl.test.d.ts","sourceRoot":"","sources":["../../src/commands/secrets.impl.test.ts"],"names":[],"mappings":""}

package/dist/commands/secrets.js

@@ -7,13 +7,13 @@ const secretsCommands = buildRouteMap({
   routes: {
     set: buildCommand({
       docs: {
-        brief: "Set one or more secrets for a worker. Supports 'key value' or 'key=value' format."
+        brief: "Set one or more secrets for a worker. Supports 'key=value' format."
       },
       parameters: {
         positional: {
           kind: "array",
           parameter: {
-            brief: "Secret key-value pairs (key value or key=value)",
+            brief: "Secret key-value pairs (key=value)",
             parse: String,
             placeholder: "secrets..."
           }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@project-ajax/cli",
-	"version": "0.0.12",
+	"version": "0.0.13",
 	"description": "A CLI for the Project Ajax platform",
 	"license": "UNLICENSED",
 	"type": "module",