@base44-preview/cli 0.1.1-pr.555.5e8fb00 → 0.1.1-pr.555.77b65cb

package/dist/cli/index.js

@@ -163947,7 +163947,7 @@ var require_view = __commonJS((exports, module) => {
   var dirname22 = path18.dirname;
   var basename7 = path18.basename;
   var extname2 = path18.extname;
-  var join27 = path18.join;
+  var join28 = path18.join;
   var resolve12 = path18.resolve;
   module.exports = View;
   function View(name2, options8) {
@@ -164009,12 +164009,12 @@ var require_view = __commonJS((exports, module) => {
   };
   View.prototype.resolve = function resolve13(dir, file2) {
     var ext = this.ext;
-    var path19 = join27(dir, file2);
+    var path19 = join28(dir, file2);
     var stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
     }
-    path19 = join27(dir, basename7(file2, ext), "index" + ext);
+    path19 = join28(dir, basename7(file2, ext), "index" + ext);
     stat2 = tryStat(path19);
     if (stat2 && stat2.isFile()) {
       return path19;
@@ -167709,7 +167709,7 @@ var require_send = __commonJS((exports, module) => {
   var Stream2 = __require("stream");
   var util2 = __require("util");
   var extname2 = path18.extname;
-  var join27 = path18.join;
+  var join28 = path18.join;
   var normalize2 = path18.normalize;
   var resolve12 = path18.resolve;
   var sep = path18.sep;
@@ -167881,7 +167881,7 @@ var require_send = __commonJS((exports, module) => {
         return res;
       }
       parts = path19.split(sep);
-      path19 = normalize2(join27(root2, path19));
+      path19 = normalize2(join28(root2, path19));
     } else {
       if (UP_PATH_REGEXP.test(path19)) {
         debug('malicious path "%s"', path19);
@@ -168021,7 +168021,7 @@ var require_send = __commonJS((exports, module) => {
           return self2.onStatError(err);
         return self2.error(404);
       }
-      var p4 = join27(path19, self2._index[i5]);
+      var p4 = join28(path19, self2._index[i5]);
       debug('stat "%s"', p4);
       fs28.stat(p4, function(err2, stat2) {
         if (err2)
@@ -214616,7 +214616,7 @@ var require_buffer_list = __commonJS((exports, module) => {
       }
     }, {
       key: "join",
-      value: function join27(s5) {
+      value: function join28(s5) {
         if (this.length === 0)
           return "";
         var p4 = this.head;
@@ -234018,7 +234018,7 @@ function normalizeBase44Env() {
 loadProjectEnvFiles();
 
 // src/cli/index.ts
-import { dirname as dirname26, join as join30 } from "node:path";
+import { dirname as dirname26, join as join31 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 
 // ../../node_modules/@clack/core/dist/index.mjs
@@ -243758,8 +243758,9 @@ var RealtimeHandlerConfigSchema = exports_external.object({
   entry: exports_external.string().min(1)
 });
 var RealtimeHandlerSchemaFileSchema = exports_external.object({
-  inbound: exports_external.unknown().optional(),
-  outbound: exports_external.unknown().optional()
+  types: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+  toClient: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+  toServer: exports_external.record(exports_external.string(), exports_external.unknown()).optional()
 });
 var DeployRealtimeHandlerResponseSchema = exports_external.object({
   status: exports_external.enum(["deployed", "unchanged"]),
@@ -243777,7 +243778,7 @@ async function deploySingleRealtimeHandler(name2, payload) {
   const appClient = getAppClient();
   let response;
   try {
-    response = await appClient.put(`backend-functions/${encodeURIComponent(name2)}`, { json: payload, timeout: false });
+    response = await appClient.put(`realtime-handlers/${encodeURIComponent(name2)}`, { json: payload, timeout: false });
   } catch (error48) {
     throw await ApiError.fromHttpError(error48, `deploying realtime handler "${name2}"`);
   }
@@ -243807,14 +243808,15 @@ async function readRealtimeHandler(entryFile, realtimeDir) {
   }
   const entry = basename4(entryFile);
   const schemaPath = join10(handlerDir, "schema.jsonc");
-  let messageSchema = undefined;
+  let messageSchema;
   if (await pathExists(schemaPath)) {
     const parsed = await readJsonFile(schemaPath);
     const result = RealtimeHandlerSchemaFileSchema.safeParse(parsed);
     if (result.success) {
       messageSchema = {
-        inbound: result.data.inbound,
-        outbound: result.data.outbound
+        types: result.data.types,
+        toClient: result.data.toClient,
+        toServer: result.data.toServer
       };
     }
   }
@@ -254675,6 +254677,7 @@ function getSiteCommand() {
 // src/core/types/generator.ts
 var import_common_tags = __toESM(require_lib2(), 1);
 var import_json_schema_to_typescript = __toESM(require_src3(), 1);
+import { join as join26 } from "node:path";
 var HEADER2 = import_common_tags.stripIndent`
   // Auto-generated by Base44 CLI - DO NOT EDIT
   // Regenerate with: base44 types generate
@@ -254691,16 +254694,32 @@ var EMPTY_TEMPLATE = import_common_tags.stripIndent`
     // No types to augment - add resources and regenerate
   }
 `;
+var SDK_PACKAGE_NAMES = ["@base44/sdk", "@base44-preview/sdk"];
+async function detectSdkPackageName(projectRoot) {
+  try {
+    const pkg = await readJsonFile(join26(projectRoot, "package.json"));
+    const deps = {
+      ...pkg.dependencies,
+      ...pkg.devDependencies
+    };
+    for (const name2 of SDK_PACKAGE_NAMES) {
+      if (name2 in deps)
+        return name2;
+    }
+  } catch {}
+  return "@base44/sdk";
+}
 async function generateTypesFile(input) {
   const content = await generateContent(input);
   await writeFile(getTypesOutputPath(input.projectRoot), content);
 }
 async function generateContent(input) {
   const { entities, functions, agents, connectors, realtimeHandlers } = input;
+  const sdkPackage = await detectSdkPackageName(input.projectRoot);
   if (!entities.length && !functions.length && !agents.length && !connectors.length && !realtimeHandlers.length) {
     return EMPTY_TEMPLATE;
   }
-  const [entityInterfaces, realtimeRegistryEntries] = await Promise.all([
+  const [entityInterfaces, realtimeResults] = await Promise.all([
     Promise.all(entities.map((e8) => compileEntity(e8))),
     Promise.all(realtimeHandlers.map((h5) => compileRealtimeHandler(h5)))
   ]);
@@ -254718,20 +254737,25 @@ async function generateContent(input) {
     ],
     [
       "RealtimeHandlerRegistry",
-      realtimeHandlers.filter((h5) => h5.messageSchema).map((h5, _10, arr) => {
+      realtimeHandlers.filter((h5) => h5.messageSchema).map((h5) => {
         const idx = realtimeHandlers.indexOf(h5);
-        return `"${h5.name}": ${realtimeRegistryEntries[idx]};`;
+        return `"${h5.name}": ${realtimeResults[idx].entry};`;
       })
     ]
   ];
   const registries2 = registryEntries.filter(([, entries]) => entries.length > 0).map(([name2, entries]) => registry2(name2, entries));
+  const realtimeInterfaces = realtimeResults.map((r5) => r5.decls).filter(Boolean);
   return [
     HEADER2,
+    "export {};",
     entityInterfaces.join(`
 
+`),
+    realtimeInterfaces.join(`
+
 `),
     import_common_tags.source`
-      declare module '@base44/sdk' {
+      declare module '${sdkPackage}' {
         ${registries2.join(`
 
 `)}
@@ -254761,29 +254785,75 @@ async function compileEntity(entity2) {
 }
 async function compileRealtimeHandler(handler) {
   const { messageSchema } = handler;
-  if (!messageSchema)
-    return "{ inbound: unknown; outbound: unknown }";
-  const compileSchema = async (schema11, typeName) => {
-    if (!schema11)
-      return "unknown";
-    try {
-      const ts8 = await import_json_schema_to_typescript.compile(schema11, typeName, {
-        bannerComment: "",
-        additionalProperties: false,
-        strictIndexSignatures: true
-      });
-      const match = ts8.match(/\{([^]*)\}/);
-      return match ? `{
-${match[1]}}` : "unknown";
-    } catch {
-      return "unknown";
-    }
+  if (!messageSchema) {
+    return { decls: "", entry: "{ toClient: unknown; toServer: unknown }" };
+  }
+  const prefix = toPascalCase(handler.name);
+  const types = messageSchema.types ?? {};
+  const toClient = messageSchema.toClient ?? {};
+  const toServer = messageSchema.toServer ?? {};
+  const typeName = (key2) => `${prefix}${toPascalCase(key2)}`;
+  const msgName = (dir, key2) => `${prefix}${dir}${toPascalCase(key2)}`;
+  const defs = {};
+  const add = (name2, schema11) => {
+    if (name2 in defs) {
+      throw new TypeGenerationError(`Duplicate generated type "${name2}" in realtime handler "${handler.name}" — a shared type and a message resolve to the same name.`, handler.name);
+    }
+    defs[name2] = { ...schema11, title: name2 };
+  };
+  for (const [key2, schema11] of Object.entries(types)) {
+    add(typeName(key2), rewriteTypeRefs(schema11, typeName));
+  }
+  const compileMessages = (msgs, dir) => Object.entries(msgs).map(([key2, schema11]) => {
+    const name2 = msgName(dir, key2);
+    const rewritten = rewriteTypeRefs(schema11, typeName);
+    add(name2, {
+      type: "object",
+      ...rewritten,
+      properties: { type: { const: key2 }, ...rewritten.properties ?? {} },
+      required: ["type", ...rewritten.required ?? []],
+      additionalProperties: false
+    });
+    return name2;
+  });
+  const toClientNames = compileMessages(toClient, "ToClient");
+  const toServerNames = compileMessages(toServer, "ToServer");
+  const allNames = [...toClientNames, ...toServerNames];
+  const rootName = `${prefix}Message`;
+  const rootSchema = {
+    title: rootName,
+    $defs: defs,
+    oneOf: allNames.map((n5) => ({ $ref: `#/$defs/${n5}` }))
   };
-  const [inbound, outbound] = await Promise.all([
-    compileSchema(messageSchema.inbound, `${handler.name}Inbound`),
-    compileSchema(messageSchema.outbound, `${handler.name}Outbound`)
-  ]);
-  return `{ inbound: ${inbound}; outbound: ${outbound} }`;
+  let decls = "";
+  try {
+    decls = (await import_json_schema_to_typescript.compile(rootSchema, rootName, {
+      bannerComment: "",
+      additionalProperties: false,
+      strictIndexSignatures: true
+    })).trim();
+  } catch (error48) {
+    throw new TypeGenerationError(`Failed to generate types for realtime handler "${handler.name}"`, handler.name, error48);
+  }
+  const union2 = (names) => names.length ? names.join(" | ") : "never";
+  return {
+    decls,
+    entry: `{ toClient: ${union2(toClientNames)}; toServer: ${union2(toServerNames)} }`
+  };
+}
+function rewriteTypeRefs(node, defName) {
+  if (Array.isArray(node)) {
+    return node.map((n5) => rewriteTypeRefs(n5, defName));
+  }
+  if (node && typeof node === "object") {
+    const out = {};
+    for (const [key2, value] of Object.entries(node)) {
+      const match = key2 === "$ref" && typeof value === "string" ? value.match(/^#\/types\/(.+)$/) : null;
+      out[key2] = match ? `#/$defs/${defName(match[1])}` : rewriteTypeRefs(value, defName);
+    }
+    return out;
+  }
+  return node;
 }
 function registry2(name2, entries) {
   return import_common_tags.source`
@@ -254797,10 +254867,10 @@ function toPascalCase(name2) {
   return name2.split(/[-_\s]+/).map((w8) => w8.charAt(0).toUpperCase() + w8.slice(1)).join("");
 }
 // src/core/types/update-project.ts
-import { join as join26 } from "node:path";
+import { join as join27 } from "node:path";
 var TYPES_INCLUDE_PATH = `${PROJECT_SUBDIR}/${TYPES_OUTPUT_SUBDIR}/*.d.ts`;
 async function updateProjectConfig(projectRoot) {
-  const tsconfigPath = join26(projectRoot, "tsconfig.json");
+  const tsconfigPath = join27(projectRoot, "tsconfig.json");
   if (!await pathExists(tsconfigPath)) {
     return false;
   }
@@ -254852,7 +254922,7 @@ function getTypesCommand() {
 // src/cli/dev/dev-server/main.ts
 var import_cors = __toESM(require_lib4(), 1);
 var import_express6 = __toESM(require_express(), 1);
-import { dirname as dirname24, join as join29 } from "node:path";
+import { dirname as dirname24, join as join30 } from "node:path";
 
 // ../../node_modules/get-port/index.js
 import net from "node:net";
@@ -258272,8 +258342,8 @@ async function createDevServer(options8) {
     broadcastEntityEvent(io6, appId, entityName, event);
   };
   const base44ConfigWatcher = new WatchBase44({
-    functions: join29(dirname24(project2.configPath), project2.functionsDir),
-    entities: join29(dirname24(project2.configPath), project2.entitiesDir)
+    functions: join30(dirname24(project2.configPath), project2.functionsDir),
+    entities: join30(dirname24(project2.configPath), project2.entitiesDir)
   }, devLogger);
   base44ConfigWatcher.on("change", async (name2) => {
     try {
@@ -262839,7 +262909,7 @@ function addCommandInfoToErrorReporter(program2, errorReporter) {
 // src/cli/index.ts
 var __dirname4 = dirname26(fileURLToPath6(import.meta.url));
 async function runCLI(options8) {
-  ensureNpmAssets(join30(__dirname4, "../assets"));
+  ensureNpmAssets(join31(__dirname4, "../assets"));
   const errorReporter = new ErrorReporter;
   errorReporter.registerProcessErrorHandlers();
   const jsonMode = process.argv.includes("--json");
@@ -262878,4 +262948,4 @@ export {
   CLIExitError
 };
 
-//# debugId=EDDB07DEADDF53C864756E2164756E21
+//# debugId=89497C2C2C3F39A664756E2164756E21