@xyo-network/archivist 2.29.0 → 2.30.0-rc.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (64) hide show
  1. package/dist/cjs/Abstract.d.ts +5 -6
  2. package/dist/cjs/Abstract.d.ts.map +1 -1
  3. package/dist/cjs/Abstract.js +3 -3
  4. package/dist/cjs/Abstract.js.map +1 -1
  5. package/dist/cjs/{XyoArchivistConfig.d.ts → Config.d.ts} +7 -8
  6. package/dist/cjs/Config.d.ts.map +1 -0
  7. package/dist/cjs/{XyoArchivistConfig.js → Config.js} +1 -1
  8. package/dist/cjs/Config.js.map +1 -0
  9. package/dist/cjs/PartialArchivistConfig.d.ts +5 -0
  10. package/dist/cjs/PartialArchivistConfig.d.ts.map +1 -0
  11. package/dist/cjs/{XyoArchivist.js → PartialArchivistConfig.js} +1 -1
  12. package/dist/cjs/PartialArchivistConfig.js.map +1 -0
  13. package/dist/cjs/Query/Payload.d.ts +1 -1
  14. package/dist/cjs/Query/Payload.d.ts.map +1 -1
  15. package/dist/cjs/XyoMemoryArchivist.d.ts +5 -4
  16. package/dist/cjs/XyoMemoryArchivist.d.ts.map +1 -1
  17. package/dist/cjs/XyoMemoryArchivist.js +8 -4
  18. package/dist/cjs/XyoMemoryArchivist.js.map +1 -1
  19. package/dist/cjs/index.d.ts +1 -2
  20. package/dist/cjs/index.d.ts.map +1 -1
  21. package/dist/cjs/index.js +1 -2
  22. package/dist/cjs/index.js.map +1 -1
  23. package/dist/docs.json +1778 -2119
  24. package/dist/esm/Abstract.d.ts +5 -6
  25. package/dist/esm/Abstract.d.ts.map +1 -1
  26. package/dist/esm/Abstract.js +2 -2
  27. package/dist/esm/Abstract.js.map +1 -1
  28. package/dist/esm/{XyoArchivistConfig.d.ts → Config.d.ts} +7 -8
  29. package/dist/esm/Config.d.ts.map +1 -0
  30. package/dist/esm/{XyoArchivistConfig.js → Config.js} +1 -1
  31. package/dist/esm/Config.js.map +1 -0
  32. package/dist/esm/PartialArchivistConfig.d.ts +5 -0
  33. package/dist/esm/PartialArchivistConfig.d.ts.map +1 -0
  34. package/dist/esm/PartialArchivistConfig.js +2 -0
  35. package/dist/esm/PartialArchivistConfig.js.map +1 -0
  36. package/dist/esm/Query/Payload.d.ts +1 -1
  37. package/dist/esm/Query/Payload.d.ts.map +1 -1
  38. package/dist/esm/XyoMemoryArchivist.d.ts +5 -4
  39. package/dist/esm/XyoMemoryArchivist.d.ts.map +1 -1
  40. package/dist/esm/XyoMemoryArchivist.js +9 -5
  41. package/dist/esm/XyoMemoryArchivist.js.map +1 -1
  42. package/dist/esm/index.d.ts +1 -2
  43. package/dist/esm/index.d.ts.map +1 -1
  44. package/dist/esm/index.js +1 -2
  45. package/dist/esm/index.js.map +1 -1
  46. package/package.json +6 -5
  47. package/src/Abstract.ts +7 -8
  48. package/src/{XyoArchivistConfig.ts → Config.ts} +6 -9
  49. package/src/PartialArchivistConfig.ts +5 -0
  50. package/src/Query/Payload.ts +2 -3
  51. package/src/XyoMemoryArchivist.ts +14 -9
  52. package/src/index.ts +1 -2
  53. package/dist/cjs/XyoArchivist.d.ts +0 -4
  54. package/dist/cjs/XyoArchivist.d.ts.map +0 -1
  55. package/dist/cjs/XyoArchivist.js.map +0 -1
  56. package/dist/cjs/XyoArchivistConfig.d.ts.map +0 -1
  57. package/dist/cjs/XyoArchivistConfig.js.map +0 -1
  58. package/dist/esm/XyoArchivist.d.ts +0 -4
  59. package/dist/esm/XyoArchivist.d.ts.map +0 -1
  60. package/dist/esm/XyoArchivist.js +0 -2
  61. package/dist/esm/XyoArchivist.js.map +0 -1
  62. package/dist/esm/XyoArchivistConfig.d.ts.map +0 -1
  63. package/dist/esm/XyoArchivistConfig.js.map +0 -1
  64. package/src/XyoArchivist.ts +0 -5
@@ -1,12 +1,11 @@
1
- import { XyoAbstractModule, XyoModuleQueryResult } from '@xyo-network/module';
1
+ import { XyoModule, XyoModuleQueryResult } from '@xyo-network/module';
2
2
  import { XyoPayload } from '@xyo-network/payload';
3
3
  import { NullablePromisableArray, Promisable, PromisableArray } from '@xyo-network/promisable';
4
4
  import { Archivist } from './Archivist';
5
+ import { XyoArchivistConfig, XyoArchivistParents } from './Config';
5
6
  import { XyoArchivistQueryPayload, XyoArchivistQueryPayloadSchema } from './Query';
6
- import { XyoArchivist } from './XyoArchivist';
7
- import { XyoArchivistConfig, XyoArchivistParents } from './XyoArchivistConfig';
8
7
  import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
9
- export declare abstract class XyoAbstractArchivist<TConfig extends XyoPayload = XyoPayload> extends XyoAbstractModule<XyoArchivistConfig<TConfig>, XyoArchivistQueryPayload> implements XyoArchivist<XyoArchivistQueryPayload>, Archivist<XyoPayload, XyoPayload, XyoPayload, XyoPayload, XyoPayloadFindFilter> {
8
+ export declare abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload> extends XyoModule<XyoArchivistConfig<TConfig>> implements Archivist<XyoPayload, XyoPayload, XyoPayload, XyoPayload, XyoPayloadFindFilter> {
10
9
  get queries(): XyoArchivistQueryPayloadSchema[];
11
10
  all(): PromisableArray<XyoPayload>;
12
11
  clear(): Promisable<void>;
@@ -16,12 +15,12 @@ export declare abstract class XyoAbstractArchivist<TConfig extends XyoPayload =
16
15
  abstract get(hashes: string[]): NullablePromisableArray<XyoPayload>;
17
16
  abstract insert(item: XyoPayload[]): PromisableArray<XyoPayload>;
18
17
  query(query: XyoArchivistQueryPayload): Promise<XyoModuleQueryResult>;
19
- get resolver(): (((address: string) => import("@xyo-network/module").XyoModule<{
18
+ get resolver(): ((address: string) => XyoModule<import("@xyo-network/module").XyoModuleConfig<{
20
19
  schema: string;
21
20
  previousHash?: string | undefined;
22
21
  sources?: string[] | undefined;
23
22
  timestamp?: number | undefined;
24
- }>) & ((address: string) => import("@xyo-network/module").XyoModule<XyoArchivistQueryPayload<never>>)) | undefined;
23
+ }>>) | undefined;
25
24
  private resolveArchivists;
26
25
  private _parents?;
27
26
  get parents(): XyoArchivistParents;
@@ -1 +1 @@
1
- {"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE9F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAQL,wBAAwB,EACxB,8BAA8B,EAC/B,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,8BAAsB,oBAAoB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,CAChF,SAAQ,iBAAiB,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,wBAAwB,CAC/E,YAAW,YAAY,CAAC,wBAAwB,CAAC,EAAE,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,CAAC;IAElI,IAAoB,OAAO,IAAI,8BAA8B,EAAE,CAE9D;IAEM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC;IAIlC,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC;IAIzB,MAAM,IAAI,eAAe,CAAC,UAAU,CAAC;IAIrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAInD,IAAI,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe,CAAC,UAAU,CAAC;IAIvE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC;IAEnE,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC;IAE1D,KAAK,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAgC3E,IAAI,QAAQ;;;;;uHAEX;IAED,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,QAAQ,CAAC,CAAqB;IACtC,IAAI,OAAO,wBAOV;CACF"}
1
+ {"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE9F,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAA;AAClE,OAAO,EAQL,wBAAwB,EACxB,8BAA8B,EAC/B,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,8BAAsB,YAAY,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,CACxE,SAAQ,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAC7C,YAAW,SAAS,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,oBAAoB,CAAC;IAE1F,IAAoB,OAAO,IAAI,8BAA8B,EAAE,CAE9D;IAEM,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC;IAIlC,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC;IAIzB,MAAM,IAAI,eAAe,CAAC,UAAU,CAAC;IAIrC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAInD,IAAI,CAAC,OAAO,EAAE,oBAAoB,GAAG,eAAe,CAAC,UAAU,CAAC;IAIvE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC;IAEnE,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC;IAE1D,KAAK,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAgC3E,IAAI,QAAQ;;;;;qBAEX;IAED,OAAO,CAAC,iBAAiB;IAUzB,OAAO,CAAC,QAAQ,CAAC,CAAqB;IACtC,IAAI,OAAO,wBAOV;CACF"}
@@ -1,7 +1,7 @@
1
1
  import { assertEx } from '@xylabs/sdk-js';
2
- import { XyoAbstractModule } from '@xyo-network/module';
2
+ import { XyoModule } from '@xyo-network/module';
3
3
  import { XyoArchivistAllQueryPayloadSchema, XyoArchivistClearQueryPayloadSchema, XyoArchivistCommitQueryPayloadSchema, XyoArchivistDeleteQueryPayloadSchema, XyoArchivistFindQueryPayloadSchema, XyoArchivistGetQueryPayloadSchema, XyoArchivistInsertQueryPayloadSchema, } from './Query';
4
- export class XyoAbstractArchivist extends XyoAbstractModule {
4
+ export class XyoArchivist extends XyoModule {
5
5
  get queries() {
6
6
  return [XyoArchivistGetQueryPayloadSchema, XyoArchivistInsertQueryPayloadSchema];
7
7
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Abstract.js","sourceRoot":"","sources":["../../src/Abstract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,SAAS,EAAwB,MAAM,qBAAqB,CAAA;AAMrE,OAAO,EACL,iCAAiC,EACjC,mCAAmC,EACnC,oCAAoC,EACpC,oCAAoC,EACpC,kCAAkC,EAClC,iCAAiC,EACjC,oCAAoC,GAGrC,MAAM,SAAS,CAAA;AAGhB,MAAM,OAAgB,YACpB,SAAQ,SAAsC;IAG9C,IAAoB,OAAO;QACzB,OAAO,CAAC,iCAAiC,EAAE,oCAAoC,CAAC,CAAA;IAClF,CAAC;IAEM,GAAG;QACR,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,KAAK;QACV,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,MAAM;QACX,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,MAAM,CAAC,OAAiB;QAC7B,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAEM,IAAI,CAAC,OAA6B;QACvC,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IAMD,KAAK,CAAC,KAAK,CAAC,KAA+B;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,CAAC,EAAE;YAC3D,OAAO,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;SAC1D;QAED,MAAM,QAAQ,GAA0B,EAAE,CAAA;QAC1C,QAAQ,KAAK,CAAC,MAAM,EAAE;YACpB,KAAK,iCAAiC;gBACpC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;gBACpC,MAAK;YACP,KAAK,mCAAmC;gBACtC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAA;gBAClB,MAAK;YACP,KAAK,oCAAoC;gBACvC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;gBACvC,MAAK;YACP,KAAK,oCAAoC;gBACvC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;gBAC/B,MAAK;YACP,KAAK,kCAAkC;gBACrC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBACjD,MAAK;YACP,KAAK,iCAAiC;gBACpC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gBAChD,MAAK;YACP,KAAK,oCAAoC;gBACvC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;gBACrD,MAAK;SACR;QACD,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAA;IAChD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAA;IAC7B,CAAC;IAEO,iBAAiB,CAAC,UAAyD;QACjF,MAAM,QAAQ,GAAiD,EAAE,CAAA;QACjE,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAClD,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,CAAA;YACvD,CAAC,CAAC,CAAA;SACH;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,QAAQ,CAAsB;IACtC,IAAI,OAAO;QACT,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI;YAC/B,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;YAC3D,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC;YACvD,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC;SAC1D,CAAA;QACD,OAAO,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAChC,CAAC;CACF"}
@@ -1,18 +1,17 @@
1
- import { XyoModuleConfig } from '@xyo-network/module';
1
+ import { XyoModule, XyoModuleConfig } from '@xyo-network/module';
2
2
  import { XyoPayload } from '@xyo-network/payload';
3
- import { XyoArchivist } from './XyoArchivist';
4
3
  export interface XyoArchivistParents {
5
- read?: Record<string, XyoArchivist | null | undefined>;
6
- write?: Record<string, XyoArchivist | null | undefined>;
7
- commit?: Record<string, XyoArchivist | null | undefined>;
4
+ read?: Record<string, XyoModule | null | undefined>;
5
+ write?: Record<string, XyoModule | null | undefined>;
6
+ commit?: Record<string, XyoModule | null | undefined>;
8
7
  }
9
- export declare type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload, TQuery extends XyoPayload = XyoPayload> = XyoModuleConfig<{
8
+ export declare type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload> = XyoModuleConfig<{
10
9
  /** @field address of one or more parent archivists to read from */
11
10
  parents?: XyoArchivistParents;
12
11
  cacheParentReads?: boolean;
13
12
  /** @field address of archivist to write through to */
14
13
  writeThrough?: string;
15
- } & TConfig, TQuery>;
14
+ } & TConfig>;
16
15
  export declare class XyoArchivistConfigWrapper<C extends XyoArchivistConfig = XyoArchivistConfig> {
17
16
  protected config?: C;
18
17
  constructor(config?: C);
@@ -21,4 +20,4 @@ export declare class XyoArchivistConfigWrapper<C extends XyoArchivistConfig = Xy
21
20
  get writeThrough(): string | undefined;
22
21
  get cacheParentReads(): boolean | undefined;
23
22
  }
24
- //# sourceMappingURL=XyoArchivistConfig.d.ts.map
23
+ //# sourceMappingURL=Config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;CACtD;AAED,oBAAY,kBAAkB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CACvF;IACE,mEAAmE;IACnE,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GAAG,OAAO,CACZ,CAAA;AAED,qBAAa,yBAAyB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB;IACtF,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACR,MAAM,CAAC,EAAE,CAAC;IAItB,IAAW,OAAO,oCAEjB;IAED,IAAW,OAAO,0DAEjB;IAED,IAAW,YAAY,uBAEtB;IAED,IAAW,gBAAgB,wBAE1B;CACF"}
@@ -16,4 +16,4 @@ export class XyoArchivistConfigWrapper {
16
16
  return this.config?.cacheParentReads;
17
17
  }
18
18
  }
19
- //# sourceMappingURL=XyoArchivistConfig.js.map
19
+ //# sourceMappingURL=Config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAmBA,MAAM,OAAO,yBAAyB;IAC1B,MAAM,CAAI;IACpB,YAAY,MAAU;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACtC,CAAC;CACF"}
@@ -0,0 +1,5 @@
1
+ import { XyoArchivistConfig } from './Config';
2
+ export declare type PartialArchivistConfig<T extends XyoArchivistConfig> = Omit<T, 'schema'> & {
3
+ schema?: T['schema'];
4
+ };
5
+ //# sourceMappingURL=PartialArchivistConfig.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PartialArchivistConfig.d.ts","sourceRoot":"","sources":["../../src/PartialArchivistConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,oBAAY,sBAAsB,CAAC,CAAC,SAAS,kBAAkB,IAAI,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG;IACrF,MAAM,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAA;CACrB,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=PartialArchivistConfig.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PartialArchivistConfig.js","sourceRoot":"","sources":["../../src/PartialArchivistConfig.ts"],"names":[],"mappings":""}
@@ -6,5 +6,5 @@ import { XyoArchivistDeleteQueryPayload } from './Delete';
6
6
  import { XyoArchivistFindQueryPayload } from './Find';
7
7
  import { XyoArchivistGetQueryPayload } from './Get';
8
8
  import { XyoArchivistInsertQueryPayload } from './Insert';
9
- export declare type XyoArchivistQueryPayload<T extends string = never> = XyoArchivistAllQueryPayload | XyoArchivistClearQueryPayload | XyoArchivistCommitQueryPayload | XyoArchivistDeleteQueryPayload | XyoArchivistFindQueryPayload | XyoArchivistGetQueryPayload | XyoArchivistInsertQueryPayload | XyoModuleQueryPayload | T;
9
+ export declare type XyoArchivistQueryPayload = XyoModuleQueryPayload | XyoArchivistAllQueryPayload | XyoArchivistClearQueryPayload | XyoArchivistCommitQueryPayload | XyoArchivistDeleteQueryPayload | XyoArchivistFindQueryPayload | XyoArchivistGetQueryPayload | XyoArchivistInsertQueryPayload;
10
10
  //# sourceMappingURL=Payload.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,QAAQ,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,oBAAY,wBAAwB,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,IACzD,2BAA2B,GAC3B,6BAA6B,GAC7B,8BAA8B,GAC9B,8BAA8B,GAC9B,4BAA4B,GAC5B,2BAA2B,GAC3B,8BAA8B,GAC9B,qBAAqB,GACrB,CAAC,CAAA"}
1
+ {"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,2BAA2B,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAA;AACvD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AACzD,OAAO,EAAE,4BAA4B,EAAE,MAAM,QAAQ,CAAA;AACrD,OAAO,EAAE,2BAA2B,EAAE,MAAM,OAAO,CAAA;AACnD,OAAO,EAAE,8BAA8B,EAAE,MAAM,UAAU,CAAA;AAEzD,oBAAY,wBAAwB,GAChC,qBAAqB,GACrB,2BAA2B,GAC3B,6BAA6B,GAC7B,8BAA8B,GAC9B,8BAA8B,GAC9B,4BAA4B,GAC5B,2BAA2B,GAC3B,8BAA8B,CAAA"}
@@ -1,7 +1,8 @@
1
1
  import { XyoPayload } from '@xyo-network/payload';
2
2
  import { PromisableArray } from '@xyo-network/promisable';
3
- import { XyoAbstractArchivist } from './Abstract';
4
- import { XyoArchivistConfig } from './XyoArchivistConfig';
3
+ import { XyoArchivist } from './Abstract';
4
+ import { XyoArchivistConfig } from './Config';
5
+ import { PartialArchivistConfig } from './PartialArchivistConfig';
5
6
  import { XyoPayloadFindFilter } from './XyoPayloadFindFilter';
6
7
  export declare type XyoMemoryArchivistConfigSchema = 'network.xyo.module.config.archivist.memory';
7
8
  export declare const XyoMemoryArchivistConfigSchema: XyoMemoryArchivistConfigSchema;
@@ -9,11 +10,11 @@ export declare type XyoMemoryArchivistConfig = XyoArchivistConfig<{
9
10
  schema: XyoMemoryArchivistConfigSchema;
10
11
  max?: number;
11
12
  }>;
12
- export declare class XyoMemoryArchivist extends XyoAbstractArchivist<XyoMemoryArchivistConfig> {
13
+ export declare class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
13
14
  get max(): number;
14
15
  private cache;
15
16
  get queries(): import("./Query").XyoArchivistQueryPayloadSchema<never>[];
16
- constructor(config: XyoMemoryArchivistConfig);
17
+ constructor(config: PartialArchivistConfig<XyoMemoryArchivistConfig>);
17
18
  delete(hashes: string[]): PromisableArray<boolean>;
18
19
  clear(): void | Promise<void>;
19
20
  protected getFromParents(hash: string): Promise<{
@@ -1 +1 @@
1
- {"version":3,"file":"XyoMemoryArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAIzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAUjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,oBAAY,8BAA8B,GAAG,4CAA4C,CAAA;AACzF,eAAO,MAAM,8BAA8B,EAAE,8BAA6E,CAAA;AAE1H,oBAAY,wBAAwB,GAAG,kBAAkB,CAAC;IACxD,MAAM,EAAE,8BAA8B,CAAA;IACtC,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAC,CAAA;AAQF,qBAAa,kBAAmB,SAAQ,oBAAoB,CAAC,wBAAwB,CAAC;IACpF,IAAW,GAAG,WAEb;IAED,OAAO,CAAC,KAAK,CAA8B;IAE3C,IAAoB,OAAO,8DAS1B;gBAEW,MAAM,EAAE,wBAAwB;IAKrC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAUzC,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAQ7B,cAAc,CAAC,IAAI,EAAE,MAAM;;;;;;IAa9B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAY3D,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC;IAa3D,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC;IAczF,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE;IAQrC,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAmB7C"}
1
+ {"version":3,"file":"XyoMemoryArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAqB,MAAM,sBAAsB,CAAA;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAIzD,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAYjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAE7D,oBAAY,8BAA8B,GAAG,4CAA4C,CAAA;AACzF,eAAO,MAAM,8BAA8B,EAAE,8BAA6E,CAAA;AAE1H,oBAAY,wBAAwB,GAAG,kBAAkB,CAAC;IACxD,MAAM,EAAE,8BAA8B,CAAA;IACtC,GAAG,CAAC,EAAE,MAAM,CAAA;CACb,CAAC,CAAA;AAQF,qBAAa,kBAAmB,SAAQ,YAAY,CAAC,wBAAwB,CAAC;IAC5E,IAAW,GAAG,WAEb;IAED,OAAO,CAAC,KAAK,CAA8B;IAE3C,IAAoB,OAAO,8DAS1B;gBAEW,MAAM,EAAE,sBAAsB,CAAC,wBAAwB,CAAC;IAK7D,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC;IAUzC,KAAK,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;cAQ7B,cAAc,CAAC,IAAI,EAAE,MAAM;;;;;;IAc9B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IAY3D,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,eAAe,CAAC,UAAU,CAAC;IAa3D,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,EAAE,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC;IAczF,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,UAAU,EAAE;IAQrC,MAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;CAoB7C"}
@@ -3,7 +3,7 @@ import { XyoBoundWitnessBuilder } from '@xyo-network/boundwitness';
3
3
  import { XyoPayloadWrapper } from '@xyo-network/payload';
4
4
  import compact from 'lodash/compact';
5
5
  import LruCache from 'lru-cache';
6
- import { XyoAbstractArchivist } from './Abstract';
6
+ import { XyoArchivist } from './Abstract';
7
7
  import { XyoArchivistAllQueryPayloadSchema, XyoArchivistClearQueryPayloadSchema, XyoArchivistCommitQueryPayloadSchema, XyoArchivistDeleteQueryPayloadSchema, XyoArchivistFindQueryPayloadSchema, XyoArchivistGetQueryPayloadSchema, XyoArchivistInsertQueryPayloadSchema, } from './Query';
8
8
  export const XyoMemoryArchivistConfigSchema = 'network.xyo.module.config.archivist.memory';
9
9
  class MemoryArchivistError extends Error {
@@ -11,7 +11,7 @@ class MemoryArchivistError extends Error {
11
11
  super(`Memory Archivist [${action}] failed${message ? ` (${message})` : ''}`, { cause: error });
12
12
  }
13
13
  }
14
- export class XyoMemoryArchivist extends XyoAbstractArchivist {
14
+ export class XyoMemoryArchivist extends XyoArchivist {
15
15
  get max() {
16
16
  return this.config?.max ?? 10000;
17
17
  }
@@ -27,7 +27,7 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist {
27
27
  ];
28
28
  }
29
29
  constructor(config) {
30
- super(config);
30
+ super({ ...config, schema: XyoMemoryArchivistConfigSchema });
31
31
  this.cache = new LruCache({ max: this.max });
32
32
  }
33
33
  delete(hashes) {
@@ -50,7 +50,8 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist {
50
50
  }
51
51
  async getFromParents(hash) {
52
52
  return compact(await Promise.all(compact(Object.values(this.parents?.read ?? {}).map(async (parent) => {
53
- const [, payloads] = (await parent?.query({ hashes: [hash], schema: XyoArchivistGetQueryPayloadSchema })) ?? [];
53
+ const query = { hashes: [hash], schema: XyoArchivistGetQueryPayloadSchema };
54
+ const [, payloads] = (await parent?.query(query)) ?? [];
54
55
  return payloads?.[0];
55
56
  }))))[0];
56
57
  }
@@ -105,7 +106,10 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist {
105
106
  const payloads = assertEx(await this.all(), 'Nothing to commit');
106
107
  const builder = new XyoBoundWitnessBuilder();
107
108
  const block = builder.payloads(payloads).witness(account).build();
108
- await Promise.allSettled(compact(Object.values(this.parents?.commit ?? [])?.map(async (parent) => await parent?.query({ payloads: [block, ...payloads], schema: XyoArchivistInsertQueryPayloadSchema }))));
109
+ await Promise.allSettled(compact(Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
110
+ const query = { payloads: [block, ...payloads], schema: XyoArchivistInsertQueryPayloadSchema };
111
+ return await parent?.query(query);
112
+ })));
109
113
  await this.clear();
110
114
  return payloads;
111
115
  }
@@ -1 +1 @@
1
- {"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"XyoMemoryArchivist.js","sourceRoot":"","sources":["../../src/XyoMemoryArchivist.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,7 @@
1
1
  export * from './Abstract';
2
2
  export * from './Archivist';
3
+ export * from './Config';
3
4
  export * from './Query';
4
- export * from './XyoArchivist';
5
- export * from './XyoArchivistConfig';
6
5
  export * from './XyoMemoryArchivist';
7
6
  export * from './XyoPayloadFindFilter';
8
7
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}
package/dist/esm/index.js CHANGED
@@ -1,8 +1,7 @@
1
1
  export * from './Abstract';
2
2
  export * from './Archivist';
3
+ export * from './Config';
3
4
  export * from './Query';
4
- export * from './XyoArchivist';
5
- export * from './XyoArchivistConfig';
6
5
  export * from './XyoMemoryArchivist';
7
6
  export * from './XyoPayloadFindFilter';
8
7
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA;AACvB,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,SAAS,CAAA;AACvB,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA"}
package/package.json CHANGED
@@ -10,10 +10,10 @@
10
10
  },
11
11
  "dependencies": {
12
12
  "@xylabs/sdk-js": "^2.6.7",
13
- "@xyo-network/boundwitness": "^2.29.0",
14
- "@xyo-network/module": "^2.29.0",
15
- "@xyo-network/payload": "^2.29.0",
16
- "@xyo-network/promisable": "^2.29.0",
13
+ "@xyo-network/boundwitness": "^2.30.0-rc.1",
14
+ "@xyo-network/module": "^2.30.0-rc.1",
15
+ "@xyo-network/payload": "^2.30.0-rc.1",
16
+ "@xyo-network/promisable": "^2.30.0-rc.1",
17
17
  "lodash": "^4.17.21",
18
18
  "lru-cache": "^7.14.0",
19
19
  "tslib": "^2.4.0"
@@ -52,5 +52,6 @@
52
52
  },
53
53
  "sideEffects": false,
54
54
  "types": "dist/esm/index.d.ts",
55
- "version": "2.29.0"
55
+ "version": "2.30.0-rc.1",
56
+ "stableVersion": "2.29.2"
56
57
  }
package/src/Abstract.ts CHANGED
@@ -1,9 +1,10 @@
1
1
  import { assertEx } from '@xylabs/sdk-js'
2
- import { XyoAbstractModule, XyoModuleQueryResult } from '@xyo-network/module'
2
+ import { XyoModule, XyoModuleQueryResult } from '@xyo-network/module'
3
3
  import { XyoPayload } from '@xyo-network/payload'
4
4
  import { NullablePromisableArray, Promisable, PromisableArray } from '@xyo-network/promisable'
5
5
 
6
6
  import { Archivist } from './Archivist'
7
+ import { XyoArchivistConfig, XyoArchivistParents } from './Config'
7
8
  import {
8
9
  XyoArchivistAllQueryPayloadSchema,
9
10
  XyoArchivistClearQueryPayloadSchema,
@@ -15,13 +16,11 @@ import {
15
16
  XyoArchivistQueryPayload,
16
17
  XyoArchivistQueryPayloadSchema,
17
18
  } from './Query'
18
- import { XyoArchivist } from './XyoArchivist'
19
- import { XyoArchivistConfig, XyoArchivistParents } from './XyoArchivistConfig'
20
19
  import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
21
20
 
22
- export abstract class XyoAbstractArchivist<TConfig extends XyoPayload = XyoPayload>
23
- extends XyoAbstractModule<XyoArchivistConfig<TConfig>, XyoArchivistQueryPayload>
24
- implements XyoArchivist<XyoArchivistQueryPayload>, Archivist<XyoPayload, XyoPayload, XyoPayload, XyoPayload, XyoPayloadFindFilter>
21
+ export abstract class XyoArchivist<TConfig extends XyoPayload = XyoPayload>
22
+ extends XyoModule<XyoArchivistConfig<TConfig>>
23
+ implements Archivist<XyoPayload, XyoPayload, XyoPayload, XyoPayload, XyoPayloadFindFilter>
25
24
  {
26
25
  public override get queries(): XyoArchivistQueryPayloadSchema[] {
27
26
  return [XyoArchivistGetQueryPayloadSchema, XyoArchivistInsertQueryPayloadSchema]
@@ -87,8 +86,8 @@ export abstract class XyoAbstractArchivist<TConfig extends XyoPayload = XyoPaylo
87
86
  return this.config.resolver
88
87
  }
89
88
 
90
- private resolveArchivists(archivists?: Record<string, XyoArchivist | null | undefined>) {
91
- const resolved: Record<string, XyoArchivist | null | undefined> = {}
89
+ private resolveArchivists(archivists?: Record<string, XyoModule | null | undefined>) {
90
+ const resolved: Record<string, XyoModule | null | undefined> = {}
92
91
  if (archivists) {
93
92
  Object.entries(archivists).forEach(([key, value]) => {
94
93
  resolved[key] = value ?? this.resolver?.(key) ?? null
@@ -1,23 +1,20 @@
1
- import { XyoModuleConfig } from '@xyo-network/module'
1
+ import { XyoModule, XyoModuleConfig } from '@xyo-network/module'
2
2
  import { XyoPayload } from '@xyo-network/payload'
3
3
 
4
- import { XyoArchivist } from './XyoArchivist'
5
-
6
4
  export interface XyoArchivistParents {
7
- read?: Record<string, XyoArchivist | null | undefined>
8
- write?: Record<string, XyoArchivist | null | undefined>
9
- commit?: Record<string, XyoArchivist | null | undefined>
5
+ read?: Record<string, XyoModule | null | undefined>
6
+ write?: Record<string, XyoModule | null | undefined>
7
+ commit?: Record<string, XyoModule | null | undefined>
10
8
  }
11
9
 
12
- export type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload, TQuery extends XyoPayload = XyoPayload> = XyoModuleConfig<
10
+ export type XyoArchivistConfig<TConfig extends XyoPayload = XyoPayload> = XyoModuleConfig<
13
11
  {
14
12
  /** @field address of one or more parent archivists to read from */
15
13
  parents?: XyoArchivistParents
16
14
  cacheParentReads?: boolean
17
15
  /** @field address of archivist to write through to */
18
16
  writeThrough?: string
19
- } & TConfig,
20
- TQuery
17
+ } & TConfig
21
18
  >
22
19
 
23
20
  export class XyoArchivistConfigWrapper<C extends XyoArchivistConfig = XyoArchivistConfig> {
@@ -0,0 +1,5 @@
1
+ import { XyoArchivistConfig } from './Config'
2
+
3
+ export type PartialArchivistConfig<T extends XyoArchivistConfig> = Omit<T, 'schema'> & {
4
+ schema?: T['schema']
5
+ }
@@ -8,7 +8,8 @@ import { XyoArchivistFindQueryPayload } from './Find'
8
8
  import { XyoArchivistGetQueryPayload } from './Get'
9
9
  import { XyoArchivistInsertQueryPayload } from './Insert'
10
10
 
11
- export type XyoArchivistQueryPayload<T extends string = never> =
11
+ export type XyoArchivistQueryPayload =
12
+ | XyoModuleQueryPayload
12
13
  | XyoArchivistAllQueryPayload
13
14
  | XyoArchivistClearQueryPayload
14
15
  | XyoArchivistCommitQueryPayload
@@ -16,5 +17,3 @@ export type XyoArchivistQueryPayload<T extends string = never> =
16
17
  | XyoArchivistFindQueryPayload
17
18
  | XyoArchivistGetQueryPayload
18
19
  | XyoArchivistInsertQueryPayload
19
- | XyoModuleQueryPayload
20
- | T
@@ -5,17 +5,20 @@ import { PromisableArray } from '@xyo-network/promisable'
5
5
  import compact from 'lodash/compact'
6
6
  import LruCache from 'lru-cache'
7
7
 
8
- import { XyoAbstractArchivist } from './Abstract'
8
+ import { XyoArchivist } from './Abstract'
9
+ import { XyoArchivistConfig } from './Config'
10
+ import { PartialArchivistConfig } from './PartialArchivistConfig'
9
11
  import {
10
12
  XyoArchivistAllQueryPayloadSchema,
11
13
  XyoArchivistClearQueryPayloadSchema,
12
14
  XyoArchivistCommitQueryPayloadSchema,
13
15
  XyoArchivistDeleteQueryPayloadSchema,
14
16
  XyoArchivistFindQueryPayloadSchema,
17
+ XyoArchivistGetQueryPayload,
15
18
  XyoArchivistGetQueryPayloadSchema,
19
+ XyoArchivistInsertQueryPayload,
16
20
  XyoArchivistInsertQueryPayloadSchema,
17
21
  } from './Query'
18
- import { XyoArchivistConfig } from './XyoArchivistConfig'
19
22
  import { XyoPayloadFindFilter } from './XyoPayloadFindFilter'
20
23
 
21
24
  export type XyoMemoryArchivistConfigSchema = 'network.xyo.module.config.archivist.memory'
@@ -32,7 +35,7 @@ class MemoryArchivistError extends Error {
32
35
  }
33
36
  }
34
37
 
35
- export class XyoMemoryArchivist extends XyoAbstractArchivist<XyoMemoryArchivistConfig> {
38
+ export class XyoMemoryArchivist extends XyoArchivist<XyoMemoryArchivistConfig> {
36
39
  public get max() {
37
40
  return this.config?.max ?? 10000
38
41
  }
@@ -50,8 +53,8 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist<XyoMemoryArchivistC
50
53
  ]
51
54
  }
52
55
 
53
- constructor(config: XyoMemoryArchivistConfig) {
54
- super(config)
56
+ constructor(config: PartialArchivistConfig<XyoMemoryArchivistConfig>) {
57
+ super({ ...config, schema: XyoMemoryArchivistConfigSchema })
55
58
  this.cache = new LruCache<string, XyoPayload>({ max: this.max })
56
59
  }
57
60
 
@@ -78,7 +81,8 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist<XyoMemoryArchivistC
78
81
  await Promise.all(
79
82
  compact(
80
83
  Object.values(this.parents?.read ?? {}).map(async (parent) => {
81
- const [, payloads] = (await parent?.query({ hashes: [hash], schema: XyoArchivistGetQueryPayloadSchema })) ?? []
84
+ const query: XyoArchivistGetQueryPayload = { hashes: [hash], schema: XyoArchivistGetQueryPayloadSchema }
85
+ const [, payloads] = (await parent?.query(query)) ?? []
82
86
  return payloads?.[0]
83
87
  }),
84
88
  ),
@@ -141,9 +145,10 @@ export class XyoMemoryArchivist extends XyoAbstractArchivist<XyoMemoryArchivistC
141
145
  const block = builder.payloads(payloads).witness(account).build()
142
146
  await Promise.allSettled(
143
147
  compact(
144
- Object.values(this.parents?.commit ?? [])?.map(
145
- async (parent) => await parent?.query({ payloads: [block, ...payloads], schema: XyoArchivistInsertQueryPayloadSchema }),
146
- ),
148
+ Object.values(this.parents?.commit ?? [])?.map(async (parent) => {
149
+ const query: XyoArchivistInsertQueryPayload = { payloads: [block, ...payloads], schema: XyoArchivistInsertQueryPayloadSchema }
150
+ return await parent?.query(query)
151
+ }),
147
152
  ),
148
153
  )
149
154
  await this.clear()
package/src/index.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  export * from './Abstract'
2
2
  export * from './Archivist'
3
+ export * from './Config'
3
4
  export * from './Query'
4
- export * from './XyoArchivist'
5
- export * from './XyoArchivistConfig'
6
5
  export * from './XyoMemoryArchivist'
7
6
  export * from './XyoPayloadFindFilter'
@@ -1,4 +0,0 @@
1
- import { XyoModule } from '@xyo-network/module';
2
- import { XyoArchivistQueryPayload } from './Query';
3
- export declare type XyoArchivist<Q extends XyoArchivistQueryPayload = XyoArchivistQueryPayload> = XyoModule<Q>;
4
- //# sourceMappingURL=XyoArchivist.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAElD,oBAAY,YAAY,CAAC,CAAC,SAAS,wBAAwB,GAAG,wBAAwB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAA"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":""}
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivistConfig.d.ts","sourceRoot":"","sources":["../../src/XyoArchivistConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;CACzD;AAED,oBAAY,kBAAkB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAC/H;IACE,mEAAmE;IACnE,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GAAG,OAAO,EACX,MAAM,CACP,CAAA;AAED,qBAAa,yBAAyB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB;IACtF,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACR,MAAM,CAAC,EAAE,CAAC;IAItB,IAAW,OAAO,oCAEjB;IAED,IAAW,OAAO,0DAEjB;IAED,IAAW,YAAY,uBAEtB;IAED,IAAW,gBAAgB,wBAE1B;CACF"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivistConfig.js","sourceRoot":"","sources":["../../src/XyoArchivistConfig.ts"],"names":[],"mappings":";;;AAsBA,MAAa,yBAAyB;IAEpC,YAAY,MAAU;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAW,OAAO;;QAChB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,OAAO;;QAChB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,YAAY;;QACrB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,YAAY,CAAA;IAClC,CAAC;IAED,IAAW,gBAAgB;;QACzB,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,gBAAgB,CAAA;IACtC,CAAC;CACF;AArBD,8DAqBC"}
@@ -1,4 +0,0 @@
1
- import { XyoModule } from '@xyo-network/module';
2
- import { XyoArchivistQueryPayload } from './Query';
3
- export declare type XyoArchivist<Q extends XyoArchivistQueryPayload = XyoArchivistQueryPayload> = XyoModule<Q>;
4
- //# sourceMappingURL=XyoArchivist.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivist.d.ts","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAElD,oBAAY,YAAY,CAAC,CAAC,SAAS,wBAAwB,GAAG,wBAAwB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAA"}
@@ -1,2 +0,0 @@
1
- export {};
2
- //# sourceMappingURL=XyoArchivist.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivist.js","sourceRoot":"","sources":["../../src/XyoArchivist.ts"],"names":[],"mappings":""}
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivistConfig.d.ts","sourceRoot":"","sources":["../../src/XyoArchivistConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7C,MAAM,WAAW,mBAAmB;IAClC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACtD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,GAAG,SAAS,CAAC,CAAA;CACzD;AAED,oBAAY,kBAAkB,CAAC,OAAO,SAAS,UAAU,GAAG,UAAU,EAAE,MAAM,SAAS,UAAU,GAAG,UAAU,IAAI,eAAe,CAC/H;IACE,mEAAmE;IACnE,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,sDAAsD;IACtD,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,GAAG,OAAO,EACX,MAAM,CACP,CAAA;AAED,qBAAa,yBAAyB,CAAC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB;IACtF,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;gBACR,MAAM,CAAC,EAAE,CAAC;IAItB,IAAW,OAAO,oCAEjB;IAED,IAAW,OAAO,0DAEjB;IAED,IAAW,YAAY,uBAEtB;IAED,IAAW,gBAAgB,wBAE1B;CACF"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"XyoArchivistConfig.js","sourceRoot":"","sources":["../../src/XyoArchivistConfig.ts"],"names":[],"mappings":"AAsBA,MAAM,OAAO,yBAAyB;IAC1B,MAAM,CAAI;IACpB,YAAY,MAAU;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACtB,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,CAAA;IAC7B,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,CAAC,MAAM,EAAE,YAAY,CAAA;IAClC,CAAC;IAED,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,MAAM,EAAE,gBAAgB,CAAA;IACtC,CAAC;CACF"}
@@ -1,5 +0,0 @@
1
- import { XyoModule } from '@xyo-network/module'
2
-
3
- import { XyoArchivistQueryPayload } from './Query'
4
-
5
- export type XyoArchivist<Q extends XyoArchivistQueryPayload = XyoArchivistQueryPayload> = XyoModule<Q>