apps 0.0.1-beta.1 → 0.0.1-beta.11

package/js/{chunk-6YBRWRK3.js → chunk-RFVIONFX.js}

@@ -1,24 +1,25 @@
 import {
   CacheError
-} from "./chunk-RBAC33PQ.js";
+} from "./chunk-R3EV5FTO.js";
 import {
   wrap
-} from "./chunk-2HHMABB6.js";
+} from "./chunk-5T57N25Q.js";
 import {
   JsonObject
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-27F7W2LG.js";
 import {
   Duration_exports,
   Effect_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 
 // src/implementation/catalog-cache.ts
 var schema = (decoder) => wrap(decoder, false);
 var Manifest = Schema_exports.Struct({
   revision: Schema_exports.String,
   pages: Schema_exports.Int,
-  summaries: Schema_exports.Int
+  summaries: Schema_exports.Int,
+  header: Schema_exports.optionalKey(JsonObject)
 });
 var invoke = (work) => Effect_exports.tryPromise({ try: work, catch: (error) => error });
 var catalogCache = (options) => Effect_exports.gen(function* () {
@@ -35,9 +36,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
   const retention = Duration_exports.toMillis(Duration_exports.fromInputUnsafe(freshFor)) + Duration_exports.toMillis(Duration_exports.fromInputUnsafe(staleFor)) + 3e5;
   const local = yield* Effect_exports.cached(options.load());
   const refresh = (context) => Effect_exports.gen(function* () {
-    const tools = yield* options.load(context);
+    const { tools, header } = yield* options.load(context);
     const digest = yield* invoke(
-      () => crypto.subtle.digest("SHA-256", new TextEncoder().encode(JSON.stringify(tools)))
+      () => crypto.subtle.digest(
+        "SHA-256",
+        new TextEncoder().encode(JSON.stringify({ tools, header: header ?? null }))
+      )
     );
     const revision = Array.from(
       new Uint8Array(digest),
@@ -51,10 +55,22 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     let summaryBytes = 0;
     let batch = [];
     let batchBytes = 0;
-    const flush = () => invoke(async () => {
-      if (batch.length) await context.cache.write(batch, retention);
+    let flushes = 0;
+    const flush = () => Effect_exports.suspend(() => {
+      const entries = batch;
+      const bytes = batchBytes;
       batch = [];
       batchBytes = 0;
+      if (!entries.length) return Effect_exports.void;
+      return invoke(() => context.cache.write(entries, retention)).pipe(
+        Effect_exports.withSpan("app.cache.flush", {
+          attributes: {
+            "cache.flush.index": flushes++,
+            "cache.flush.entries": entries.length,
+            "cache.flush.bytes": bytes
+          }
+        })
+      );
     });
     const append = (entry) => Effect_exports.gen(function* () {
       const bytes = new TextEncoder().encode(JSON.stringify(entry)).byteLength;
@@ -92,7 +108,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     yield* pageOut();
     yield* summaryOut();
     yield* flush();
-    return { revision, pages: pages2, summaries };
+    return {
+      revision,
+      pages: pages2,
+      summaries,
+      ...header === void 0 ? {} : { header: yield* json(header) }
+    };
   });
   const getOptions = {
     key,
@@ -101,7 +122,12 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     staleFor,
     load: (context) => Effect_exports.runPromise(refresh(context), { signal: context.signal })
   };
-  const current = () => cache === void 0 ? Effect_exports.fail(new CacheError({ reason: "unavailable" })) : invoke(() => cache.get(getOptions));
+  let reading;
+  const current = () => cache === void 0 ? Effect_exports.fail(new CacheError({ reason: "unavailable" })) : invoke(
+    () => reading ??= cache.get(getOptions).finally(() => {
+      reading = void 0;
+    })
+  );
   if (options.revalidate) {
     if (cache === void 0) yield* local;
     else yield* invoke(() => cache.revalidate(getOptions));
@@ -128,14 +154,17 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
     return values;
   });
   const metadata = () => Effect_exports.gen(function* () {
-    if (cache === void 0) return yield* local;
+    if (cache === void 0) return (yield* local).tools;
     const manifest = yield* current();
     return yield* pages(cache, manifest.revision, "page", manifest.pages, options.schema);
   });
   return {
     list: metadata,
+    /** The record stored with the current revision, if the source supplied one. */
+    header: () => cache === void 0 ? local.pipe(Effect_exports.map(({ header }) => header)) : current().pipe(Effect_exports.map((manifest) => manifest.header)),
     summaries: () => Effect_exports.gen(function* () {
-      if (cache === void 0) return (yield* local).map((tool) => options.summary.of(tool));
+      if (cache === void 0)
+        return (yield* local).tools.map((tool) => options.summary.of(tool));
       const manifest = yield* current();
       return yield* pages(
         cache,
@@ -145,7 +174,7 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
         options.summary.schema
       );
     }),
-    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map((tools) => tools.find((tool) => tool.name === name))) : current().pipe(
+    resolve: (name) => cache === void 0 ? local.pipe(Effect_exports.map(({ tools }) => tools.find((tool) => tool.name === name))) : current().pipe(
       Effect_exports.flatMap(
         (manifest) => invoke(
           () => cache.read(part(manifest.revision, "tool", name), schema(options.schema))

package/js/{chunk-RBAC33PQ.js → chunk-TYVDBQSI.js}

@@ -1,78 +1,51 @@
 import {
-  parseDatabaseSchema,
   promiseTable
-} from "./chunk-PLCMJREA.js";
+} from "./chunk-ZQINWV4W.js";
 import {
+  declaredOperations,
   fromPromise,
-  nativeOperation
-} from "./chunk-PZ36XMXW.js";
+  nativeOperation,
+  nativeRouter
+} from "./chunk-GPFVWWDZ.js";
 import {
   ScheduleTiming
-} from "./chunk-IHQ4ML7K.js";
+} from "./chunk-KRSCJDTW.js";
+import {
+  DatabaseSchema
+} from "./chunk-N7YDVXYJ.js";
 import {
   decoderOf,
   isSchema,
   storageFieldOf
-} from "./chunk-2HHMABB6.js";
+} from "./chunk-5T57N25Q.js";
 import {
   AppStorageUnavailable
-} from "./chunk-FZJOYIZO.js";
+} from "./chunk-PZB6T6KU.js";
 import {
   JsonValue
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-27F7W2LG.js";
 import {
   Effect_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 
-// ../app-cache/src/contracts/cache.ts
-var CacheError = class extends Schema_exports.TaggedError()("CacheError", {
-  reason: Schema_exports.Literals(["unavailable", "storage", "invalid", "capacity", "timeout"])
-}) {
+// src/contracts/http.ts
+var ResponseStatusError = class extends Schema_exports.TaggedError()(
+  "ResponseStatusError",
+  { status: Schema_exports.Number }
+) {
+  get message() {
+    return `Request failed with status ${this.status}`;
+  }
 };
-var cacheLimits = {
-  keyBytes: 8192,
-  entryBytes: 2e6,
-  batchBytes: 8e6,
-  batchEntries: 128,
-  totalBytes: 128e6,
-  totalEntries: 1e5,
-  retentionMs: 7 * 24 * 60 * 60 * 1e3,
-  loadTimeoutMs: 9e4,
-  leaseMs: 12e4
+var ResponseDecodeError = class extends Schema_exports.TaggedError()(
+  "ResponseDecodeError",
+  {}
+) {
+  get message() {
+    return "Response body did not match the expected schema";
+  }
 };
-var Key = Schema_exports.String.check(Schema_exports.isPattern(/^[a-f0-9]{64}$/));
-var Time = Schema_exports.Finite.check(Schema_exports.isGreaterThanOrEqualTo(0));
-var CacheEntry = Schema_exports.Struct({
-  value: Schema_exports.Json,
-  version: Schema_exports.String,
-  freshUntil: Time,
-  staleUntil: Time
-});
-var CacheCommand = Schema_exports.Union([
-  Schema_exports.Struct({ operation: Schema_exports.Literal("read"), keys: Schema_exports.Array(Key) }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("claim"),
-    key: Key,
-    version: Schema_exports.NullOr(Schema_exports.String)
-  }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("publish"),
-    key: Key,
-    lease: Schema_exports.String,
-    entry: CacheEntry
-  }),
-  Schema_exports.Struct({ operation: Schema_exports.Literal("release"), key: Key, lease: Schema_exports.String }),
-  Schema_exports.Struct({
-    operation: Schema_exports.Literal("write"),
-    entries: Schema_exports.Array(Schema_exports.Struct({ key: Key, entry: CacheEntry }))
-  }),
-  Schema_exports.Struct({ operation: Schema_exports.Literal("invalidate"), key: Key })
-]);
-var CacheReply = Schema_exports.Union([
-  Schema_exports.Struct({ ok: Schema_exports.Literal(true), value: Schema_exports.Json }),
-  Schema_exports.Struct({ ok: Schema_exports.Literal(false), error: CacheError })
-]);
 
 // src/implementation/workflows.ts
 var NativeWorkflow = /* @__PURE__ */ Symbol("apps.Workflow");
@@ -97,8 +70,12 @@ var nativeWorkflow = (value) => {
 var InternalApp = /* @__PURE__ */ Symbol("apps.App");
 var isApp = (value) => typeof value === "object" && value !== null && InternalApp in value;
 var toEffectApp = (app) => app[InternalApp];
+function rejectCatalogs(definition) {
+  if ("queries" in definition || "mutations" in definition)
+    throw new Error("Put queries and mutations in a router under tools");
+}
 function adaptDefinition(definition) {
-  if ("tools" in definition) throw new Error("Use queries and mutations instead of tools");
+  rejectCatalogs(definition);
   const webhooks = definition.webhooks === void 0 ? {} : {
     webhooks: Object.fromEntries(
       Object.entries(definition.webhooks).map(([name, webhook]) => [
@@ -114,42 +91,42 @@ function adaptDefinition(definition) {
       ])
     )
   };
-  const operations = (kind, catalog) => Object.fromEntries(
-    Object.entries(catalog).map(([name, value]) => {
-      const operation = nativeOperation(value);
-      if (operation === void 0 || operation.kind !== kind)
-        throw new Error("Invalid app data operation");
-      return [name, operation];
-    })
-  );
   const workflows = definition.workflows === void 0 ? {} : {
     workflows: Object.fromEntries(
       Object.entries(definition.workflows).map(([name, value]) => {
-        const declared = nativeWorkflow(value);
-        if (declared === void 0) throw new Error("Invalid workflow declaration");
-        return [name, declared];
+        const declared2 = nativeWorkflow(value);
+        if (declared2 === void 0) throw new Error("Invalid workflow declaration");
+        return [name, declared2];
       })
     )
   };
-  const data = {
-    ...definition.queries === void 0 ? {} : { queries: operations("query", definition.queries) },
-    ...definition.mutations === void 0 ? {} : { mutations: operations("mutation", definition.mutations) }
-  };
+  const root = definition.tools === void 0 ? void 0 : nativeRouter(definition.tools);
+  if (definition.tools !== void 0 && root === void 0)
+    throw new Error("tools must be a router");
+  const data = root === void 0 ? {} : { tools: root };
+  const declared = root?.kind === "router" ? declaredOperations(root) : [];
+  const mutations = /* @__PURE__ */ new Set();
+  for (const { operation } of declared) {
+    if (operation.kind !== "mutation") continue;
+    if (mutations.has(operation))
+      throw new Error("A mutation can be mounted at only one path in tools");
+    mutations.add(operation);
+  }
   const schedules = definition.schedules === void 0 ? {} : {
     schedules: Object.fromEntries(
       Object.entries(definition.schedules).map(([name, schedule]) => {
-        const matches = Object.entries(definition.mutations ?? {}).filter(
-          ([, operation]) => operation === schedule.operation
+        const target = nativeOperation(schedule.operation);
+        const match = declared.find(
+          ({ operation }) => operation === target && operation.kind === "mutation"
         );
-        const match = matches[0];
-        if (match === void 0 || matches.length !== 1)
-          throw new Error("A schedule must reference exactly one named mutation in this app");
+        if (match === void 0)
+          throw new Error("A schedule must reference a mutation in this app's tools");
         return [
           name,
           {
             timing: Schema_exports.decodeUnknownSync(ScheduleTiming)(schedule.timing),
             input: Schema_exports.decodeUnknownSync(JsonValue)(schedule.input),
-            tool: `mutations.${match[0]}`
+            tool: match.name
           }
         ];
       })
@@ -164,6 +141,7 @@ function adaptDefinition(definition) {
   };
 }
 var defineApp = (requirements, definition) => {
+  if (typeof definition !== "function") rejectCatalogs(definition);
   const evaluate = typeof definition === "function" ? definition : async () => definition;
   const factory = fromPromise(evaluate);
   const native = {
@@ -201,7 +179,7 @@ var serialize = (tables) => {
       }
     ])
   );
-  return Effect_exports.runSync(parseDatabaseSchema(definitions));
+  return Schema_exports.decodeUnknownSync(DatabaseSchema)(definitions);
 };
 var authorDatabase = (tables, session, signal, writable) => {
   return Object.fromEntries(
@@ -251,11 +229,8 @@ var unavailableStorage = {
 };
 
 export {
-  CacheError,
-  cacheLimits,
-  CacheEntry,
-  CacheCommand,
-  CacheReply,
+  ResponseStatusError,
+  ResponseDecodeError,
   workflow,
   isApp,
   toEffectApp,

package/js/{chunk-QKHR7BMF.js → chunk-UK573G7W.js}

@@ -211,7 +211,7 @@ import {
   withFiber,
   withParentSpan,
   zero2 as zero
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-CDL5PM2Q.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";