@instafy/cli 0.1.8-staging.373 → 0.1.8-staging.374

package/dist/project.js

@@ -1,12 +1,15 @@
 import fs from "node:fs";
 import path from "node:path";
 import kleur from "kleur";
-import { createInterface } from "node:readline/promises";
-import { emitKeypressEvents } from "node:readline";
-import { stdin as input, stdout as output } from "node:process";
+import { stdin as input } from "node:process";
 import { getInstafyProfileConfigPath, resolveConfiguredStudioUrl, resolveControllerUrl, resolveUserAccessToken, } from "./config.js";
 import { formatAuthRequiredError } from "./errors.js";
 import { findProjectManifest } from "./project-manifest.js";
+let promptsModule = null;
+async function loadPrompts() {
+    promptsModule ?? (promptsModule = import("@clack/prompts"));
+    return promptsModule;
+}
 async function fetchOrganizations(controllerUrl, token) {
     const response = await fetch(`${controllerUrl}/orgs`, {
         headers: {
@@ -33,143 +36,6 @@ async function fetchOrgProjects(controllerUrl, token, orgId) {
     const body = (await response.json());
     return Array.isArray(body.projects) ? body.projects : [];
 }
-async function promptSelectIndex(params) {
-    const ttyInput = input;
-    const isRawModeAvailable = typeof ttyInput.setRawMode === "function";
-    const canUseArrowKeys = Boolean(input.isTTY && output.isTTY && isRawModeAvailable && process.env.TERM !== "dumb");
-    if (!canUseArrowKeys) {
-        const rl = createInterface({ input, output });
-        try {
-            while (true) {
-                const raw = (await rl.question(`Select option (default ${params.defaultIndex}): `)).trim();
-                if (!raw) {
-                    return params.defaultIndex;
-                }
-                const selected = Number(raw);
-                if (!Number.isFinite(selected) || selected < 0 || selected >= params.options.length) {
-                    console.log(kleur.red("Invalid selection."));
-                    continue;
-                }
-                return selected;
-            }
-        }
-        finally {
-            rl.close();
-        }
-    }
-    return await new Promise((resolve, reject) => {
-        const options = params.options;
-        const defaultIndex = Math.min(Math.max(params.defaultIndex, 0), Math.max(0, options.length - 1));
-        let selectedIndex = defaultIndex;
-        let renderedLineCount = 0;
-        let typedDigits = "";
-        let typedResetTimeout = null;
-        let completed = false;
-        const previousRawMode = Boolean(ttyInput.isRaw);
-        const render = (hintOverride) => {
-            const hint = hintOverride ?? "Use ↑/↓ to move, Enter to select, or type a number.";
-            const lines = [
-                kleur.yellow(`${params.title}:`),
-                ...options.map((label, index) => {
-                    const prefix = index === selectedIndex ? kleur.cyan(">") : " ";
-                    const number = kleur.gray(`${index})`);
-                    return ` ${prefix} ${number} ${label}`;
-                }),
-                kleur.gray(hint),
-            ];
-            if (renderedLineCount > 0) {
-                output.write(`\x1b[${renderedLineCount}A`);
-            }
-            for (const line of lines) {
-                output.write(`\x1b[2K\r${line}\n`);
-            }
-            renderedLineCount = lines.length;
-        };
-        const cleanup = () => {
-            if (completed)
-                return;
-            completed = true;
-            input.off("keypress", onKeypress);
-            if (typedResetTimeout) {
-                clearTimeout(typedResetTimeout);
-                typedResetTimeout = null;
-            }
-            try {
-                ttyInput.setRawMode(previousRawMode);
-            }
-            catch {
-                // ignore
-            }
-            output.write("\x1b[?25h"); // show cursor
-            output.write("\n");
-        };
-        const onKeypress = (_chunk, key) => {
-            if (!key)
-                return;
-            if (key.ctrl && key.name === "c") {
-                cleanup();
-                reject(new Error("Cancelled."));
-                return;
-            }
-            if (_chunk && /^[0-9]$/.test(_chunk)) {
-                typedDigits += _chunk;
-                if (typedResetTimeout) {
-                    clearTimeout(typedResetTimeout);
-                }
-                typedResetTimeout = setTimeout(() => {
-                    typedDigits = "";
-                    render();
-                }, 1200);
-                const candidate = Number(typedDigits);
-                if (Number.isFinite(candidate) && candidate >= 0 && candidate < options.length) {
-                    selectedIndex = candidate;
-                }
-                render(typedDigits ? `Number: ${typedDigits}` : undefined);
-                return;
-            }
-            if (key.name === "backspace") {
-                typedDigits = typedDigits.slice(0, -1);
-                render(typedDigits ? `Number: ${typedDigits}` : undefined);
-                return;
-            }
-            if (key.name === "up") {
-                typedDigits = "";
-                selectedIndex = selectedIndex <= 0 ? options.length - 1 : selectedIndex - 1;
-                render();
-                return;
-            }
-            if (key.name === "down") {
-                typedDigits = "";
-                selectedIndex = selectedIndex >= options.length - 1 ? 0 : selectedIndex + 1;
-                render();
-                return;
-            }
-            if (key.name === "return" || key.name === "enter") {
-                if (typedDigits) {
-                    const candidate = Number(typedDigits);
-                    if (Number.isFinite(candidate) && candidate >= 0 && candidate < options.length) {
-                        selectedIndex = candidate;
-                    }
-                }
-                const picked = selectedIndex;
-                cleanup();
-                resolve(picked);
-            }
-        };
-        try {
-            emitKeypressEvents(input);
-            ttyInput.setRawMode(true);
-            output.write("\x1b[?25l"); // hide cursor
-            input.on("keypress", onKeypress);
-            input.resume();
-            render();
-        }
-        catch (error) {
-            cleanup();
-            reject(error instanceof Error ? error : new Error(String(error)));
-        }
-    });
-}
 async function createOrganization(controllerUrl, token, payload) {
     const response = await fetch(`${controllerUrl}/orgs`, {
         method: "POST",
@@ -198,19 +64,32 @@ async function resolveOrg(controllerUrl, token, options) {
     const orgName = options.orgName?.trim() || null;
     const studioUrl = resolveConfiguredStudioUrl({ profile: options.profile ?? null }) ?? "https://staging.instafy.dev";
     const studioOrgUrl = `${studioUrl.replace(/\/$/, "")}/studio?panel=settings`;
-    const allowInteractive = input.isTTY && options.json !== true;
-    async function promptAndCreateOrg(rl) {
-        const enteredName = (await rl.question("Organization name (default: Personal): ")).trim();
-        const chosenName = enteredName || "Personal";
-        const enteredSlug = (await rl.question("Organization slug (optional): ")).trim();
+    const allowInteractive = Boolean(input.isTTY && process.stdout.isTTY && options.json !== true && process.env.CI !== "true");
+    async function promptAndCreateOrg() {
+        const { isCancel, text } = await loadPrompts();
+        const enteredName = await text({
+            message: "Organization name",
+            defaultValue: "Personal",
+        });
+        if (isCancel(enteredName)) {
+            throw new Error("Cancelled.");
+        }
+        const chosenName = String(enteredName).trim() || "Personal";
+        const enteredSlug = await text({
+            message: "Organization slug (optional)",
+        });
+        if (isCancel(enteredSlug)) {
+            throw new Error("Cancelled.");
+        }
+        const chosenSlug = String(enteredSlug).trim();
         const payload = {
             orgName: chosenName,
         };
         if (options.ownerUserId) {
             payload.ownerUserId = options.ownerUserId;
         }
-        if (enteredSlug) {
-            payload.orgSlug = enteredSlug;
+        if (chosenSlug) {
+            payload.orgSlug = chosenSlug;
         }
         const created = await createOrganization(controllerUrl, token, payload);
         return { orgId: created.orgId, orgName: created.orgName ?? chosenName };
@@ -226,21 +105,19 @@ async function resolveOrg(controllerUrl, token, options) {
         const orgs = await fetchOrganizations(controllerUrl, token);
         if (orgs.length === 0) {
             if (allowInteractive) {
+                const { confirm, isCancel } = await loadPrompts();
                 console.log(kleur.yellow("No organizations found for this account."));
                 console.log("");
                 console.log(`Create one in Studio: ${kleur.cyan(studioOrgUrl)}`);
                 console.log("");
-                const rl = createInterface({ input, output });
-                try {
-                    const confirm = (await rl.question("Create a new organization now? (Y/n): ")).trim().toLowerCase();
-                    if (confirm && ["n", "no"].includes(confirm)) {
-                        throw new Error("No organization selected.");
-                    }
-                    return await promptAndCreateOrg(rl);
-                }
-                finally {
-                    rl.close();
+                const shouldCreate = await confirm({
+                    message: "Create a new organization now?",
+                    initialValue: true,
+                });
+                if (isCancel(shouldCreate) || !shouldCreate) {
+                    throw new Error("No organization selected.");
                 }
+                return await promptAndCreateOrg();
             }
             throw new Error(`No organizations found.\n\nNext:\n- Create an org in Studio: ${studioOrgUrl}\n- Or rerun: instafy project init --org-name \"My Org\"`);
         }
@@ -248,48 +125,53 @@ async function resolveOrg(controllerUrl, token, options) {
             return { orgId: orgs[0].id, orgName: orgs[0].name ?? null };
         }
         if (allowInteractive) {
-            const options = [
-                "+ Create a new organization",
-                ...orgs.map((org) => `${org.name}${org.slug ? ` · ${org.slug}` : ""} (${org.id})`),
-            ];
-            const pickedIndex = await promptSelectIndex({
-                title: "Choose an organization for this project",
-                options,
-                defaultIndex: 1,
+            const { isCancel, select } = await loadPrompts();
+            const selection = await select({
+                message: "Choose an organization for this project",
+                options: [
+                    { value: "__create__", label: "+ Create a new organization" },
+                    ...orgs.map((org) => ({
+                        value: org.id,
+                        label: org.name,
+                        hint: `${org.slug ? `${org.slug} · ` : ""}${org.id}`,
+                    })),
+                ],
+                initialValue: orgs[0].id,
             });
-            if (pickedIndex === 0) {
-                const rl = createInterface({ input, output });
-                try {
-                    return await promptAndCreateOrg(rl);
-                }
-                finally {
-                    rl.close();
-                }
+            if (isCancel(selection)) {
+                throw new Error("Cancelled.");
+            }
+            if (selection === "__create__") {
+                return await promptAndCreateOrg();
+            }
+            const pickedOrg = orgs.find((org) => org.id === selection);
+            if (!pickedOrg) {
+                throw new Error("Selected organization not found.");
             }
-            const pickedOrg = orgs[pickedIndex - 1];
             return { orgId: pickedOrg.id, orgName: pickedOrg.name ?? null };
         }
         throw new Error("Multiple organizations found.\n\nNext:\n- instafy org list\n- instafy project init --org-id <uuid>");
     }
     if (orgSlug && !orgName) {
         if (allowInteractive) {
-            const rl = createInterface({ input, output });
-            try {
-                console.log(kleur.yellow("Organization slug did not match an existing org."));
-                console.log(`Create one in Studio: ${kleur.cyan(studioOrgUrl)}`);
-                console.log("");
-                const enteredName = (await rl.question("Organization name (default: Personal): ")).trim();
-                const chosenName = enteredName || "Personal";
-                const payload = { orgName: chosenName, orgSlug };
-                if (options.ownerUserId) {
-                    payload.ownerUserId = options.ownerUserId;
-                }
-                const created = await createOrganization(controllerUrl, token, payload);
-                return { orgId: created.orgId, orgName: created.orgName ?? chosenName };
+            const { isCancel, text } = await loadPrompts();
+            console.log(kleur.yellow("Organization slug did not match an existing org."));
+            console.log(`Create one in Studio: ${kleur.cyan(studioOrgUrl)}`);
+            console.log("");
+            const enteredName = await text({
+                message: "Organization name",
+                defaultValue: "Personal",
+            });
+            if (isCancel(enteredName)) {
+                throw new Error("Cancelled.");
             }
-            finally {
-                rl.close();
+            const chosenName = String(enteredName).trim() || "Personal";
+            const payload = { orgName: chosenName, orgSlug };
+            if (options.ownerUserId) {
+                payload.ownerUserId = options.ownerUserId;
             }
+            const created = await createOrganization(controllerUrl, token, payload);
+            return { orgId: created.orgId, orgName: created.orgName ?? chosenName };
         }
         throw new Error(`Organization slug "${orgSlug}" did not match an existing org, and org name is required to create one.\n\nNext:\n- Create an org in Studio: ${studioOrgUrl}\n- Or rerun: instafy project init --org-name \"My Org\" --org-slug "${orgSlug}"`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instafy/cli",
-  "version": "0.1.8-staging.373",
+  "version": "0.1.8-staging.374",
   "description": "Run Instafy projects locally, link folders to Studio, and share previews/webhooks via tunnels.",
   "private": false,
   "publishConfig": {
@@ -24,6 +24,7 @@
     "test:live": "pnpm build && TUNNEL_E2E_LIVE=1 vitest run test/tunnel-live.e2e.spec.ts"
   },
   "dependencies": {
+    "@clack/prompts": "^0.11.0",
     "commander": "^12.1.0",
     "kleur": "^4.1.5"
   },