@base44-preview/cli 0.0.38-pr.362.72930b8 → 0.0.38-pr.362.db7a625

package/dist/{deno-runtime → assets/deno-runtime}/main.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
-  "sources": ["../../deno-runtime/main.ts"],
+  "sources": ["../../../deno-runtime/main.ts"],
   "sourcesContent": [
     "/**\n * Deno Function Wrapper\n *\n * This script is executed by Deno to run user functions.\n * It patches Deno.serve to inject a dynamic port before importing the user's function.\n *\n * Environment variables:\n * - FUNCTION_PATH: Absolute path to the user's function entry file\n * - FUNCTION_PORT: Port number for the function to listen on\n * - FUNCTION_NAME: Name of the function (for logging)\n */\n\n// Make this file a module for top-level await support\nexport {};\n\nconst functionPath = Deno.env.get(\"FUNCTION_PATH\");\nconst port = parseInt(Deno.env.get(\"FUNCTION_PORT\") || \"8000\", 10);\nconst functionName = Deno.env.get(\"FUNCTION_NAME\") || \"unknown\";\n\nif (!functionPath) {\n  console.error(\"[wrapper] FUNCTION_PATH environment variable is required\");\n  Deno.exit(1);\n}\n\n// Store the original Deno.serve\nconst originalServe = Deno.serve.bind(Deno);\n\n// Patch Deno.serve to inject our port and add onListen callback\n// @ts-expect-error - We're intentionally overriding Deno.serve\nDeno.serve = (\n  optionsOrHandler:\n    | Deno.ServeOptions\n    | Deno.ServeHandler\n    | (Deno.ServeOptions & { handler: Deno.ServeHandler }),\n  maybeHandler?: Deno.ServeHandler,\n): Deno.HttpServer<Deno.NetAddr> => {\n  const onListen = () => {\n    // This message is used by FunctionManager to detect when the function is ready\n    console.log(`[${functionName}] Listening on http://localhost:${port}`);\n  };\n\n  // Handle the different Deno.serve signatures:\n  // 1. Deno.serve(handler)\n  // 2. Deno.serve(options, handler)\n  // 3. Deno.serve({ ...options, handler })\n  if (typeof optionsOrHandler === \"function\") {\n    // Signature: Deno.serve(handler)\n    return originalServe({ port, onListen }, optionsOrHandler);\n  }\n\n  if (maybeHandler) {\n    // Signature: Deno.serve(options, handler)\n    return originalServe({ ...optionsOrHandler, port, onListen }, maybeHandler);\n  }\n\n  // Signature: Deno.serve({ ...options, handler })\n  const options = optionsOrHandler as Deno.ServeOptions & {\n    handler: Deno.ServeHandler;\n  };\n  return originalServe({ ...options, port, onListen });\n};\n\nconsole.log(`[${functionName}] Starting function from ${functionPath}`);\n\n// Dynamically import the user's function\n// The function will call Deno.serve which is now patched to use our port\ntry {\n  await import(functionPath);\n} catch (error) {\n  console.error(`[${functionName}] Failed to load function:`, error);\n  Deno.exit(1);\n}\n"
   ],

package/dist/cli/index.js

@@ -206944,7 +206944,7 @@ var require_buffer_list = __commonJS((exports, module) => {
       }
     }, {
       key: "join",
-      value: function join16(s5) {
+      value: function join15(s5) {
         if (this.length === 0)
           return "";
         var p4 = this.head;
@@ -226140,12 +226140,6 @@ import { homedir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-// src/core/assets.ts
-var assetsDir;
-function getAssetsDir() {
-  return assetsDir;
-}
-
 // src/core/consts.ts
 var PROJECT_SUBDIR = "base44";
 var CONFIG_FILE_EXTENSION = "jsonc";
@@ -226223,14 +226217,18 @@ function getBase44GlobalDir() {
 function getAuthFilePath() {
   return join(getBase44GlobalDir(), "auth", "auth.json");
 }
-function getTemplatesDir() {
-  const assets = getAssetsDir();
-  if (assets)
-    return join(assets, "templates");
-  return join(__dirname2, "../templates");
+function getTemplatesDir(assetsDir) {
+  if (assetsDir)
+    return join(assetsDir, "templates");
+  return join(__dirname2, "../assets/templates");
+}
+function getTemplatesIndexPath(assetsDir) {
+  return join(getTemplatesDir(assetsDir), "templates.json");
 }
-function getTemplatesIndexPath() {
-  return join(getTemplatesDir(), "templates.json");
+function getDenoWrapperPath(assetsDir) {
+  if (assetsDir)
+    return join(assetsDir, "deno-runtime", "main.js");
+  return join(__dirname2, "../assets/deno-runtime/main.js");
 }
 function getAppConfigPath(projectRoot) {
   return join(projectRoot, PROJECT_SUBDIR, ".app.jsonc");
@@ -234233,16 +234231,17 @@ async function readAppConfig(projectRoot) {
 var import_ejs = __toESM(require_ejs(), 1);
 var import_front_matter = __toESM(require_front_matter(), 1);
 import { dirname as dirname7, join as join7 } from "node:path";
-async function listTemplates() {
-  const parsed = await readJsonFile(getTemplatesIndexPath());
+async function listTemplates(assetsDir) {
+  const indexPath = getTemplatesIndexPath(assetsDir);
+  const parsed = await readJsonFile(indexPath);
   const result = TemplatesConfigSchema.safeParse(parsed);
   if (!result.success) {
-    throw new SchemaValidationError("Invalid templates configuration", result.error, getTemplatesIndexPath());
+    throw new SchemaValidationError("Invalid templates configuration", result.error, indexPath);
   }
   return result.data.templates;
 }
-async function renderTemplate(template, destPath, data) {
-  const templateDir = join7(getTemplatesDir(), template.path);
+async function renderTemplate(template, destPath, data, assetsDir) {
+  const templateDir = join7(getTemplatesDir(assetsDir), template.path);
   const files = await globby("**/*", {
     cwd: templateDir,
     dot: true,
@@ -234279,14 +234278,10 @@ async function assertProjectNotExists(dirPath) {
   }
 }
 async function createProjectFiles(options) {
-  const { name: name2, description, path: basePath, template } = options;
+  const { name: name2, description, path: basePath, template, assetsDir } = options;
   await assertProjectNotExists(basePath);
   const { projectId } = await createProject(name2, description);
-  await renderTemplate(template, basePath, {
-    name: name2,
-    description,
-    projectId
-  });
+  await renderTemplate(template, basePath, { name: name2, description, projectId }, assetsDir);
   return {
     projectId,
     projectDir: basePath
@@ -241957,8 +241952,8 @@ var package_default = {
     "bin"
   ],
   scripts: {
-    build: "bun run clean && cp -r templates dist/ && bun run infra/build.ts",
-    "build:watch": "bun run clean && cp -r templates dist/ && bun run infra/build.ts --watch",
+    build: "bun run clean && mkdir -p dist/assets && cp -r templates dist/assets/ && bun run infra/build.ts",
+    "build:watch": "bun run clean && mkdir -p dist/assets && cp -r templates dist/assets/ && bun run infra/build.ts --watch",
     typecheck: "tsc --noEmit",
     dev: "./bin/dev.ts",
     start: "./bin/run.js",
@@ -243145,8 +243140,8 @@ function getFunctionsDeployCommand(context) {
 import { basename as basename3, join as join11, resolve as resolve2 } from "node:path";
 var import_kebabCase = __toESM(require_kebabCase(), 1);
 var DEFAULT_TEMPLATE_ID = "backend-only";
-async function getTemplateById(templateId) {
-  const templates = await listTemplates();
+async function getTemplateById(templateId, assetsDir) {
+  const templates = await listTemplates(assetsDir);
   const template2 = templates.find((t) => t.id === templateId);
   if (!template2) {
     const validIds = templates.map((t) => t.id).join(", ");
@@ -243162,8 +243157,8 @@ function validateNonInteractiveFlags(command) {
     command.error("Non-interactive mode requires all flags: --name, --path");
   }
 }
-async function createInteractive(options) {
-  const templates = await listTemplates();
+async function createInteractive(options, assetsDir) {
+  const templates = await listTemplates(assetsDir);
   const templateOptions = templates.map((t) => ({
     value: t,
     label: t.name,
@@ -243204,10 +243199,10 @@ async function createInteractive(options) {
     deploy: options.deploy,
     skills: options.skills,
     isInteractive: true
-  });
+  }, assetsDir);
 }
-async function createNonInteractive(options) {
-  const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID);
+async function createNonInteractive(options, assetsDir) {
+  const template2 = await getTemplateById(options.template ?? DEFAULT_TEMPLATE_ID, assetsDir);
   return await executeCreate({
     template: template2,
     name: options.name,
@@ -243215,7 +243210,7 @@ async function createNonInteractive(options) {
     deploy: options.deploy,
     skills: options.skills,
     isInteractive: false
-  });
+  }, assetsDir);
 }
 async function executeCreate({
   template: template2,
@@ -243225,7 +243220,7 @@ async function executeCreate({
   deploy: deploy5,
   skills,
   isInteractive
-}) {
+}, assetsDir) {
   const name2 = rawName.trim();
   const resolvedPath = resolve2(projectPath);
   const { projectId } = await runTask("Setting up your project...", async () => {
@@ -243233,7 +243228,8 @@ async function executeCreate({
       name: name2,
       description: description?.trim(),
       path: resolvedPath,
-      template: template2
+      template: template2,
+      assetsDir
     });
   }, {
     successMessage: theme.colors.base44Orange("Project created successfully"),
@@ -243311,9 +243307,9 @@ function getCreateCommand(context) {
   return new Command("create").description("Create a new Base44 project").addArgument(new Argument("name", "Project name").argOptional()).option("-p, --path <path>", "Path where to create the project").option("-t, --template <id>", "Template ID (e.g., backend-only, backend-and-client)").option("--deploy", "Build and deploy the site").option("--no-skills", "Skip AI agent skills installation").hook("preAction", validateNonInteractiveFlags).action(async (name2, options) => {
     const isNonInteractive = !!(options.name ?? name2) && !!options.path;
     if (isNonInteractive) {
-      await runCommand(() => createNonInteractive({ name: options.name ?? name2, ...options }), { requireAuth: true, requireAppConfig: false }, context);
+      await runCommand(() => createNonInteractive({ name: options.name ?? name2, ...options }, context.assetsDir), { requireAuth: true, requireAppConfig: false }, context);
     } else {
-      await runCommand(() => createInteractive({ name: name2, ...options }), { fullBanner: true, requireAuth: true, requireAppConfig: false }, context);
+      await runCommand(() => createInteractive({ name: name2, ...options }, context.assetsDir), { fullBanner: true, requireAuth: true, requireAppConfig: false }, context);
     }
   });
 }
@@ -243950,7 +243946,7 @@ function getTypesCommand(context) {
 }
 
 // src/cli/dev/dev-server/main.ts
-import { dirname as dirname15, join as join18 } from "node:path";
+import { dirname as dirname14, join as join17 } from "node:path";
 var import_cors = __toESM(require_lib4(), 1);
 var import_express4 = __toESM(require_express(), 1);
 
@@ -244109,10 +244105,6 @@ function createDevLogger() {
 
 // src/cli/dev/dev-server/function-manager.ts
 import { spawn as spawn2, spawnSync as spawnSync2 } from "node:child_process";
-import { dirname as dirname12, join as join15 } from "node:path";
-import { fileURLToPath as fileURLToPath7 } from "node:url";
-var __dirname5 = dirname12(fileURLToPath7(import.meta.url));
-var WRAPPER_PATH = getAssetsDir() ? join15(getAssetsDir(), "deno-runtime", "main.js") : join15(__dirname5, "../deno-runtime/main.js");
 var READY_TIMEOUT = 30000;
 
 class FunctionManager {
@@ -244120,9 +244112,11 @@ class FunctionManager {
   running = new Map;
   starting = new Map;
   logger;
-  constructor(functions, logger) {
+  wrapperPath;
+  constructor(functions, logger, wrapperPath) {
     this.functions = new Map(functions.map((f7) => [f7.name, f7]));
     this.logger = logger;
+    this.wrapperPath = wrapperPath;
     if (functions.length > 0) {
       this.verifyDenoIsInstalled();
     }
@@ -244195,7 +244189,7 @@ class FunctionManager {
   }
   spawnFunction(func, port) {
     this.logger.log(`Spawning function "${func.name}" on port ${port}`);
-    const process21 = spawn2("deno", ["run", "--allow-all", WRAPPER_PATH], {
+    const process21 = spawn2("deno", ["run", "--allow-all", this.wrapperPath], {
       env: {
         ...globalThis.process.env,
         FUNCTION_PATH: func.entryPath,
@@ -245416,9 +245410,9 @@ class NodeFsHandler {
     if (this.fsw.closed) {
       return;
     }
-    const dirname14 = sp2.dirname(file2);
+    const dirname13 = sp2.dirname(file2);
     const basename5 = sp2.basename(file2);
-    const parent = this.fsw._getWatchedDir(dirname14);
+    const parent = this.fsw._getWatchedDir(dirname13);
     let prevStats = stats;
     if (parent.has(basename5))
       return;
@@ -245445,7 +245439,7 @@ class NodeFsHandler {
             prevStats = newStats2;
           }
         } catch (error48) {
-          this.fsw._remove(dirname14, basename5);
+          this.fsw._remove(dirname13, basename5);
         }
       } else if (parent.has(basename5)) {
         const at13 = newStats.atimeMs;
@@ -246406,7 +246400,7 @@ async function createDevServer(options8) {
     next();
   });
   const devLogger = createDevLogger();
-  const functionManager = new FunctionManager(functions, devLogger);
+  const functionManager = new FunctionManager(functions, devLogger, options8.denoWrapperPath);
   const functionRoutes = createFunctionRouter(functionManager, devLogger);
   app.use("/api/apps/:appId/functions", functionRoutes);
   if (functionManager.getFunctionNames().length > 0) {
@@ -246448,8 +246442,8 @@ async function createDevServer(options8) {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: join18(dirname15(project2.configPath), project2.functionsDir),
-    entities: join18(dirname15(project2.configPath), project2.entitiesDir)
+    functions: join17(dirname14(project2.configPath), project2.functionsDir),
+    entities: join17(dirname14(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
@@ -246493,10 +246487,11 @@ async function createDevServer(options8) {
 }
 
 // src/cli/commands/dev.ts
-async function devAction(options8) {
+async function devAction(options8, context) {
   const port = options8.port ? Number(options8.port) : undefined;
   const { port: resolvedPort } = await createDevServer({
     port,
+    denoWrapperPath: getDenoWrapperPath(context.assetsDir),
     loadResources: async () => {
       const { functions, entities, project: project2 } = await readProjectConfig();
       return { functions, entities, project: project2 };
@@ -246508,7 +246503,7 @@ async function devAction(options8) {
 }
 function getDevCommand(context) {
   return new Command("dev").description("Start the development server").option("-p, --port <number>", "Port for the development server").action(async (options8) => {
-    await runCommand(() => devAction(options8), { requireAuth: true }, context);
+    await runCommand(() => devAction(options8, context), { requireAuth: true }, context);
   });
 }
 
@@ -246638,7 +246633,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 dirname16, posix, sep } from "path";
+import { dirname as dirname15, posix, sep } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -246647,7 +246642,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname16(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname15(process.argv[1]) : process.cwd(), isWindows5 = sep === "\\") {
   const normalizedBase = isWindows5 ? normalizeWindowsPath2(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -250836,11 +250831,15 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
   });
 }
 // src/cli/index.ts
-async function runCLI() {
+async function runCLI(options8) {
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const isNonInteractive = !process.stdin.isTTY || !process.stdout.isTTY;
-  const context = { errorReporter, isNonInteractive };
+  const context = {
+    errorReporter,
+    isNonInteractive,
+    assetsDir: options8?.assetsDir
+  };
   const program2 = createProgram(context);
   try {
     const userInfo = await readAuth();
@@ -250865,4 +250864,4 @@ export {
   CLIExitError
 };
 
-//# debugId=16BBB389AA548E0B64756E2164756E21
+//# debugId=D0A2D98BCA9348F864756E2164756E21