@vocoder/cli 0.1.14 → 0.1.16

package/dist/bin.mjs

@@ -1249,7 +1249,7 @@ function filterItems(items, query) {
   const lower = query.toLowerCase();
   return items.filter((i) => i.value.toLowerCase().includes(lower));
 }
-function buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor) {
+function buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor, optional = false) {
   const lines = [];
   const end = Math.min(filtered.length, scrollOffset + MAX_VISIBLE2);
   for (let i = scrollOffset; i < end; i++) {
@@ -1274,11 +1274,16 @@ function buildList2(filtered, cursor, scrollOffset, selected, filter, customPatt
   }
   const hidden = filtered.length - (end - scrollOffset);
   if (hidden > 0) lines.push(dim2(`${S_BAR2}  ${hidden} more`));
-  if (selected.size > 0) lines.push(dim2(`${S_BAR2}  ${selected.size} selected \u2014 Enter to confirm`));
+  if (selected.size > 0) {
+    lines.push(dim2(`${S_BAR2}  ${selected.size} selected \u2014 Enter to confirm`));
+  } else if (optional) {
+    lines.push(dim2(`${S_BAR2}  Enter to skip`));
+  }
   return lines.join("\n");
 }
 async function filterableBranchSelect(params) {
   const { message, branches, defaultBranch } = params;
+  const optional = params.optional ?? false;
   let filter = "";
   let cursor = 0;
   let scrollOffset = 0;
@@ -1305,7 +1310,7 @@ async function filterableBranchSelect(params) {
   const prompt = new Prompt2(
     {
       validate() {
-        if (selected.size === 0) return "At least one branch is required.";
+        if (!optional && selected.size === 0) return "At least one branch is required.";
         return void 0;
       },
       render() {
@@ -1326,7 +1331,7 @@ ${symbol2(this.state)}  ${message}
             return [
               hdr.trimEnd(),
               `${ylw2(S_BAR2)}  ${dim2("/")} ${hint}`,
-              buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor),
+              buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor, optional),
               `${ylw2(S_BAR_END2)}  ${ylw2(this.error)}`,
               ""
             ].join("\n");
@@ -1334,7 +1339,7 @@ ${symbol2(this.state)}  ${message}
             return [
               hdr.trimEnd(),
               `${cyan2(S_BAR2)}  ${dim2("/")} ${hint}`,
-              buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor),
+              buildList2(filtered, cursor, scrollOffset, selected, filter, customPatterns, addCursor, optional),
               `${cyan2(S_BAR_END2)}`,
               ""
             ].join("\n");
@@ -1472,12 +1477,12 @@ async function runProjectCreate(params) {
   }
   const detected = detectGitBranches();
   const initialBranches = params.defaultBranches?.length ? params.defaultBranches : [detected.defaultBranch];
-  let selectedBranches = [];
+  let pushBranches = [];
   {
     let initial = initialBranches;
-    while (selectedBranches.length === 0) {
+    while (pushBranches.length === 0) {
       const result = await filterableBranchSelect({
-        message: "Target branches",
+        message: "Translate on push \u2014 which branches?",
         branches: detected.branches,
         defaultBranch: detected.defaultBranch,
         initialValues: initial
@@ -1487,24 +1492,54 @@ async function runProjectCreate(params) {
         p3.log.warn("At least one branch is required. Please select at least one.");
         initial = [detected.defaultBranch];
       } else {
-        selectedBranches = result;
+        pushBranches = result;
       }
     }
   }
-  const triggerChoice = await p3.select({
-    message: "When should translations run?",
-    options: [
-      { value: "push", label: "On push to target branches" },
-      { value: "pull_request", label: "On pull requests" },
-      { value: "push_and_pr", label: "On push and pull requests" },
-      { value: "manual", label: "Manual only", hint: "use vocoder sync or trigger from dashboard" }
-    ]
+  const prResult = await filterableBranchSelect({
+    message: "Translate on pull requests \u2014 which branches? (optional)",
+    branches: detected.branches,
+    defaultBranch: detected.defaultBranch,
+    initialValues: [],
+    optional: true
+  });
+  if (prResult === null) return null;
+  const prBranches = prResult;
+  const autoSet = /* @__PURE__ */ new Set([...pushBranches, ...prBranches]);
+  const manualResult = await filterableBranchSelect({
+    message: `Manual-only branches \u2014 translate via \`vocoder sync\` only (optional)`,
+    branches: detected.branches.filter((b) => !autoSet.has(b)),
+    defaultBranch: detected.defaultBranch,
+    initialValues: [],
+    optional: true
+  });
+  if (manualResult === null) return null;
+  const manualBranches = manualResult.filter((b) => {
+    if (autoSet.has(b)) {
+      p3.log.warn(`"${b}" is already configured for automatic translation \u2014 skipping from manual.`);
+      return false;
+    }
+    return true;
   });
-  if (p3.isCancel(triggerChoice)) return null;
-  const triggersForBranch = triggerChoice === "push_and_pr" ? ["push", "pull_request"] : [triggerChoice];
-  const branchTriggers = selectedBranches.map((pattern) => ({
+  if (pushBranches.length === 0 && prBranches.length === 0 && manualBranches.length === 0) {
+    p3.log.error("At least one branch must be configured.");
+    return null;
+  }
+  const triggerMap = /* @__PURE__ */ new Map();
+  for (const b of pushBranches) {
+    if (!triggerMap.has(b)) triggerMap.set(b, /* @__PURE__ */ new Set());
+    triggerMap.get(b).add("push");
+  }
+  for (const b of prBranches) {
+    if (!triggerMap.has(b)) triggerMap.set(b, /* @__PURE__ */ new Set());
+    triggerMap.get(b).add("pull_request");
+  }
+  for (const b of manualBranches) {
+    triggerMap.set(b, /* @__PURE__ */ new Set(["manual"]));
+  }
+  const branchTriggers = Array.from(triggerMap.entries()).map(([pattern, triggers]) => ({
     pattern,
-    triggers: triggersForBranch
+    triggers: Array.from(triggers)
   }));
   try {
     const result = await api.createProject(userToken, {
@@ -1577,40 +1612,65 @@ async function runProjectAppCreate(params) {
   if (targetLocales.length === 0) {
     p3.log.warn("No target languages selected \u2014 you can add them later from the dashboard.");
   }
-  const triggerChoice = await p3.select({
-    message: "When should translations run?",
-    options: [
-      { value: "push", label: "On push to target branches" },
-      { value: "pull_request", label: "On pull requests" },
-      { value: "push_and_pr", label: "On push and pull requests" },
-      { value: "manual", label: "Manual only", hint: "use vocoder sync or trigger from dashboard" }
-    ]
-  });
-  if (p3.isCancel(triggerChoice)) return null;
-  const triggersForBranch = triggerChoice === "push_and_pr" ? ["push", "pull_request"] : [triggerChoice];
-  const detected = detectGitBranches();
-  let selectedBranches = [];
+  const detectedApp = detectGitBranches();
+  let appPushBranches = [];
   {
-    let initial = [detected.defaultBranch];
-    while (selectedBranches.length === 0) {
+    let initial = [detectedApp.defaultBranch];
+    while (appPushBranches.length === 0) {
       const result = await filterableBranchSelect({
-        message: "Target branches",
-        branches: detected.branches,
-        defaultBranch: detected.defaultBranch,
+        message: "Translate on push \u2014 which branches?",
+        branches: detectedApp.branches,
+        defaultBranch: detectedApp.defaultBranch,
         initialValues: initial
       });
       if (result === null) return null;
       if (result.length === 0) {
         p3.log.warn("At least one branch is required.");
-        initial = [detected.defaultBranch];
+        initial = [detectedApp.defaultBranch];
       } else {
-        selectedBranches = result;
+        appPushBranches = result;
       }
     }
   }
-  const branchTriggers = selectedBranches.map((pattern) => ({
+  const appPrResult = await filterableBranchSelect({
+    message: "Translate on pull requests \u2014 which branches? (optional)",
+    branches: detectedApp.branches,
+    defaultBranch: detectedApp.defaultBranch,
+    initialValues: [],
+    optional: true
+  });
+  if (appPrResult === null) return null;
+  const appAutoSet = /* @__PURE__ */ new Set([...appPushBranches, ...appPrResult]);
+  const appManualResult = await filterableBranchSelect({
+    message: "Manual-only branches (optional)",
+    branches: detectedApp.branches.filter((b) => !appAutoSet.has(b)),
+    defaultBranch: detectedApp.defaultBranch,
+    initialValues: [],
+    optional: true
+  });
+  if (appManualResult === null) return null;
+  const appManualBranches = appManualResult.filter((b) => {
+    if (appAutoSet.has(b)) {
+      p3.log.warn(`"${b}" is already configured for automatic translation \u2014 skipping from manual.`);
+      return false;
+    }
+    return true;
+  });
+  const appTriggerMap = /* @__PURE__ */ new Map();
+  for (const b of appPushBranches) {
+    if (!appTriggerMap.has(b)) appTriggerMap.set(b, /* @__PURE__ */ new Set());
+    appTriggerMap.get(b).add("push");
+  }
+  for (const b of appPrResult) {
+    if (!appTriggerMap.has(b)) appTriggerMap.set(b, /* @__PURE__ */ new Set());
+    appTriggerMap.get(b).add("pull_request");
+  }
+  for (const b of appManualBranches) {
+    appTriggerMap.set(b, /* @__PURE__ */ new Set(["manual"]));
+  }
+  const branchTriggers = Array.from(appTriggerMap.entries()).map(([pattern, triggers]) => ({
     pattern,
-    triggers: triggersForBranch
+    triggers: Array.from(triggers)
   }));
   try {
     const result = await api.createProjectApp(userToken, {
@@ -2332,20 +2392,68 @@ async function init(options = {}) {
         p5.log.warn(
           `Project limit reached \u2014 ${ws.projectCount}/${ws.maxProjects} on your ${chalk6.bold(ws.planId)} plan.`
         );
+        const hasRepoContext = !!identity?.repoCanonical;
+        const options2 = [];
+        if (hasRepoContext) {
+          options2.push({
+            value: "connect",
+            label: "Connect this repo to an existing project"
+          });
+        }
+        options2.push({ value: "upgrade", label: "Upgrade plan" });
+        options2.push({ value: "cancel", label: "Cancel" });
         const limitAction = await p5.select({
           message: "What would you like to do?",
-          options: [
-            { value: "upgrade", label: "Upgrade plan" },
-            { value: "cancel", label: "Cancel" }
-          ]
+          options: options2
         });
         if (p5.isCancel(limitAction) || limitAction === "cancel") {
           p5.cancel("Setup cancelled.");
           return 1;
         }
-        await tryOpenBrowser2(`${apiUrl}${SUBSCRIPTION_SETTINGS_PATH}`);
-        p5.cancel("Upgrade your plan in the browser, then re-run `vocoder init`.");
-        return 1;
+        if (limitAction === "upgrade") {
+          await tryOpenBrowser2(`${apiUrl}${SUBSCRIPTION_SETTINGS_PATH}`);
+          p5.cancel("Upgrade your plan in the browser, then re-run `vocoder init`.");
+          return 1;
+        }
+        const existingProjects = await api.listProjects(userToken, selectedWorkspaceId);
+        if (existingProjects.length === 0) {
+          p5.log.error("No projects found in this workspace.");
+          return 1;
+        }
+        const chosenId = await p5.select({
+          message: "Which project should this repo be connected to?",
+          options: existingProjects.map((proj) => ({
+            value: proj.id,
+            label: proj.name
+          }))
+        });
+        if (p5.isCancel(chosenId)) {
+          p5.cancel("Setup cancelled.");
+          return 1;
+        }
+        const chosen = existingProjects.find((proj) => proj.id === chosenId);
+        const appResult = await runProjectAppCreate({
+          api,
+          userToken,
+          projectId: chosen.id,
+          projectName: chosen.name,
+          organizationName: selectedWorkspaceName,
+          repoCanonical: identity?.repoCanonical,
+          defaultScopePath: identity?.repoScopePath,
+          existingApps: []
+        });
+        if (!appResult) {
+          p5.log.error("Setup failed. Run `vocoder init` again.");
+          return 1;
+        }
+        runScaffold({
+          projectName: appResult.projectName,
+          organizationName: selectedWorkspaceName,
+          sourceLocale: appResult.sourceLocale,
+          branchTriggers: appResult.branchTriggers
+        });
+        p5.outro("You're all set.");
+        return 0;
       }
     } catch {
     }