@xyo-network/archivist 2.36.7 → 2.36.9

package/src/XyoCookieArchivist.ts

@@ -1,5 +1,7 @@
 import { assertEx } from '@xylabs/assert'
+import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
+import { XyoModuleResolverFunc } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import Cookies from 'js-cookie'
@@ -30,12 +32,6 @@ export type XyoCookieArchivistConfig = XyoArchivistConfig<{
   namespace?: string
 }>
 
-class CookieArchivistError extends Error {
-  constructor(action: string, error: Error['cause'], message?: string) {
-    super(`Cookie Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
-  }
-}
-
 export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
   public get domain() {
     return this.config?.domain
@@ -66,8 +62,8 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
     ]
   }
 
-  constructor(config?: PartialArchivistConfig<XyoCookieArchivistConfig>) {
-    super({ ...config, schema: XyoCookieArchivistConfigSchema })
+  constructor(config?: PartialArchivistConfig<XyoCookieArchivistConfig>, account?: XyoAccount, resolver?: XyoModuleResolverFunc) {
+    super({ ...config, schema: XyoCookieArchivistConfigSchema }, account, resolver)
   }
 
   private keyFromHash(hash: string) {
@@ -82,7 +78,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       })
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('delete', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -95,7 +91,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       })
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('clear', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -109,7 +105,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('get', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -132,7 +128,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('insert', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -147,7 +143,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       return x
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('find', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -158,7 +154,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
         .map(([, value]) => JSON.parse(value))
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('all', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -186,7 +182,7 @@ export class XyoCookieArchivist extends XyoArchivist<XyoCookieArchivistConfig> {
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new CookieArchivistError('commit', ex, 'unexpected')
+      throw ex
     }
   }
 }

package/src/XyoMemoryArchivist.ts

@@ -1,5 +1,7 @@
 import { assertEx } from '@xylabs/assert'
+import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
+import { XyoModuleResolverFunc } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -27,12 +29,6 @@ export type XyoMemoryArchivistConfig = XyoArchivistConfig<{
   max?: number
 }>
 
-class MemoryArchivistError extends Error {
-  constructor(action: string, error: Error['cause'], message?: string) {
-    super(`Memory Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
-  }
-}
-
 export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
   static create(config?: XyoMemoryArchivistConfig) {
     return new XyoMemoryArchivist(config)
@@ -55,8 +51,8 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
     ]
   }
 
-  constructor(config?: PartialArchivistConfig<XyoMemoryArchivistConfig>) {
-    super({ ...config, schema: XyoMemoryArchivistConfigSchema })
+  constructor(config?: PartialArchivistConfig<XyoMemoryArchivistConfig>, account?: XyoAccount, resolver?: XyoModuleResolverFunc) {
+    super({ ...config, schema: XyoMemoryArchivistConfigSchema }, account, resolver)
     this.cache = new LruCache<string, XyoPayload>({ max: this.max })
   }
 
@@ -67,7 +63,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       })
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('delete', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -76,7 +72,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       this.cache.clear()
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('clear', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -93,7 +89,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('get', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -115,7 +111,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('insert', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -130,7 +126,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       return result
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('find', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -139,7 +135,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       return this.cache.dump().map((value) => value[1].value)
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('all', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -166,7 +162,7 @@ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new MemoryArchivistError('commit', ex, 'unexpected')
+      throw ex
     }
   }
 }

package/src/XyoStorageArchivist.spec.ts

@@ -2,7 +2,10 @@
  * @jest-environment jsdom
  */
 
+import { PayloadWrapper } from '@xyo-network/payload'
+
 import { testArchivistAll, testArchivistRoundTrip } from './test.spec.test'
+import { XyoMemoryArchivist } from './XyoMemoryArchivist'
 import { XyoStorageArchivist } from './XyoStorageArchivist'
 
 testArchivistRoundTrip(new XyoStorageArchivist({ namespace: 'test', type: 'local' }), 'local')
@@ -19,3 +22,24 @@ test('XyoArchivist Private Key Save', () => {
   const storage2 = new XyoStorageArchivist({ namespace: 'test', persistAccount: true, type: 'local' })
   expect(storage2.address).toBe(address)
 })
+
+test('XyoArchivist Parent Write Through', async () => {
+  const memory = new XyoMemoryArchivist()
+
+  const resolver = (address: string) => {
+    return address === memory.address ? memory : null
+  }
+
+  const storage = new XyoStorageArchivist(
+    { namespace: 'test', parents: { write: [memory.address] }, persistAccount: true, type: 'local' },
+    undefined,
+    resolver,
+  )
+
+  const wrapper = new PayloadWrapper({ schema: 'network.xyo.test' })
+
+  await storage.insert([wrapper.payload])
+
+  expect((await storage.get([wrapper.hash])).length).toBe(1)
+  expect((await memory.get([wrapper.hash])).length).toBe(1)
+})

package/src/XyoStorageArchivist.ts

@@ -1,6 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { XyoAccount } from '@xyo-network/account'
 import { XyoBoundWitness } from '@xyo-network/boundwitness'
+import { XyoModuleResolverFunc } from '@xyo-network/module'
 import { PayloadWrapper, XyoPayload } from '@xyo-network/payload'
 import { PromisableArray } from '@xyo-network/promise'
 import compact from 'lodash/compact'
@@ -32,12 +33,6 @@ export type XyoStorageArchivistConfig = XyoArchivistConfig<{
   persistAccount?: boolean
 }>
 
-class StorageArchivistError extends Error {
-  constructor(action: string, error: Error['cause'], message?: string) {
-    super(`Storage Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error })
-  }
-}
-
 export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig> {
   public get type() {
     return this.config?.type ?? 'local'
@@ -84,8 +79,8 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
     return this._privateStorage
   }
 
-  constructor(config?: PartialArchivistConfig<XyoStorageArchivistConfig>) {
-    super({ ...config, schema: XyoStorageArchivistConfigSchema })
+  constructor(config?: PartialArchivistConfig<XyoStorageArchivistConfig>, account?: XyoAccount, resolver?: XyoModuleResolverFunc) {
+    super({ ...config, schema: XyoStorageArchivistConfigSchema }, account, resolver)
     this.saveAccount()
   }
 
@@ -121,7 +116,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       })
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('delete', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -130,7 +125,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       this.storage.clear()
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('clear', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -144,7 +139,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('get', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -167,7 +162,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       return [result[0], ...parentBoundWitnesses]
     } catch (ex) {
       console.error(`Error: ${ex}`)
-      throw new StorageArchivistError('insert', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -182,7 +177,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       return x
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('find', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -191,7 +186,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       return Object.entries(this.storage.getAll()).map(([, value]) => value)
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('all', ex, 'unexpected')
+      throw ex
     }
   }
 
@@ -219,7 +214,7 @@ export class XyoStorageArchivist extends XyoArchivist<XyoStorageArchivistConfig>
       )
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
-      throw new StorageArchivistError('commit', ex, 'unexpected')
+      throw ex
     }
   }
 }