@seedprotocol/sdk 0.1.108 → 0.1.110

package/dist/main.js

@@ -1,7 +1,7 @@
-export { j as ImageSrc, I as Item, k as ItemProperty, J as Json, L as List, M as Model, P as Property, R as Relation, T as Text, t as client, v as getCorrectId, s as getGlobalService, n as useCreateItem, p as useDeleteItem, q as useGlobalServiceStatus, l as useItem, m as useItemProperties, o as useItemProperty, u as useItems, r as useServices, w as withSeed } from './index-CsC8qxj6.js';
+export { j as ImageSrc, I as Item, k as ItemProperty, J as Json, L as List, M as Model, P as Property, R as Relation, T as Text, t as client, v as getCorrectId, s as getGlobalService, n as useCreateItem, p as useDeleteItem, q as useGlobalServiceStatus, l as useItem, m as useItemProperties, o as useItemProperty, u as useItems, r as useServices, w as withSeed } from './index-DPl7MLMn.js';
 import 'immer';
 import 'reflect-metadata';
-import './constants-qIJt7998.js';
+import './constants-CEnkzyny.js';
 import 'xstate';
 import 'arweave';
 import 'drizzle-orm';

package/dist/{seed.schema.config-hUwOwJMn.js → seed.schema.config-B7qlhJai.js}

@@ -1,6 +1,6 @@
-import { _ as __decorate, a as __metadata } from './constants-qIJt7998.js';
+import { _ as __decorate, a as __metadata } from './constants-CEnkzyny.js';
 import 'drizzle-orm';
-import { T as Text, M as Model } from './index-CsC8qxj6.js';
+import { T as Text, M as Model } from './index-DPl7MLMn.js';
 import 'react';
 import 'reflect-metadata';
 import 'xstate';
@@ -76,4 +76,4 @@ const models = {
 };
 
 export { models };
-//# sourceMappingURL=seed.schema.config-hUwOwJMn.js.map
+//# sourceMappingURL=seed.schema.config-B7qlhJai.js.map

package/dist/{seed.schema.config-hUwOwJMn.js.map → seed.schema.config-B7qlhJai.js.map}

@@ -1 +1 @@
-{"version":3,"file":"seed.schema.config-hUwOwJMn.js","sources":["../../src/shared/configs/seed.schema.config.ts"],"sourcesContent":["import { Model, Text } from '@/browser'\n\n@Model\nclass Seed {\n  @Text() uid!: string\n  @Text() type!: string\n}\n\n@Model\nclass Version {\n  @Text() seedUid!: string\n  @Text() note!: string\n}\n\n@Model\nclass Metadata {\n  @Text() key!: string\n  @Text() value!: string\n}\n\nexport const models = {\n  Seed,\n  Version,\n  Metadata,\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,IAAM,IAAI,GAAV,MAAM,IAAI,CAAA;CAGT;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAa,CAAA,EAAA,IAAA,CAAA,SAAA,EAAA,KAAA,EAAA,KAAA,CAAA,CAAA;AACZ,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAc,CAAA,EAAA,IAAA,CAAA,SAAA,EAAA,MAAA,EAAA,KAAA,CAAA,CAAA;AAFjB,IAAI,GAAA,UAAA,CAAA;IADT;AACK,CAAA,EAAA,IAAI,CAGT;AAGD,IAAM,OAAO,GAAb,MAAM,OAAO,CAAA;CAGZ;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAiB,CAAA,EAAA,OAAA,CAAA,SAAA,EAAA,SAAA,EAAA,KAAA,CAAA,CAAA;AAChB,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAc,CAAA,EAAA,OAAA,CAAA,SAAA,EAAA,MAAA,EAAA,KAAA,CAAA,CAAA;AAFjB,OAAO,GAAA,UAAA,CAAA;IADZ;AACK,CAAA,EAAA,OAAO,CAGZ;AAGD,IAAM,QAAQ,GAAd,MAAM,QAAQ,CAAA;CAGb;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAa,CAAA,EAAA,QAAA,CAAA,SAAA,EAAA,KAAA,EAAA,KAAA,CAAA,CAAA;AACZ,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAe,CAAA,EAAA,QAAA,CAAA,SAAA,EAAA,OAAA,EAAA,KAAA,CAAA,CAAA;AAFlB,QAAQ,GAAA,UAAA,CAAA;IADb;AACK,CAAA,EAAA,QAAQ,CAGb;AAEY,MAAA,MAAM,GAAG;IACpB,IAAI;IACJ,OAAO;IACP,QAAQ;;;;;"}
+{"version":3,"file":"seed.schema.config-B7qlhJai.js","sources":["../../src/shared/configs/seed.schema.config.ts"],"sourcesContent":["import { Model, Text } from '@/browser'\n\n@Model\nclass Seed {\n  @Text() uid!: string\n  @Text() type!: string\n}\n\n@Model\nclass Version {\n  @Text() seedUid!: string\n  @Text() note!: string\n}\n\n@Model\nclass Metadata {\n  @Text() key!: string\n  @Text() value!: string\n}\n\nexport const models = {\n  Seed,\n  Version,\n  Metadata,\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,IAAM,IAAI,GAAV,MAAM,IAAI,CAAA;CAGT;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAa,CAAA,EAAA,IAAA,CAAA,SAAA,EAAA,KAAA,EAAA,KAAA,CAAA,CAAA;AACZ,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAc,CAAA,EAAA,IAAA,CAAA,SAAA,EAAA,MAAA,EAAA,KAAA,CAAA,CAAA;AAFjB,IAAI,GAAA,UAAA,CAAA;IADT;AACK,CAAA,EAAA,IAAI,CAGT;AAGD,IAAM,OAAO,GAAb,MAAM,OAAO,CAAA;CAGZ;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAiB,CAAA,EAAA,OAAA,CAAA,SAAA,EAAA,SAAA,EAAA,KAAA,CAAA,CAAA;AAChB,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAc,CAAA,EAAA,OAAA,CAAA,SAAA,EAAA,MAAA,EAAA,KAAA,CAAA,CAAA;AAFjB,OAAO,GAAA,UAAA,CAAA;IADZ;AACK,CAAA,EAAA,OAAO,CAGZ;AAGD,IAAM,QAAQ,GAAd,MAAM,QAAQ,CAAA;CAGb;AAFS,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAa,CAAA,EAAA,QAAA,CAAA,SAAA,EAAA,KAAA,EAAA,KAAA,CAAA,CAAA;AACZ,UAAA,CAAA;AAAP,IAAA,IAAI,EAAE;;AAAe,CAAA,EAAA,QAAA,CAAA,SAAA,EAAA,OAAA,EAAA,KAAA,CAAA,CAAA;AAFlB,QAAQ,GAAA,UAAA,CAAA;IADb;AACK,CAAA,EAAA,QAAQ,CAGb;AAEY,MAAA,MAAM,GAAG;IACpB,IAAI;IACJ,OAAO;IACP,QAAQ;;;;;"}

package/dist/src/ItemProperty.ts

@@ -58,15 +58,15 @@ export class ItemProperty<PropertyType> {
     seedLocalId,
     versionLocalId,
     versionUid,
-    itemModelName,
+    modelName,
     propertyName,
     storageTransactionId,
     schemaUid,
   }: Partial<CreatePropertyInstanceProps>) {
-    const ModelClass = getModel(itemModelName)
+    const ModelClass = getModel(modelName)
 
     if (!ModelClass) {
-      throw new Error(`Model ${itemModelName} not found`)
+      throw new Error(`Model ${modelName} not found`)
     }
 
     if (!propertyName) {
@@ -80,7 +80,7 @@ export class ItemProperty<PropertyType> {
       seedUid,
       versionLocalId,
       versionUid,
-      itemModelName,
+      modelName: modelName,
       storageTransactionId,
       propertyRecordSchema: ModelClass.schema[propertyName],
       schemaUid,
@@ -150,6 +150,16 @@ export class ItemProperty<PropertyType> {
         const { context } = snapshot
         const { propertyRecordSchema } = context
 
+        // if (
+        //   context.propertyName &&
+        //   context.propertyName.includes('featureImage')
+        // ) {
+        //   console.log(
+        //     `${context.localId} context for ${snapshot.value}`,
+        //     context,
+        //   )
+        // }
+
         if (context.seedLocalId) {
           const cacheKey = ItemProperty.cacheKey(
             context.seedLocalId,
@@ -217,12 +227,10 @@ export class ItemProperty<PropertyType> {
 
         this._subject.next(renderValue)
         if (context.seedLocalId) {
-          eventEmitter.emit(
-            `item.${itemModelName}.${context.seedLocalId}.update`,
-          )
+          eventEmitter.emit(`item.${modelName}.${context.seedLocalId}.update`)
         }
         if (context.seedUid) {
-          eventEmitter.emit(`item.${itemModelName}.${context.seedUid}.update`)
+          eventEmitter.emit(`item.${modelName}.${context.seedUid}.update`)
         }
       },
     )
@@ -232,7 +240,7 @@ export class ItemProperty<PropertyType> {
 
   private _updateResponseListener(event) {
     logger(
-      `[ItemProperty] [_updateResponseListener] [${this.itemModelName}.${this.seedLocalId}] ${this.propertyName} event`,
+      `[ItemProperty] [_updateResponseListener] [${this.modelName}.${this.seedLocalId}] ${this.propertyName} event`,
       event,
     )
   }
@@ -351,14 +359,27 @@ export class ItemProperty<PropertyType> {
     return this._getSnapshot().context.propertyName
   }
 
-  get itemModelName() {
-    return this._getSnapshot().context.itemModelName
+  get modelName() {
+    return this._getSnapshot().context.modelName
   }
 
   get propertyDef(): Static<typeof TProperty> | undefined {
     return this._getSnapshot().context.propertyRecordSchema
   }
 
+  get localStoragePath(): string | void {
+    if (this.propertyDef && this.propertyDef.localStorageDir) {
+      return `/files${this.propertyDef.localStorageDir}/${this._getSnapshot().context.refResolvedValue}`
+    }
+    if (this._getSnapshot().context.localStorageDir) {
+      return `/files${this._getSnapshot().context.localStorageDir}/${this._getSnapshot().context.refResolvedValue}`
+    }
+  }
+
+  get versionLocalId(): string | undefined {
+    return this._getSnapshot().context.versionLocalId
+  }
+
   get status() {
     return this._getSnapshot().value
   }

package/dist/src/analyzeInput.ts

@@ -23,7 +23,7 @@ export const analyzeInput = fromCallback<
     versionUid,
     propertyValue: existingValue,
     propertyRecordSchema,
-    itemModelName,
+    modelName,
   } = context
 
   let { schemaUid } = context
@@ -104,7 +104,7 @@ export const analyzeInput = fromCallback<
       seedLocalId,
       versionLocalId,
       versionUid,
-      modelName: itemModelName,
+      modelName,
       schemaUid,
     })
 

package/dist/src/getItem.ts

@@ -107,7 +107,7 @@ export const getItemDataFromDb: GetItemDataFromDb = async ({
     itemData[propertyName] = propertyValue
   }
 
-  return itemData
+  if (itemData) return itemData
 }
 
 type GetItemParams = {

package/dist/src/getPublishPayload.ts

@@ -18,6 +18,10 @@ import { getSchemaUidForSchemaDefinition } from '@/browser/stores/eas'
 import { ItemProperty } from '@/browser/property/ItemProperty'
 import { getCorrectId } from '@/browser/helpers'
 import { Item } from '@/browser/item/Item'
+import debug from 'debug'
+import { getSegmentedItemProperties } from '@/browser/helpers/getSegmentedItemProperties'
+
+const logger = debug('app:item:getPublishPayload')
 
 const getVersionUid = (item: Item<any>) => {
   let versionUid
@@ -63,46 +67,6 @@ const getPropertyData = async (itemProperty: ItemProperty<any>) => {
   }
 }
 
-const getSegmentedItemProperties = (item: Item<any>) => {
-  const itemBasicProperties = []
-  const itemRelationProperties = []
-  const itemListProperties = []
-  const itemStorageProperties = []
-
-  for (const itemProperty of Object.values(item.properties)) {
-    if (!itemProperty.propertyDef) {
-      continue
-    }
-
-    if (itemProperty.propertyDef.dataType === 'Relation') {
-      itemRelationProperties.push(itemProperty)
-      continue
-    }
-
-    if (itemProperty.propertyDef.dataType === 'List') {
-      itemListProperties.push(itemProperty)
-      continue
-    }
-
-    if (
-      itemProperty.propertyDef.storageType &&
-      itemProperty.propertyDef.storageType === 'ItemStorage'
-    ) {
-      itemStorageProperties.push(itemProperty)
-      continue
-    }
-
-    itemBasicProperties.push(itemProperty)
-  }
-
-  return {
-    itemBasicProperties,
-    itemRelationProperties,
-    itemListProperties,
-    itemStorageProperties,
-  }
-}
-
 const processBasicProperties = async (
   itemBasicProperties: ItemProperty<any>[],
   itemPublishData: PublishPayload,
@@ -148,6 +112,7 @@ const processBasicProperties = async (
 const processRelationProperty = async (
   relationProperty: ItemProperty<any>,
   multiPublishPayload: MultiPublishPayload,
+  uploadedTransactions: UploadedTransaction[],
 ): Promise<MultiPublishPayload> => {
   const value = relationProperty.getService().getSnapshot()
     .context.propertyValue
@@ -185,7 +150,21 @@ const processRelationProperty = async (
     propertiesToUpdate: [],
   }
 
-  const { itemBasicProperties } = getSegmentedItemProperties(relatedItem)
+  const { itemBasicProperties, itemUploadProperties } =
+    getSegmentedItemProperties(relatedItem)
+
+  if (itemUploadProperties.length === 1) {
+    const uploadProperty = itemUploadProperties[0]
+    const itemProperty = uploadProperty.itemProperty
+    const transactionData = uploadedTransactions.find(
+      (transaction) => transaction.seedLocalId === relatedItem.seedLocalId,
+    )
+    if (transactionData) {
+      itemProperty.value = transactionData.txId
+      await itemProperty.save()
+      itemBasicProperties.push(itemProperty)
+    }
+  }
 
   publishPayload = await processBasicProperties(
     itemBasicProperties,
@@ -285,15 +264,18 @@ type PublishPayload = {
 
 type MultiPublishPayload = PublishPayload[]
 
+type UploadedTransaction = {
+  txId: string
+  itemPropertyLocalId?: string
+  seedLocalId?: string
+  versionLocalId?: string
+  itemPropertyName?: string
+}
+
 export const getPublishPayload = async (
-  seedLocalId: string,
+  item: Item<any>,
+  uploadedTransactions: UploadedTransaction[],
 ): Promise<MultiPublishPayload> => {
-  const item = await getItem({ seedLocalId })
-
-  if (!item) {
-    throw new Error('Item not found')
-  }
-
   // if (item.modelName === 'Post') {
   //   item.authors = [
   //     'Sr0bIx9Fwj',
@@ -324,9 +306,22 @@ export const getPublishPayload = async (
     itemBasicProperties,
     itemRelationProperties,
     itemListProperties,
-    itemStorageProperties,
+    itemUploadProperties,
   } = getSegmentedItemProperties(item)
 
+  if (itemUploadProperties.length === 1) {
+    const uploadProperty = itemUploadProperties[0]
+    const itemProperty = uploadProperty.itemProperty
+    const transactionData = uploadedTransactions.find(
+      (transaction) => transaction.seedLocalId === item.seedLocalId,
+    )
+    if (transactionData) {
+      itemProperty.value = transactionData.txId
+      await itemProperty.save()
+      itemBasicProperties.push(itemProperty)
+    }
+  }
+
   itemPublishData = await processBasicProperties(
     itemBasicProperties,
     itemPublishData,
@@ -338,6 +333,7 @@ export const getPublishPayload = async (
     multiPublishPayload = await processRelationProperty(
       relationProperty,
       multiPublishPayload,
+      uploadedTransactions,
     )
   }
 

package/dist/src/getPublishUploads.ts

@@ -0,0 +1,240 @@
+import { Item, ItemProperty } from '@/browser'
+import Transaction from 'arweave/web/lib/transaction'
+import { CreateTransactionInterface } from 'arweave/web'
+import { getArweave } from '@/browser/helpers/arweave'
+import { fs } from '@zenfs/core'
+import { getCorrectId } from '@/browser/helpers'
+import { getSegmentedItemProperties } from '@/browser/helpers/getSegmentedItemProperties'
+import debug from 'debug'
+
+const logger = debug('app:item:getPublishUploads')
+
+export const getContentHash = async (
+  base64: string | null | undefined,
+  uint: Uint8Array | undefined,
+): Promise<string> => {
+  let data
+
+  if (base64 && !uint) {
+    const encoder = new TextEncoder()
+    data = encoder.encode(base64)
+  }
+
+  if (uint) {
+    data = uint
+  }
+
+  // Hash the data with SHA-256
+  const hashBuffer = await crypto.subtle.digest('SHA-256', data as Uint8Array)
+
+  // Convert the ArrayBuffer to a hex string
+  const hashArray = Array.from(new Uint8Array(hashBuffer))
+  return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('')
+}
+export const prepareArweaveTransaction = async (
+  data: string | Uint8Array,
+  contentHash: string | undefined,
+): Promise<Transaction> => {
+  const transactionData: Partial<CreateTransactionInterface> = {
+    data,
+    tags: [],
+  }
+
+  const tx = await getArweave()!.createTransaction(transactionData)
+
+  if (contentHash) {
+    logger('contentHash', contentHash)
+    logger('adding content hash tag to tx.id:', tx.id)
+    tx.addTag('Content-SHA-256', contentHash)
+  }
+
+  return tx
+}
+export type UploadProperty = {
+  itemProperty: ItemProperty<any>
+  childProperties: ItemProperty<any>[]
+}
+type ChildUploadData = {
+  propertyName: string
+  localStoragePath: string
+}
+const processUploadProperty = async (
+  uploadProperty: UploadProperty,
+  uploads: PublishUpload[],
+  relatedItemProperty?: ItemProperty<any>,
+): Promise<PublishUpload[]> => {
+  const itemProperty = uploadProperty.itemProperty
+
+  const childUploads: ChildUploadData[] = []
+
+  for (const childProperty of uploadProperty.childProperties) {
+    const filePath = childProperty.localStoragePath
+
+    if (!filePath) {
+      throw new Error(
+        `No localStoragePath found for ItemProperty ${childProperty.propertyName}`,
+      )
+    }
+
+    const exists = await fs.promises.exists(filePath)
+    if (!exists) {
+      throw new Error(`File doesn't exist at ${filePath}`)
+    }
+
+    childUploads.push({
+      propertyName: childProperty.propertyName,
+      localStoragePath: filePath,
+    })
+  }
+
+  // const filePath = itemProperty.localStoragePath
+  //
+  // if (!filePath) {
+  //   throw new Error(
+  //     `No localStoragePath found for ItemProperty ${itemProperty.propertyName}`,
+  //   )
+  // }
+  //
+  // const exists = await fs.promises.exists(filePath)
+  // if (!exists) {
+  //   throw new Error(`File doesn't exist at ${filePath}`)
+  //
+  //   // const handle = await navigator.storage.getDirectory()
+  //   //
+  //   // await configureSingle({
+  //   //   backend: WebAccess,
+  //   //   handle,
+  //   // })
+  // }
+  //
+  // const mainFileContents = await fs.promises.readFile(filePath)
+  let fileContents
+  let transaction: Transaction
+
+  if (!childUploads || childUploads.length === 0) {
+    if (relatedItemProperty && relatedItemProperty.localStoragePath) {
+      const filePath = relatedItemProperty.localStoragePath
+
+      const exists = await fs.promises.exists(filePath)
+      if (!exists) {
+        throw new Error(`File doesn't exist at ${filePath}`)
+
+        // const handle = await navigator.storage.getDirectory()
+        //
+        // await configureSingle({
+        //   backend: WebAccess,
+        //   handle,
+        // })
+      }
+
+      fileContents = await fs.promises.readFile(filePath)
+    }
+    if (!fileContents) {
+      return uploads
+    }
+  }
+
+  if (childUploads.length > 0) {
+    const separator = '===FILE_SEPARATOR==='
+    // let compositeFileContents = `${itemProperty.propertyName}${separator}${mainFileContents}`
+    let compositeFileContents = ''
+
+    for (const childUpload of childUploads) {
+      const childUploadContents = await fs.promises.readFile(
+        childUpload.localStoragePath,
+      )
+      compositeFileContents += `${separator}${childUpload.propertyName}${separator}${childUploadContents}`
+    }
+
+    fileContents = Buffer.from(compositeFileContents)
+  }
+
+  if (!fileContents) {
+    throw new Error(`No file contents found for ${itemProperty.propertyName}`)
+  }
+
+  const uint8Array = new Uint8Array(
+    fileContents.buffer,
+    fileContents.byteOffset,
+    fileContents.byteLength,
+  )
+
+  const contentHash = await getContentHash(null, uint8Array)
+
+  transaction = await prepareArweaveTransaction(fileContents, contentHash)
+
+  let itemPropertyLocalId = relatedItemProperty
+    ? relatedItemProperty.localId
+    : itemProperty.localId
+  let itemPropertyName = relatedItemProperty
+    ? relatedItemProperty.propertyName
+    : itemProperty.propertyName
+
+  uploads.push({
+    itemPropertyName,
+    itemPropertyLocalId,
+    seedLocalId: itemProperty.seedLocalId!,
+    versionLocalId: itemProperty.versionLocalId!,
+    transactionToSign: transaction,
+  })
+
+  return uploads
+}
+export type PublishUpload = {
+  itemPropertyName: string
+  itemPropertyLocalId: string
+  seedLocalId: string
+  versionLocalId: string
+  transactionToSign: Transaction
+}
+export const getPublishUploads = async (
+  item: Item<any>,
+  uploads: PublishUpload[] = [],
+  relatedItemProperty?: ItemProperty<any>,
+) => {
+  // if (item.modelName === 'Post') {
+  //   if (!item.authors) {
+  //     item.authors = [
+  //       'Sr0bIx9Fwj',
+  //       '0xc2879650e9503a303ceb46f966e55baab480b267dc20cede23ef503622eee6d7',
+  //     ]
+  //   }
+  // }
+
+  const { itemUploadProperties, itemRelationProperties } =
+    getSegmentedItemProperties(item)
+
+  for (const uploadProperty of itemUploadProperties) {
+    uploads = await processUploadProperty(
+      uploadProperty,
+      uploads,
+      relatedItemProperty,
+    )
+  }
+
+  for (const relationProperty of itemRelationProperties) {
+    const propertyValue = relationProperty.getService().getSnapshot()
+      .context.propertyValue
+
+    if (!propertyValue || relationProperty.uid) {
+      continue
+    }
+
+    const { localId: seedLocalId, uid: seedUid } = getCorrectId(propertyValue)
+
+    const relatedItem = await Item.find({
+      seedLocalId,
+      seedUid,
+    })
+
+    if (!relatedItem) {
+      throw new Error(
+        `No relatedItem found for ${relationProperty.propertyName}`,
+      )
+    }
+
+    uploads = await getPublishUploads(relatedItem, uploads, relationProperty)
+  }
+
+  return uploads
+}

package/dist/src/getSegmentedItemProperties.ts

@@ -0,0 +1,65 @@
+import { Item } from '@/browser'
+import { UploadProperty } from '@/browser/db/read/getPublishUploads'
+
+export const getSegmentedItemProperties = (item: Item<any>) => {
+  const itemBasicProperties = []
+  const itemRelationProperties = []
+  const itemListProperties = []
+  const itemUploadProperties: UploadProperty[] = []
+  const itemStorageProperties = []
+  let itemStorageTransactionProperty: UploadProperty | undefined
+
+  for (const itemProperty of Object.values(item.properties)) {
+    if (!itemProperty.propertyDef) {
+      continue
+    }
+
+    const isItemStorage =
+      itemProperty.propertyDef.storageType &&
+      itemProperty.propertyDef.storageType === 'ItemStorage'
+
+    const isImageSrc =
+      itemProperty.propertyDef.dataType === 'Relation' &&
+      itemProperty.propertyDef.refValueType === 'ImageSrc'
+
+    const isStorageTransaction =
+      itemProperty.propertyName === 'storageTransactionId'
+
+    if (itemProperty.propertyDef.dataType === 'Relation') {
+      itemRelationProperties.push(itemProperty)
+      continue
+    }
+
+    if (itemProperty.propertyDef.dataType === 'List') {
+      itemListProperties.push(itemProperty)
+      continue
+    }
+
+    if (isItemStorage) {
+      itemStorageProperties.push(itemProperty)
+      continue
+    }
+
+    if (isStorageTransaction) {
+      itemStorageTransactionProperty = { itemProperty, childProperties: [] }
+      continue
+    }
+
+    itemBasicProperties.push(itemProperty)
+  }
+
+  if (itemStorageTransactionProperty && itemStorageProperties.length > 0) {
+    itemStorageTransactionProperty.childProperties = itemStorageProperties
+  }
+
+  if (itemStorageTransactionProperty) {
+    itemUploadProperties.push(itemStorageTransactionProperty)
+  }
+
+  return {
+    itemBasicProperties,
+    itemRelationProperties,
+    itemListProperties,
+    itemUploadProperties,
+  }
+}

package/dist/src/hydrateFromDb.ts

@@ -21,7 +21,7 @@ export const hydrateFromDb = fromCallback<
     propertyName: propertyNameRaw,
     propertyValue,
     propertyRecordSchema,
-    itemModelName,
+    modelName,
   } = context
 
   let propertyName = propertyNameRaw
@@ -264,8 +264,8 @@ export const hydrateFromDb = fromCallback<
       schemaUid: schemaUidFromDb,
       refValueType,
       localStorageDir,
-      resolvedValue: refResolvedValue,
-      resolvedDisplayValue: refResolvedDisplayValue,
+      refResolvedValue,
+      refResolvedDisplayValue,
       renderValue: refResolvedDisplayValue,
       populatedFromDb: true,
     })
@@ -278,7 +278,7 @@ export const hydrateFromDb = fromCallback<
       const { Item } = await import(`@/browser/item`)
       const item = await Item.find({
         seedLocalId,
-        modelName: itemModelName,
+        modelName,
       })
       if (item) {
         const filePath = `/files/${localStorageDir}/${refResolvedValue}`

package/dist/src/propertyMachine.ts

@@ -105,8 +105,9 @@ export const propertyMachine = setup({
         resolvingRelatedValueSuccess: {
           target: 'idle',
           actions: assign({
-            resolvedDisplayValue: ({ event }) => event.resolvedDisplayValue,
-            resolvedValue: ({ event }) => event.resolvedValue,
+            refResolvedDisplayValue: ({ event }) =>
+              event.refResolvedDisplayValue,
+            resolvedValue: ({ event }) => event.refResolvedValue,
           }),
         },
         resolvingRelatedValueDone: {

package/dist/src/read.ts

@@ -43,7 +43,7 @@ export const getPropertyData = async (
 
   return {
     ...row,
-    itemModelName: startCase(row.modelType),
+    modelName: startCase(row.modelType),
   }
 }