@seedprotocol/sdk 0.7.8 → 0.7.9-next.1177.ga3e08ed

package/dist/{getPublishUploads-DVsDx6Xf.js → getPublishUploads-BzUIDA2G.js}

@@ -1,11 +1,11 @@
-import { Q as BaseFileManager, M as ModelPropertyDataTypes, G as BaseDb, p as htmlEmbeddedImageCoPublish, Z as getArweaveUrlForTransaction, Y as resolveSeedIdsFromRefString, X as normalizeRelationPropertyValue, _ as INTERNAL_STORAGE_MODEL_FILE_IDS, W as isPublishedSeedRef, i as isDataType, $ as getStorageDirForDataType, a0 as getContentSha256, a1 as buildArweaveContentTags, a2 as getItemStorageSubdir, a3 as getItemStorageLocalFileName, m as metadata } from './index-C0SetTd1.js';
-import { BaseArweaveClient } from '@seedprotocol/arweave';
-import { g as getPublishDraftGraph, a as getSegmentedItemProperties } from './publishDraftGraph-I5yKe1Xz.js';
+import { M as ModelPropertyDataTypes, Q as BaseFileManager, L as BaseDb, x as htmlEmbeddedImageCoPublish, r as resolveSeedIdsFromRefString, q as normalizeRelationPropertyValue, V as INTERNAL_STORAGE_MODEL_FILE_IDS, l as isPublishedSeedRef, i as isDataType, W as getStorageDirForDataType, X as getContentSha256, Y as buildArweaveContentTags, Z as getItemStorageSubdir, _ as getItemStorageLocalFileName, m as metadata } from './index-Dx_GTdyQ.js';
+import { getPublicArweaveRawUrl, BaseArweaveClient } from '@seedprotocol/arweave';
+import { w as withItemLoads, g as getPublishDraftGraph, a as getSegmentedItemProperties } from './publishDraftGraph-C5F6b7GK.js';
 import debug from 'debug';
-import { I as Item, C as waitForEntityIdle, D as compareMetadataRowsLatestFirst } from './Item-CjTEShfk.js';
 import { parseFragment } from 'parse5';
 import { eq, and } from 'drizzle-orm';
-import { n as getContentHash, o as isVerbatimItemStorageDraftRow, p as convertVerbatimItemStorageRow } from './ClientManager-B1r_8P5Z.js';
+import { n as getContentHash } from './ClientManager-GZfXErDX.js';
+import { I as Item, B as waitForEntityIdle, C as compareMetadataRowsLatestFirst } from './Item-0oDoTPhi.js';
 import 'pluralize';
 import '@seedprotocol/eas';
 import { g as getExtensionForMimeType, r as resolveUploadMimeType } from './mimeTypes-C9r76DCH.js';
@@ -241,12 +241,12 @@ const ARWEAVE_TX_ID = /^[a-z0-9_-]{43}$/i;
  * The Arweave tx of the storage seed a placeholder names: uploaded in this publish's phase 1, or,
  * when not uploaded now, the transaction it was published with (its storageTransactionId).
  */
-async function resolveSeedPropertyRefTxId(item, propertyName, txBySeedLocalId) {
+async function resolveSeedPropertyRefTxId(item, propertyName, txBySeedLocalId, loads) {
     const { seedLocalId, seedUid } = resolveSeedPropertyRefTarget(item, propertyName);
     const uploaded = seedLocalId ? txBySeedLocalId.get(seedLocalId) : undefined;
     if (uploaded)
         return uploaded;
-    const storageItem = await Item.find({ seedLocalId, seedUid });
+    const storageItem = await loads.find({ seedLocalId, seedUid });
     const st = storageItem?.internalProperties['storageTransactionId'] ??
         storageItem?.allProperties['storageTransactionId'];
     const stSnap = st?.getService().getSnapshot();
@@ -298,7 +298,10 @@ async function createImageItemFromBytes(bytes, mimeType) {
         const fs = await BaseFileManager.getFs();
         fs.writeFileSync(filePath, bytes);
     }
-    return { seedLocalId: imageItem.seedLocalId };
+    const { seedLocalId } = imageItem;
+    // Publish loads the image again when it uploads and attests it
+    imageItem.unload();
+    return { seedLocalId };
 }
 /**
  * Scan Html storage properties, materialize embedded images as Image items, insert co-publish rows.
@@ -312,9 +315,11 @@ async function prepareHtmlEmbeddedImagesForPublish(item, publishPolicy) {
     const deferred = new Set();
     // The item's own Html, and the Html of the draft items published with it: each gets its embedded
     // images materialized and co-published (rows keyed by the item owning the Html property).
-    for (const parent of [item, ...(await getRelatedDraftsCoPublishedWith(item))]) {
-        await prepareHtmlEmbeddedImagesOfItem(appDb, parent, publishPolicy, deferred);
-    }
+    await withItemLoads(undefined, async (loads) => {
+        for (const parent of [item, ...(await getRelatedDraftsCoPublishedWith(item, loads))]) {
+            await prepareHtmlEmbeddedImagesOfItem(appDb, parent, publishPolicy, deferred);
+        }
+    });
     return { deferredHtmlSeedLocalIds: [...deferred] };
 }
 /**
@@ -322,11 +327,11 @@ async function prepareHtmlEmbeddedImagesForPublish(item, publishPolicy) {
  * through relation and list properties, as getPublishPayload and getPublishUploads walk them
  * (publishDraftGraph.ts). Html-embedded images of these items are co-published with `item` like its own.
  */
-async function getRelatedDraftsCoPublishedWith(item) {
-    const _mod_0 = await import('./publishDraftGraph-I5yKe1Xz.js');
+async function getRelatedDraftsCoPublishedWith(item, loads) {
+    const _mod_0 = await import('./publishDraftGraph-C5F6b7GK.js');
     const _ns_0 = _mod_0.p;
     const { getPublishDraftGraph } = _ns_0;
-    const { drafts } = await getPublishDraftGraph(item);
+    const { drafts } = await getPublishDraftGraph(item, { loads });
     return drafts.map((d) => d.item);
 }
 async function prepareHtmlEmbeddedImagesOfItem(appDb, item, publishPolicy, deferred) {
@@ -409,9 +414,14 @@ async function rewriteHtmlEmbeddedImagesOnDisk(parentSeedLocalId, uploadedTransa
     const appDb = BaseDb.getAppDb();
     if (!appDb)
         return;
-    const parentItem = await Item.find({ seedLocalId: parentSeedLocalId });
-    if (!parentItem)
-        return;
+    await withItemLoads(undefined, async (loads) => {
+        const parentItem = await loads.find({ seedLocalId: parentSeedLocalId });
+        if (!parentItem)
+            return;
+        await rewriteHtmlEmbeddedImagesOfItemAndDrafts(appDb, parentItem, uploadedTransactions, deferredHtmlSeedLocalIds, loads);
+    });
+}
+async function rewriteHtmlEmbeddedImagesOfItemAndDrafts(appDb, parentItem, uploadedTransactions, deferredHtmlSeedLocalIds, loads) {
     const txBySeedLocalId = new Map();
     for (const u of uploadedTransactions) {
         if (u.seedLocalId && u.txId) {
@@ -422,11 +432,11 @@ async function rewriteHtmlEmbeddedImagesOnDisk(parentSeedLocalId, uploadedTransa
         ? new Set(deferredHtmlSeedLocalIds.map((id) => id.trim()))
         : undefined;
     // The parent's Html and that of the draft items published with it (see prepareHtmlEmbeddedImagesForPublish).
-    for (const item of [parentItem, ...(await getRelatedDraftsCoPublishedWith(parentItem))]) {
-        await rewriteHtmlEmbeddedImagesOfItem(appDb, item, txBySeedLocalId, deferred);
+    for (const item of [parentItem, ...(await getRelatedDraftsCoPublishedWith(parentItem, loads))]) {
+        await rewriteHtmlEmbeddedImagesOfItem(appDb, item, txBySeedLocalId, deferred, loads);
     }
 }
-async function rewriteHtmlEmbeddedImagesOfItem(appDb, parentItem, txBySeedLocalId, deferred) {
+async function rewriteHtmlEmbeddedImagesOfItem(appDb, parentItem, txBySeedLocalId, deferred, loads) {
     const rows = await appDb
         .select()
         .from(htmlEmbeddedImageCoPublish)
@@ -455,12 +465,12 @@ async function rewriteHtmlEmbeddedImagesOfItem(appDb, parentItem, txBySeedLocalI
                 continue;
             const dataUri = await findDataUriForStableKey(html, r.stableKey);
             if (dataUri)
-                replacements.set(dataUri, getArweaveUrlForTransaction(txId));
+                replacements.set(dataUri, getPublicArweaveRawUrl(txId));
         }
         const urlByPropertyName = new Map();
         for (const name of findSeedPropertyRefsInHtml(html)) {
-            const txId = await resolveSeedPropertyRefTxId(parentItem, name, txBySeedLocalId);
-            urlByPropertyName.set(name, getArweaveUrlForTransaction(txId));
+            const txId = await resolveSeedPropertyRefTxId(parentItem, name, txBySeedLocalId, loads);
+            urlByPropertyName.set(name, getPublicArweaveRawUrl(txId));
         }
         const newHtml = replaceSeedPropertyRefsInHtml(replaceDataUrisInParsedHtml(html, replacements), urlByPropertyName);
         if (newHtml === html)
@@ -654,7 +664,7 @@ const getStorageSeedUploadData = async (itemStorageSeedProperties, options) => {
     }
     return uploads;
 };
-async function appendCoPublishedImageUploadData(item, uploads, options) {
+async function appendCoPublishedImageUploadData(item, uploads, loads, options) {
     const appDb = BaseDb.getAppDb();
     if (!appDb || options?.onlyHtmlStorageSeedLocalIds?.length)
         return uploads;
@@ -666,7 +676,7 @@ async function appendCoPublishedImageUploadData(item, uploads, options) {
     for (const row of rows) {
         if (seen.has(row.imageSeedLocalId))
             continue;
-        const imageItem = await Item.find({ seedLocalId: row.imageSeedLocalId, modelName: 'Image' });
+        const imageItem = await loads.find({ seedLocalId: row.imageSeedLocalId, modelName: 'Image' });
         if (!imageItem)
             continue;
         const st = imageItem.internalProperties['storageTransactionId'] ??
@@ -705,41 +715,10 @@ const getLatestItemStorageRow = async (childProperty) => {
     const rows = await appDb.select().from(metadata).where(and(...where));
     return [...rows].sort(compareMetadataRowsLatestFirst)[0];
 };
-/**
- * Write a legacy ItemStorage draft row's verbatim content to `<seedUid or seedLocalId><extension>`
- * and record it on the row (refResolvedValue, localStorageDir) and in the property context. The
- * row's propertyValue is cleared once the file is written, so the row has the same shape as one a
- * save makes and a later edit of the file never leaves stale text behind it.
- */
-const migrateVerbatimItemStorageRow = async (childProperty, row) => {
-    const seedId = row.seedUid || childProperty.seedUid || row.seedLocalId || childProperty.seedLocalId;
-    if (!seedId || !row.localId)
-        return undefined;
-    const propertyDef = childProperty.propertyDef;
-    const converted = await convertVerbatimItemStorageRow(row.localId, {
-        seedId,
-        localStorageDir: propertyDef?.localStorageDir || row.localStorageDir,
-        filenameSuffix: propertyDef?.filenameSuffix,
-    });
-    if (!converted)
-        return undefined;
-    const { fileName, filePath, localStorageDir, content } = converted;
-    // The content is still the value: keep it as renderValue (the property may show it from propertyValue).
-    childProperty.getService().send({
-        type: 'updateContext',
-        refResolvedValue: fileName,
-        localStorageDir,
-        renderValue: content,
-    });
-    logger(`resolveItemStorageChildFile: wrote verbatim ${childProperty.propertyName} content to ${filePath}`);
-    return filePath;
-};
 /**
  * Local file of one ItemStorage child of a composite upload. Tries, in order: the property's
  * localStoragePath (context set by save / hydration / the live query), its newest metadata row's
- * refResolvedValue + localStorageDir, then (for a local draft whose propertyValue is the content
- * itself, as rows made before Item.create saved ItemStorage values) that content written to its
- * file, then (for a local draft, or no row) the name
+ * refResolvedValue + localStorageDir, then (for a local draft, or no row) the name
  * saveItemStorage gives a new file (`<seedUid or seedLocalId><extension>` in the model's storage
  * directory). A published or derived row is never swapped for a local file of another name: that
  * file would be older content.
@@ -772,17 +751,6 @@ const resolveItemStorageChildFile = async (childProperty) => {
             return { filePath: fromRow };
     }
     const isLocalDraft = !!row && !row.uid && row.derivedFromUid == null;
-    // A local draft holding the content itself (no file reference): what Item.create / createNewItem
-    // stored for ItemStorage values before they went through the save pipeline. Write it to the file a
-    // save would have, point the row and the property at it, and upload that.
-    if (row && isVerbatimItemStorageDraftRow(row)) {
-        const migrated = await migrateVerbatimItemStorageRow(childProperty, row).catch((error) => {
-            logger('resolveItemStorageChildFile: writing verbatim ItemStorage content failed', error);
-            return undefined;
-        });
-        if (migrated)
-            return { filePath: migrated };
-    }
     const suffix = propertyDef?.filenameSuffix;
     const seedIds = !row || isLocalDraft
         ? [row?.seedUid, childProperty.seedUid, row?.seedLocalId, childProperty.seedLocalId]
@@ -848,7 +816,7 @@ async function uploadPropertyWouldUpload(uploadProperty, relatedItemProperty) {
     }
     return false;
 }
-async function itemOwnUploadCandidates(item, relatedItemProperty, recurseStorageRelations) {
+async function itemOwnUploadCandidates(item, relatedItemProperty, recurseStorageRelations, loads) {
     const { itemUploadProperties, itemRelationProperties, itemImageProperties } = await getSegmentedItemProperties(item);
     for (const uploadProperty of itemUploadProperties) {
         if (await uploadPropertyWouldUpload(uploadProperty, relatedItemProperty)) {
@@ -877,7 +845,7 @@ async function itemOwnUploadCandidates(item, relatedItemProperty, recurseStorage
         if (!seedLocalId && !seedUid) {
             throw new Error(`Invalid relation value for ${relationProperty.propertyName}: expected local seed id or 0x uid`);
         }
-        const relatedItem = await Item.find({
+        const relatedItem = await loads.find({
             seedLocalId,
             seedUid,
         });
@@ -887,7 +855,7 @@ async function itemOwnUploadCandidates(item, relatedItemProperty, recurseStorage
                 continue;
             throw new Error(`No relatedItem found for ${relationProperty.propertyName}`);
         }
-        if (await itemOwnUploadCandidates(relatedItem, relationProperty, false)) {
+        if (await itemOwnUploadCandidates(relatedItem, relationProperty, false, loads)) {
             return true;
         }
     }
@@ -895,14 +863,16 @@ async function itemOwnUploadCandidates(item, relatedItemProperty, recurseStorage
 }
 /** Same walk as getPublishUploads: the item and the draft items its publish carries along. */
 async function itemHasPublishUploadCandidates(item, relatedItemProperty) {
-    if (await itemOwnUploadCandidates(item, relatedItemProperty, true))
-        return true;
-    const { drafts } = await getPublishDraftGraph(item, { strict: true });
-    for (const { item: draft, via, viaList } of drafts) {
-        if (await itemOwnUploadCandidates(draft, viaList ? undefined : via, true))
+    return withItemLoads(undefined, async (loads) => {
+        if (await itemOwnUploadCandidates(item, relatedItemProperty, true, loads))
             return true;
-    }
-    return false;
+        const { drafts } = await getPublishDraftGraph(item, { strict: true, loads });
+        for (const { item: draft, via, viaList } of drafts) {
+            if (await itemOwnUploadCandidates(draft, viaList ? undefined : via, true, loads))
+                return true;
+        }
+        return false;
+    });
 }
 const processUploadPropertyData = async (uploadProperty, uploads, relatedItemProperty, options) => {
     const itemProperty = uploadProperty.itemProperty;
@@ -999,7 +969,7 @@ const processUploadPropertyData = async (uploadProperty, uploads, relatedItemPro
 /** No seed uid yet: a related item in this state is published together with the item. */
 const isDraftItem = (item) => !item.seedUid || item.seedUid === '0x' + '0'.repeat(64);
 /** One item's own uploads: its files, storage seeds, Html-embedded images, and the items its storage relations point at. */
-const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, options) => {
+const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, options, loads) => {
     const { itemUploadProperties, itemRelationProperties, itemImageProperties } = await getSegmentedItemProperties(item);
     // Phase 2 of an embedded-image publish: only the deferred Html storage seeds, of this item and of
     // the related items published with it (whose Html can embed images too).
@@ -1016,7 +986,7 @@ const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, o
         uploads.push(...storageSeedUploads);
         // Images embedded in this item's Html: the published item's, and a related draft's published with it.
         if (!relatedItemProperty || isDraftItem(item)) {
-            uploads = await appendCoPublishedImageUploadData(item, uploads, options);
+            uploads = await appendCoPublishedImageUploadData(item, uploads, loads, options);
         }
     }
     if (options?.skipRelationRecursion) {
@@ -1040,7 +1010,7 @@ const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, o
         if (!seedLocalId && !seedUid) {
             throw new Error(`Invalid relation value for ${relationProperty.propertyName}: expected local seed id or 0x uid`);
         }
-        const relatedItem = await Item.find({
+        const relatedItem = await loads.find({
             seedLocalId,
             seedUid,
         });
@@ -1050,10 +1020,7 @@ const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, o
                 continue;
             throw new Error(`No relatedItem found for ${relationProperty.propertyName}`);
         }
-        uploads = await getItemOwnPublishUploadData(relatedItem, uploads, relationProperty, {
-            ...options,
-            skipRelationRecursion: true,
-        });
+        uploads = await getItemOwnPublishUploadData(relatedItem, uploads, relationProperty, { ...options, skipRelationRecursion: true }, loads);
     }
     return uploads;
 };
@@ -1065,15 +1032,17 @@ const getItemOwnPublishUploadData = async (item, uploads, relatedItemProperty, o
  * DataItems; {@link getPublishUploads} turns them into L1 transactions.
  */
 const getPublishUploadData = async (item, uploads = [], relatedItemProperty, options) => {
-    uploads = await getItemOwnPublishUploadData(item, uploads, relatedItemProperty, options);
-    if (options?.skipRelationRecursion) {
+    return withItemLoads(undefined, async (loads) => {
+        uploads = await getItemOwnPublishUploadData(item, uploads, relatedItemProperty, options, loads);
+        if (options?.skipRelationRecursion) {
+            return uploads;
+        }
+        const { drafts } = await getPublishDraftGraph(item, { strict: true, loads });
+        for (const { item: draft, via, viaList } of drafts) {
+            uploads = await getItemOwnPublishUploadData(draft, uploads, viaList ? undefined : via, options, loads);
+        }
         return uploads;
-    }
-    const { drafts } = await getPublishDraftGraph(item, { strict: true });
-    for (const { item: draft, via, viaList } of drafts) {
-        uploads = await getItemOwnPublishUploadData(draft, uploads, viaList ? undefined : via, options);
-    }
-    return uploads;
+    });
 };
 /**
  * Arweave L1 transactions for a publish of `item`: {@link getPublishUploadData}, each made into an
@@ -1081,7 +1050,7 @@ const getPublishUploadData = async (item, uploads = [], relatedItemProperty, opt
  */
 const getPublishUploads = async (item, uploads = [], relatedItemProperty, options) => {
     // Every edit made before publishing is in `metadata` and its files first (ADR 0019)
-    const { waitForPendingOutboxOps } = await import('./index-CJK3F_MK.js');
+    const { waitForPendingOutboxOps } = await import('./index-CkYb3wcU.js');
     await waitForPendingOutboxOps();
     const uploadData = await getPublishUploadData(item, [], relatedItemProperty, options);
     // Each createTransaction fetches the price / anchor from the gateway: run a few at once.
@@ -1108,4 +1077,4 @@ var getPublishUploads$1 = /*#__PURE__*/Object.freeze({
 });
 
 export { HTML_EMBEDDED_MAX_IMAGES_PER_DOC as H, SEED_PROPERTY_REF_PREFIX as S, HTML_EMBEDDED_MAX_IMAGE_BYTES as a, HTML_EMBEDDED_MAX_TOTAL_BYTES as b, HtmlEmbeddedDataUriLimitError as c, HtmlSeedPropertyRefError as d, clearHtmlEmbeddedImageCoPublishRows as e, findEmbeddedImageFilePath as f, getRelatedDraftsCoPublishedWith as g, extractDataUriImagesFromHtml as h, findSeedPropertyRefsInHtml as i, getPublishUploadData as j, itemHasPublishUploadCandidates as k, replaceSeedPropertyRefsInHtml as l, resolveEffectiveHtmlEmbeddedDataUriPolicy as m, rewriteHtmlEmbeddedImagesOnDisk as n, getPublishUploads$1 as o, prepareHtmlEmbeddedImagesForPublish as p, replaceDataUrisInParsedHtml as r };
-//# sourceMappingURL=getPublishUploads-DVsDx6Xf.js.map
+//# sourceMappingURL=getPublishUploads-BzUIDA2G.js.map