@base44-preview/cli 0.1.6-pr.580.1bd5eee → 0.1.6-pr.580.64295ac

package/dist/cli/index.js

@@ -163190,7 +163190,7 @@ var require_stringify5 = __commonJS((exports, module) => {
     return typeof v10 === "string" || typeof v10 === "number" || typeof v10 === "boolean" || typeof v10 === "symbol" || typeof v10 === "bigint";
   };
   var sentinel = {};
-  var stringify = function stringify2(object2, prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, encoder, filter2, sort, allowDots, serializeDate, format3, formatter, encodeValuesOnly, charset, sideChannel) {
+  var stringify2 = function stringify3(object2, prefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, encoder, filter2, sort, allowDots, serializeDate, format3, formatter, encodeValuesOnly, charset, sideChannel) {
     var obj = object2;
     var tmpSc = sideChannel;
     var step = 0;
@@ -163266,7 +163266,7 @@ var require_stringify5 = __commonJS((exports, module) => {
       sideChannel.set(object2, step);
       var valueSideChannel = getSideChannel();
       valueSideChannel.set(sentinel, sideChannel);
-      pushToArray(values, stringify2(value, keyPrefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, generateArrayPrefix === "comma" && encodeValuesOnly && isArray(obj) ? null : encoder, filter2, sort, allowDots, serializeDate, format3, formatter, encodeValuesOnly, charset, valueSideChannel));
+      pushToArray(values, stringify3(value, keyPrefix, generateArrayPrefix, commaRoundTrip, allowEmptyArrays, strictNullHandling, skipNulls, encodeDotInKeys, generateArrayPrefix === "comma" && encodeValuesOnly && isArray(obj) ? null : encoder, filter2, sort, allowDots, serializeDate, format3, formatter, encodeValuesOnly, charset, valueSideChannel));
     }
     return values;
   };
@@ -163364,7 +163364,7 @@ var require_stringify5 = __commonJS((exports, module) => {
       if (options8.skipNulls && value === null) {
         continue;
       }
-      pushToArray(keys, stringify(value, key2, generateArrayPrefix, commaRoundTrip, options8.allowEmptyArrays, options8.strictNullHandling, options8.skipNulls, options8.encodeDotInKeys, options8.encode ? options8.encoder : null, options8.filter, options8.sort, options8.allowDots, options8.serializeDate, options8.format, options8.formatter, options8.encodeValuesOnly, options8.charset, sideChannel));
+      pushToArray(keys, stringify2(value, key2, generateArrayPrefix, commaRoundTrip, options8.allowEmptyArrays, options8.strictNullHandling, options8.skipNulls, options8.encodeDotInKeys, options8.encode ? options8.encoder : null, options8.filter, options8.sort, options8.allowDots, options8.serializeDate, options8.format, options8.formatter, options8.encodeValuesOnly, options8.charset, sideChannel));
     }
     var joined = keys.join(options8.delimiter);
     var prefix = options8.addQueryPrefix === true ? "?" : "";
@@ -163654,13 +163654,13 @@ var require_parse8 = __commonJS((exports, module) => {
 
 // ../../node_modules/qs/lib/index.js
 var require_lib6 = __commonJS((exports, module) => {
-  var stringify = require_stringify5();
+  var stringify2 = require_stringify5();
   var parse11 = require_parse8();
   var formats = require_formats();
   module.exports = {
     formats,
     parse: parse11,
-    stringify
+    stringify: stringify2
   };
 });
 
@@ -165293,7 +165293,7 @@ var require_dist = __commonJS((exports) => {
   exports.compile = compile2;
   exports.match = match;
   exports.pathToRegexp = pathToRegexp;
-  exports.stringify = stringify;
+  exports.stringify = stringify2;
   var DEFAULT_DELIMITER = "/";
   var NOOP_VALUE = (value) => value;
   var ID_START = /^[$_\p{ID_Start}]$/u;
@@ -165623,7 +165623,7 @@ var require_dist = __commonJS((exports) => {
     }
     return value;
   }
-  function stringify(data) {
+  function stringify2(data) {
     return stringifyTokens(data.tokens);
   }
   function isNameSafe(name2) {
@@ -168490,7 +168490,7 @@ var require_response = __commonJS((exports, module) => {
     var escape3 = app.get("json escape");
     var replacer = app.get("json replacer");
     var spaces = app.get("json spaces");
-    var body = stringify(obj, replacer, spaces, escape3);
+    var body = stringify2(obj, replacer, spaces, escape3);
     if (!this.get("Content-Type")) {
       this.set("Content-Type", "application/json");
     }
@@ -168501,7 +168501,7 @@ var require_response = __commonJS((exports, module) => {
     var escape3 = app.get("json escape");
     var replacer = app.get("json replacer");
     var spaces = app.get("json spaces");
-    var body = stringify(obj, replacer, spaces, escape3);
+    var body = stringify2(obj, replacer, spaces, escape3);
     var callback = this.req.query[app.get("jsonp callback name")];
     if (!this.get("Content-Type")) {
       this.set("X-Content-Type-Options", "nosniff");
@@ -168820,7 +168820,7 @@ var require_response = __commonJS((exports, module) => {
     }
     file2.pipe(res2);
   }
-  function stringify(value, replacer, spaces, escape3) {
+  function stringify2(value, replacer, spaces, escape3) {
     var json3 = replacer || spaces ? JSON.stringify(value, replacer, spaces) : JSON.stringify(value);
     if (escape3 && typeof json3 === "string") {
       json3 = json3.replace(/[<>&]/g, function(c8) {
@@ -258285,6 +258285,43 @@ function getWorkspaceCommand() {
   return new Command("workspace").description("List workspaces, inspect one, and move apps between them").addCommand(getWorkspaceListCommand()).addCommand(getWorkspaceGetCommand()).addCommand(getWorkspaceMoveCommand());
 }
 
+// src/cli/dev/createDevLogger.ts
+var colorByType = {
+  error: theme.styles.error,
+  warn: theme.styles.warn,
+  log: (input) => input
+};
+var stringify = (item) => {
+  if (typeof item === "string") {
+    return item;
+  }
+  if (item instanceof Error) {
+    return item.toString();
+  }
+  try {
+    return JSON.stringify(item, null, 2) ?? String(item);
+  } catch {
+    return String(item);
+  }
+};
+function createDevLogger(label2, labelColor = theme.styles.dim) {
+  const prefix = label2 ? `${labelColor(`[${label2}]`)} ` : "";
+  const print = (type, ...args) => {
+    const colorize = colorByType[type];
+    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
+  };
+  return {
+    log: (...args) => print("log", ...args),
+    error: (msg, err) => {
+      print("error", msg);
+      if (err) {
+        print("error", err);
+      }
+    },
+    warn: (...args) => print("warn", ...args)
+  };
+}
+
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
@@ -258421,43 +258458,6 @@ var $tmpName = promisify11(tmp.tmpName);
 var $tmpdir = tmp.tmpdir;
 var $setGracefulCleanup = tmp.setGracefulCleanup;
 
-// src/cli/dev/createDevLogger.ts
-var colorByType = {
-  error: theme.styles.error,
-  warn: theme.styles.warn,
-  log: (input) => input
-};
-var stringify = (item) => {
-  if (typeof item === "string") {
-    return item;
-  }
-  if (item instanceof Error) {
-    return item.toString();
-  }
-  try {
-    return JSON.stringify(item, null, 2) ?? String(item);
-  } catch {
-    return String(item);
-  }
-};
-function createDevLogger(label2, labelColor = theme.styles.dim) {
-  const prefix = label2 ? `${labelColor(`[${label2}]`)} ` : "";
-  const print = (type, ...args) => {
-    const colorize = colorByType[type];
-    console[type](prefix + args.map((item) => colorize(stringify(item))).join(" "));
-  };
-  return {
-    log: (...args) => print("log", ...args),
-    error: (msg, err) => {
-      print("error", msg);
-      if (err) {
-        print("error", err);
-      }
-    },
-    warn: (...args) => print("warn", ...args)
-  };
-}
-
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2 } from "node:child_process";
 import { dirname as dirname20, join as join27 } from "node:path";
@@ -259073,127 +259073,6 @@ function createFunctionRouter(manager, logger2) {
   return router;
 }
 
-// src/cli/dev/dev-server/serve-runner.ts
-import { spawn as spawn3 } from "node:child_process";
-import process23 from "node:process";
-
-class ServeRunner {
-  command;
-  cwd;
-  env;
-  logger;
-  child;
-  stopping = false;
-  stopPromise;
-  exitListeners = [];
-  constructor(options8) {
-    this.command = options8.command;
-    this.cwd = options8.cwd;
-    this.env = options8.env;
-    this.logger = options8.logger;
-  }
-  start() {
-    if (this.child) {
-      return;
-    }
-    const stdin2 = process23.platform === "win32" ? "ignore" : "inherit";
-    const child = spawn3(this.command, {
-      cwd: this.cwd,
-      shell: true,
-      detached: process23.platform !== "win32",
-      env: { ...process23.env, ...this.env },
-      stdio: [stdin2, "pipe", "pipe"],
-      windowsHide: true
-    });
-    this.child = child;
-    this.setupHandlers(child);
-  }
-  onExit(listener) {
-    this.exitListeners.push(listener);
-  }
-  async stop() {
-    if (this.stopPromise) {
-      return this.stopPromise;
-    }
-    this.stopPromise = this.stopChild();
-    return this.stopPromise;
-  }
-  async stopChild() {
-    const child = this.child;
-    if (!child || child.exitCode !== null) {
-      return;
-    }
-    this.stopping = true;
-    const exited = new Promise((resolve13) => child.once("exit", () => resolve13()));
-    if (process23.platform === "win32" && child.pid) {
-      const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
-        stdio: "ignore",
-        windowsHide: true
-      });
-      await new Promise((resolve13) => {
-        taskkill.once("exit", () => resolve13());
-        taskkill.once("error", () => resolve13());
-      });
-    } else if (child.pid) {
-      try {
-        process23.kill(-child.pid, "SIGTERM");
-      } catch {
-        child.kill();
-      }
-    }
-    await exited;
-  }
-  setupHandlers(child) {
-    child.stdout?.on("data", (data) => this.emitLines(data, "log"));
-    child.stderr?.on("data", (data) => this.emitLines(data, "error"));
-    child.on("error", (error48) => {
-      this.logger.error("Frontend dev server failed to start:", error48);
-      this.notifyExit(null);
-    });
-    child.on("exit", (code2) => {
-      if (this.stopping) {
-        return;
-      }
-      this.logger.error(`Frontend dev server exited with code ${code2}`);
-      this.notifyExit(code2);
-    });
-  }
-  notifyExit(code2) {
-    for (const listener of this.exitListeners) {
-      listener(code2);
-    }
-  }
-  emitLines(data, type) {
-    const lines = data.toString().trimEnd().split(`
-`);
-    for (const line3 of lines) {
-      if (type === "error") {
-        this.logger.error(line3);
-      } else {
-        this.logger.log(line3);
-      }
-    }
-  }
-}
-
-// src/cli/dev/frontend-runner.ts
-function createFrontendRunner({
-  serveCommand,
-  projectRoot,
-  appId,
-  appBaseUrl
-}) {
-  return new ServeRunner({
-    command: serveCommand,
-    cwd: projectRoot,
-    env: {
-      VITE_BASE44_APP_ID: appId,
-      VITE_BASE44_APP_BASE_URL: appBaseUrl
-    },
-    logger: createDevLogger("frontend", theme.colors.base44Orange)
-  });
-}
-
 // src/cli/dev/dev-server/db/database.ts
 var import_nedb = __toESM(require_nedb(), 1);
 
@@ -262159,16 +262038,6 @@ async function createDevServer(options8) {
     }
   });
   await base44ConfigWatcher.start();
-  const serveCommand = project2.site?.serveCommand;
-  let serveRunner;
-  if (options8.appId && serveCommand) {
-    serveRunner = createFrontendRunner({
-      serveCommand,
-      projectRoot: project2.root,
-      appId: options8.appId,
-      appBaseUrl: baseUrl
-    });
-  }
   const handleShutdownError = (error48) => {
     const errorMessage = error48 instanceof Error ? error48.message : String(error48);
     devLogger.error(`Failed to shut down dev server: ${errorMessage}`);
@@ -262191,7 +262060,6 @@ async function createDevServer(options8) {
     base44ConfigWatcher.close();
     await io6.close();
     await functionManager.stopAll();
-    await serveRunner?.stop();
     await closeServerIfRunning();
   };
   let shutdownPromise;
@@ -262201,27 +262069,128 @@ async function createDevServer(options8) {
   };
   process.on("SIGINT", shutdown);
   process.on("SIGTERM", shutdown);
-  serveRunner?.onExit(() => {
-    shutdown().finally(() => process.exit(1));
-  });
-  if (serveRunner) {
-    devLogger.log(`Backend running on ${baseUrl}`);
-    serveRunner.start();
-  }
-  return { port, server, isServingFrontend: serveRunner !== undefined };
+  return { port, server, shutdown };
 }
 
-// src/cli/dev/remote-serve.ts
-function startRemoteServe(options8) {
-  const runner = createFrontendRunner(options8);
-  stopRunnerOnProcessSignals(runner);
-  runner.onExit((code2) => process.exit(code2 ?? 1));
-  runner.start();
+// src/cli/dev/dev-server/serve-runner.ts
+import { spawn as spawn3 } from "node:child_process";
+import process23 from "node:process";
+
+class ServeRunner {
+  command;
+  cwd;
+  env;
+  logger;
+  child;
+  stopping = false;
+  stopPromise;
+  exitListeners = [];
+  constructor(options8) {
+    this.command = options8.command;
+    this.cwd = options8.cwd;
+    this.env = options8.env;
+    this.logger = options8.logger;
+  }
+  start() {
+    if (this.child) {
+      return;
+    }
+    const stdin2 = process23.platform === "win32" ? "ignore" : "inherit";
+    const child = spawn3(this.command, {
+      cwd: this.cwd,
+      shell: true,
+      detached: process23.platform !== "win32",
+      env: { ...process23.env, ...this.env },
+      stdio: [stdin2, "pipe", "pipe"],
+      windowsHide: true
+    });
+    this.child = child;
+    this.setupHandlers(child);
+  }
+  onExit(listener) {
+    this.exitListeners.push(listener);
+  }
+  async stop() {
+    if (this.stopPromise) {
+      return this.stopPromise;
+    }
+    this.stopPromise = this.stopChild();
+    return this.stopPromise;
+  }
+  async stopChild() {
+    const child = this.child;
+    if (!child || child.exitCode !== null) {
+      return;
+    }
+    this.stopping = true;
+    const exited = new Promise((resolve15) => child.once("exit", () => resolve15()));
+    if (process23.platform === "win32" && child.pid) {
+      const taskkill = spawn3("taskkill", ["/pid", String(child.pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+      await new Promise((resolve15) => {
+        taskkill.once("exit", () => resolve15());
+        taskkill.once("error", () => resolve15());
+      });
+    } else if (child.pid) {
+      try {
+        process23.kill(-child.pid, "SIGTERM");
+      } catch {
+        child.kill();
+      }
+    }
+    await exited;
+  }
+  setupHandlers(child) {
+    child.stdout?.on("data", (data) => this.emitLines(data, "log"));
+    child.stderr?.on("data", (data) => this.emitLines(data, "error"));
+    child.on("error", (error48) => {
+      this.logger.error("Frontend dev server failed to start:", error48);
+      this.notifyExit(null);
+    });
+    child.on("exit", (code2) => {
+      if (this.stopping) {
+        return;
+      }
+      this.logger.error(`Frontend dev server exited with code ${code2}`);
+      this.notifyExit(code2);
+    });
+  }
+  notifyExit(code2) {
+    for (const listener of this.exitListeners) {
+      listener(code2);
+    }
+  }
+  emitLines(data, type) {
+    const lines = data.toString().trimEnd().split(`
+`);
+    for (const line3 of lines) {
+      if (type === "error") {
+        this.logger.error(line3);
+      } else {
+        this.logger.log(line3);
+      }
+    }
+  }
 }
-function stopRunnerOnProcessSignals(runner) {
-  const stop2 = () => void runner.stop();
-  process.on("SIGINT", stop2);
-  process.on("SIGTERM", stop2);
+
+// src/cli/dev/serve-command-runner.ts
+function createServeCommandRunner({
+  serveCommand,
+  projectRoot,
+  appId,
+  appBaseUrl
+}) {
+  return new ServeRunner({
+    command: serveCommand,
+    cwd: projectRoot,
+    env: {
+      VITE_BASE44_APP_ID: appId,
+      VITE_BASE44_APP_BASE_URL: appBaseUrl
+    },
+    logger: createDevLogger("frontend", theme.colors.base44Orange)
+  });
 }
 
 // src/cli/commands/dev.ts
@@ -262238,40 +262207,56 @@ function validateDevOptions(command2) {
     command2.error("--port applies to the local backend, which --remote does not start.");
   }
 }
-async function remoteDevAction(app) {
+function requireLinkedProject({ app }) {
+  if (!app?.projectRoot) {
+    throw new ConfigInvalidError("base44 dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
+  }
+  return { id: app.id, projectRoot: app.projectRoot };
+}
+async function resolveConfiguredSite(app) {
   const { project: project2 } = await readProjectConfig(app.projectRoot);
   const serveCommand = project2.site?.serveCommand;
-  if (!serveCommand) {
+  return serveCommand ? { serveCommand, projectRoot: project2.root } : undefined;
+}
+function stopRunnerOnProcessSignals(runner) {
+  const stop2 = () => void runner.stop();
+  process.on("SIGINT", stop2);
+  process.on("SIGTERM", stop2);
+}
+function startServeCommand(runner, backend) {
+  stopRunnerOnProcessSignals(runner);
+  runner.onExit(() => {
+    backend.shutdown().finally(() => process.exit(1));
+  });
+  createDevLogger("backend", theme.styles.info).log(`Backend running on ${backend.url}`);
+  runner.start();
+}
+async function remoteDevAction(app) {
+  const site2 = await resolveConfiguredSite(app);
+  if (!site2) {
     throw new ConfigInvalidError("base44 dev --remote serves the frontend against the production backend, but this project has no site.serveCommand in base44/config.jsonc.");
   }
   const appBaseUrl = await getSiteUrl();
-  startRemoteServe({
+  const runner = createServeCommandRunner({
+    ...site2,
     appId: app.id,
-    appBaseUrl,
-    serveCommand,
-    projectRoot: project2.root
+    appBaseUrl
   });
+  stopRunnerOnProcessSignals(runner);
+  runner.onExit((code2) => process.exit(code2 ?? 1));
+  runner.start();
   return {
     outroMessage: `Frontend dev server targets ${theme.styles.bold(appBaseUrl)} — every write hits your live app`
   };
 }
-async function devAction(ctx, options8) {
-  const { app } = ctx;
-  if (!app?.projectRoot) {
-    throw new ConfigInvalidError("base44 dev requires a linked local project. Run it from a project with base44/.app.jsonc.");
-  }
-  return options8.remote ? remoteDevAction({ id: app.id, projectRoot: app.projectRoot }) : localDevAction(ctx, options8);
-}
-async function localDevAction({ log, app }, options8) {
-  const port = options8.port ? Number(options8.port) : undefined;
-  const appId = app?.id;
+async function localDevAction(ctx, app, options8) {
+  const site2 = await resolveConfiguredSite(app);
   const siteUrlPromise = getSiteUrl().catch(() => {
     return;
   });
-  const { port: resolvedPort, isServingFrontend } = await createDevServer({
-    log,
-    port,
-    appId,
+  const backend = await createDevServer({
+    log: ctx.log,
+    port: options8.port ? Number(options8.port) : undefined,
     denoWrapperPath: getDenoWrapperPath(),
     loadResources: async () => {
       const { functions, entities, project: project2 } = await readProjectConfig();
@@ -262279,9 +262264,22 @@ async function localDevAction({ log, app }, options8) {
       return { functions, entities, project: project2, siteUrl };
     }
   });
-  const outroMessage = isServingFrontend ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(localServerUrl(resolvedPort))}`;
+  const backendUrl = localServerUrl(backend.port);
+  if (site2) {
+    const runner = createServeCommandRunner({
+      ...site2,
+      appId: app.id,
+      appBaseUrl: backendUrl
+    });
+    startServeCommand(runner, { url: backendUrl, shutdown: backend.shutdown });
+  }
+  const outroMessage = site2 ? "Open your app using the frontend dev server URL" : `Dev server is available at ${theme.colors.links(backendUrl)}`;
   return { outroMessage };
 }
+async function devAction(ctx, options8) {
+  const app = requireLinkedProject(ctx);
+  return options8.remote ? remoteDevAction(app) : localDevAction(ctx, app, options8);
+}
 function getDevCommand() {
   return new Base44Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").option("--remote", "Serve the frontend against the production backend instead of a local one").hook("preAction", validateDevOptions).action(devAction);
 }
@@ -266801,4 +266799,4 @@ export {
   CLIExitError
 };
 
-//# debugId=C598ADE54F60BFD364756E2164756E21
+//# debugId=4E24EC53FAF832E164756E2164756E21