apps 0.0.1-beta.93 → 0.0.1-beta.94

package/js/index.js

@@ -139,6 +139,31 @@ var decoderDocument = (decoder) => {
   const document = Schema_exports.toJsonSchemaDocument(decoder);
   return Schema_exports.decodeUnknownSync(JsonObject)({ ...document.schema, $defs: document.definitions });
 };
+var accountBranches = (variants) => {
+  const groups = /* @__PURE__ */ new Map();
+  for (const [accountId, schema] of variants) {
+    const key = JSON.stringify(schema);
+    const group = groups.get(key);
+    if (group === void 0) groups.set(key, { schema, first: accountId, rest: [] });
+    else group.rest.push(accountId);
+  }
+  return {
+    type: "object",
+    anyOf: [...groups.values()].map(({ schema, first, rest }, index) => ({
+      type: "object",
+      properties: {
+        accountId: rest.length === 0 ? { type: "string", const: first } : { type: "string", enum: [first, ...rest] },
+        input: nestJsonSchema(schema, `#/anyOf/${index}/properties/input`)
+      },
+      required: ["accountId", "input"]
+    }))
+  };
+};
+var outputBranches = (outputs) => ({
+  anyOf: [...new Map(outputs.map((output) => [JSON.stringify(output), output])).values()].map(
+    (output, index) => nestJsonSchema(output, `#/anyOf/${index}`)
+  )
+});
 var declaresOutput = (operation) => {
   if (operation.output !== void 0) return true;
   const property = Object.getOwnPropertyDescriptor(operation, "outputSchema");
@@ -161,20 +186,9 @@ var combineOperation = (accounts) => {
       ([accountId, operation]) => Schema_exports.Struct({ accountId: Schema_exports.Literal(accountId), input: operation.input })
     )
   );
-  const inputSchema = () => ({
-    type: "object",
-    anyOf: [...accounts].map(([accountId, operation], index) => ({
-      type: "object",
-      properties: {
-        accountId: { type: "string", const: accountId },
-        input: nestJsonSchema(
-          decoderDocument(operation.input),
-          `#/anyOf/${index}/properties/input`
-        )
-      },
-      required: ["accountId", "input"]
-    }))
-  });
+  const inputSchema = () => accountBranches(
+    [...accounts].map(([accountId, operation]) => [accountId, decoderDocument(operation.input)])
+  );
   const declaration2 = operationDeclaration({
     kind,
     ...first.description === void 0 ? {} : { description: first.description },
@@ -199,12 +213,14 @@ var combineOperation = (accounts) => {
     }
   });
   if (variants.every(declaresOutput)) {
-    const outputSchema = once(() => ({
-      anyOf: variants.flatMap((operation) => {
-        const output = outputDocument(operation);
-        return output === void 0 ? [] : [output];
-      }).map((output, index) => nestJsonSchema(output, `#/anyOf/${index}`))
-    }));
+    const outputSchema = once(
+      () => outputBranches(
+        variants.flatMap((operation) => {
+          const output = outputDocument(operation);
+          return output === void 0 ? [] : [output];
+        })
+      )
+    );
     const native2 = nativeOperation(declaration2);
     if (native2 !== void 0)
       Object.defineProperty(native2, "outputSchema", { enumerable: true, get: outputSchema });
@@ -230,23 +246,15 @@ var mergeSummary = (name, variants) => {
 };
 var merge = (name, variants) => Schema_exports.decodeUnknownSync(HostedTool)({
   ...mergeSummary(name, variants),
-  inputSchema: {
-    type: "object",
-    anyOf: variants.map(([accountId, tool], index) => ({
-      type: "object",
-      properties: {
-        accountId: { type: "string", const: accountId },
-        input: nestJsonSchema(tool.inputSchema, `#/anyOf/${index}/properties/input`)
-      },
-      required: ["accountId", "input"]
-    }))
-  },
+  inputSchema: accountBranches(
+    variants.map(([accountId, tool]) => [accountId, tool.inputSchema])
+  ),
   ...variants.every(([, tool]) => tool.outputSchema !== void 0) ? {
-    outputSchema: {
-      anyOf: variants.flatMap(
-        ([, tool], index) => tool.outputSchema === void 0 ? [] : [nestJsonSchema(tool.outputSchema, `#/anyOf/${index}`)]
+    outputSchema: outputBranches(
+      variants.flatMap(
+        ([, tool]) => tool.outputSchema === void 0 ? [] : [tool.outputSchema]
       )
-    }
+    )
   } : {},
   ...sameAcross("_meta", variants)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps",
-  "version": "0.0.1-beta.93",
+  "version": "0.0.1-beta.94",
   "description": "TypeScript apps with typed tools, accounts, storage, and UI.",
   "type": "module",
   "sideEffects": false,