@base44-preview/cli 0.1.3-pr.568.68320bd → 0.1.3-pr.568.e436c11

package/dist/cli/index.js

@@ -161113,11 +161113,11 @@ var require_json4 = __commonJS((exports, module) => {
   var debug = require_src4()("body-parser:json");
   var read3 = require_read();
   var { normalizeOptions: normalizeOptions5 } = require_utils8();
-  module.exports = json2;
+  module.exports = json3;
   var FIRST_CHAR_REGEXP = /^[\x20\x09\x0a\x0d]*([^\x20\x09\x0a\x0d])/;
   var JSON_SYNTAX_CHAR = "#";
   var JSON_SYNTAX_REGEXP = /#+/g;
-  function json2(options8) {
+  function json3(options8) {
     const normalizedOptions = normalizeOptions5(options8, "application/json");
     var reviver = options8?.reviver;
     var strict = options8?.strict !== false;
@@ -168320,7 +168320,7 @@ var require_response = __commonJS((exports, module) => {
     }
     return this;
   };
-  res.json = function json2(obj) {
+  res.json = function json3(obj) {
     var app = this.app;
     var escape3 = app.get("json escape");
     var replacer = app.get("json replacer");
@@ -168656,9 +168656,9 @@ var require_response = __commonJS((exports, module) => {
     file2.pipe(res2);
   }
   function stringify(value, replacer, spaces, escape3) {
-    var json2 = replacer || spaces ? JSON.stringify(value, replacer, spaces) : JSON.stringify(value);
-    if (escape3 && typeof json2 === "string") {
-      json2 = json2.replace(/[<>&]/g, function(c8) {
+    var json3 = replacer || spaces ? JSON.stringify(value, replacer, spaces) : JSON.stringify(value);
+    if (escape3 && typeof json3 === "string") {
+      json3 = json3.replace(/[<>&]/g, function(c8) {
         switch (c8.charCodeAt(0)) {
           case 60:
             return "\\u003c";
@@ -168671,7 +168671,7 @@ var require_response = __commonJS((exports, module) => {
         }
       });
     }
-    return json2;
+    return json3;
   }
 });
 
@@ -251335,6 +251335,11 @@ class Base44Command extends Command {
     });
   }
 }
+// src/cli/utils/json.ts
+function toJsonStdout(result) {
+  return `${JSON.stringify(result, null, 2)}
+`;
+}
 // src/cli/errors.ts
 class CLIExitError extends Error {
   code;
@@ -251544,10 +251549,6 @@ var MoveAppResponseSchema = exports_external.looseObject({
   appId: data.app_id,
   newWorkspaceId: data.new_workspace_id
 }));
-var APP_EDITOR_ROLES = ["owner", "admin", "editor"];
-function canCreateAppsInWorkspace(role) {
-  return role !== undefined && APP_EDITOR_ROLES.includes(role.toLowerCase());
-}
 
 // src/core/workspace/api.ts
 async function listWorkspaces() {
@@ -253455,62 +253456,13 @@ function fetchWorkspaces(ctx) {
     errorMessage: "Failed to fetch workspaces"
   });
 }
-function workspaceHints(workspaces) {
-  return [
-    { message: "Run 'base44 workspace list' to see available workspaces" },
-    ...workspaces.filter((w) => canCreateAppsInWorkspace(w.userRole)).map((w) => ({ message: `${w.name} — ${w.id}` }))
-  ];
-}
 function workspaceLabel(workspace2) {
   const suffix = workspace2.isPersonal ? "personal" : workspace2.userRole ?? "member";
   return `${workspace2.name} (${suffix})`;
 }
-async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
+async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive, options = {}) {
   if (flagWorkspaceId) {
-    const workspaces2 = await fetchWorkspaces(ctx);
-    const match = workspaces2.find((w) => w.id === flagWorkspaceId);
-    if (!match) {
-      throw new InvalidInputError(`Workspace "${flagWorkspaceId}" not found, or you are not a member of it.`, { hints: workspaceHints(workspaces2) });
-    }
-    if (!canCreateAppsInWorkspace(match.userRole)) {
-      throw new InvalidInputError(`You don't have permission to create apps in workspace "${match.name}" (your role: ${match.userRole ?? "unknown"}).`);
-    }
-    return match.id;
-  }
-  if (!isInteractive) {
-    return;
-  }
-  const workspaces = await fetchWorkspaces(ctx);
-  const eligible = workspaces.filter((w) => canCreateAppsInWorkspace(w.userRole));
-  if (eligible.length <= 1) {
-    return;
-  }
-  const options = eligible.map((w) => ({
-    value: w.id,
-    label: workspaceLabel(w)
-  }));
-  const selected = await Je({
-    message: "Which workspace should this app belong to?",
-    options,
-    initialValue: eligible[0].id
-  });
-  if (Ct(selected)) {
-    onPromptCancel();
-  }
-  return selected;
-}
-async function resolveListingWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
-  if (flagWorkspaceId) {
-    const workspaces2 = await fetchWorkspaces(ctx);
-    const match = workspaces2.find((w) => w.id === flagWorkspaceId);
-    if (!match) {
-      throw new InvalidInputError(`Workspace "${flagWorkspaceId}" not found, or you are not a member of it.`, {
-        hints: [
-          { message: "Run 'base44 workspace list' to see your workspaces" }
-        ]
-      });
-    }
-    return match.id;
+    return flagWorkspaceId;
   }
   if (!isInteractive) {
     return;
@@ -253519,13 +253471,13 @@ async function resolveListingWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
   if (workspaces.length <= 1) {
     return;
   }
-  const options = workspaces.map((w) => ({
+  const promptOptions = workspaces.map((w) => ({
     value: w.id,
     label: workspaceLabel(w)
   }));
   const selected = await Je({
-    message: "Which workspace is the app in?",
-    options,
+    message: options.promptMessage ?? "Which workspace should this app belong to?",
+    options: promptOptions,
     initialValue: workspaces[0].id
   });
   if (Ct(selected)) {
@@ -253880,7 +253832,7 @@ async function resolveExplicitAppId(ctx, appId) {
   return appId;
 }
 async function chooseProjectInteractively(ctx, options) {
-  const workspaceId = await resolveListingWorkspaceId(ctx, options.workspace ?? options.org, !ctx.isNonInteractive);
+  const workspaceId = await resolveWorkspaceId(ctx, options.workspace ?? options.org, !ctx.isNonInteractive, { promptMessage: "Which workspace is the app in?" });
   const projects = await ctx.runTask("Fetching projects...", () => listProjects({ workspaceId }), {
     successMessage: "Projects fetched",
     errorMessage: "Failed to fetch projects"
@@ -254375,10 +254327,6 @@ async function resolveFlagOrStdin(flagValue, flagName) {
   }
   return readStdin(flagName, { trim: false });
 }
-function toJsonStdout(result) {
-  return `${JSON.stringify(result, null, 2)}
-`;
-}
 function parsePositiveInt(value, flagName) {
   if (value === undefined) {
     return;
@@ -254816,10 +254764,6 @@ function getTypesCommand() {
 }
 
 // src/cli/commands/workspace/shared.ts
-function toJsonStdout2(result) {
-  return `${JSON.stringify(result, null, 2)}
-`;
-}
 function workspaceTag(workspace2) {
   const role = workspace2.userRole ?? "member";
   return workspace2.isPersonal ? `personal, ${role}` : role;
@@ -254838,7 +254782,7 @@ async function getWorkspaceAction({ runTask: runTask2, log, jsonMode }, workspac
   if (jsonMode) {
     return {
       outroMessage: workspace2.name,
-      stdout: toJsonStdout2(workspace2)
+      stdout: toJsonStdout(workspace2)
     };
   }
   log.message(`  ${theme.styles.bold(workspace2.name)} ${theme.styles.dim(`[${workspaceTag(workspace2)}]`)}
@@ -254851,71 +254795,40 @@ function getWorkspaceGetCommand() {
 }
 
 // src/cli/commands/workspace/list.ts
-function pluralize2(n5) {
-  return `${n5} workspace${n5 !== 1 ? "s" : ""}`;
-}
 async function listWorkspacesAction({ log, runTask: runTask2, jsonMode }, options8) {
   let workspaces = await runTask2("Fetching workspaces...", () => listWorkspaces(), { errorMessage: "Failed to fetch workspaces" });
-  if (options8.canCreate) {
-    workspaces = workspaces.filter((w8) => canCreateAppsInWorkspace(w8.userRole));
-  }
   if (options8.role) {
     const role = options8.role.toLowerCase();
     workspaces = workspaces.filter((w8) => w8.userRole?.toLowerCase() === role);
   }
+  const summary = `${workspaces.length} workspace${workspaces.length !== 1 ? "s" : ""}`;
   if (jsonMode) {
-    return {
-      outroMessage: pluralize2(workspaces.length),
-      stdout: toJsonStdout2(workspaces)
-    };
+    return { outroMessage: summary, stdout: toJsonStdout(workspaces) };
   }
   for (const workspace2 of workspaces) {
     log.message(`  ${theme.styles.bold(workspace2.name)} ${theme.styles.dim(`[${workspaceTag(workspace2)}]`)}
   ${theme.styles.dim(workspace2.id)}`);
   }
-  return { outroMessage: pluralize2(workspaces.length) };
+  return { outroMessage: summary };
 }
 function getWorkspaceListCommand() {
-  return new Base44Command("list", { requireAppContext: false }).description("List the workspaces you belong to").option("--can-create", "Only workspaces you can create or move apps into (owner/admin/editor)").option("--role <role>", "Only workspaces where your role matches (owner, admin, editor, viewer)").action(listWorkspacesAction);
+  return new Base44Command("list", { requireAppContext: false }).description("List the workspaces you belong to").option("--role <role>", "Only workspaces where your role matches (owner, admin, editor, viewer)").action(listWorkspacesAction);
 }
 
 // src/cli/commands/workspace/move.ts
-function workspaceName(workspaces, id2) {
-  if (!id2)
-    return "unknown workspace";
-  return workspaces.find((w8) => w8.id === id2)?.name ?? id2;
-}
-async function resolveTargetWorkspace(target, workspaces, currentWorkspaceId, isInteractive) {
-  const eligible = workspaces.filter((w8) => canCreateAppsInWorkspace(w8.userRole) && w8.id !== currentWorkspaceId);
-  if (target) {
-    const match = workspaces.find((w8) => w8.id === target);
-    if (!match) {
-      throw new InvalidInputError(`Workspace "${target}" not found, or you are not a member of it.`, {
-        hints: [
-          { message: "Run 'base44 workspace list' to see your workspaces" }
-        ]
-      });
-    }
-    if (target === currentWorkspaceId) {
-      throw new InvalidInputError("The app is already in that workspace.");
-    }
-    if (!canCreateAppsInWorkspace(match.userRole)) {
-      throw new InvalidInputError(`You don't have permission to move apps into workspace "${match.name}" (your role: ${match.userRole ?? "unknown"}).`);
-    }
-    return match.id;
-  }
-  if (!isInteractive) {
-    throw new InvalidInputError("A target workspace ID is required in non-interactive mode.", {
-      hints: [
-        { message: "Usage: base44 workspace move <workspace-id>" },
-        { message: "Run 'base44 workspace list' to see your workspaces" }
-      ]
-    });
-  }
-  if (eligible.length === 0) {
+async function promptForTargetWorkspace(ctx, appId) {
+  const { workspaces, currentWorkspaceId } = await ctx.runTask("Fetching workspaces...", async () => {
+    const [workspaces2, app] = await Promise.all([
+      listWorkspaces(),
+      getApp(appId)
+    ]);
+    return { workspaces: workspaces2, currentWorkspaceId: app.organizationId };
+  }, { errorMessage: "Failed to fetch workspaces" });
+  const destinations = workspaces.filter((w8) => w8.id !== currentWorkspaceId);
+  if (destinations.length === 0) {
     throw new InvalidInputError("No other workspaces available to move this app into.");
   }
-  const options8 = eligible.map((w8) => ({
+  const options8 = destinations.map((w8) => ({
     value: w8.id,
     label: `${w8.name} (${w8.userRole ?? "member"})`
   }));
@@ -254926,42 +254839,64 @@ async function resolveTargetWorkspace(target, workspaces, currentWorkspaceId, is
   if (Ct(selected)) {
     onPromptCancel();
   }
-  return selected;
+  const targetWorkspaceId = selected;
+  const nameOf = (id2) => workspaces.find((w8) => w8.id === id2)?.name ?? id2 ?? "unknown workspace";
+  return {
+    targetWorkspaceId,
+    fromName: nameOf(currentWorkspaceId),
+    toName: nameOf(targetWorkspaceId)
+  };
 }
 async function moveAction(ctx, target, options8) {
   const { runTask: runTask2, isNonInteractive, jsonMode } = ctx;
   const isInteractive = !isNonInteractive && !jsonMode;
   const { id: appId } = getAppContext();
-  const { workspaces, currentWorkspaceId } = await runTask2("Fetching workspaces...", async () => {
-    const [workspaces2, app] = await Promise.all([
-      listWorkspaces(),
-      getApp(appId)
-    ]);
-    return { workspaces: workspaces2, currentWorkspaceId: app.organizationId };
-  }, { errorMessage: "Failed to fetch workspaces" });
-  const targetWorkspaceId = await resolveTargetWorkspace(target, workspaces, currentWorkspaceId, isInteractive);
-  if (isInteractive && !options8.yes) {
-    const proceed = await Re({
-      message: `Move this app from ${theme.styles.bold(workspaceName(workspaces, currentWorkspaceId))} to ${theme.styles.bold(workspaceName(workspaces, targetWorkspaceId))}?`
-    });
-    if (Ct(proceed)) {
-      onPromptCancel();
+  let targetWorkspaceId;
+  let toLabel;
+  if (target) {
+    targetWorkspaceId = target;
+    toLabel = target;
+    if (isInteractive && !options8.yes) {
+      const proceed = await Re({
+        message: `Move this app to workspace ${theme.styles.bold(target)}?`
+      });
+      if (Ct(proceed)) {
+        onPromptCancel();
+      }
+      if (!proceed) {
+        return { outroMessage: "Move cancelled" };
+      }
     }
-    if (!proceed) {
-      return { outroMessage: "Move cancelled" };
+  } else if (isInteractive) {
+    const picked = await promptForTargetWorkspace(ctx, appId);
+    targetWorkspaceId = picked.targetWorkspaceId;
+    toLabel = picked.toName;
+    if (!options8.yes) {
+      const proceed = await Re({
+        message: `Move this app from ${theme.styles.bold(picked.fromName)} to ${theme.styles.bold(picked.toName)}?`
+      });
+      if (Ct(proceed)) {
+        onPromptCancel();
+      }
+      if (!proceed) {
+        return { outroMessage: "Move cancelled" };
+      }
     }
+  } else {
+    throw new InvalidInputError("A target workspace ID is required in non-interactive mode.", {
+      hints: [
+        { message: "Usage: base44 workspace move <workspace-id>" },
+        { message: "Run 'base44 workspace list' to see your workspaces" }
+      ]
+    });
   }
   const result = await runTask2("Moving app to workspace...", () => moveAppToWorkspace(appId, targetWorkspaceId, {
     disconnectIntegrations: options8.disconnectIntegrations
   }), { errorMessage: "Failed to move app" });
-  const targetName = workspaceName(workspaces, targetWorkspaceId);
   if (jsonMode) {
-    return {
-      outroMessage: `App moved to ${targetName}`,
-      stdout: toJsonStdout2(result)
-    };
+    return { outroMessage: "App moved", stdout: toJsonStdout(result) };
   }
-  return { outroMessage: `App moved to ${theme.styles.bold(targetName)}` };
+  return { outroMessage: `App moved to ${theme.styles.bold(toLabel)}` };
 }
 function getWorkspaceMoveCommand() {
   return new Base44Command("move").description("Move the current app to another workspace").argument("[workspace-id]", "Target workspace (organization) ID").option("--disconnect-integrations", "Disconnect the app's OAuth integrations as part of the move").option("-y, --yes", "Skip the confirmation prompt").addHelpText("after", `
@@ -263005,4 +262940,4 @@ export {
   CLIExitError
 };
 
-//# debugId=F3935F096F24A1DE64756E2164756E21
+//# debugId=C39B52458812629964756E2164756E21