apps 0.0.1-beta.3 → 0.0.1-beta.30

package/js/{chunk-SATWJKN6.js → chunk-PWF2DRJ3.js}

@@ -1,6 +1,6 @@
 import {
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // src/contracts/schema.ts
 var JsonValue = Schema_exports.Json;

package/js/{chunk-D47C7KG5.js → chunk-VUVBMNKC.js}

@@ -3,14 +3,14 @@ import {
   CacheEntry,
   CacheError,
   cacheLimits
-} from "./chunk-LGIYBDWA.js";
+} from "./chunk-BRGF7VFN.js";
 import {
   Clock_exports,
   Duration_exports,
   Effect_exports,
   Exit_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // ../app-cache/src/index.ts
 var canonical = (value) => {

package/js/{chunk-ZCAMUXSG.js → chunk-WGBI5MVX.js}

@@ -1,6 +1,6 @@
 import {
   FetchHttpClient_exports
-} from "./chunk-HDJH3RPR.js";
+} from "./chunk-BBTELEAN.js";
 import {
   HttpBody_exports,
   HttpClient,
@@ -18,7 +18,7 @@ import {
   setBody,
   transformResponse,
   uint8Array
-} from "./chunk-QKHR7BMF.js";
+} from "./chunk-XGN5IFOZ.js";
 import {
   Array as Array2,
   Boolean2 as Boolean,
@@ -125,7 +125,7 @@ import {
   withDefault2 as withDefault,
   withTracerEnabled,
   zero
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";
@@ -2508,7 +2508,6 @@ export {
   withRemoteSpan,
   invocationFetch,
   collectTelemetry,
-  TraceContext,
   externalTrace,
   traceLinks,
   pendingSpan

package/js/{chunk-T2LAZCAD.js → chunk-WQ5MVBTP.js}

@@ -1,6 +1,6 @@
 import {
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // src/contracts/ui-auth.ts
 var AppSignInId = Schema_exports.String.check(Schema_exports.isPattern(/^[a-f0-9]{64}$/)).pipe(

package/js/{chunk-PLCMJREA.js → chunk-XBQTJP76.js}

@@ -1,5 +1,7 @@
 import {
   AppDatabaseError,
+  DatabaseFieldReserved,
+  DatabaseLimitExceeded,
   DatabaseLimits,
   DatabaseOperation,
   DatabaseSchema,
@@ -8,18 +10,21 @@ import {
   Row,
   RowMetadata,
   defaultDatabaseLimits,
-  defaultDatabaseRuntimeLimits
-} from "./chunk-BMOIAIVR.js";
+  defaultDatabaseRuntimeLimits,
+  reservedFieldNames
+} from "./chunk-M2KEEOIQ.js";
 import {
+  Cause_exports,
   Clock_exports,
   Effect_exports,
   Encoding_exports,
   Schema_exports,
   Semaphore_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // ../app-data/src/implementation/schema.ts
-var metadata = /* @__PURE__ */ new Set(["id", "createdAt", "updatedAt"]);
+var metadata = new Set(reservedFieldNames);
+var reserved = (name) => metadata.has(name);
 var indexesFor = (table) => [{ name: "by_creation", fields: [] }, ...table.indexes].map((index) => ({
   name: index.name,
   fields: [
@@ -33,23 +38,25 @@ var validScalar = (field, value) => field.kind === "number" ? typeof value === "
   return point !== void 0 && point >= 55296 && point <= 57343;
 });
 var parseDatabaseSchema = (input) => Schema_exports.decodeUnknownEffect(DatabaseSchema)(input).pipe(
+  Effect_exports.mapError(() => new AppDatabaseError({ reason: "schema" })),
   Effect_exports.flatMap(
     (schema) => Effect_exports.gen(function* () {
-      for (const table of Object.values(schema)) {
-        if (Object.keys(table.fields).some((name) => metadata.has(name)) || new Set(table.indexes.map((index) => index.name)).size !== table.indexes.length)
+      for (const [name, table] of Object.entries(schema)) {
+        const field = Object.keys(table.fields).find(reserved);
+        if (field !== void 0) return yield* new DatabaseFieldReserved({ table: name, field });
+        if (new Set(table.indexes.map((index) => index.name)).size !== table.indexes.length)
           return yield* new AppDatabaseError({ reason: "schema" });
-        for (const field of Object.values(table.fields)) {
-          if ((field.kind === "id" ? field.references === void 0 : field.references !== void 0) || field.default !== void 0 && !validScalar(field, field.default) || field.references !== void 0 && !Object.hasOwn(schema, field.references))
+        for (const field2 of Object.values(table.fields)) {
+          if ((field2.kind === "id" ? field2.references === void 0 : field2.references !== void 0) || field2.default !== void 0 && !validScalar(field2, field2.default) || field2.references !== void 0 && !Object.hasOwn(schema, field2.references))
             return yield* new AppDatabaseError({ reason: "schema" });
         }
         for (const index of table.indexes)
-          if (index.name === "by_creation" || new Set(index.fields).size !== index.fields.length || index.fields.some((name) => fieldFor(table, name) === void 0))
+          if (index.name === "by_creation" || new Set(index.fields).size !== index.fields.length || index.fields.some((name2) => fieldFor(table, name2) === void 0))
             return yield* new AppDatabaseError({ reason: "schema" });
       }
       return schema;
     })
-  ),
-  Effect_exports.mapError(() => new AppDatabaseError({ reason: "schema" }))
+  )
 );
 var canonicalSchema = (schema) => JSON.stringify(
   Object.fromEntries(
@@ -248,7 +255,12 @@ var decodeBody = Schema_exports.decodeUnknownEffect(Schema_exports.fromJsonStrin
 var storageError = () => new AppDatabaseError({ reason: "storage" });
 var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
   const { sql, crypto } = options;
-  const schema = yield* parseDatabaseSchema(options.schema);
+  const schema = yield* parseDatabaseSchema(options.schema).pipe(
+    Effect_exports.catchTag(
+      "DatabaseFieldReserved",
+      () => Effect_exports.fail(new AppDatabaseError({ reason: "schema" }))
+    )
+  );
   const limits = yield* Schema_exports.decodeUnknownEffect(DatabaseLimits)(
     options.limits ?? defaultDatabaseLimits
   ).pipe(Effect_exports.mapError(() => new AppDatabaseError({ reason: "limit" })));
@@ -295,7 +307,13 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
       };
       const charge = (name, amount) => Effect_exports.suspend(() => {
         used[name] += amount;
-        return used[name] > limits[name] ? Effect_exports.fail(new AppDatabaseError({ reason: "limit" })) : Effect_exports.void;
+        return used[name] > limits[name] ? Effect_exports.fail(
+          new DatabaseLimitExceeded({
+            limit: name,
+            maximum: limits[name],
+            requested: used[name]
+          })
+        ) : Effect_exports.void;
       });
       const get = (table, id) => Effect_exports.gen(function* () {
         yield* charge("directGets", 1);
@@ -312,8 +330,13 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
       const store = (tableName, table, row) => Effect_exports.gen(function* () {
         const meta = yield* Schema_exports.decodeUnknownEffect(RowMetadata)(row);
         const body = JSON.stringify(row);
-        if (new TextEncoder().encode(body).length > limits.valueBytes)
-          return yield* new AppDatabaseError({ reason: "limit" });
+        const bytes = new TextEncoder().encode(body).length;
+        if (bytes > limits.valueBytes)
+          return yield* new DatabaseLimitExceeded({
+            limit: "valueBytes",
+            maximum: limits.valueBytes,
+            requested: bytes
+          });
         const keys = yield* Effect_exports.forEach(
           indexesFor(table),
           (index) => encodeIndexKey(
@@ -384,9 +407,14 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
               const bounds = yield* queryBounds(table, plan, limits.indexBytes);
               reads.add(tableName);
               yield* charge("scanCalls", 1);
-              const maximum = terminal.kind === "count" ? limits.rowsRead - used.rowsRead : limits.rowsReturned - used.rowsReturned;
-              const count = terminal.kind === "first" ? 1 : terminal.kind === "take" ? terminal.count : terminal.kind === "paginate" ? terminal.numItems : maximum;
-              if (count > maximum) return yield* new AppDatabaseError({ reason: "limit" });
+              const remaining = terminal.kind === "count" ? limits.rowsRead - used.rowsRead : limits.rowsReturned - used.rowsReturned;
+              const count = terminal.kind === "first" ? 1 : terminal.kind === "take" ? terminal.count : terminal.kind === "paginate" ? terminal.numItems : remaining;
+              if ((terminal.kind === "take" || terminal.kind === "paginate") && count > limits.rowsReturned)
+                return yield* new DatabaseLimitExceeded({
+                  limit: "pageSize",
+                  maximum: limits.rowsReturned,
+                  requested: count
+                });
               if (count === 0 && terminal.kind === "take") return [];
               const query = yield* fingerprint(
                 crypto,
@@ -412,7 +440,10 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
                   plan.order === "asc" ? sql`i.sort_key > ${position}` : sql`i.sort_key < ${position}`
                 );
               const direction = plan.order === "asc" ? sql.literal("ASC") : sql.literal("DESC");
-              const limit = terminal.kind === "first" || terminal.kind === "take" ? count : count + 1;
+              const limit = Math.min(
+                terminal.kind === "first" || terminal.kind === "take" ? count : count + 1,
+                remaining + 1
+              );
               if (terminal.kind === "count") {
                 const rows2 = yield* sql`SELECT i.sort_key FROM app_indexes i WHERE ${sql.and(predicates)} ORDER BY i.sort_key ${direction} LIMIT ${limit}`.pipe(
                   Effect_exports.flatMap(Schema_exports.decodeUnknownEffect(Schema_exports.Array(CountRow)))
@@ -436,7 +467,11 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
                 )
               );
               if (terminal.kind === "collect" && rows.length > count)
-                return yield* new AppDatabaseError({ reason: "limit" });
+                return yield* new DatabaseLimitExceeded({
+                  limit: "rowsReturned",
+                  maximum: limits.rowsReturned,
+                  requested: used.rowsReturned + rows.length
+                });
               const page = rows.slice(0, count);
               yield* charge("rowsReturned", page.length);
               const values = yield* Effect_exports.forEach(page, (row) => decodeBody(row.body));
@@ -502,6 +537,11 @@ var makeSqliteDatabase = (options) => Effect_exports.gen(function* () {
         })
       };
       return yield* Effect_exports.suspend(() => work(session)).pipe(
+        // A failed database call poisons the session. Report that failure even when
+        // authored code caught it or threw something else in its place.
+        Effect_exports.catchCause(
+          (cause) => failed === void 0 || Cause_exports.hasInterrupts(cause) ? Effect_exports.failCause(cause) : Effect_exports.fail(failed)
+        ),
         Effect_exports.tap(
           () => gate.withPermits(1)(
             Effect_exports.suspend(() => failed === void 0 ? Effect_exports.void : Effect_exports.fail(failed))

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

@@ -211,7 +211,7 @@ import {
   withFiber,
   withParentSpan,
   zero2 as zero
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 import {
   __export
 } from "./chunk-CZ7CSFO4.js";
@@ -4358,6 +4358,8 @@ export {
   bodyFormData,
   HttpClientRequest_exports,
   fromWeb2 as fromWeb,
+  HttpServerResponse_exports,
+  HttpServerRequest_exports,
   HttpTraceContext_exports,
   HttpClient,
   transformResponse,
@@ -4368,8 +4370,6 @@ export {
   TracerPropagationEnabled,
   layerMergedContext,
   HttpClient_exports,
-  HttpServerResponse_exports,
-  HttpServerRequest_exports,
   prefixPath,
   fromLiteral
 };

package/js/{chunk-WFSQXYUT.js → chunk-YML53Z7H.js}

@@ -1,6 +1,7 @@
 import {
+  JsonObject,
   ValidationError
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-PWF2DRJ3.js";
 import {
   Cause_exports,
   Effect_exports,
@@ -9,7 +10,7 @@ import {
   SchemaIssue_exports,
   SchemaParser_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // ../../node_modules/.bun/@cfworker+json-schema@4.1.1/node_modules/@cfworker/json-schema/dist/esm/deep-compare-strict.js
 function deepCompareStrict(a, b) {
@@ -1144,6 +1145,25 @@ function object(fields) {
   ) : Schema_exports.Struct(Object.fromEntries(entries));
   return { ...wrap(decoder, false), fields: Object.freeze({ ...fields }) };
 }
+var Exposure = /* @__PURE__ */ Symbol("apps.FieldExposure");
+var exposureOf = (schema) => Exposure in schema && (schema[Exposure] === "plain" || schema[Exposure] === "raw") ? schema[Exposure] : void 0;
+var expose = (schema, exposure) => (
+  // SAFETY: the copy keeps every member of S, and `optional` and `default` keep the marking.
+  {
+    ...schema,
+    [Exposure]: exposure,
+    optional: () => expose(schema.optional(), exposure),
+    default: (value) => expose(schema.default(value), exposure)
+  }
+);
+var plain = (schema) => expose(schema, "plain");
+var raw = (schema) => expose(schema, "raw");
+var fieldExposure = (fields) => Object.fromEntries(
+  Object.entries(fields).flatMap(([name, field]) => {
+    const exposure = exposureOf(field);
+    return exposure === void 0 ? [] : [[name, exposure]];
+  })
+);
 var ImportedJsonSchema = /* @__PURE__ */ Symbol("apps.JsonSchemaDocument");
 var importedJsonSchema = (decoder) => ImportedJsonSchema in decoder ? decoder[ImportedJsonSchema] : void 0;
 var withJsonSchemaDocument = (decoder, document) => Object.assign(decoder, { [ImportedJsonSchema]: document });
@@ -1332,7 +1352,7 @@ var compileJsonSchemaDecoder = (document) => Effect_exports.gen(function* () {
   );
   return Object.assign(decoder, { [ImportedJsonSchema]: document });
 });
-var lazyDecoder = (document) => {
+var lazyCompiledDecoder = (document) => {
   const read = once(document);
   let compiled;
   const compile = Effect_exports.suspend(
@@ -1352,9 +1372,11 @@ var lazyDecoder = (document) => {
       Effect_exports.flatMap((schema) => SchemaParser_exports.decodeUnknownEffect(schema)(input, options))
     )
   );
-  return withLazyJsonSchemaDocument(decoder, read);
+  return { decoder: withLazyJsonSchemaDocument(decoder, read), compile };
 };
+var lazyDecoder = (document) => lazyCompiledDecoder(document).decoder;
 var lazyJsonSchemaDecoder = (document) => Effect_exports.sync(() => lazyDecoder(document));
+var preparedJsonSchemaDecoder = (document) => lazyCompiledDecoder(() => document);
 var isJsonValue = Schema_exports.is(Schema_exports.Json);
 var jsonDocument = (input) => {
   if (typeof input !== "object" || input === null || Array.isArray(input)) return void 0;
@@ -1387,6 +1409,16 @@ var jsonSchema = (input) => {
 var storageFieldOf = (schema) => schema[StorageField];
 var id = (table) => wrap(Schema_exports.NonEmptyString, false, { kind: "id", references: table });
 var userId = () => wrap(Schema_exports.NonEmptyString, false, { kind: "userId" });
+var jsonSchemaDocument = (decoder) => {
+  const imported = importedJsonSchema(decoder);
+  if (imported !== void 0) return Schema_exports.decodeUnknownEffect(JsonObject)(imported);
+  const document = Schema_exports.toJsonSchemaDocument(decoder);
+  return Schema_exports.decodeUnknownEffect(JsonObject)({
+    ...document.schema,
+    $defs: document.definitions,
+    $schema: "https://json-schema.org/draft/2020-12/schema"
+  });
+};
 
 export {
   decoderOf,
@@ -1401,15 +1433,20 @@ export {
   literal,
   array,
   object,
+  plain,
+  raw,
+  fieldExposure,
   importedJsonSchema,
   once,
   withLazyJsonSchemaDocument,
   nestJsonSchema,
   compileJsonSchemaDecoder,
   lazyJsonSchemaDecoder,
+  preparedJsonSchemaDecoder,
   jsonSchemaDecoder,
   jsonSchema,
   storageFieldOf,
   id,
-  userId
+  userId,
+  jsonSchemaDocument
 };

package/js/{chunk-5MQZEB6Y.js → chunk-ZZOCEUTB.js}

@@ -1,24 +1,32 @@
 import {
   CacheError
-} from "./chunk-LGIYBDWA.js";
+} from "./chunk-BRGF7VFN.js";
 import {
   wrap
-} from "./chunk-WFSQXYUT.js";
+} from "./chunk-YML53Z7H.js";
 import {
   JsonObject
-} from "./chunk-SATWJKN6.js";
+} from "./chunk-PWF2DRJ3.js";
 import {
   Duration_exports,
   Effect_exports,
   Schema_exports
-} from "./chunk-FW5HBOIK.js";
+} from "./chunk-NXTXZ635.js";
 
 // src/implementation/catalog-cache.ts
+var catalogScope = (options, invalid) => {
+  const { account, cache, headers } = options;
+  if (account === void 0)
+    return headers === void 0 ? Effect_exports.succeed(cache) : Effect_exports.fail(invalid());
+  if (cache === void 0) return Effect_exports.succeed(void 0);
+  return Effect_exports.try({ try: () => cache.forAccount(account), catch: invalid });
+};
 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 +43,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),
@@ -104,7 +115,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,
@@ -113,7 +129,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));
@@ -140,14 +161,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,
@@ -157,7 +181,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))
@@ -168,5 +192,6 @@ var catalogCache = (options) => Effect_exports.gen(function* () {
 });
 
 export {
+  catalogScope,
   catalogCache
 };