@seedprotocol/sdk 0.1.75 → 0.1.76

package/dist/{seed.schema.config-BPJfo_5h.js → seed.schema.config-CaxQONHV.js}

@@ -1,6 +1,6 @@
-import { c as __decorate, e as __metadata } from './constants-B9hSFQXL.js';
+import { _ as __decorate, a as __metadata } from './constants-rmQ8zg8_.js';
 import 'drizzle-orm';
-import { Text, Model } from './main.js';
+import { T as Text, M as Model } from './index-nyYoS6hl.js';
 import 'react';
 import 'reflect-metadata';
 import 'xstate';
@@ -76,4 +76,4 @@ const models = {
 };
 
 export { models };
-//# sourceMappingURL=seed.schema.config-BPJfo_5h.js.map
+//# sourceMappingURL=seed.schema.config-CaxQONHV.js.map

package/dist/{seed.schema.config-BPJfo_5h.js.map → seed.schema.config-CaxQONHV.js.map}

@@ -1 +1 @@
-{"version":3,"file":"seed.schema.config-BPJfo_5h.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-CaxQONHV.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

@@ -18,7 +18,6 @@ import { getModel } from '@/browser/stores/modelClass'
 import { getCorrectId } from '@/browser/helpers'
 import { Static } from '@sinclair/typebox'
 import { TProperty } from '@/browser/property'
-import { fs } from '@zenfs/core'
 
 const logger = debug('app:property:class')
 
@@ -151,14 +150,6 @@ export class ItemProperty<PropertyType> {
         const { context } = snapshot
         const { propertyRecordSchema } = context
 
-        // if (this.uid && !cacheHasProperty(this.uid)) {
-        //   addPropertyToCache(this)
-        // }
-        //
-        // if (!this.uid && this.localId && !cacheHasProperty(this.localId,)) {
-        //   addPropertyToCache(this)
-        // }
-
         if (context.seedLocalId) {
           const cacheKey = ItemProperty.cacheKey(
             context.seedLocalId,
@@ -179,19 +170,26 @@ export class ItemProperty<PropertyType> {
 
         let renderValue
 
-        if (
-          propertyRecordSchema &&
-          propertyRecordSchema.storageType &&
-          propertyRecordSchema.storageType === 'ItemStorage' &&
-          context.resolvedValue &&
-          context.localStorageDir
-        ) {
-          const filePath = `/files/${context.localStorageDir}/${context.resolvedValue}`
-          const exists = await fs.promises.exists(filePath)
-          if (exists) {
-            renderValue = await fs.promises.readFile(filePath, 'utf-8')
-          }
-        }
+        // if (
+        //   propertyRecordSchema &&
+        //   propertyRecordSchema.storageType &&
+        //   propertyRecordSchema.storageType === 'ItemStorage' &&
+        //   context.resolvedValue &&
+        //   context.localStorageDir
+        // ) {
+        //   const filePath = `/files/${context.localStorageDir}/${context.resolvedValue}`
+        //   try {
+        //     const exists = await fs.promises.exists(filePath)
+        //     if (exists) {
+        //       renderValue = await fs.promises.readFile(filePath, 'utf-8')
+        //     }
+        //   } catch (e) {
+        //     logger(
+        //       `[ItemProperty] [${context.seedLocalId}] [${context.propertyName}] [storageType] error`,
+        //       e,
+        //     )
+        //   }
+        // }
 
         if (!renderValue) {
           renderValue = context.renderValue || context.propertyValue
@@ -296,13 +294,11 @@ export class ItemProperty<PropertyType> {
     const cacheKey = ItemProperty.cacheKey(cacheKeyId!, propertyName)
     if (this.instanceCache.has(cacheKey)) {
       const { instance, refCount } = this.instanceCache.get(cacheKey)!
+      instance.getService().send({ type: 'reload' })
       this.instanceCache.set(cacheKey, {
         instance,
         refCount: refCount + 1,
       })
-      if (instance.status === 'idle') {
-        instance.getService().send({ type: 'refresh' })
-      }
       return instance
     }
     const propertyData = await getPropertyData(

package/dist/src/getItem.ts

@@ -83,46 +83,26 @@ export const getItemDataFromDb: GetItemDataFromDb = async ({
 
   let itemData = itemDataRows[0]
 
-  const propertiesData = await getItemProperties({ seedLocalId, seedUid })
-
-  // const initObj: ItemData = {
-  //   seedLocalId,
-  //   seedUid,
-  //   modelName,
-  // }
+  const propertiesData = await getItemProperties({
+    seedLocalId,
+    seedUid: itemData.seedUid || undefined,
+  })
 
   if (!propertiesData || propertiesData.length === 0) {
     return itemData
   }
 
-  const firstPropertyData = propertiesData[0]
-
   for (const propertyData of propertiesData) {
     const propertyName = propertyData.propertyName
 
-    const propertyValue = propertyData.propertyValue
-
-    // TODO: Find a better place for the property data below
-    // Since initObj is used to initialize an Item, the following values
-    // just overwrite each other for each property since they are Property
-    // specific.
-
-    // const refSeedType = propertyDbValues[11]
-    // if (refSeedType) {
-    //   initObj.refSeedType = refSeedType
-    // }
-    // const refValueType = propertyDbValues[12]
-    // if (refValueType) {
-    //   initObj.refValueType = refValueType
-    // }
-    //
-    // if (
-    //   refSeedType &&
-    //   refValueType === 'list' &&
-    //   propertyName.endsWith('Ids')
-    // ) {
-    //   logger('[db/queries] [getItemDataFromDb] propertyName', propertyName)
-    // }
+    let propertyValue = propertyData.propertyValue
+
+    if (propertyName.endsWith('Id') || propertyName.endsWith('Ids')) {
+      if (propertyData.refSeedType) {
+        const propertyNameVariant = propertyName.replace(/Ids?$/, '')
+        itemData[propertyNameVariant] = propertyValue
+      }
+    }
 
     itemData[propertyName] = propertyValue
   }

package/dist/src/getItemProperties.ts

@@ -1,15 +1,7 @@
 import { PropertyData } from '@/types'
 import { getAppDb } from '@/browser/db/sqlWasmClient'
 import { metadata, seeds, versions } from '@/shared/seedSchema'
-import {
-  and,
-  eq,
-  getTableColumns,
-  isNotNull,
-  isNull,
-  or,
-  SQL,
-} from 'drizzle-orm'
+import { and, eq, getTableColumns, isNotNull, isNull, SQL } from 'drizzle-orm'
 
 type GetPropertiesForSeedProps = {
   seedLocalId?: string
@@ -30,16 +22,24 @@ export const getItemProperties: GetItemProperties = async ({
 
   const whereClauses: SQL[] = [isNotNull(metadata.propertyName)]
 
-  const uidWhereClause: SQL = seedUid
-    ? eq(seeds.uid, seedUid)
-    : isNull(seeds.uid)
-  const localWhereClause: SQL = seedLocalId
-    ? eq(seeds.localId, seedLocalId)
-    : isNull(seeds.localId)
+  if (seedUid) {
+    whereClauses.push(eq(seeds.uid, seedUid))
+  }
+
+  if (seedLocalId) {
+    whereClauses.push(eq(seeds.localId, seedLocalId))
+  }
 
-  whereClauses.push(or(localWhereClause, uidWhereClause) as SQL)
+  // const uidWhereClause: SQL = seedUid
+  //   ? eq(seeds.uid, seedUid)
+  //   : isNull(seeds.uid)
+  // const localWhereClause: SQL = seedLocalId
+  //   ? eq(seeds.localId, seedLocalId)
+  //   : isNull(seeds.localId)
+
+  // whereClauses.push(or(localWhereClause, uidWhereClause) as SQL)
   whereClauses.push(isNotNull(metadata.propertyName))
-  whereClauses.push(isNotNull(metadata.easDataType))
+  // whereClauses.push(isNotNull(metadata.easDataType))
 
   if (typeof edited !== 'undefined') {
     if (edited) {
@@ -50,21 +50,6 @@ export const getItemProperties: GetItemProperties = async ({
     }
   }
 
-  // if (!seedLocalId || !seedUid) {
-  //   const seedRows = await appDb
-  //     .select({
-  //       localId: seeds.localId,
-  //       uid: seeds.uid,
-  //     })
-  //     .from(seeds)
-  //     .where(or(localWhereClause, uidWhereClause))
-  //
-  //   if (seedRows && seedRows.length > 0) {
-  //     seedUid = seedRows[0].uid as string
-  //     seedLocalId = seedRows[0].localId as string
-  //   }
-  // }
-
   const metadataColumns = getTableColumns(metadata)
 
   const propertiesData = await appDb
@@ -79,84 +64,3 @@ export const getItemProperties: GetItemProperties = async ({
 
   return propertiesData
 }
-
-// const localIdWhere = seedLocalId
-//   ? `s.local_id = '${seedLocalId}'`
-//   : 's.local_id IS NULL'
-// const uidWhere = seedUid ? `s.uid = '${seedUid}'` : 's.uid IS NULL'
-//
-// const queryStatement = `WITH LatestMetadata as (SELECT m.property_name,
-//                                                        m.property_value,
-//                                                        m.version_local_id,
-//                                                        MAX(m.attestation_created_at),
-//                                                        m.uid,
-//                                                        m.seed_local_id,
-//                                                        seed_uid
-//                                                 FROM metadata m
-//                                                          JOIN seeds s ON s.local_id = m.seed_local_id
-//                                                 GROUP BY m.property_name),
-//
-//                              LatestVersion as (SELECT v.local_id,
-//                                                       MAX(v.attestation_created_at) as attestation_created_at,
-//                                                       v.uid,
-//                                                       v.seed_local_id,
-//                                                       v.seed_uid
-//                                                FROM versions v
-//                                                         JOIN seeds s ON s.local_id = v.seed_local_id
-//                                                GROUP BY s.local_id)
-//
-//
-//                         SELECT s.local_id,
-//                                s.uid,
-//                                s.schema_uid,
-//                                m.property_name,
-//                                m.property_value,
-//                                COUNT(v.local_id) as versions_count,
-//                                m.model_type,
-//                                lv.attestation_created_at,
-//                                m.local_id,
-//                                m.uid,
-//                                MAX(m.attestation_created_at),
-//                                m.ref_seed_type,
-//                                m.ref_value_type,
-//                                m.seed_local_id,
-//                                m.seed_uid,
-//                                m.created_at,
-//                                m.updated_at,
-//                                m.version_uid
-//                         FROM seeds s
-//                                  JOIN LatestMetadata lm ON s.local_id = m.seed_local_id
-//                                  JOIN LatestVersion lv ON lv.seed_local_id = m.seed_local_id
-//                                  JOIN metadata m ON m.property_name = lm.property_name OR lm.property_value = s.uid
-//                                  JOIN versions v ON s.local_id = v.seed_local_id
-//                         WHERE ${localIdWhere}
-//                            OR ${uidWhere}
-//                         GROUP BY m.property_name;
-// `
-//
-// const { rows } = await runQueryForStatement(queryStatement)
-//
-// const propertiesDataOld: PropertyData[] = []
-//
-// for (const row of rows) {
-//   propertiesDataOld.push({
-//     localId: row[0],
-//     uid: row[1],
-//     schemaUid: row[2],
-//     propertyName: row[3],
-//     propertyValue: row[4],
-//     versionsCount: row[5],
-//     itemModelName: row[6],
-//     attestationCreatedAt: row[7],
-//     metadataLocalId: row[8],
-//     metadataUid: row[9],
-//     metadataAttestationCreatedAt: row[10],
-//     refSeedType: row[11],
-//     refValueType: row[12],
-//     seedLocalId: row[13],
-//     seedUid: row[14],
-//     createdAt: row[15],
-//     updatedAt: row[16],
-//     versionUid: row[17],
-//   })
-// }

package/dist/src/hydrateFromDb.ts

@@ -48,25 +48,6 @@ export const hydrateFromDb = fromCallback<
 
     const whereClauses = []
 
-    let hydrateQuery
-    // let safeValue = propertyValue
-    // let propertyValueQueryString = `property_value `
-    // let propertyNameQueryString = `property_name = '${propertyName}'`
-    let propertyNameQuery = eq(metadata.propertyName, propertyName)
-
-    // if (safeValue && typeof propertyValue === 'string') {
-    //   safeValue = escapeSqliteString(propertyValue)
-    //   propertyValueQueryString += `= '${safeValue}'`
-    // }
-
-    // if (!safeValue) {
-    //   propertyValueQueryString += 'IS NULL'
-    // }
-
-    // if (typeof propertyValue === 'number') {
-    //   propertyValueQueryString += `= ${propertyValue}`
-    // }
-
     if (
       propertyRecordSchema &&
       propertyRecordSchema.ref &&
@@ -86,44 +67,22 @@ export const hydrateFromDb = fromCallback<
             eq(metadata.propertyName, missingPropertyNameVariant),
           ),
         )
-        // propertyNameQuery = or(
-        //   eq(metadata.propertyName, propertyName),
-        //   eq(metadata.propertyName, missingPropertyNameVariant),
-        // )
       }
       if (!missingPropertyNameVariant) {
         whereClauses.push(eq(metadata.propertyName, propertyName))
       }
+    } else {
+      whereClauses.push(eq(metadata.propertyName, propertyName))
     }
 
-    // if (seedUid && !seedLocalId) {
-    //   hydrateQuery = selectFromStatement.where(
-    //     and(eq(metadata.seedUid, seedUid), propertyNameQuery),
-    //   )
-    // }
-
     if (seedUid) {
-      // hydrateQuery = selectFromStatement.where(
-      //   and(
-      //     eq(metadata.seedLocalId, seedLocalId),
-      //     eq(metadata.seedUid, seedUid),
-      //     propertyNameQuery,
-      //   ),
-      // )
       whereClauses.push(eq(metadata.seedUid, seedUid))
     }
 
     if (seedLocalId) {
-      // hydrateQuery = selectFromStatement.where(
-      //   and(eq(metadata.seedLocalId, seedLocalId), propertyNameQuery),
-      // )
       whereClauses.push(eq(metadata.seedLocalId, seedLocalId))
     }
 
-    if (!hydrateQuery) {
-      return
-    }
-
     const rows = await appDb
       .select()
       .from(metadata)
@@ -193,26 +152,31 @@ export const hydrateFromDb = fromCallback<
     }
 
     if (
-      refResolvedValue &&
-      refResolvedDisplayValue &&
-      refResolvedDisplayValue.includes('http')
+      propertyRecordSchema &&
+      propertyRecordSchema.refValueType === 'ImageSrc'
     ) {
-      let urlNeedsToBeRefreshed = false
-
-      try {
-        const response = await fetch(refResolvedDisplayValue, {
-          method: 'HEAD',
-        })
+      let shouldReadFromFile = true
+
+      if (
+        refResolvedValue &&
+        refResolvedDisplayValue &&
+        refResolvedDisplayValue.includes('http')
+      ) {
+        try {
+          const response = await fetch(refResolvedDisplayValue, {
+            method: 'HEAD',
+          })
 
-        // Check if the status is in the 200-299 range
-        if (!response.ok) {
-          urlNeedsToBeRefreshed = true
+          // Check if the status is in the 200-299 range
+          if (response.ok) {
+            shouldReadFromFile = false
+          }
+        } catch (error) {
+          shouldReadFromFile = true
         }
-      } catch (error) {
-        urlNeedsToBeRefreshed = true
       }
 
-      if (urlNeedsToBeRefreshed) {
+      if (shouldReadFromFile) {
         let dir = localStorageDir
         if (
           !dir &&

package/dist/src/item.ts

@@ -251,7 +251,7 @@ export const useItems: UseItems = ({ modelName, deleted }) => {
           item.createdAt,
       ],
       ['desc'],
-    ).slice(0, 10),
+    ),
     isReadingDb,
   }
 }

package/dist/src/itemMachineSingle.ts

@@ -7,6 +7,7 @@ import { initialize } from './actors/initialize'
 import { hydrateExistingItem } from './actors/hydrateExistingItem'
 import { hydrateNewItem } from './actors/hydrateNewItem'
 import { fetchDataFromEas } from './actors/fetchDataFromEas'
+import { reload } from '@/browser/item/single/actors/reload'
 
 export const itemMachineSingle = setup({
   types: {
@@ -19,6 +20,7 @@ export const itemMachineSingle = setup({
     hydrateExistingItem,
     hydrateNewItem,
     fetchDataFromEas,
+    reload,
   },
 }).createMachine({
   id: MachineIds.ITEM,
@@ -75,17 +77,7 @@ export const itemMachineSingle = setup({
         }
       }),
     },
-    // addPropertyAttestation: {
-    //   actions: assign(({ context, event }) => {
-    //     console.log('[singleItemMachine] [addPropertyAttestation] event', event)
-    //     const propertyInstances =
-    //       context.propertyInstances || new Map<string, typeof ItemProperty>()
-    //     propertyInstances.set(event.propertyName, event.propertyInstances)
-    //     return {
-    //       propertyInstances,
-    //     }
-    //   }),
-    // },
+    reload: '.reloading',
   },
   states: {
     idle: {},
@@ -150,24 +142,15 @@ export const itemMachineSingle = setup({
         input: ({ context }) => ({ context }),
       },
     },
-    // fetchingDataFromEas: {
-    //   on: {
-    //     fetchDataFromEasSuccess: 'savingDataToDb',
-    //   },
-    //   invoke: {
-    //     src: 'fetchDataFromEas',
-    //     input: ({ context }) => ({ context }),
-    //   },
-    // },
-    // savingDataToDb: {
-    //   on: {
-    //     saveDataToDbSuccess: 'idle',
-    //   },
-    //   invoke: {
-    //     src: 'saveDataToDb',
-    //     input: ({ context }) => ({ context }),
-    //   },
-    // },
+    reloading: {
+      on: {
+        reloadSuccess: 'idle',
+      },
+      invoke: {
+        src: 'reload',
+        input: ({ context }) => ({ context }),
+      },
+    },
     destroying: {
       type: 'final',
     },

package/dist/src/reload.ts

@@ -0,0 +1,33 @@
+import { EventObject, fromCallback } from 'xstate'
+import { FromCallbackInput } from '@/types/machines'
+import { ItemMachineContext } from '@/types/item'
+
+export const reload = fromCallback<
+  EventObject,
+  FromCallbackInput<ItemMachineContext<any>>
+>(({ sendBack, input: { context } }) => {
+  const { propertyInstances } = context
+
+  const _reload = async () => {
+    if (!propertyInstances) {
+      return
+    }
+
+    for (const propertyInstance of propertyInstances.values()) {
+      if (propertyInstance) {
+        const propertyRecordSchema = propertyInstance.propertyDef
+        if (
+          propertyRecordSchema &&
+          propertyRecordSchema.storageType &&
+          propertyRecordSchema.storageType === 'ItemStorage'
+        ) {
+          propertyInstance.getService().send({ type: 'reload' })
+        }
+      }
+    }
+  }
+
+  _reload().then(() => {
+    sendBack({ type: 'reloadSuccess' })
+  })
+})

package/dist/src/resolveRelatedValue.ts

@@ -1,11 +1,15 @@
 import { EventObject, fromCallback } from 'xstate'
 import { convertTxIdToImageSrc } from '@/shared/helpers'
-import { propertyMachine } from '../propertyMachine'
 import { fs } from '@zenfs/core'
 import {
   getRelationValueData,
   getStorageTransactionIdForSeedUid,
 } from '@/browser/db/read'
+import debug from 'debug'
+import { FromCallbackInput } from '@/types/machines'
+import { PropertyMachineContext } from '@/types/property'
+
+const logger = debug('app:property:actors:resolveRelatedValue')
 
 const storageTransactionIdToContentUrl = new Map<string, string>()
 const refResolvedValueToContentUrl = new Map<string, string>()
@@ -13,7 +17,7 @@ const seedUidToContentUrl = new Map<string, string>()
 
 export const resolveRelatedValue = fromCallback<
   EventObject,
-  typeof propertyMachine
+  FromCallbackInput<PropertyMachineContext, EventObject>
 >(({ sendBack, input: { context } }) => {
   const {
     isRelation,
@@ -30,7 +34,15 @@ export const resolveRelatedValue = fromCallback<
       return
     }
 
-    if (seedUidToContentUrl.has(propertyValue)) {
+    let parsedValue
+
+    try {
+      parsedValue = JSON.parse(propertyValue)
+    } catch (error) {
+      logger(`${propertyName} value is not a JSON string.`)
+    }
+
+    if (!parsedValue && seedUidToContentUrl.has(propertyValue)) {
       const contentUrl = seedUidToContentUrl.get(propertyValue)
       sendBack({
         type: 'updateRenderValue',
@@ -45,6 +57,12 @@ export const resolveRelatedValue = fromCallback<
 
     if (Array.isArray(propertyValue)) {
       // TODO: Handle array of seedUids
+      logger(`${propertyName} value is an array of seedUids`)
+      return
+    }
+
+    if (Array.isArray(parsedValue)) {
+      logger(`${propertyName} value is a stringified array of seedUids`)
       return
     }
 
@@ -133,7 +151,10 @@ export const resolveRelatedValue = fromCallback<
 
       if (typeof propertyValueFromDb === 'string') {
         // Check files for a filename that matches the propertyValue
-        if (propertyRecordSchema.dataType === 'ImageSrc') {
+        if (
+          propertyRecordSchema &&
+          propertyRecordSchema.refValueType === 'ImageSrc'
+        ) {
           let contentUrl
 
           if (storageTransactionIdToContentUrl.has(propertyValueFromDb)) {

package/dist/src/resolveRemoteStorage.ts

@@ -1,9 +1,10 @@
 import { EventObject, fromCallback } from 'xstate'
-import { itemMachineSingle } from '@/browser/item/single/itemMachineSingle'
+import { FromCallbackInput } from '@/types/machines'
+import { PropertyMachineContext } from '@/types/property'
 
 export const resolveRemoteStorage = fromCallback<
   EventObject,
-  typeof itemMachineSingle
+  FromCallbackInput<PropertyMachineContext, EventObject>
 >(({ sendBack, input: { context } }) => {
   const { propertyInstances } = context
 

package/dist/types/src/browser/db/read/getItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getItem.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/db/read/getItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAKrC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQlC,KAAK,uBAAuB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,iBAAiB,GAAG,CACvB,MAAM,EAAE,uBAAuB,KAC5B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;AAElC,eAAO,MAAM,iBAAiB,EAAE,iBA2G/B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,OAAO,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,OAAO,EAAE,OAsBrB,CAAA"}
+{"version":3,"file":"getItem.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/db/read/getItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAKrC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAQlC,KAAK,uBAAuB,GAAG;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,iBAAiB,GAAG,CACvB,MAAM,EAAE,uBAAuB,KAC5B,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAA;AAElC,eAAO,MAAM,iBAAiB,EAAE,iBAuF/B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,OAAO,GAAG,CAAC,MAAM,EAAE,aAAa,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAA;AAExE,eAAO,MAAM,OAAO,EAAE,OAsBrB,CAAA"}

package/dist/types/src/browser/db/read/getItemProperties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getItemProperties.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/db/read/getItemProperties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAatC,KAAK,yBAAyB,GAAG;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,KAAK,iBAAiB,GAAG,CACvB,KAAK,EAAE,yBAAyB,KAC7B,OAAO,CAAC,YAAY,EAAE,CAAC,CAAA;AAE5B,eAAO,MAAM,iBAAiB,EAAE,iBAyD/B,CAAA"}
+{"version":3,"file":"getItemProperties.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/db/read/getItemProperties.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAKtC,KAAK,yBAAyB,GAAG;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,KAAK,iBAAiB,GAAG,CACvB,KAAK,EAAE,yBAAyB,KAC7B,OAAO,CAAC,YAAY,EAAE,CAAC,CAAA;AAE5B,eAAO,MAAM,iBAAiB,EAAE,iBAkD/B,CAAA"}

package/dist/types/src/browser/item/Item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../../../../src/browser/item/Item.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,aAAa,EACb,WAAW,EACX,WAAW,EACX,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAe,YAAY,EAAE,MAAM,QAAQ,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAYjC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAGhE,qBAAa,IAAI,CAAC,CAAC,SAAS,WAAW,CAAC,WAAW,CAAC;IAClD,OAAO,CAAC,MAAM,CAAC,aAAa,CAGf;IACb,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IACjE,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAqB;IAC3D,CAAC,SAAS,CAAC,UAAO;IAClB,OAAO,CAAC,kBAAkB,CAEC;gBAEf,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;WAyH7B,MAAM,CAAC,CAAC,SAAS,WAAW,CAAC,WAAW,CAAC,EACpD,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;WAkDR,IAAI,CAAC,EAChB,SAAS,EACT,WAAW,EACX,OAAO,GACR,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;WAqBpC,GAAG,CACd,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;WAeV,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpD,OAAO,CAAC,uBAAuB;IAwB/B,SAAS,aAAc,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,KAAG,YAAY,CAI7D;IAED,UAAU,QAAO,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAEtD;IAED,mBAAmB,QAAa,OAAO,CAAC,YAAY,EAAE,CAAC,CAKtD;IAED,OAAO,QAAa,OAAO,CAAC,IAAI,CAAC,CAYhC;IAED,iBAAiB,sBAEhB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,gBAAgB,IAAI,YAAY,CAEnC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAElD;IAED,MAAM,IAAI,IAAI;CAIf"}
+{"version":3,"file":"Item.d.ts","sourceRoot":"","sources":["../../../../../src/browser/item/Item.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EACR,aAAa,EACb,WAAW,EACX,WAAW,EACX,YAAY,EACZ,YAAY,EACb,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAe,YAAY,EAAE,MAAM,QAAQ,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAYjC,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAA;AAGhE,qBAAa,IAAI,CAAC,CAAC,SAAS,WAAW,CAAC,WAAW,CAAC;IAClD,OAAO,CAAC,MAAM,CAAC,aAAa,CAGf;IACb,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwC;IACjE,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAqB;IAC3D,CAAC,SAAS,CAAC,UAAO;IAClB,OAAO,CAAC,kBAAkB,CAEC;gBAEf,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;WAyH7B,MAAM,CAAC,CAAC,SAAS,WAAW,CAAC,WAAW,CAAC,EACpD,KAAK,EAAE,OAAO,CAAC,QAAQ,CAAC,GACvB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;WAoDR,IAAI,CAAC,EAChB,SAAS,EACT,WAAW,EACX,OAAO,GACR,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;WAqBpC,GAAG,CACd,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;WAeV,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcpD,OAAO,CAAC,uBAAuB;IAwB/B,SAAS,aAAc,CAAC,SAAS,EAAE,GAAG,KAAK,IAAI,KAAG,YAAY,CAI7D;IAED,UAAU,QAAO,YAAY,CAAC,OAAO,iBAAiB,CAAC,CAEtD;IAED,mBAAmB,QAAa,OAAO,CAAC,YAAY,EAAE,CAAC,CAKtD;IAED,OAAO,QAAa,OAAO,CAAC,IAAI,CAAC,CAYhC;IAED,iBAAiB,sBAEhB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,gBAAgB,IAAI,YAAY,CAEnC;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAElD;IAED,MAAM,IAAI,IAAI;CAIf"}

package/dist/types/src/browser/item/single/actors/reload.d.ts

@@ -0,0 +1,5 @@
+import { EventObject } from 'xstate';
+import { FromCallbackInput } from '@/types/machines';
+import { ItemMachineContext } from '@/types/item';
+export declare const reload: import("xstate").CallbackActorLogic<EventObject, FromCallbackInput<ItemMachineContext<any>>, EventObject>;
+//# sourceMappingURL=reload.d.ts.map

package/dist/types/src/browser/item/single/actors/reload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reload.d.ts","sourceRoot":"","sources":["../../../../../../../src/browser/item/single/actors/reload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAgB,MAAM,QAAQ,CAAA;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AAEjD,eAAO,MAAM,MAAM,2GA4BjB,CAAA"}