@base44-preview/cli 0.1.5-pr.568.1f028a6 → 0.1.5-pr.569.0f0eefe

package/dist/cli/index.js

@@ -218287,6 +218287,7 @@ var PROJECT_CONFIG_PATTERNS = [
   `config.${CONFIG_FILE_EXTENSION_GLOB}`
 ];
 var BASE44_APP_ID_ENV_VAR = "BASE44_APP_ID";
+var DEFAULT_DEV_SERVER_PORT = 4400;
 var TYPES_OUTPUT_SUBDIR = ".types";
 var TYPES_FILENAME = "types.d.ts";
 var AUTH_CLIENT_ID = "base44_cli";
@@ -236069,13 +236070,11 @@ var CreateProjectResponseSchema = exports_external.looseObject({
 var AppDetailSchema = exports_external.looseObject({
   id: exports_external.string(),
   name: exports_external.string().optional(),
-  organization_id: exports_external.string().nullish(),
-  is_managed_source_code: exports_external.boolean().optional()
+  organization_id: exports_external.string().nullish()
 }).transform((data) => ({
   id: data.id,
   name: data.name,
-  organizationId: data.organization_id ?? undefined,
-  isManagedSourceCode: data.is_managed_source_code
+  organizationId: data.organization_id ?? undefined
 }));
 var ProjectSchema = exports_external.object({
   id: exports_external.string(),
@@ -241896,15 +241895,14 @@ async function setAppVisibility(visibility) {
     throw await ApiError.fromHttpError(error48, "updating app visibility");
   }
 }
-async function listProjects(options = {}) {
+async function listProjects() {
   let response;
   try {
     response = await base44Client.get("api/apps", {
       searchParams: {
         sort: "-updated_date",
         fields: "id,name,user_description,is_managed_source_code",
-        limit: 50,
-        ...options.workspaceId ? { workspace_id: options.workspaceId } : {}
+        limit: 50
       }
     });
   } catch (error48) {
@@ -241920,9 +241918,7 @@ async function getApp(appId) {
   let response;
   try {
     response = await base44Client.get(`api/apps/${appId}`, {
-      searchParams: {
-        fields: "id,name,organization_id,is_managed_source_code"
-      }
+      searchParams: { fields: "id,name,organization_id" }
     });
   } catch (error48) {
     throw await ApiError.fromHttpError(error48, "fetching app");
@@ -253471,7 +253467,7 @@ function workspaceLabel(workspace2) {
   const suffix = workspace2.isPersonal ? "personal" : workspace2.userRole ?? "member";
   return `${workspace2.name} (${suffix})`;
 }
-async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive, options = {}) {
+async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
   if (flagWorkspaceId) {
     return flagWorkspaceId;
   }
@@ -253482,13 +253478,13 @@ async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive, options =
   if (workspaces.length <= 1) {
     return;
   }
-  const promptOptions = workspaces.map((w) => ({
+  const options = workspaces.map((w) => ({
     value: w.id,
     label: workspaceLabel(w)
   }));
   const selected = await Je({
-    message: options.promptMessage ?? "Which workspace should this app belong to?",
-    options: promptOptions,
+    message: "Which workspace should this app belong to?",
+    options,
     initialValue: workspaces[0].id
   });
   if (Ct(selected)) {
@@ -253821,40 +253817,6 @@ async function promptForExistingProject(linkableProjects) {
   }
   return selectedProject;
 }
-async function resolveExplicitAppId(ctx, appId) {
-  const app = await ctx.runTask("Validating app...", () => getApp(appId), {
-    errorMessage: "Could not validate app"
-  }).catch((error48) => {
-    if (error48 instanceof ApiError && (error48.statusCode === 404 || error48.statusCode === 403)) {
-      throw new InvalidInputError(`App "${appId}" not found, or you don't have access to it.`, {
-        hints: [
-          { message: "Check the app ID is correct" },
-          {
-            message: "Run 'base44 link' without --app-id to browse apps by workspace"
-          }
-        ]
-      });
-    }
-    throw error48;
-  });
-  if (app.isManagedSourceCode) {
-    throw new InvalidInputError(`App "${appId}" is a managed-source app and can't be linked with the CLI.`);
-  }
-  return appId;
-}
-async function chooseProjectInteractively(ctx, options) {
-  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"
-  });
-  const linkableProjects = projects.filter((p) => p.isManagedSourceCode !== true);
-  if (!linkableProjects.length) {
-    return;
-  }
-  const selectedProject = await promptForExistingProject(linkableProjects);
-  return selectedProject.id;
-}
 async function link(ctx, options, command2) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
   const appId = readExplicitAppId(command2).value;
@@ -253878,10 +253840,32 @@ async function link(ctx, options, command2) {
   let finalAppId;
   const action = appId ? "choose" : options.create ? "create" : await promptForLinkAction();
   if (action === "choose") {
-    const linkedAppId = appId ? await resolveExplicitAppId(ctx, appId) : await chooseProjectInteractively(ctx, options);
-    if (!linkedAppId) {
+    const projects = await runTask2("Fetching projects...", async () => listProjects(), {
+      successMessage: "Projects fetched",
+      errorMessage: "Failed to fetch projects"
+    });
+    const linkableProjects = projects.filter((p) => p.isManagedSourceCode !== true);
+    if (!linkableProjects.length) {
       return { outroMessage: "No projects available for linking" };
     }
+    let linkedAppId;
+    if (appId) {
+      const project2 = linkableProjects.find((p) => p.id === appId);
+      if (!project2) {
+        throw new InvalidInputError(`App with ID "${appId}" not found or not available for linking.`, {
+          hints: [
+            { message: "Check the app ID is correct" },
+            {
+              message: "Use 'base44 link' without --app-id to see available projects"
+            }
+          ]
+        });
+      }
+      linkedAppId = appId;
+    } else {
+      const selectedProject = await promptForExistingProject(linkableProjects);
+      linkedAppId = selectedProject.id;
+    }
     await runTask2("Linking project...", async () => {
       await writeAppConfig(projectRoot.root, linkedAppId);
       setAppContext({ id: linkedAppId, projectRoot: projectRoot.root });
@@ -253910,7 +253894,7 @@ async function link(ctx, options, command2) {
 function getLinkCommand() {
   return new Base44Command("link", {
     requireAppContext: false
-  }).description("Link a local project to a Base44 project (create new or link existing)").configureHelp({ showGlobalOptions: true }).option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").option("-w, --workspace <id>", "Workspace (organization) ID to scope the app picker to (or create the app in, with --create). Defaults to your personal workspace").addOption(new Option("--org <id>", "Alias for --workspace").hideHelp()).addOption(new Option("-p, --project-id <id>", "Project ID to link to an existing project").hideHelp()).addOption(new Option("--projectId <id>", "Project ID to link to an existing project").hideHelp()).hook("preAction", validateNonInteractiveFlags).action(link);
+  }).description("Link a local project to a Base44 project (create new or link existing)").configureHelp({ showGlobalOptions: true }).option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").option("-w, --workspace <id>", "Workspace (organization) ID to create the app in when using --create (defaults to your personal workspace)").addOption(new Option("--org <id>", "Alias for --workspace").hideHelp()).addOption(new Option("-p, --project-id <id>", "Project ID to link to an existing project").hideHelp()).addOption(new Option("--projectId <id>", "Project ID to link to an existing project").hideHelp()).hook("preAction", validateNonInteractiveFlags).action(link);
 }
 
 // src/cli/commands/project/logs.ts
@@ -258474,17 +258458,14 @@ function getDevCommand() {
 import { spawn as spawn4 } from "node:child_process";
 import { copyFileSync, writeFileSync as writeFileSync2 } from "node:fs";
 async function runScript(options8) {
-  const { appId, code: code2 } = options8;
+  const { appId, code: code2, local } = options8;
   verifyDenoInstalled("to run scripts with exec");
   const cleanupFns = [];
   const tempScript = await $file({ postfix: ".ts" });
   cleanupFns.push(tempScript.cleanup);
   writeFileSync2(tempScript.path, code2, "utf-8");
   const scriptPath = `file://${tempScript.path}`;
-  const [appUserToken, appBaseUrl] = await Promise.all([
-    getAppUserToken(),
-    getSiteUrl()
-  ]);
+  const [appUserToken, appBaseUrl] = local ? [local.token, local.serverUrl] : await Promise.all([getAppUserToken(), getSiteUrl()]);
   const tempWrapper = await $file({ postfix: ".ts" });
   cleanupFns.push(tempWrapper.cleanup);
   copyFileSync(getExecWrapperPath(), tempWrapper.path);
@@ -258523,10 +258504,28 @@ function readStdin2() {
     process.stdin.on("error", reject);
   });
 }
-async function execAction({
-  app,
-  isNonInteractive
-}) {
+function parsePort(value) {
+  const port = Number(value);
+  if (!Number.isInteger(port) || port <= 0 || port > 65535) {
+    throw new InvalidInputError(`Invalid --port value: "${value}".`, {
+      hints: [{ message: "Pass a port number, e.g. --port 4400" }]
+    });
+  }
+  return port;
+}
+async function resolveLocalTarget(port) {
+  const { email: email3 } = await readAuth();
+  return {
+    serverUrl: `http://localhost:${port}`,
+    token: createJwtToken(email3)
+  };
+}
+async function execAction({ app, isNonInteractive }, options8) {
+  if (options8.port !== undefined && !options8.local) {
+    throw new InvalidInputError("--port can only be used with --local.", {
+      hints: [{ message: "Usage: base44 exec --local --port <port>" }]
+    });
+  }
   const noInputError = new InvalidInputError("No input provided. Pipe a script to stdin.", {
     hints: [
       { message: "File:  cat ./script.ts | base44 exec" },
@@ -258542,22 +258541,24 @@ async function execAction({
   if (!code2.trim()) {
     throw noInputError;
   }
-  const { exitCode } = await runScript({ appId: app.id, code: code2 });
+  const local = options8.local ? await resolveLocalTarget(options8.port !== undefined ? parsePort(options8.port) : DEFAULT_DEV_SERVER_PORT) : undefined;
+  const { exitCode } = await runScript({ appId: app.id, code: code2, local });
   if (exitCode !== 0) {
     process.exitCode = exitCode;
   }
   return {};
 }
 function getExecCommand() {
-  return new Base44Command("exec").description("Run a script with the Base44 SDK pre-authenticated as the current user").addHelpText("after", `
+  return new Base44Command("exec").description("Run a script with the Base44 SDK pre-authenticated as the current user").option("--local", "Run against the local `base44 dev` server instead of the deployed app").option("--port <number>", `Port the local dev server is on (with --local; defaults to ${DEFAULT_DEV_SERVER_PORT})`).addHelpText("after", `
 Examples:
   Run a script file:
     $ cat ./script.ts | base44 exec
 
   Inline script:
-    $ echo "const users = await base44.entities.User.list()" | base44 exec`).action(async (ctx) => {
-    return await execAction(ctx);
-  });
+    $ echo "const users = await base44.entities.User.list()" | base44 exec
+
+  Against the local dev server (base44 dev must be running):
+    $ echo "await base44.entities.Task.create({ title: 'seed' })" | base44 exec --local`).action(execAction);
 }
 
 // src/cli/commands/project/eject.ts
@@ -262951,4 +262952,4 @@ export {
   CLIExitError
 };
 
-//# debugId=66DC83EDAF91D49064756E2164756E21
+//# debugId=8BDA6B1F446714F764756E2164756E21