@base44-preview/cli 0.1.5-pr.576.161be22 → 0.1.5-pr.576.58ab8ee

package/dist/assets/backend-runtime/base44-runtime.ts

@@ -3,54 +3,60 @@
  *
  * Deployed backend functions import this module by its bare specifier
  * (`import { secrets } from "base44:runtime"`). No such module exists on a
- * developer machine, so `deno.json` maps the specifier onto this file and
+ * developer machine, so `import-map.json` maps the specifier onto this file and
  * `base44 dev` hands that import map to the Deno subprocess.
  *
- * The surface mirrors production; the deliberate differences are called out on
- * each export below.
+ * Like the deployed module, this is only a delegator: it holds no state and
+ * reads no environment. Everything is served by the `globalThis.Base44` bridge
+ * that the host installs before loading the function — `main.ts` locally, the
+ * generated Worker entry when deployed. Keeping the two the same shape means a
+ * change to what a secret *is* only touches the host, never this file.
  */
 
+/** Contract the host installs on `globalThis.Base44`. */
+export interface Base44Bridge {
+  waitUntil(promise: Promise<unknown>): void;
+  secrets: { get(name: string): string | undefined };
+}
+
+function bridge(): Base44Bridge {
+  const installed = (globalThis as { Base44?: Base44Bridge }).Base44;
+  if (!installed) {
+    throw new Error(
+      'base44:runtime was imported without a Base44 function host. It is only available inside a backend function — "base44 dev" installs the bridge before loading your code.',
+    );
+  }
+  return installed;
+}
+
 /**
  * App secrets.
  *
- * Deployed, these are read from the Worker env binding of the current request.
- * Locally they come from the environment `base44 dev` was started with —
- * values stored with `base44 secrets set` are deliberately not fetched, so a
- * production secret is never copied onto a developer machine. Export the
- * variable in your shell to exercise a function that reads it.
+ * Deployed, these come from the Worker env binding of the current request.
+ * Locally the host reads them from the environment `base44 dev` was started
+ * with, so a production secret is never copied onto a developer machine —
+ * export the variable in your shell to exercise a function that reads it.
  *
  * Returns `undefined` for an unset name rather than throwing, matching the
- * deployed signature. Code that needs a secret should construct inside the
+ * deployed signature. Code needing a secret should construct inside the
  * handler: at module scope a client built from `undefined` throws during boot,
  * where no try/catch is reached and nothing is logged.
  */
 export const secrets: { get(name: string): string | undefined } = {
   get(name: string): string | undefined {
-    return Deno.env.get(name);
+    return bridge().secrets.get(name);
   },
 };
 
-// Holds a strong reference to in-flight work so a floating promise cannot be
-// collected before it settles.
-const pending = new Set<Promise<unknown>>();
-
 /**
  * Continue work after the response has been sent.
  *
  * Deployed, this rides `ctx.waitUntil` to extend the invocation until the
- * promise settles. Locally the function is a long-lived server process, so
- * there is nothing to hold open; the promise is tracked only so a rejection is
- * reported against the function instead of surfacing as an unhandled
- * rejection. Returns the same promise so it composes, as in production.
+ * promise settles. Locally the function is a long-lived server process, so the
+ * host has nothing to hold open and only reports rejections. Returns the same
+ * promise either way, so it composes.
  */
 export function waitUntil<T>(promise: Promise<T>): Promise<T> {
-  const tracked = Promise.resolve(promise)
-    .catch((error: unknown) => {
-      console.error("[base44:runtime] waitUntil task failed:", error);
-    })
-    .finally(() => {
-      pending.delete(tracked);
-    });
-  pending.add(tracked);
+  bridge().waitUntil(promise);
   return promise;
 }

package/dist/assets/backend-runtime/main.ts

@@ -20,6 +20,8 @@
 // Make this file a module for top-level await support
 export {};
 
+import type { Base44Bridge } from "./base44-runtime.ts";
+
 const functionPath = Deno.env.get("FUNCTION_PATH");
 const port = parseInt(Deno.env.get("FUNCTION_PORT") || "8000", 10);
 const functionName = Deno.env.get("FUNCTION_NAME") || "unknown";
@@ -81,6 +83,37 @@ Object.defineProperty(Deno, "serve", {
   configurable: true,
 });
 
+// Local stand-in for the bridge the deployed Worker entry installs. It must be
+// in place before the function is imported, because module-scope code may read
+// a secret. Deployed, secrets come from the request's Worker env binding and
+// `waitUntil` rides `ctx.waitUntil`; locally secrets come from this process's
+// environment and the server is long-lived, so there is nothing to hold open —
+// in-flight work is only tracked so a rejection is reported against the
+// function instead of surfacing as an unhandled rejection.
+const inFlight = new Set<Promise<unknown>>();
+
+const base44Bridge: Base44Bridge = {
+  secrets: {
+    get: (name: string) => Deno.env.get(name),
+  },
+  waitUntil: (promise: Promise<unknown>) => {
+    const tracked = Promise.resolve(promise)
+      .catch((error: unknown) => {
+        console.error(`[${functionName}] waitUntil task failed:`, error);
+      })
+      .finally(() => {
+        inFlight.delete(tracked);
+      });
+    inFlight.add(tracked);
+  },
+};
+
+Object.defineProperty(globalThis, "Base44", {
+  value: base44Bridge,
+  writable: false,
+  configurable: true,
+});
+
 type FetchHandler = (req: Request) => Response | Promise<Response>;
 
 /**

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 join26(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 dirname24, join as join29 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -253808,7 +253808,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 +253845,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 +253887,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 +253905,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 +254950,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 dirname22, join as join28 } from "node:path";
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -255123,79 +255122,8 @@ 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 { dirname as dirname19, join as join25 } 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 +255206,11 @@ 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 importMapPath = join25(dirname19(this.wrapperPath), "import-map.json");
+    const process21 = spawn2("deno", ["run", "--allow-all", "--import-map", importMapPath, 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 +257310,9 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname22 = sp2.dirname(file2);
+    const dirname21 = sp2.dirname(file2);
     const basename7 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname22);
+    const parent = this.fsw._getWatchedDir(dirname21);
     let prevStats = stats;
     if (parent.has(basename7))
       return;
@@ -257411,7 +257339,7 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname22, basename7);
+          this.fsw._remove(dirname21, basename7);
         }
       } else if (parent.has(basename7)) {
         const at13 = newStats.atimeMs;
@@ -258444,8 +258372,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: join28(dirname22(project2.configPath), project2.functionsDir),
+    entities: join28(dirname22(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
@@ -258840,7 +258768,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 dirname23, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -258849,7 +258777,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] ? dirname23(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -263038,9 +262966,9 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
   });
 }
 // src/cli/index.ts
-var __dirname4 = dirname25(fileURLToPath6(import.meta.url));
+var __dirname4 = dirname24(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join30(__dirname4, "../assets"));
+  ensureNpmAssets(join29(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const jsonMode = process.argv.includes("--json");
@@ -263079,4 +263007,4 @@ export {
   CLIExitError
 };
 
-//# debugId=81AA053654470EFC64756E2164756E21
+//# debugId=DEC46CF3A56ABD6664756E2164756E21