@base44-preview/cli 0.1.1-pr.555.9853704 → 0.1.1-pr.555.9975160

package/dist/cli/index.js

@@ -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(),
+  inbound: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
+  outbound: 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,12 +243808,13 @@ 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 = {
+        types: result.data.types,
         inbound: result.data.inbound,
         outbound: result.data.outbound
       };
@@ -254696,7 +254698,10 @@ 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 };
+    const deps = {
+      ...pkg.dependencies,
+      ...pkg.devDependencies
+    };
     for (const name2 of SDK_PACKAGE_NAMES) {
       if (name2 in deps)
         return name2;
@@ -254714,7 +254719,7 @@ async function generateContent(input) {
   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)))
   ]);
@@ -254732,18 +254737,22 @@ 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 '${sdkPackage}' {
@@ -254776,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: "{ inbound: unknown; outbound: unknown }" };
+  }
+  const prefix = toPascalCase(handler.name);
+  const types = messageSchema.types ?? {};
+  const inbound = messageSchema.inbound ?? {};
+  const outbound = messageSchema.outbound ?? {};
+  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 inboundNames = compileMessages(inbound, "Inbound");
+  const outboundNames = compileMessages(outbound, "Outbound");
+  const allNames = [...inboundNames, ...outboundNames];
+  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: `{ inbound: ${union2(inboundNames)}; outbound: ${union2(outboundNames)} }`
+  };
+}
+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`
@@ -262893,4 +262948,4 @@ export {
   CLIExitError
 };
 
-//# debugId=33E3FAB72031407264756E2164756E21
+//# debugId=844227E4524139FD64756E2164756E21