@base44-preview/cli 0.1.5-pr.576.5e79c21 → 0.1.5-pr.577.1701370

package/bin/binary-entry.ts

@@ -1,7 +1,7 @@
 /**
  * Entry point for standalone compiled binaries (built with `bun build --compile`).
  *
- * This file embeds a single assets tarball (templates + backend-runtime) into the
+ * This file embeds a single assets tarball (templates + deno-runtime) into the
  * binary and extracts it to ~/.base44/assets/<version>/ on first run.
  * The npm distribution uses bin/run.js instead — this file is only used
  * for the compiled binary path.
@@ -25,11 +25,7 @@ const assetsDir = join(homedir(), ".base44", "assets", VERSION);
 // Extract assets if this version hasn't been unpacked yet.
 // Bun.file() reads from the virtual $bunfs, then we write to real disk
 // so the rest of the CLI can access these files normally.
-//
-// The directory existing is not proof its contents are current: an install
-// that predates a renamed or added asset directory would otherwise keep the
-// stale layout forever, so check for an expected directory too.
-if (!existsSync(assetsDir) || !existsSync(join(assetsDir, "backend-runtime"))) {
+if (!existsSync(assetsDir)) {
   mkdirSync(assetsDir, { recursive: true });
   const bytes = await Bun.file(assetsTarball).bytes();
   const archive = new Bun.Archive(bytes);

package/dist/assets/{backend-runtime → deno-runtime}/main.ts

@@ -4,13 +4,6 @@
  * This script is executed by Deno to run user functions.
  * It patches Deno.serve to inject a dynamic port before importing the user's function.
  *
- * Two handler shapes are supported:
- * - `export default async function (req) { ... }` — the shape the deployed
- *   runtime expects. The wrapper serves it after importing the module.
- * - `Deno.serve(handler)` — the legacy shape. A module that calls Deno.serve
- *   while being imported serves itself and its default export is ignored,
- *   mirroring the deployed bundler's precedence.
- *
  * Environment variables:
  * - FUNCTION_PATH: Absolute path to the user's function entry file
  * - FUNCTION_PORT: Port number for the function to listen on
@@ -32,10 +25,6 @@ if (!functionPath) {
 // Store the original Deno.serve
 const originalServe = Deno.serve.bind(Deno);
 
-// Set when the user's module calls Deno.serve while it is being imported.
-// Such a module serves itself, so its default export (if any) is ignored.
-let servedDuringImport = false;
-
 // Patch Deno.serve to inject our port and add onListen callback.
 const patchedServe = (
   optionsOrHandler:
@@ -44,8 +33,6 @@ const patchedServe = (
     | (Deno.ServeOptions & { handler: Deno.ServeHandler }),
   maybeHandler?: Deno.ServeHandler,
 ): Deno.HttpServer<Deno.NetAddr> => {
-  servedDuringImport = true;
-
   const onListen = () => {
     // This message is used by FunctionManager to detect when the function is ready
     console.log(`[${functionName}] Listening on http://localhost:${port}`);
@@ -81,56 +68,13 @@ Object.defineProperty(Deno, "serve", {
   configurable: true,
 });
 
-type FetchHandler = (req: Request) => Response | Promise<Response>;
-
-/**
- * Pull the request handler off the user's module namespace, accepting both
- * `export default async function (req)` and the `export default { fetch }`
- * object form.
- */
-const resolveDefaultHandler = (
-  module: Record<string, unknown>,
-): FetchHandler | null => {
-  const exported = module.default;
-
-  if (typeof exported === "function") {
-    return exported as FetchHandler;
-  }
-
-  if (exported && typeof exported === "object") {
-    const { fetch } = exported as { fetch?: unknown };
-    if (typeof fetch === "function") {
-      return (fetch as FetchHandler).bind(exported);
-    }
-  }
-
-  return null;
-};
-
 console.log(`[${functionName}] Starting function from ${functionPath}`);
 
-// Dynamically import the user's function. A legacy function calls Deno.serve
-// during import, which is now patched to use our port.
-let functionModule: Record<string, unknown>;
+// Dynamically import the user's function
+// The function will call Deno.serve which is now patched to use our port
 try {
-  functionModule = await import(functionPath);
+  await import(functionPath);
 } catch (error) {
   console.error(`[${functionName}] Failed to load function:`, error);
   Deno.exit(1);
 }
-
-// Nothing served itself during import, so the module is expected to export a
-// handler. Serving it here goes through the same patched Deno.serve, so the
-// readiness line still gets printed exactly once.
-if (!servedDuringImport) {
-  const handler = resolveDefaultHandler(functionModule);
-
-  if (!handler) {
-    console.error(
-      `[${functionName}] The function must export default a request handler or call Deno.serve()`,
-    );
-    Deno.exit(1);
-  }
-
-  Deno.serve(handler);
-}

package/dist/cli/index.js

@@ -213884,7 +213884,7 @@ var require_parse_path = __commonJS((exports, module) => {
   var reFirstKey = /^[^\[]*/;
   var reDigitPath = /^\[(\d+)\]/;
   var reNormalPath = /^\[([^\]]+)\]/;
-  function parsePath2(key2) {
+  function parsePath(key2) {
     function failure() {
       return [{ type: "object", key: key2, last: true }];
     }
@@ -213925,7 +213925,7 @@ var require_parse_path = __commonJS((exports, module) => {
     tail.last = true;
     return steps;
   }
-  module.exports = parsePath2;
+  module.exports = parsePath;
 });
 
 // ../../node_modules/append-field/lib/set-value.js
@@ -213996,10 +213996,10 @@ var require_set_value = __commonJS((exports, module) => {
 
 // ../../node_modules/append-field/index.js
 var require_append_field = __commonJS((exports, module) => {
-  var parsePath2 = require_parse_path();
+  var parsePath = require_parse_path();
   var setValue = require_set_value();
   function appendField(store, key2, value) {
-    var steps = parsePath2(key2);
+    var steps = parsePath(key2);
     steps.reduce(function(context, step) {
       return setValue(context, step, context[step.key], value);
     }, store);
@@ -214616,7 +214616,7 @@ var require_buffer_list = __commonJS((exports, module) => {
       }
     }, {
       key: "join",
-      value: function join27(s5) {
+      value: function join25(s5) {
         if (this.length === 0)
           return "";
         var p4 = this.head;
@@ -218205,7 +218205,7 @@ var require_dist5 = __commonJS((exports, module) => {
   });
   module.exports = __toCommonJS(src_exports);
   var import_promises22 = __require("node:fs/promises");
-  var import_node_fs24 = __require("node:fs");
+  var import_node_fs23 = __require("node:fs");
   var DEVIN_LOCAL_PATH = "/opt/.devin";
   var CURSOR2 = "cursor";
   var CURSOR_CLI = "cursor-cli";
@@ -218262,7 +218262,7 @@ var require_dist5 = __commonJS((exports, module) => {
       return { isAgent: true, agent: { name: REPLIT } };
     }
     try {
-      await (0, import_promises22.access)(DEVIN_LOCAL_PATH, import_node_fs24.constants.F_OK);
+      await (0, import_promises22.access)(DEVIN_LOCAL_PATH, import_node_fs23.constants.F_OK);
       return { isAgent: true, agent: { name: DEVIN } };
     } catch (error48) {}
     return { isAgent: false, agent: undefined };
@@ -234033,7 +234033,7 @@ function normalizeBase44Env() {
 loadProjectEnvFiles();
 
 // src/cli/index.ts
-import { dirname as dirname25, join as join30 } from "node:path";
+import { dirname as dirname23, join as join28 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -244116,17 +244116,14 @@ function getTemplatesDir() {
 function getTemplatesIndexPath() {
   return join11(ASSETS_DIR, "templates", "templates.json");
 }
-function getBackendRuntimeDir() {
-  return join11(ASSETS_DIR, "backend-runtime");
-}
 function getDenoWrapperPath() {
-  return join11(getBackendRuntimeDir(), "main.ts");
+  return join11(ASSETS_DIR, "deno-runtime", "main.ts");
 }
 function getExecWrapperPath() {
-  return join11(getBackendRuntimeDir(), "exec.ts");
+  return join11(ASSETS_DIR, "deno-runtime", "exec.ts");
 }
 function ensureNpmAssets(sourceDir) {
-  if (existsSync(ASSETS_DIR) && existsSync(getBackendRuntimeDir()))
+  if (existsSync(ASSETS_DIR))
     return;
   if (!existsSync(sourceDir))
     return;
@@ -253808,7 +253805,7 @@ async function promptForLinkAction() {
   actionOptions.push({
     value: "choose",
     label: "Link an existing project",
-    hint: "Choose from one of your available projects previously created by the Base44 CLI"
+    hint: "Choose from one of your existing Base44 apps"
   });
   const action = await Je({
     message: "How would you like to link this project?",
@@ -253845,8 +253842,8 @@ async function promptForNewProjectDetails() {
     description: result.description ? result.description.trim() : undefined
   };
 }
-async function promptForExistingProject(linkableProjects) {
-  const projectOptions = linkableProjects.map((project2) => ({
+async function promptForExistingProject(projects) {
+  const projectOptions = projects.map((project2) => ({
     value: project2,
     label: project2.name
   }));
@@ -253887,15 +253884,14 @@ async function link(ctx, options, command2) {
       successMessage: "Projects fetched",
       errorMessage: "Failed to fetch projects"
     });
-    const linkableProjects = projects.filter((p) => p.isManagedSourceCode !== true);
-    if (!linkableProjects.length) {
+    if (!projects.length) {
       return { outroMessage: "No projects available for linking" };
     }
     let linkedAppId;
     if (appId) {
-      const project2 = linkableProjects.find((p) => p.id === appId);
+      const project2 = projects.find((p) => p.id === appId);
       if (!project2) {
-        throw new InvalidInputError(`App with ID "${appId}" not found or not available for linking.`, {
+        throw new InvalidInputError(`App with ID "${appId}" not found.`, {
           hints: [
             { message: "Check the app ID is correct" },
             {
@@ -253906,7 +253902,7 @@ async function link(ctx, options, command2) {
       }
       linkedAppId = appId;
     } else {
-      const selectedProject = await promptForExistingProject(linkableProjects);
+      const selectedProject = await promptForExistingProject(projects);
       linkedAppId = selectedProject.id;
     }
     await runTask2("Linking project...", async () => {
@@ -254951,7 +254947,7 @@ function getWorkspaceCommand() {
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
-import { dirname as dirname23, join as join29 } from "node:path";
+import { dirname as dirname21, join as join27 } from "node:path";
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -255123,79 +255119,7 @@ function createDevLogger(label2, labelColor = theme.styles.dim) {
 
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2 } from "node:child_process";
-import { dirname as dirname20, join as join26 } from "node:path";
-import { pathToFileURL as pathToFileURL6 } from "node:url";
-
-// src/cli/dev/dev-server/import-map.ts
-var import_json52 = __toESM(require_lib(), 1);
-import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
-import { dirname as dirname19, join as join25, parse as parsePath } from "node:path";
 import { pathToFileURL } from "node:url";
-var DENO_CONFIG_NAMES = ["deno.json", "deno.jsonc"];
-function findDenoConfig(startDir) {
-  const { root: root2 } = parsePath(startDir);
-  let dir = startDir;
-  while (true) {
-    for (const name2 of DENO_CONFIG_NAMES) {
-      const candidate = join25(dir, name2);
-      if (existsSync2(candidate))
-        return candidate;
-    }
-    if (dir === root2)
-      return null;
-    const parent = dirname19(dir);
-    if (parent === dir)
-      return null;
-    dir = parent;
-  }
-}
-function absolutize(value, baseUrl) {
-  if (!value.startsWith("./") && !value.startsWith("../"))
-    return value;
-  return new URL(value, baseUrl).href;
-}
-function absolutizeEntries(entries, baseUrl) {
-  return Object.fromEntries(Object.entries(entries).map(([key2, value]) => [
-    absolutize(key2, baseUrl),
-    absolutize(value, baseUrl)
-  ]));
-}
-function readImportMap(filePath) {
-  const parsed = import_json52.default.parse(readFileSync3(filePath, "utf-8"));
-  if (!parsed || typeof parsed !== "object")
-    return {};
-  const { imports, scopes } = parsed;
-  return { imports, scopes };
-}
-function buildImportMapArg(baseImportMapPath, projectDir) {
-  const baseUrl = pathToFileURL(baseImportMapPath).href;
-  const base = readImportMap(baseImportMapPath);
-  const merged = {
-    imports: absolutizeEntries(base.imports ?? {}, baseUrl),
-    scopes: {}
-  };
-  const projectConfigPath = findDenoConfig(projectDir);
-  if (projectConfigPath) {
-    const projectUrl = pathToFileURL(projectConfigPath).href;
-    let project2 = {};
-    try {
-      project2 = readImportMap(projectConfigPath);
-    } catch {
-      project2 = {};
-    }
-    merged.imports = {
-      ...absolutizeEntries(project2.imports ?? {}, projectUrl),
-      ...merged.imports
-    };
-    for (const [scope, entries] of Object.entries(project2.scopes ?? {})) {
-      merged.scopes[absolutize(scope, projectUrl)] = absolutizeEntries(entries, projectUrl);
-    }
-  }
-  const json3 = JSON.stringify(merged);
-  return `data:application/json,${encodeURIComponent(json3)}`;
-}
-
-// src/cli/dev/dev-server/function-manager.ts
 var READY_TIMEOUT = 30000;
 
 class FunctionManager {
@@ -255278,11 +255202,10 @@ class FunctionManager {
   }
   spawnFunction(func, port) {
     this.logger.log(`Spawning function "${func.name}" on port ${port}`);
-    const importMapArg = buildImportMapArg(join26(dirname20(this.wrapperPath), "import-map.json"), globalThis.process.cwd());
-    const process21 = spawn2("deno", ["run", "--allow-all", "--import-map", importMapArg, this.wrapperPath], {
+    const process21 = spawn2("deno", ["run", "--allow-all", this.wrapperPath], {
       env: {
         ...globalThis.process.env,
-        FUNCTION_PATH: pathToFileURL6(func.entryPath).href,
+        FUNCTION_PATH: pathToFileURL(func.entryPath).href,
         FUNCTION_PORT: String(port),
         FUNCTION_NAME: func.name
       },
@@ -257382,9 +257305,9 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname22 = sp2.dirname(file2);
+    const dirname20 = sp2.dirname(file2);
     const basename7 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname22);
+    const parent = this.fsw._getWatchedDir(dirname20);
     let prevStats = stats;
     if (parent.has(basename7))
       return;
@@ -257411,7 +257334,7 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname22, basename7);
+          this.fsw._remove(dirname20, basename7);
         }
       } else if (parent.has(basename7)) {
         const at13 = newStats.atimeMs;
@@ -258444,8 +258367,8 @@ async function createDevServer(options8) {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: join29(dirname23(project2.configPath), project2.functionsDir),
-    entities: join29(dirname23(project2.configPath), project2.entitiesDir)
+    functions: join27(dirname21(project2.configPath), project2.functionsDir),
+    entities: join27(dirname21(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
@@ -258840,7 +258763,7 @@ var import_detect_agent = __toESM(require_dist5(), 1);
 import { release, type } from "node:os";
 
 // ../../node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname24, posix, sep } from "path";
+import { dirname as dirname22, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -258849,7 +258772,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname24(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname22(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -263038,9 +262961,9 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
   });
 }
 // src/cli/index.ts
-var __dirname4 = dirname25(fileURLToPath6(import.meta.url));
+var __dirname4 = dirname23(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join30(__dirname4, "../assets"));
+  ensureNpmAssets(join28(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const jsonMode = process.argv.includes("--json");
@@ -263079,4 +263002,4 @@ export {
   CLIExitError
 };
 
-//# debugId=81AA053654470EFC64756E2164756E21
+//# debugId=E927ADA2FAB329A664756E2164756E21