@xyo-network/archivist 2.66.9 → 2.67.0-rc.2

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-export * from './ArchivingModule';
+export * from './AbstractArchivingModule';
 export * from './CookieArchivist';
 export * from './StorageArchivist';
 export * from '@xyo-network/abstract-archivist';

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAA;AACzC,cAAc,mBAAmB,CAAA;AACjC,cAAc,oBAAoB,CAAA;AAClC,cAAc,iCAAiC,CAAA;AAC/C,cAAc,8BAA8B,CAAA;AAC5C,cAAc,gCAAgC,CAAA;AAC9C,cAAc,+BAA+B,CAAA"}

package/package.json

@@ -11,18 +11,17 @@
   "dependencies": {
     "@xylabs/assert": "^2.9.3",
     "@xylabs/promise": "^2.9.3",
-    "@xyo-network/abstract-archivist": "~2.66.9",
-    "@xyo-network/account": "~2.66.9",
-    "@xyo-network/account-model": "~2.66.9",
-    "@xyo-network/archivist-model": "~2.66.9",
-    "@xyo-network/archivist-wrapper": "~2.66.9",
-    "@xyo-network/boundwitness-model": "~2.66.9",
-    "@xyo-network/core": "~2.66.9",
-    "@xyo-network/memory-archivist": "~2.66.9",
-    "@xyo-network/module": "~2.66.9",
-    "@xyo-network/payload-model": "~2.66.9",
-    "@xyo-network/payload-wrapper": "~2.66.9",
-    "@xyo-network/promise": "~2.66.9",
+    "@xyo-network/abstract-archivist": "~2.67.0-rc.2",
+    "@xyo-network/account-model": "~2.67.0-rc.2",
+    "@xyo-network/archivist-model": "~2.67.0-rc.2",
+    "@xyo-network/archivist-wrapper": "~2.67.0-rc.2",
+    "@xyo-network/boundwitness-model": "~2.67.0-rc.2",
+    "@xyo-network/core": "~2.67.0-rc.2",
+    "@xyo-network/memory-archivist": "~2.67.0-rc.2",
+    "@xyo-network/module": "~2.67.0-rc.2",
+    "@xyo-network/payload-model": "~2.67.0-rc.2",
+    "@xyo-network/payload-wrapper": "~2.67.0-rc.2",
+    "@xyo-network/promise": "~2.67.0-rc.2",
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "store2": "^2.14.2"
@@ -31,10 +30,9 @@
     "@types/js-cookie": "^3.0.3",
     "@types/lodash": "^4.14.195",
     "@xylabs/delay": "^2.9.3",
-    "@xylabs/ts-scripts-yarn3": "^2.18.11",
-    "@xylabs/tsconfig": "^2.18.11",
-    "@xyo-network/boundwitness-wrapper": "~2.66.9",
-    "@xyo-network/id-payload-plugin": "~2.66.9",
+    "@xylabs/ts-scripts-yarn3": "^2.19.0",
+    "@xylabs/tsconfig": "^2.19.0",
+    "@xyo-network/id-payload-plugin": "~2.67.0-rc.2",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -71,5 +69,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.66.9"
+  "version": "2.67.0-rc.2",
+  "stableVersion": "2.66.9"
 }

package/src/{ArchivingModule.ts → AbstractArchivingModule.ts}

@@ -1,11 +1,8 @@
 import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistModule, asArchivistModule, isArchivistInstance } from '@xyo-network/archivist-model'
-import { IndirectArchivistWrapper } from '@xyo-network/archivist-wrapper'
-import { BoundWitness } from '@xyo-network/boundwitness-model'
+import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
 import { AnyObject } from '@xyo-network/core'
-import { AbstractModule, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
+import { AbstractModuleInstance, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
 import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
-import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import compact from 'lodash/compact'
 
 export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfig<
@@ -15,14 +12,14 @@ export type ArchivingModuleConfig<T extends AnyObject = AnyObject> = ModuleConfi
   } & T
 >
 // @creatableModule()
-export abstract class ArchivingModule<
+export abstract class AbstractArchivingModule<
     TParams extends ModuleParams<ArchivingModuleConfig> = ModuleParams<ArchivingModuleConfig>,
     TEventData extends ModuleEventData = ModuleEventData,
   >
-  extends AbstractModule<TParams, TEventData>
+  extends AbstractModuleInstance<TParams, TEventData>
   implements Module<TParams, TEventData>
 {
-  protected override async bindQueryResult<T extends Query | PayloadWrapper<Query>>(
+  protected override async bindQueryResult<T extends Query>(
     query: T,
     payloads: Payload[],
     additionalWitnesses: AccountInstance[] = [],
@@ -33,18 +30,20 @@ export abstract class ArchivingModule<
     return [result, witnesses]
   }
 
-  protected async resolveArchivists(): Promise<ArchivistModule[]> {
+  protected async resolveArchivists(): Promise<ArchivistInstance[]> {
     return compact(
-      (await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) => asArchivistModule(module)),
+      (await Promise.all((await this.resolve({ address: this.config.archivists ?? [] })) ?? [])).map((module) =>
+        asArchivistInstance(module, () => `Module failed to cast to Archivist [${module.config.name}]`),
+      ),
     )
   }
 
-  protected async storeToArchivists(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async storeToArchivists(payloads: Payload[]): Promise<Payload[]> {
     const archivists = await this.resolveArchivists()
     return (
       await Promise.all(
         archivists.map((archivist) => {
-          return isArchivistInstance(archivist) ? archivist.insert(payloads) : IndirectArchivistWrapper.wrap(archivist, this.account).insert(payloads)
+          return archivist.insert?.(payloads)
         }),
       )
     ).map(([bw]) => bw)

package/src/CookieArchivist.ts

@@ -1,6 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
+import { AbstractArchivist } from '@xyo-network/abstract-archivist'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -37,7 +37,7 @@ export type CookieArchivistParams = ArchivistParams<AnyConfigSchema<CookieArchiv
 export class CookieArchivist<
   TParams extends CookieArchivistParams,
   TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
-> extends AbstractDirectArchivist<TParams, TEventData> {
+> extends AbstractArchivist<TParams, TEventData> {
   static override configSchemas = [CookieArchivistConfigSchema]
 
   get domain() {
@@ -100,10 +100,10 @@ export class CookieArchivist<
       const settled = await Promise.allSettled(
         compact(
           Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-            const queryPayload = PayloadWrapper.wrap<ArchivistInsertQuery>({
+            const queryPayload: ArchivistInsertQuery = {
               payloads: await PayloadHasher.hashes(payloads),
               schema: ArchivistInsertQuerySchema,
-            })
+            }
             const query = await this.bindQuery(queryPayload, payloads)
             return (await parent?.query(query[0], query[1]))?.[0]
           }),
@@ -145,7 +145,7 @@ export class CookieArchivist<
     }
   }
 
-  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     try {
       const resultPayloads: Payload[] = await Promise.all(
         payloads.map(async (payload) => {
@@ -158,15 +158,13 @@ export class CookieArchivist<
         }),
       )
       const [result] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-      const parentBoundWitnesses: BoundWitness[] = []
       const parents = await this.parents()
       if (Object.entries(parents.write ?? {}).length) {
         //we store the child bw also
-        parentBoundWitnesses.push(...(await this.writeToParents([result[0], ...resultPayloads])))
+        await this.writeToParents([result[0], ...resultPayloads])
       }
-      const boundWitnesses = [result[0], ...parentBoundWitnesses]
-      await this.emit('inserted', { boundWitnesses, module: this })
-      return boundWitnesses
+      await this.emit('inserted', { module: this, payloads })
+      return payloads
     } catch (ex) {
       console.error(`Error: ${JSON.stringify(ex, null, 2)}`)
       throw ex

package/src/StorageArchivist.ts

@@ -1,8 +1,6 @@
 import { assertEx } from '@xylabs/assert'
 import { fulfilled } from '@xylabs/promise'
-import { AbstractDirectArchivist } from '@xyo-network/abstract-archivist'
-import { Account } from '@xyo-network/account'
-import { AccountInstance } from '@xyo-network/account-model'
+import { AbstractArchivist } from '@xyo-network/abstract-archivist'
 import {
   ArchivistAllQuerySchema,
   ArchivistClearQuerySchema,
@@ -16,7 +14,7 @@ import {
   ArchivistParams,
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
-import { Logger, PayloadHasher } from '@xyo-network/core'
+import { PayloadHasher } from '@xyo-network/core'
 import { AnyConfigSchema } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -41,7 +39,7 @@ export class StorageArchivist<
     TParams extends StorageArchivistParams = StorageArchivistParams,
     TEventData extends ArchivistModuleEventData = ArchivistModuleEventData,
   >
-  extends AbstractDirectArchivist<TParams, TEventData>
+  extends AbstractArchivist<TParams, TEventData>
   implements ArchivistInstance
 {
   static override configSchemas = [StorageArchivistConfigSchema]
@@ -92,7 +90,7 @@ export class StorageArchivist<
     return this._storage
   }
 
-  override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
+  /*override async loadAccount(account?: AccountInstance, persistAccount?: boolean, privateStorage?: StoreBase, _logger?: Logger) {
     if (!this._account) {
       if (persistAccount) {
         const privateKey = privateStorage?.get('privateKey')
@@ -108,7 +106,7 @@ export class StorageArchivist<
       }
     }
     return await super.loadAccount()
-  }
+  }*/
 
   protected override allHandler(): PromisableArray<Payload> {
     this.logger?.log(`this.storage.length: ${this.storage.length}`)
@@ -128,10 +126,10 @@ export class StorageArchivist<
     const settled = await Promise.allSettled(
       compact(
         Object.values((await this.parents()).commit ?? [])?.map(async (parent) => {
-          const queryPayload = PayloadWrapper.wrap<ArchivistInsertQuery>({
+          const queryPayload: ArchivistInsertQuery = {
             payloads: await PayloadHasher.hashes(payloads),
             schema: ArchivistInsertQuerySchema,
-          })
+          }
           const query = await this.bindQuery(queryPayload, payloads)
           return (await parent?.query(query[0], query[1]))?.[0]
         }),
@@ -166,7 +164,7 @@ export class StorageArchivist<
     )
   }
 
-  protected async insertHandler(payloads: Payload[]): Promise<BoundWitness[]> {
+  protected async insertHandler(payloads: Payload[]): Promise<Payload[]> {
     const resultPayloads = await Promise.all(
       payloads.map(async (payload) => {
         const wrapper = PayloadWrapper.wrap(payload)
@@ -178,16 +176,13 @@ export class StorageArchivist<
       }),
     )
     const [[storageBoundWitness]] = await this.bindQueryResult({ payloads, schema: ArchivistInsertQuerySchema }, resultPayloads)
-    const parentBoundWitnesses: BoundWitness[] = []
     const parents = await this.parents()
     if (Object.entries(parents.write ?? {}).length) {
       //we store the child bw also
-      const [parentBoundWitness] = await this.writeToParents([storageBoundWitness, ...resultPayloads])
-      parentBoundWitnesses.push(parentBoundWitness)
+      await this.writeToParents([storageBoundWitness, ...resultPayloads])
     }
-    const boundWitnesses = [storageBoundWitness, ...parentBoundWitnesses]
-    await this.emit('inserted', { boundWitnesses, module: this })
-    return boundWitnesses
+    await this.emit('inserted', { module: this, payloads })
+    return payloads
   }
 
   protected saveAccount() {

package/src/index.ts

@@ -1,4 +1,4 @@
-export * from './ArchivingModule'
+export * from './AbstractArchivingModule'
 export * from './CookieArchivist'
 export * from './StorageArchivist'
 export * from '@xyo-network/abstract-archivist'

package/src/spec/testArchivist.ts

@@ -4,8 +4,6 @@
 
 import { delay } from '@xylabs/delay'
 import { ArchivistInstance } from '@xyo-network/archivist-model'
-import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { PayloadHasher } from '@xyo-network/core'
 import { IdSchema } from '@xyo-network/id-payload-plugin'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
@@ -21,11 +19,8 @@ export const testArchivistRoundTrip = (archivistPromise: Promisable<ArchivistIns
 
     const archivist = await archivistPromise
     const insertResult = await archivist.insert([idPayload])
-    const insertResultWrappers = insertResult.map((bw) => BoundWitnessWrapper.wrap(bw))
-    const insertResultPayload = insertResultWrappers.pop() as BoundWitnessWrapper
-    expect(insertResultPayload).toBeDefined()
+    expect(insertResult).toBeDefined()
 
-    expect(PayloadHasher.find(insertResultPayload.payloadHashes, await payloadWrapper.hashAsync())).toBeDefined()
     const getResult = await archivist.get([await payloadWrapper.hashAsync()])
     expect(getResult).toBeDefined()
     expect(getResult.length).toBe(1)

package/dist/cjs/ArchivingModule.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ArchivingModule.js","sourceRoot":"","sources":["../../src/ArchivingModule.ts"],"names":[],"mappings":";;;;AACA,kEAAsG;AACtG,sEAAyE;AAGzE,gDAA4H;AAG5H,qEAAoC;AAQpC,qBAAqB;AACrB,MAAsB,eAIpB,SAAQ,uBAAmC;IAGlB,eAAe,CACtC,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,gBAA+B,EAAE;;;;;YAEjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,MAAM,OAAM,eAAe,YAAC,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,aAAa,CAAC,CAAA;YAC5G,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACvD,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5B,CAAC;KAAA;IAEe,iBAAiB;;;YAC/B,OAAO,IAAA,iBAAO,EACZ,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAA,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,MAAM,CAAC,UAAU,mCAAI,EAAE,EAAE,CAAC,CAAC,mCAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAA,mCAAiB,EAAC,MAAM,CAAC,CAAC,CACtI,CAAA;;KACF;IAEe,iBAAiB,CAAC,QAAmB;;YACnD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACjD,OAAO,CACL,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gBAC3B,OAAO,IAAA,qCAAmB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,4CAAwB,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;YAC9I,CAAC,CAAC,CACH,CACF,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;QACrB,CAAC;KAAA;CACF;AAlCD,0CAkCC"}