@xyo-network/archivist 2.75.13 → 2.75.15

package/src/AbstractArchivingModule.ts

@@ -1,49 +1,18 @@
-import { compact } from '@xylabs/lodash'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ArchivistInstance, asArchivistInstance } from '@xyo-network/archivist-model'
-import { AbstractModuleInstance, AnyConfigSchema, Module, ModuleConfig, ModuleEventData, ModuleParams, ModuleQueryResult } from '@xyo-network/module'
-import { ModuleError, Payload, Query } from '@xyo-network/payload-model'
+import { AbstractModuleInstance } from '@xyo-network/module-abstract'
+import { AnyConfigSchema, Module, ModuleConfig, ModuleEventData, ModuleParams } from '@xyo-network/module-model'
 
-export type ArchivingModuleConfig<T extends ModuleConfig = ModuleConfig> = ModuleConfig<
+/** @deprecated use AbstractModule which now has this functionality included */
+export type ArchivingModuleBaseConfig<T extends ModuleConfig = ModuleConfig> = ModuleConfig<
   {
     archivists?: string[]
     schema: string
   } & T
 >
-// @creatableModule()
+
+/** @deprecated use AbstractModule which now has this functionality included */
 export abstract class AbstractArchivingModule<
-    TParams extends ModuleParams<AnyConfigSchema<ArchivingModuleConfig>> = ModuleParams<AnyConfigSchema<ArchivingModuleConfig>>,
+    TParams extends ModuleParams<AnyConfigSchema<ArchivingModuleBaseConfig>> = ModuleParams<AnyConfigSchema<ArchivingModuleBaseConfig>>,
     TEventData extends ModuleEventData = ModuleEventData,
   >
   extends AbstractModuleInstance<TParams, TEventData>
-  implements Module<TParams, TEventData>
-{
-  protected override async bindQueryResult<T extends Query>(
-    query: T,
-    payloads: Payload[],
-    additionalWitnesses: AccountInstance[] = [],
-    errorPayloads: ModuleError[] = [],
-  ): Promise<ModuleQueryResult> {
-    const result = await super.bindQueryResult(query, payloads, additionalWitnesses, errorPayloads)
-    await this.storeToArchivists(result.flat())
-    return result
-  }
-
-  protected async resolveArchivists(): Promise<ArchivistInstance[]> {
-    const archivists = this.config.archivists
-    if (!archivists) return []
-    const resolved = await Promise.all(archivists.map((archivist) => this.resolve(archivist)))
-    return compact(resolved.map((mod) => asArchivistInstance(mod)))
-  }
-
-  protected async storeToArchivists(payloads: Payload[]): Promise<Payload[]> {
-    const archivists = await this.resolveArchivists()
-    return (
-      await Promise.all(
-        archivists.map((archivist) => {
-          return archivist.insert?.(payloads)
-        }),
-      )
-    ).map(([bw]) => bw)
-  }
-}
+  implements Module<TParams, TEventData> {}

package/src/CookieArchivist.ts

@@ -15,7 +15,7 @@ import {
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadHasher } from '@xyo-network/core'
-import { AnyConfigSchema } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable, PromisableArray } from '@xyo-network/promise'

package/src/StorageArchivist.ts

@@ -16,7 +16,7 @@ import {
 } from '@xyo-network/archivist-model'
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadHasher } from '@xyo-network/core'
-import { AnyConfigSchema } from '@xyo-network/module'
+import { AnyConfigSchema } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 import { Promisable, PromisableArray } from '@xyo-network/promise'