@odla-ai/brand 0.8.0 → 0.8.2

package/dist/index.js

@@ -1794,6 +1794,13 @@ function contrastReport(swatches) {
   return report;
 }
 
+// src/link-shape.ts
+function hasExactOneLink(value, expectedId) {
+  if (Array.isArray(value))
+    return value.length === 1 && value[0]?.id === expectedId;
+  return typeof value === "object" && value !== null && value.id === expectedId;
+}
+
 // src/skill/asset-tools.ts
 var MAX_VIEW_BYTES = 4718592;
 var IMAGE_TYPES = /* @__PURE__ */ new Set(["image/png", "image/jpeg", "image/gif", "image/webp"]);
@@ -1836,7 +1843,7 @@ function assetTools(ctx) {
       }
     });
     const row = (res[BRAND_NS.asset] ?? [])[0];
-    if (!row || row.status !== "live" || row.deletedAt || !Array.isArray(row.book) || row.book.length !== 1 || row.book[0]?.id !== book.id) throw new BrandNotFoundError(`asset ${assetId}`);
+    if (!row || row.status !== "live" || row.deletedAt || !hasExactOneLink(row.book, book.id)) throw new BrandNotFoundError(`asset ${assetId}`);
     return row;
   };
   const viewAsset = {
@@ -1924,7 +1931,7 @@ async function proposalSourceAssetId(ctx, book, value) {
   });
   const rows = result[BRAND_NS.asset] ?? [];
   const asset = rows.length === 1 ? rows[0] : void 0;
-  if (!asset || asset.id !== sourceAssetId || asset.bookId !== book.id || asset.status !== "live" || asset.deletedAt !== void 0 || !Array.isArray(asset.book) || asset.book.length !== 1 || asset.book[0]?.id !== book.id) throw new BrandInputError(
+  if (!asset || asset.id !== sourceAssetId || asset.bookId !== book.id || asset.status !== "live" || asset.deletedAt !== void 0 || !hasExactOneLink(asset.book, book.id)) throw new BrandInputError(
     "sourceAssetId must be a live asset in this brand book"
   );
   return sourceAssetId;
@@ -2366,7 +2373,7 @@ function readTools(ctx) {
           book: {}
         }
       });
-      const linked = (rows) => rows.filter((row) => row.bookId === authorizedBook.id && Array.isArray(row.book) && row.book.length === 1 && row.book[0]?.id === authorizedBook.id);
+      const linked = (rows) => rows.filter((row) => row.bookId === authorizedBook.id && hasExactOneLink(row.book, authorizedBook.id));
       const sections = linked(
         res[BRAND_NS.section] ?? []
       );
@@ -2416,7 +2423,7 @@ function readTools(ctx) {
           book: {}
         }
       });
-      const rows = (res[BRAND_NS.asset] ?? []).filter((asset) => asset.bookId === ctx.bookId && Array.isArray(asset.book) && asset.book.length === 1 && asset.book[0]?.id === ctx.bookId);
+      const rows = (res[BRAND_NS.asset] ?? []).filter((asset) => asset.bookId === ctx.bookId && hasExactOneLink(asset.book, ctx.bookId));
       if (rows.length === 0) {
         return { content: input.kind ? `(no ${String(input.kind)} assets uploaded yet)` : "(no assets uploaded yet)" };
       }
@@ -2545,7 +2552,7 @@ async function linkedAsset(ctx, book, assetId, allowDeleting = false) {
   });
   const row = rowAsWritten(BRAND_NS.asset, (result[BRAND_NS.asset] ?? [])[0]);
   const links = row?.book;
-  if (!row || row.bookId !== book.id || !Array.isArray(links) || links.length !== 1 || links[0]?.id !== book.id || row.status !== "live" && !(allowDeleting && row.status === "deleting")) throw new BrandNotFoundError(`asset ${assetId}`);
+  if (!row || row.bookId !== book.id || !hasExactOneLink(links, book.id) || row.status !== "live" && !(allowDeleting && row.status === "deleting")) throw new BrandNotFoundError(`asset ${assetId}`);
   return row;
 }
 
@@ -2748,7 +2755,7 @@ async function handleAssetsRoot(ctx, req, bookId) {
   });
   const assets = (result[BRAND_NS.asset] ?? []).filter((value) => {
     const row = value;
-    return row.bookId === book.id && Array.isArray(row.book) && row.book.length === 1 && row.book[0]?.id === book.id;
+    return row.bookId === book.id && hasExactOneLink(row.book, book.id);
   });
   return json({ assets });
 }
@@ -3234,7 +3241,7 @@ async function proposalReceiptByMutation(ctx, mutationKey) {
     }
   });
   const row = (result[BRAND_NS.approvalReceipt] ?? [])[0];
-  if (!row || !Array.isArray(row.book) || row.book.length !== 1 || row.book[0]?.id !== row.bookId) return void 0;
+  if (!row || !hasExactOneLink(row.book, row.bookId)) return void 0;
   const { book: _book, ...receipt2 } = row;
   return receiptAsWritten(receipt2);
 }
@@ -3269,7 +3276,7 @@ async function receipt(ctx, id, actionDigest, expected) {
     }
   });
   const row = (result[BRAND_NS.approvalReceipt] ?? [])[0];
-  if (!row || row.actionDigest !== actionDigest || row.resolution !== "accepted" || row.bookId !== expected.bookId || row.reviewedProposal.bookId !== expected.bookId || row.reviewedProposal.kind !== expected.kind || !Array.isArray(row.book) || row.book.length !== 1 || row.book[0]?.id !== expected.bookId || expected.paletteId !== void 0 && row.paletteId !== expected.paletteId || expected.proposalId !== void 0 && row.proposalId !== expected.proposalId || expected.content !== void 0 && canonicalBrandJson(row.reviewedProposal.payload.content) !== canonicalBrandJson(expected.content)) throw new BrandConflictError(`approval receipt ${id} is invalid`);
+  if (!row || row.actionDigest !== actionDigest || row.resolution !== "accepted" || row.bookId !== expected.bookId || row.reviewedProposal.bookId !== expected.bookId || row.reviewedProposal.kind !== expected.kind || !hasExactOneLink(row.book, expected.bookId) || expected.paletteId !== void 0 && row.paletteId !== expected.paletteId || expected.proposalId !== void 0 && row.proposalId !== expected.proposalId || expected.content !== void 0 && canonicalBrandJson(row.reviewedProposal.payload.content) !== canonicalBrandJson(expected.content)) throw new BrandConflictError(`approval receipt ${id} is invalid`);
   const { book: _book, ...stored } = row;
   const unhydrated = receiptAsWritten(stored);
   if (!await verifyBrandApprovalReceipt(unhydrated))
@@ -3284,8 +3291,11 @@ async function activePalette(ctx, book) {
       book: {}
     }
   });
-  const palette = (result[BRAND_NS.palette] ?? [])[0];
-  if (!palette || palette.bookId !== book.id || palette.status !== "active" || !palette.proposalId || !palette.approvalReceiptId || !palette.approvalActionDigest || !Array.isArray(palette.book) || palette.book.length !== 1 || palette.book[0]?.id !== book.id) throw new BrandConflictError(
+  const palette = rowAsWritten(
+    BRAND_NS.palette,
+    (result[BRAND_NS.palette] ?? [])[0]
+  );
+  if (!palette || palette.bookId !== book.id || palette.status !== "active" || !palette.proposalId || !palette.approvalReceiptId || !palette.approvalActionDigest || !hasExactOneLink(palette.book, book.id)) throw new BrandConflictError(
     "active palette is missing valid approval provenance"
   );
   const approval = await receipt(
@@ -3332,9 +3342,12 @@ async function approvedTypography(ctx, book) {
       book: {}
     }
   });
-  const section = (result[BRAND_NS.section] ?? [])[0];
+  const section = rowAsWritten(
+    BRAND_NS.section,
+    (result[BRAND_NS.section] ?? [])[0]
+  );
   if (!section || section.status !== "approved") return {};
-  if (section.bookId !== book.id || section.kind !== "typography" || !section.approvalReceiptId || !section.approvalActionDigest || !Array.isArray(section.book) || section.book.length !== 1 || section.book[0]?.id !== book.id) throw new BrandConflictError(
+  if (section.bookId !== book.id || section.kind !== "typography" || !section.approvalReceiptId || !section.approvalActionDigest || !hasExactOneLink(section.book, book.id)) throw new BrandConflictError(
     "approved typography is missing valid approval provenance"
   );
   assertSectionContent("typography", section.content);
@@ -3375,7 +3388,7 @@ async function proposalDecisionState(ctx, req, book, proposal, resolution, recei
       }
     });
     sourceAsset = (result[BRAND_NS.asset] ?? [])[0];
-    if (!sourceAsset || sourceAsset.id !== source.assetId || sourceAsset.bookId !== book.id || sourceAsset.status !== "live" || sourceAsset.deletedAt !== void 0 || sourceAsset.contentDigest !== source.contentDigest || sourceAsset.size !== source.objectSize || sourceAsset.contentType !== source.contentType || await brandJsonDigest({ appId: ctx.appId, path: sourceAsset.path }) !== source.pathDigest || sourceAsset.analysisRevision !== source.analysisRevision || (sourceAsset.analysisDigest ?? null) !== source.analysisDigest || !Array.isArray(sourceAsset.book) || sourceAsset.book.length !== 1 || sourceAsset.book[0]?.id !== book.id) throw new BrandConflictError(
+    if (!sourceAsset || sourceAsset.id !== source.assetId || sourceAsset.bookId !== book.id || sourceAsset.status !== "live" || sourceAsset.deletedAt !== void 0 || sourceAsset.contentDigest !== source.contentDigest || sourceAsset.size !== source.objectSize || sourceAsset.contentType !== source.contentType || await brandJsonDigest({ appId: ctx.appId, path: sourceAsset.path }) !== source.pathDigest || sourceAsset.analysisRevision !== source.analysisRevision || (sourceAsset.analysisDigest ?? null) !== source.analysisDigest || !hasExactOneLink(sourceAsset.book, book.id)) throw new BrandConflictError(
       "source asset changed since the proposal was reviewed"
     );
     if (!await ctx.verifySourceAssetSnapshot({
@@ -3559,7 +3572,7 @@ async function handleProposalResolution(ctx, req, bookId, proposalId) {
     }
   });
   const proposal = proposalAsWritten((result[BRAND_NS.proposal] ?? [])[0]);
-  if (!proposal || proposal.bookId !== book.id || !Array.isArray(proposal.book) || proposal.book.length !== 1 || proposal.book[0]?.id !== book.id) throw new BrandNotFoundError(`proposal ${proposalId}`);
+  if (!proposal || proposal.bookId !== book.id || !hasExactOneLink(proposal.book, book.id)) throw new BrandNotFoundError(`proposal ${proposalId}`);
   const current = proposalReviewSnapshot(proposal);
   const { reviewDigest, ...unsignedReview } = current;
   if (await brandJsonDigest(unsignedReview) !== reviewDigest || canonicalBrandJson(current) !== canonicalBrandJson(reviewed)) throw new BrandConflictError("proposal changed since review");
@@ -3703,7 +3716,7 @@ async function acceptedReceipt(db, bookId, receiptId, actionDigest) {
     }
   });
   const receipt2 = (result[BRAND_NS.approvalReceipt] ?? [])[0];
-  if (!receipt2 || receipt2.resolution !== "accepted" || receipt2.actionDigest !== actionDigest || !Array.isArray(receipt2.book) || receipt2.book.length !== 1 || receipt2.book[0]?.id !== bookId) return missing(bookId);
+  if (!receipt2 || receipt2.resolution !== "accepted" || receipt2.actionDigest !== actionDigest || !hasExactOneLink(receipt2.book, bookId)) return missing(bookId);
   const { book: _book, ...stored } = receipt2;
   const unhydrated = receiptAsWritten(stored);
   if (!await verifyBrandApprovalReceipt(unhydrated)) return missing(bookId);
@@ -3719,7 +3732,7 @@ async function approvedCache(db, book) {
     }
   });
   const palette = (paletteResult[BRAND_NS.palette] ?? [])[0];
-  if (!palette || palette.status !== "active" || palette.approvalReceiptId !== cache.paletteReceiptId || palette.approvalActionDigest !== cache.paletteActionDigest || !Array.isArray(palette.book) || palette.book.length !== 1 || palette.book[0]?.id !== book.id) return missing(book.id);
+  if (!palette || palette.status !== "active" || palette.approvalReceiptId !== cache.paletteReceiptId || palette.approvalActionDigest !== cache.paletteActionDigest || !hasExactOneLink(palette.book, book.id)) return missing(book.id);
   await acceptedReceipt(
     db,
     book.id,
@@ -3737,7 +3750,7 @@ async function approvedCache(db, book) {
   });
   const typography = (sectionResult[BRAND_NS.section] ?? [])[0];
   if (hasTypeId) {
-    if (!typography || typography.bookId !== book.id || typography.kind !== "typography" || typography.status !== "approved" || typography.approvalReceiptId !== cache.typographyReceiptId || typography.approvalActionDigest !== cache.typographyActionDigest || !Array.isArray(typography.book) || typography.book.length !== 1 || typography.book[0]?.id !== book.id) return missing(book.id);
+    if (!typography || typography.bookId !== book.id || typography.kind !== "typography" || typography.status !== "approved" || typography.approvalReceiptId !== cache.typographyReceiptId || typography.approvalActionDigest !== cache.typographyActionDigest || !hasExactOneLink(typography.book, book.id)) return missing(book.id);
     await acceptedReceipt(
       db,
       book.id,
@@ -4142,7 +4155,7 @@ async function attachedBrandAssetIds(db, book, row) {
     const rows = result[BRAND_NS.asset] ?? [];
     if (rows.length !== 1) return null;
     const asset = rows[0];
-    return asset.id === id && asset.bookId === book.id && asset.status === "live" && asset.deletedAt === void 0 && Array.isArray(asset.book) && asset.book.length === 1 && asset.book[0]?.id === book.id ? id : null;
+    return asset.id === id && asset.bookId === book.id && asset.status === "live" && asset.deletedAt === void 0 && hasExactOneLink(asset.book, book.id) ? id : null;
   }));
   return assets.filter((id) => id !== null);
 }