@sixb/core 0.1.17 → 0.1.19

package/dist/{chunk-4ra628t7.js → chunk-3zxk45er.js}

@@ -1,10 +1,10 @@
 // @bun
+import {
+  isFileRef2
+} from "./chunk-jhm3zsa7.js";
 import {
   BlobStorageError2
 } from "./chunk-h8teetr0.js";
-import {
-  isFileRef2
-} from "./chunk-h3v76ams.js";
 
 // src/blob-storage/download-urls.ts
 import { createHash, randomBytes, randomUUID } from "crypto";
@@ -82,7 +82,71 @@ function expiryFrom(createdAt, expiresInMs) {
   }
   return new Date(expiresAt);
 }
+// src/blob-storage/file-content.ts
+function resolveFileRefAtPath2(root, path) {
+  const value = resolveJsonPointer(root, path);
+  return isFileRef2(value) ? value : null;
+}
+async function statFileRef2(blobStorage, fileRef) {
+  const stat = await blobStorage.stat(fileRef.blobId);
+  return stat && stat.blobId === fileRef.blobId && stat.digest === fileRef.digest && stat.sizeBytes === fileRef.sizeBytes ? stat : null;
+}
+async function openFileRef2(blobStorage, fileRef) {
+  const stat = await statFileRef2(blobStorage, fileRef);
+  if (!stat)
+    return null;
+  return { fileRef, body: openOnFirstRead(blobStorage, fileRef.blobId) };
+}
+function openOnFirstRead(blobStorage, blobId) {
+  let reader;
+  return new ReadableStream({
+    async pull(controller) {
+      reader ??= (await blobStorage.open(blobId)).getReader();
+      const { done, value } = await reader.read();
+      if (done)
+        controller.close();
+      else
+        controller.enqueue(value);
+    },
+    async cancel(reason) {
+      await reader?.cancel(reason);
+    }
+  }, { highWaterMark: 0 });
+}
+function jsonPointerSegment2(segment) {
+  return String(segment).replaceAll("~", "~0").replaceAll("/", "~1");
+}
+function resolveJsonPointer(root, pointer) {
+  if (pointer === "") {
+    return root;
+  }
+  if (!pointer.startsWith("/")) {
+    return;
+  }
+  let current = root;
+  for (const rawSegment of pointer.slice(1).split("/")) {
+    const segment = decodeJsonPointerSegment(rawSegment);
+    if (Array.isArray(current)) {
+      const index = Number.parseInt(segment, 10);
+      if (!Number.isInteger(index) || index < 0 || index.toString() !== segment) {
+        return;
+      }
+      if (!Object.hasOwn(current, segment)) {
+        return;
+      }
+      current = current[index];
+      continue;
+    }
+    if (typeof current !== "object" || current === null || !Object.hasOwn(current, segment)) {
+      return;
+    }
+    current = current[segment];
+  }
+  return current;
+}
+function decodeJsonPointerSegment(segment) {
+  return segment.replaceAll("~1", "/").replaceAll("~0", "~");
+}
+export { FILE_DOWNLOAD_ROUTE_PREFIX2, createFileDownloadUrl, revokeFileDownloadUrl, resolveFileDownload2, resolveFileRefAtPath2, statFileRef2, openFileRef2, jsonPointerSegment2 };
 
-export { FILE_DOWNLOAD_ROUTE_PREFIX2, createFileDownloadUrl, revokeFileDownloadUrl, resolveFileDownload2 };
-
-//# debugId=0DA1ED5935603AF264756E2164756E21
+//# debugId=14717FDAE9DF0DDF64756E2164756E21

package/dist/{chunk-4ra628t7.js.map → chunk-3zxk45er.js.map}

@@ -1,10 +1,11 @@
 {
   "version": 3,
-  "sources": ["../src/blob-storage/download-urls.ts"],
+  "sources": ["../src/blob-storage/download-urls.ts", "../src/blob-storage/file-content.ts"],
   "sourcesContent": [
-    "import { createHash, randomBytes, randomUUID } from \"node:crypto\"\nimport type { FileDownloadGrantRecord, FileDownloadGrantStorage, Storage } from \"../storage\"\nimport { BlobStorageError } from \"./errors\"\nimport type { BlobStorage, FileRef } from \"./types\"\nimport { isFileRef } from \"./validation\"\n\n/**\n * Download URLs let a third party that cannot hold a Sixb session — a social network fetching\n * media to publish, for instance — read one file for a bounded time.\n *\n * Each URL carries a random token. Storage keeps only its SHA-256, with the file, the expiry, and\n * the execution that issued it. The API looks the token up on every request, so any process\n * sharing the storage can issue a URL, and a URL can be revoked before it expires.\n *\n * The API serves the bytes itself rather than redirecting to the blob provider: fetchers such as\n * TikTok refuse redirects and accept only hosts whose ownership the developer verified.\n */\n\n/** Path prefix of the public route that serves download URLs. */\nexport const FILE_DOWNLOAD_ROUTE_PREFIX = \"/api/files/downloads/\"\n\nconst DEFAULT_EXPIRY_MS = 60 * 60 * 1000\n// SQLite compares ISO timestamps as text, which orders them correctly only for four-digit years.\nconst LATEST_EXPIRY_MS = Date.UTC(9999, 11, 31, 23, 59, 59, 999)\n/** 32 random bytes in base64url. */\nconst TOKEN_PATTERN = /^[A-Za-z0-9_-]{43}$/\n\nexport interface CreateFileDownloadUrlOptions {\n  /** How long the URL stays valid. Defaults to one hour. */\n  readonly expiresInMs?: number\n}\n\nexport interface FileDownloadUrl {\n  /** Pass to `blobs.revokeDownloadUrl()` to stop the URL before it expires. */\n  readonly id: string\n  readonly url: string\n  readonly expiresAt: Date\n}\n\n/** What issuing and revoking need from the execution that asks. */\nexport interface FileDownloadUrlContext {\n  readonly projectId: string\n  readonly storage: Storage\n  readonly blobStorage: BlobStorage\n  readonly executionId: string\n  readonly apiPublicOrigin: string | undefined\n}\n\nexport async function createFileDownloadUrl(\n  context: FileDownloadUrlContext,\n  file: FileRef,\n  options: CreateFileDownloadUrlOptions = {}\n): Promise<FileDownloadUrl> {\n  if (!isFileRef(file)) {\n    throw new Error(\"[Sixb] blobs.createDownloadUrl() requires a valid file reference.\")\n  }\n  const createdAt = new Date()\n  const expiresAt = expiryFrom(createdAt, options.expiresInMs ?? DEFAULT_EXPIRY_MS)\n  const grants = requireGrantStorage(context.storage)\n  if (context.apiPublicOrigin === undefined) {\n    throw new Error(\n      \"[Sixb] blobs.createDownloadUrl() needs the API's public origin. Set SIXB_API_PUBLIC_ORIGIN for the API and every worker.\"\n    )\n  }\n  // Fail here, not when a third party fetches the URL minutes later and gets a bare 404.\n  const stat = await context.blobStorage.stat(file.blobId)\n  if (!stat || stat.digest !== file.digest || stat.sizeBytes !== file.sizeBytes) {\n    throw new BlobStorageError(`[Sixb] No stored blob matches file '${file.blobId}'.`)\n  }\n\n  const token = randomBytes(32).toString(\"base64url\")\n  const { logicalPath: _logicalPath, ...served } = file\n  const grant: FileDownloadGrantRecord = {\n    id: `filedownload_${randomUUID()}`,\n    projectId: context.projectId,\n    tokenHash: hashToken(token),\n    file: served,\n    executionId: context.executionId,\n    createdAt,\n    expiresAt,\n  }\n  await grants.create(grant)\n\n  return {\n    id: grant.id,\n    url: new URL(`${FILE_DOWNLOAD_ROUTE_PREFIX}${token}`, context.apiPublicOrigin).toString(),\n    expiresAt: grant.expiresAt,\n  }\n}\n\nexport async function revokeFileDownloadUrl(\n  context: FileDownloadUrlContext,\n  id: string\n): Promise<void> {\n  const revoked = await requireGrantStorage(context.storage).revoke({\n    projectId: context.projectId,\n    id,\n    revokedAt: new Date(),\n  })\n  if (!revoked) {\n    throw new Error(`[Sixb] Download URL '${id}' does not exist.`)\n  }\n}\n\n/** The file a token serves, or `null` when the token is unknown, expired, or revoked. */\nexport async function resolveFileDownload(\n  host: { readonly id: string; readonly storage: Storage },\n  token: string\n): Promise<FileRef | null> {\n  const grants = host.storage.fileDownloadGrants\n  if (!grants || !TOKEN_PATTERN.test(token)) return null\n\n  const grant = await grants.findByTokenHash({ projectId: host.id, tokenHash: hashToken(token) })\n  if (!grant || grant.revokedAt || grant.expiresAt.getTime() <= Date.now()) return null\n  return grant.file\n}\n\nfunction hashToken(token: string): string {\n  return createHash(\"sha256\").update(token).digest(\"hex\")\n}\n\nfunction requireGrantStorage(storage: Storage): FileDownloadGrantStorage {\n  if (!storage.fileDownloadGrants) {\n    throw new Error(\"[Sixb] Download URLs require storage.fileDownloadGrants.\")\n  }\n  return storage.fileDownloadGrants\n}\n\nfunction expiryFrom(createdAt: Date, expiresInMs: number): Date {\n  if (!Number.isSafeInteger(expiresInMs) || expiresInMs <= 0) {\n    throw new Error(\"[Sixb] expiresInMs must be a positive integer.\")\n  }\n  const expiresAt = createdAt.getTime() + expiresInMs\n  if (expiresAt > LATEST_EXPIRY_MS) {\n    throw new Error(\"[Sixb] expiresInMs must end before the year 10000.\")\n  }\n  return new Date(expiresAt)\n}\n"
+    "import { createHash, randomBytes, randomUUID } from \"node:crypto\"\nimport type { FileDownloadGrantRecord, FileDownloadGrantStorage, Storage } from \"../storage\"\nimport { BlobStorageError } from \"./errors\"\nimport type { BlobStorage, FileRef } from \"./types\"\nimport { isFileRef } from \"./validation\"\n\n/**\n * Download URLs let a third party that cannot hold a Sixb session — a social network fetching\n * media to publish, for instance — read one file for a bounded time.\n *\n * Each URL carries a random token. Storage keeps only its SHA-256, with the file, the expiry, and\n * the execution that issued it. The API looks the token up on every request, so any process\n * sharing the storage can issue a URL, and a URL can be revoked before it expires.\n *\n * The API serves the bytes itself rather than redirecting to the blob provider: fetchers such as\n * TikTok refuse redirects and accept only hosts whose ownership the developer verified.\n */\n\n/** Path prefix of the public route that serves download URLs. */\nexport const FILE_DOWNLOAD_ROUTE_PREFIX = \"/api/files/downloads/\"\n\nconst DEFAULT_EXPIRY_MS = 60 * 60 * 1000\n// SQLite compares ISO timestamps as text, which orders them correctly only for four-digit years.\nconst LATEST_EXPIRY_MS = Date.UTC(9999, 11, 31, 23, 59, 59, 999)\n/** 32 random bytes in base64url. */\nconst TOKEN_PATTERN = /^[A-Za-z0-9_-]{43}$/\n\nexport interface CreateFileDownloadUrlOptions {\n  /** How long the URL stays valid. Defaults to one hour. */\n  readonly expiresInMs?: number\n}\n\nexport interface FileDownloadUrl {\n  /** Pass to `blobs.revokeDownloadUrl()` to stop the URL before it expires. */\n  readonly id: string\n  readonly url: string\n  readonly expiresAt: Date\n}\n\n/** What issuing and revoking need from the execution that asks. */\nexport interface FileDownloadUrlContext {\n  readonly projectId: string\n  readonly storage: Storage\n  readonly blobStorage: BlobStorage\n  readonly executionId: string\n  readonly apiPublicOrigin: string | undefined\n}\n\nexport async function createFileDownloadUrl(\n  context: FileDownloadUrlContext,\n  file: FileRef,\n  options: CreateFileDownloadUrlOptions = {}\n): Promise<FileDownloadUrl> {\n  if (!isFileRef(file)) {\n    throw new Error(\"[Sixb] blobs.createDownloadUrl() requires a valid file reference.\")\n  }\n  const createdAt = new Date()\n  const expiresAt = expiryFrom(createdAt, options.expiresInMs ?? DEFAULT_EXPIRY_MS)\n  const grants = requireGrantStorage(context.storage)\n  if (context.apiPublicOrigin === undefined) {\n    throw new Error(\n      \"[Sixb] blobs.createDownloadUrl() needs the API's public origin. Set SIXB_API_PUBLIC_ORIGIN for the API and every worker.\"\n    )\n  }\n  // Fail here, not when a third party fetches the URL minutes later and gets a bare 404.\n  const stat = await context.blobStorage.stat(file.blobId)\n  if (!stat || stat.digest !== file.digest || stat.sizeBytes !== file.sizeBytes) {\n    throw new BlobStorageError(`[Sixb] No stored blob matches file '${file.blobId}'.`)\n  }\n\n  const token = randomBytes(32).toString(\"base64url\")\n  const { logicalPath: _logicalPath, ...served } = file\n  const grant: FileDownloadGrantRecord = {\n    id: `filedownload_${randomUUID()}`,\n    projectId: context.projectId,\n    tokenHash: hashToken(token),\n    file: served,\n    executionId: context.executionId,\n    createdAt,\n    expiresAt,\n  }\n  await grants.create(grant)\n\n  return {\n    id: grant.id,\n    url: new URL(`${FILE_DOWNLOAD_ROUTE_PREFIX}${token}`, context.apiPublicOrigin).toString(),\n    expiresAt: grant.expiresAt,\n  }\n}\n\nexport async function revokeFileDownloadUrl(\n  context: FileDownloadUrlContext,\n  id: string\n): Promise<void> {\n  const revoked = await requireGrantStorage(context.storage).revoke({\n    projectId: context.projectId,\n    id,\n    revokedAt: new Date(),\n  })\n  if (!revoked) {\n    throw new Error(`[Sixb] Download URL '${id}' does not exist.`)\n  }\n}\n\n/** The file a token serves, or `null` when the token is unknown, expired, or revoked. */\nexport async function resolveFileDownload(\n  host: { readonly id: string; readonly storage: Storage },\n  token: string\n): Promise<FileRef | null> {\n  const grants = host.storage.fileDownloadGrants\n  if (!grants || !TOKEN_PATTERN.test(token)) return null\n\n  const grant = await grants.findByTokenHash({ projectId: host.id, tokenHash: hashToken(token) })\n  if (!grant || grant.revokedAt || grant.expiresAt.getTime() <= Date.now()) return null\n  return grant.file\n}\n\nfunction hashToken(token: string): string {\n  return createHash(\"sha256\").update(token).digest(\"hex\")\n}\n\nfunction requireGrantStorage(storage: Storage): FileDownloadGrantStorage {\n  if (!storage.fileDownloadGrants) {\n    throw new Error(\"[Sixb] Download URLs require storage.fileDownloadGrants.\")\n  }\n  return storage.fileDownloadGrants\n}\n\nfunction expiryFrom(createdAt: Date, expiresInMs: number): Date {\n  if (!Number.isSafeInteger(expiresInMs) || expiresInMs <= 0) {\n    throw new Error(\"[Sixb] expiresInMs must be a positive integer.\")\n  }\n  const expiresAt = createdAt.getTime() + expiresInMs\n  if (expiresAt > LATEST_EXPIRY_MS) {\n    throw new Error(\"[Sixb] expiresInMs must end before the year 10000.\")\n  }\n  return new Date(expiresAt)\n}\n",
+    "import type { BlobInfo, BlobStorage, FileRef, OpenedFileRef } from \"./types\"\nimport { isFileRef } from \"./validation\"\n\n/**\n * A file is served only through the record that references it: the caller reads that record with\n * its own authority, resolves the FileRef inside it, then checks the FileRef against the stored\n * blob. File content routes and the SDK's `file().open()` share these steps.\n */\n\n/** The FileRef at a JSON Pointer in an authorized record, or null when none is there. */\nexport function resolveFileRefAtPath(root: unknown, path: string): FileRef | null {\n  const value = resolveJsonPointer(root, path)\n  return isFileRef(value) ? value : null\n}\n\n/** The stored blob a FileRef names, or null when it is absent or no longer matches it. */\nexport async function statFileRef(\n  blobStorage: Pick<BlobStorage, \"stat\">,\n  fileRef: FileRef\n): Promise<BlobInfo | null> {\n  const stat = await blobStorage.stat(fileRef.blobId)\n  return stat &&\n    stat.blobId === fileRef.blobId &&\n    stat.digest === fileRef.digest &&\n    stat.sizeBytes === fileRef.sizeBytes\n    ? stat\n    : null\n}\n\n/**\n * Open a FileRef resolved from an authorized record, or return null when its blob is gone. The\n * blob itself is opened on the body's first read, so a body nobody reads holds nothing.\n */\nexport async function openFileRef(\n  blobStorage: Pick<BlobStorage, \"stat\" | \"open\">,\n  fileRef: FileRef\n): Promise<OpenedFileRef | null> {\n  const stat = await statFileRef(blobStorage, fileRef)\n  if (!stat) return null\n  return { fileRef, body: openOnFirstRead(blobStorage, fileRef.blobId) }\n}\n\nfunction openOnFirstRead(\n  blobStorage: Pick<BlobStorage, \"open\">,\n  blobId: string\n): ReadableStream<Uint8Array> {\n  let reader: ReadableStreamDefaultReader<Uint8Array> | undefined\n  return new ReadableStream<Uint8Array>(\n    {\n      async pull(controller) {\n        reader ??= (await blobStorage.open(blobId)).getReader()\n        const { done, value } = await reader.read()\n        if (done) controller.close()\n        else controller.enqueue(value)\n      },\n      async cancel(reason) {\n        await reader?.cancel(reason)\n      },\n    },\n    // No read-ahead: the first pull waits for the first read.\n    { highWaterMark: 0 }\n  )\n}\n\n/** Escape one segment of a JSON Pointer. */\nexport function jsonPointerSegment(segment: string | number): string {\n  return String(segment).replaceAll(\"~\", \"~0\").replaceAll(\"/\", \"~1\")\n}\n\nfunction resolveJsonPointer(root: unknown, pointer: string): unknown {\n  if (pointer === \"\") {\n    return root\n  }\n\n  if (!pointer.startsWith(\"/\")) {\n    return undefined\n  }\n\n  let current = root\n  for (const rawSegment of pointer.slice(1).split(\"/\")) {\n    const segment = decodeJsonPointerSegment(rawSegment)\n    if (Array.isArray(current)) {\n      const index = Number.parseInt(segment, 10)\n      if (!Number.isInteger(index) || index < 0 || index.toString() !== segment) {\n        return undefined\n      }\n      if (!Object.hasOwn(current, segment)) {\n        return undefined\n      }\n      current = current[index]\n      continue\n    }\n\n    if (typeof current !== \"object\" || current === null || !Object.hasOwn(current, segment)) {\n      return undefined\n    }\n\n    current = (current as Record<string, unknown>)[segment]\n  }\n\n  return current\n}\n\nfunction decodeJsonPointerSegment(segment: string): string {\n  return segment.replaceAll(\"~1\", \"/\").replaceAll(\"~0\", \"~\")\n}\n"
   ],
-  "mappings": "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",
-  "debugId": "0DA1ED5935603AF264756E2164756E21",
+  "mappings": "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",
+  "debugId": "14717FDAE9DF0DDF64756E2164756E21",
   "names": []
 }

package/dist/{chunk-pja9jfz6.js → chunk-4tcx876c.js}

@@ -3,7 +3,7 @@ import {
   MAX_OBJECT_READ_FACETS2,
   isAllowed2,
   assertAuthorized2
-} from "./chunk-5be2ath4.js";
+} from "./chunk-y7rqfrgg.js";
 import {
   validateSchemaValue2,
   validatePropertyValue2,
@@ -12,35 +12,35 @@ import {
   isTextSchema,
   isContainsSchema,
   queryScalarKindForSchema
-} from "./chunk-rpxz486p.js";
+} from "./chunk-hvsb78a1.js";
 import {
   validateRerankingResults
-} from "./chunk-s7ftxrdr.js";
+} from "./chunk-29yx306f.js";
 import {
+  MAX_VECTOR_K,
+  vectorConfiguration,
+  vectorSources,
+  normalizeVector2,
   hasVectorProfile2,
   isVectorProfileQuery2,
   objectBatchKey2,
   linkBatchKey2,
   objectLinkCursor2,
   compareQueryScalarValues,
-  queryScalarValuesEqual,
-  MAX_VECTOR_K,
-  vectorConfiguration,
-  vectorSources,
-  normalizeVector2
-} from "./chunk-5yd8cchh.js";
+  queryScalarValuesEqual
+} from "./chunk-j2bp5ryw.js";
 import {
-  normalizeObjectQuery2,
   ObjectQueryValidationError2,
   ObjectQueryPlanningError2,
-  ObjectQueryExecutionError2
-} from "./chunk-kpx7jrmn.js";
-import {
-  formatUnknownObjectTypeMessage
-} from "./chunk-cqr3acm1.js";
+  ObjectQueryExecutionError2,
+  normalizeObjectQuery2
+} from "./chunk-91mg3nj9.js";
 import {
   sameEmbeddingModel
 } from "./chunk-kyjcwqz6.js";
+import {
+  formatUnknownObjectTypeMessage
+} from "./chunk-cqr3acm1.js";
 import {
   normalizeDecimalValue2
 } from "./chunk-3bh94gbw.js";
@@ -67,6 +67,41 @@ var NOOP_QUERY_ADMISSION = Object.freeze({
   }),
   set: (input) => input.states[0] ?? NOOP_ADMISSION_STATE
 });
+function composeObjectQueryAdmissions(first, second) {
+  const parts = new WeakMap;
+  const join = (left, right) => {
+    const state = Object.freeze({});
+    parts.set(state, [left, right]);
+    return state;
+  };
+  const split = (state) => {
+    const pair = parts.get(state);
+    if (!pair)
+      throw new Error("[Sixb] Composed query admission received a foreign state.");
+    return pair;
+  };
+  const transition = (left, right) => {
+    const denial = left.denial ?? right.denial;
+    return { state: join(left.state, right.state), ...denial ? { denial } : {} };
+  };
+  const admission = {
+    empty: () => join(first.empty(), second.empty()),
+    source: (input) => transition(first.source(input), second.source(input)),
+    edge: (input) => {
+      const [left, right] = split(input.state);
+      return transition(first.edge({ ...input, state: left }), second.edge({ ...input, state: right }));
+    },
+    property: (input) => {
+      const [left, right] = split(input.state);
+      return first.property({ ...input, state: left }) ?? second.property({ ...input, state: right });
+    },
+    set: (input) => {
+      const pairs = input.states.map(split);
+      return join(first.set({ ...input, states: pairs.map(([left]) => left) }), second.set({ ...input, states: pairs.map(([, right]) => right) }));
+    }
+  };
+  return Object.freeze(admission);
+}
 function validateObjectQuery2(query, options) {
   const admitted = validateObjectQueryWithAdmission(query, options, NOOP_QUERY_ADMISSION);
   return {
@@ -299,7 +334,7 @@ function validateStart(objectTypeId, includeSubtypes, path, ctx) {
     addIssue(ctx, path, "unknown_object_type", formatUnknownObjectTypeMessage(objectTypeId));
     return { result: { objectTypeIds: [] }, query: { kind: "start", objectTypeId } };
   }
-  const objectTypeIds = includeSubtypes ? uniqueStrings([objectTypeId, ...ctx.ontology.listSubTypes(objectTypeId)]) : [objectTypeId];
+  const objectTypeIds = includeSubtypes ? withSubtypes([objectTypeId], ctx) : [objectTypeId];
   return { result: { objectTypeIds }, query: { kind: "start", objectTypeId, includeSubtypes } };
 }
 function validatePredicate(predicate, shape, admissionState, path, ctx) {
@@ -513,16 +548,15 @@ function validateTextQuery(query, fields, shape, admissionState, path, ctx) {
       addIssue(ctx, path, "missing_text_fields", `Object type '${objectType.id}' must define search.defaultText or the text query must specify fields`);
       continue;
     }
+    const admitted = admitTextFields(fieldIds, fields === undefined, {
+      state: admissionState,
+      objectTypeId: objectType.id,
+      path: `${path}.fields`,
+      ctx
+    });
     if (fieldsByObjectType)
-      fieldsByObjectType[objectType.id] = uniqueStrings(fieldIds);
+      fieldsByObjectType[objectType.id] = uniqueStrings(admitted);
     for (const fieldId of fieldIds) {
-      admitProperty(ctx, {
-        state: admissionState,
-        propertyId: fieldId,
-        objectTypeId: objectType.id,
-        use: "text",
-        path: `${path}.fields`
-      });
       const property = getProperty(objectType, fieldId);
       if (!property) {
         addIssue(ctx, path, "unknown_text_field", `Text query references unknown property '${fieldId}' on '${objectType.id}'`);
@@ -538,6 +572,29 @@ function validateTextQuery(query, fields, shape, admissionState, path, ctx) {
   }
   return fieldsByObjectType ? { fieldsByObjectType } : {};
 }
+function admitTextFields(fieldIds, defaults, input) {
+  const admitted = [];
+  let firstDenial;
+  for (const fieldId of fieldIds) {
+    const denial = input.ctx.admission.property({
+      state: input.state,
+      propertyId: fieldId,
+      objectTypeId: input.objectTypeId,
+      use: "text",
+      path: input.path
+    });
+    if (!denial) {
+      admitted.push(fieldId);
+    } else if (!defaults) {
+      recordAdmissionDenial(input.ctx, denial);
+    } else {
+      firstDenial ??= denial;
+    }
+  }
+  if (admitted.length === 0 && firstDenial)
+    recordAdmissionDenial(input.ctx, firstDenial);
+  return admitted;
+}
 function validateVectorProfileQuery(query, shape, state, path, ctx) {
   const types = getObjectTypesForResult(shape, ctx);
   if (types.length !== 1 || !Number.isSafeInteger(query.k) || query.k < 1 || query.k > MAX_VECTOR_K) {
@@ -605,7 +662,9 @@ function validateOutgoingTraverse(linkId, shape, path, ctx) {
       }
     }
   }
-  return { objectTypeIds: uniqueStrings(targetTypeIds) };
+  const objectTypeIds = uniqueStrings(targetTypeIds);
+  touchLinkTargets(objectTypeIds, ctx);
+  return { objectTypeIds };
 }
 function validateIncomingTraverse(linkId, sourceObjectTypeId, shape, path, ctx) {
   let candidateTypes = ctx.ontology.listObjectTypes();
@@ -688,7 +747,14 @@ function resolveOutgoingExpansionTargets(linkId, sourceObjectTypeId, shape, path
   if (!foundOnAnyType) {
     addIssue(ctx, path, "unknown_expand_link", `Expansion references link '${linkId}' not present on result type ${shape.objectTypeIds.join(" | ")} (an expand abandoned by a later traverse?)`);
   }
-  return { objectTypeIds: uniqueStrings(targetTypeIds) };
+  const objectTypeIds = uniqueStrings(targetTypeIds);
+  touchLinkTargets(objectTypeIds, ctx);
+  return { objectTypeIds };
+}
+function touchLinkTargets(objectTypeIds, ctx) {
+  for (const objectTypeId of withSubtypes(objectTypeIds, ctx)) {
+    ctx.touchedObjectTypeIds.add(objectTypeId);
+  }
 }
 function resolveIncomingExpansionTargets(linkId, sourceObjectTypeId, shape, path, ctx) {
   let candidateTypes = ctx.ontology.listObjectTypes();
@@ -900,6 +966,9 @@ function keyForTypeIds(typeIds) {
 function uniqueStrings(values) {
   return [...new Set(values)];
 }
+function withSubtypes(objectTypeIds, ctx) {
+  return uniqueStrings(objectTypeIds.flatMap((id) => [id, ...ctx.ontology.listSubTypes(id)]));
+}
 function admitTransition(ctx, transition) {
   if (transition.denial)
     recordAdmissionDenial(ctx, transition.denial);
@@ -1385,15 +1454,7 @@ var DEFAULT_MAX_FACET_LIMIT = 1000;
 var DEFAULT_MAX_EXPANSION_FANOUT = 1000;
 var PAGE_TOKEN_PREFIX = "offset:";
 async function executeObjectQuery2(input, options) {
-  const normalized = normalizeObjectQuery2(input.query);
-  const validated = validateObjectQuery2(normalized, {
-    ontology: options.ontology,
-    maxLimit: options.maxLimit,
-    maxPageSize: options.maxPageSize,
-    maxRefs: options.maxRefs,
-    normalize: false
-  });
-  assertQueryViewable(input.projectId, validated, options);
+  const validated = validateExecutableQuery(input, options);
   const capabilities = options.storage.queryCapabilities();
   const hasQueryObjects = typeof options.storage.queryObjects === "function";
   const hasCountObjects = typeof options.storage.countObjects === "function";
@@ -1458,15 +1519,7 @@ async function executeObjectQuery2(input, options) {
   return { ...fallback, plan };
 }
 async function countObjects2(input, options) {
-  const normalized = normalizeObjectQuery2(input.query);
-  const validated = validateObjectQuery2(normalized, {
-    ontology: options.ontology,
-    maxLimit: options.maxLimit,
-    maxPageSize: options.maxPageSize,
-    maxRefs: options.maxRefs,
-    normalize: false
-  });
-  assertQueryViewable(input.projectId, validated, options);
+  const validated = validateExecutableQuery(input, options);
   const capabilities = options.storage.queryCapabilities();
   const hasQueryObjects = typeof options.storage.queryObjects === "function";
   const hasCountObjects = typeof options.storage.countObjects === "function";
@@ -1512,15 +1565,7 @@ async function countObjects2(input, options) {
   return { count: evaluation.total, plan };
 }
 async function existsObjects2(input, options) {
-  const normalized = normalizeObjectQuery2(input.query);
-  const validated = validateObjectQuery2(normalized, {
-    ontology: options.ontology,
-    maxLimit: options.maxLimit,
-    maxPageSize: options.maxPageSize,
-    maxRefs: options.maxRefs,
-    normalize: false
-  });
-  assertQueryViewable(input.projectId, validated, options);
+  const validated = validateExecutableQuery(input, options);
   const capabilities = options.storage.queryCapabilities();
   const hasQueryObjects = typeof options.storage.queryObjects === "function";
   const hasCountObjects = typeof options.storage.countObjects === "function";
@@ -1566,16 +1611,18 @@ async function existsObjects2(input, options) {
   return { exists: evaluation.total > 0, plan };
 }
 async function facetObjects2(input, options) {
-  const normalized = normalizeObjectQuery2(input.query);
-  const validated = validateObjectQuery2(normalized, {
-    ontology: options.ontology,
-    maxLimit: options.maxLimit,
-    maxPageSize: options.maxPageSize,
-    maxRefs: options.maxRefs,
-    normalize: false
-  });
-  assertQueryViewable(input.projectId, validated, options);
+  const validated = validateExecutableQuery(input, options);
   const facets = validateObjectFacetRequests(input.facets, validated.result.objectTypeIds, options);
+  facets.forEach((facet, index) => {
+    const denial = options.admission?.property({
+      state: validated.admissionState,
+      propertyId: facet.propertyId,
+      use: "facet",
+      path: `$.facets[${index}].propertyId`
+    });
+    if (denial)
+      throw denial;
+  });
   const aggregateQuery = stripOuterRowShape(validated.query);
   const capabilities = options.storage.queryCapabilities();
   const hasQueryObjects = typeof options.storage.queryObjects === "function";
@@ -1625,6 +1672,21 @@ async function facetObjects2(input, options) {
     plan
   };
 }
+function validateExecutableQuery(input, options) {
+  const validationOptions = {
+    ontology: options.ontology,
+    maxLimit: options.maxLimit,
+    maxPageSize: options.maxPageSize,
+    maxRefs: options.maxRefs,
+    normalize: false
+  };
+  const normalized = normalizeObjectQuery2(input.query);
+  const validated = validateObjectQuery2(normalized, validationOptions);
+  assertQueryViewable(input.projectId, validated, options);
+  if (!options.admission)
+    return { ...validated, admissionState: {} };
+  return validateObjectQueryWithAdmission(normalized, validationOptions, options.admission);
+}
 function assertQueryViewable(projectId, validated, authorization) {
   if (!authorization.runtimeAuthorization && !authorization.authorization)
     return;
@@ -2619,6 +2681,6 @@ async function hydrateLinkQueryObjects(projectId, selected, links, storage) {
     return row ? [row] : [];
   });
 }
-export { validateObjectQuery2, validateObjectQueryWithAdmission, collectObjectQueryValidationIssues2, resolveObjectQueryResultShape2, planObjectQuery2, executeObjectQuery2, countObjects2, existsObjects2, facetObjects2, validateObjectFacetRequests, explainObjectQuery2, preflightObjectQueryLinks, executeObjectQueryLinks2 };
+export { composeObjectQueryAdmissions, validateObjectQuery2, validateObjectQueryWithAdmission, collectObjectQueryValidationIssues2, resolveObjectQueryResultShape2, planObjectQuery2, executeObjectQuery2, countObjects2, existsObjects2, facetObjects2, validateObjectFacetRequests, explainObjectQuery2, preflightObjectQueryLinks, executeObjectQueryLinks2 };
 
-//# debugId=A31A747EB003D67964756E2164756E21
+//# debugId=6A00FC17EF4657DE64756E2164756E21