@xyo-network/diviner-payload-memory 2.82.0 → 2.83.0

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.
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -26,9 +26,9 @@ module.exports = __toCommonJS(src_exports);
26
26
 
27
27
  // src/MemoryPayloadDiviner.ts
28
28
  var import_assert = require("@xylabs/assert");
29
- var import_core = require("@xyo-network/core");
30
29
  var import_diviner_payload_abstract = require("@xyo-network/diviner-payload-abstract");
31
30
  var import_diviner_payload_model = require("@xyo-network/diviner-payload-model");
31
+ var import_hash = require("@xyo-network/hash");
32
32
  var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.PayloadDiviner {
33
33
  static configSchemas = [import_diviner_payload_model.PayloadDivinerConfigSchema];
34
34
  async divineHandler(payloads) {
@@ -48,7 +48,12 @@ var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.Payload
48
48
  for (const [prop, filter2] of additionalFilterCriteria) {
49
49
  const property = prop;
50
50
  if (Array.isArray(filter2)) {
51
- all = all.filter((payload) => filter2.every((value) => payload?.[property]?.includes(value)));
51
+ all = all.filter(
52
+ (payload) => filter2.every((value) => {
53
+ const prop2 = payload?.[property];
54
+ return Array.isArray(prop2) && prop2.includes?.(value);
55
+ })
56
+ );
52
57
  } else {
53
58
  all = all.filter((payload) => payload?.[property] === filter2);
54
59
  }
@@ -57,9 +62,7 @@ var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.Payload
57
62
  const parsedLimit = limit || all.length;
58
63
  const parsedOffset = offset || 0;
59
64
  return offset !== void 0 ? all.slice(parsedOffset, parsedLimit) : (async () => {
60
- const allPairs = await Promise.all(
61
- all.map(async (payload) => [await import_core.PayloadHasher.hashAsync(payload), payload])
62
- );
65
+ const allPairs = await Promise.all(all.map(async (payload) => [await import_hash.PayloadHasher.hashAsync(payload), payload]));
63
66
  if (hash) {
64
67
  while (allPairs.length > 0 && allPairs[0][0] !== hash) {
65
68
  allPairs.shift();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/index.ts","../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["export * from './MemoryPayloadDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema, PayloadDivinerParams } from '@xyo-network/diviner-payload-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: Payload[]): Promise<Payload[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = await archivist.all?.()\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof Payload\n if (Array.isArray(filter)) {\n all = all.filter((payload) => filter.every((value) => payload?.[property]?.includes(value)))\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(\n all.map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAyB;AACzB,kBAA8B;AAC9B,sCAA+B;AAC/B,mCAA+F;AAGxF,IAAM,uBAAN,cAAgG,+CAAwB;AAAA,EAC7H,OAAgB,gBAAgB,CAAC,uDAA0B;AAAA,EAE3D,MAAyB,cAAc,UAA0C;AAC/E,UAAM,aAAS,wBAAS,UAAU,OAAO,yDAA4B,GAAG,IAAI,GAAG,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,gBAAY,wBAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAM,MAAM,UAAU,MAAM;AAChC,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,SAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI,OAAO,CAAC,YAAYA,QAAO,MAAM,CAAC,UAAU,UAAU,QAAQ,GAAG,SAAS,KAAK,CAAC,CAAC;AAAA,UAC7F,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,YAAY,UAAU,QAAQ,MAAMA,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ;AAAA,UAC7B,IAAI,IAAgC,OAAO,YAAY,CAAC,MAAM,0BAAc,UAAU,OAAO,GAAG,OAAO,CAAC;AAAA,QAC1G;AACA,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter"]}
1
+ {"version":3,"sources":["../../src/index.ts","../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["export * from './MemoryPayloadDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport {\n isPayloadDivinerQueryPayload,\n PayloadDivinerConfigSchema,\n PayloadDivinerParams,\n PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<\n TParams extends PayloadDivinerParams = PayloadDivinerParams,\n TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = (await archivist.all?.()) as TOut[]\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof TOut\n if (Array.isArray(filter)) {\n all = all.filter((payload) =>\n filter.every((value) => {\n const prop = payload?.[property]\n //TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n return Array.isArray(prop) && prop.includes?.(value)\n }),\n )\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(all.map<Promise<[string, TOut]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]))\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAyB;AAEzB,sCAA+B;AAC/B,mCAKO;AACP,kBAA8B;AAGvB,IAAM,uBAAN,cAKG,+CAA+C;AAAA,EACvD,OAAgB,gBAAgB,CAAC,uDAA0B;AAAA,EAE3D,MAAyB,cAAc,UAAmC;AACxE,UAAM,aAAS,wBAAS,UAAU,OAAO,yDAA4B,GAAG,IAAI,GAAG,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,gBAAY,wBAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAO,MAAM,UAAU,MAAM;AACjC,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,SAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI;AAAA,cAAO,CAAC,YAChBA,QAAO,MAAM,CAAC,UAAU;AACtB,sBAAMC,QAAO,UAAU,QAAQ;AAE/B,uBAAO,MAAM,QAAQA,KAAI,KAAKA,MAAK,WAAW,KAAK;AAAA,cACrD,CAAC;AAAA,YACH;AAAA,UACF,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,YAAY,UAAU,QAAQ,MAAMD,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ,IAAI,IAAI,IAA6B,OAAO,YAAY,CAAC,MAAM,0BAAc,UAAU,OAAO,GAAG,OAAO,CAAC,CAAC;AACzI,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","prop"]}
@@ -1,8 +1,11 @@
1
1
  // src/MemoryPayloadDiviner.ts
2
2
  import { assertEx } from "@xylabs/assert";
3
- import { PayloadHasher } from "@xyo-network/core";
4
3
  import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
5
- import { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema } from "@xyo-network/diviner-payload-model";
4
+ import {
5
+ isPayloadDivinerQueryPayload,
6
+ PayloadDivinerConfigSchema
7
+ } from "@xyo-network/diviner-payload-model";
8
+ import { PayloadHasher } from "@xyo-network/hash";
6
9
  var MemoryPayloadDiviner = class extends PayloadDiviner {
7
10
  static configSchemas = [PayloadDivinerConfigSchema];
8
11
  async divineHandler(payloads) {
@@ -22,7 +25,12 @@ var MemoryPayloadDiviner = class extends PayloadDiviner {
22
25
  for (const [prop, filter2] of additionalFilterCriteria) {
23
26
  const property = prop;
24
27
  if (Array.isArray(filter2)) {
25
- all = all.filter((payload) => filter2.every((value) => payload?.[property]?.includes(value)));
28
+ all = all.filter(
29
+ (payload) => filter2.every((value) => {
30
+ const prop2 = payload?.[property];
31
+ return Array.isArray(prop2) && prop2.includes?.(value);
32
+ })
33
+ );
26
34
  } else {
27
35
  all = all.filter((payload) => payload?.[property] === filter2);
28
36
  }
@@ -31,9 +39,7 @@ var MemoryPayloadDiviner = class extends PayloadDiviner {
31
39
  const parsedLimit = limit || all.length;
32
40
  const parsedOffset = offset || 0;
33
41
  return offset !== void 0 ? all.slice(parsedOffset, parsedLimit) : (async () => {
34
- const allPairs = await Promise.all(
35
- all.map(async (payload) => [await PayloadHasher.hashAsync(payload), payload])
36
- );
42
+ const allPairs = await Promise.all(all.map(async (payload) => [await PayloadHasher.hashAsync(payload), payload]));
37
43
  if (hash) {
38
44
  while (allPairs.length > 0 && allPairs[0][0] !== hash) {
39
45
  allPairs.shift();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema, PayloadDivinerParams } from '@xyo-network/diviner-payload-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: Payload[]): Promise<Payload[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = await archivist.all?.()\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof Payload\n if (Array.isArray(filter)) {\n all = all.filter((payload) => filter.every((value) => payload?.[property]?.includes(value)))\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(\n all.map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B,kCAAwD;AAGxF,IAAM,uBAAN,cAAgG,eAAwB;AAAA,EAC7H,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,cAAc,UAA0C;AAC/E,UAAM,SAAS,SAAS,UAAU,OAAO,4BAA4B,GAAG,IAAI,GAAG,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,YAAY,SAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAM,MAAM,UAAU,MAAM;AAChC,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,SAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI,OAAO,CAAC,YAAYA,QAAO,MAAM,CAAC,UAAU,UAAU,QAAQ,GAAG,SAAS,KAAK,CAAC,CAAC;AAAA,UAC7F,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,YAAY,UAAU,QAAQ,MAAMA,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ;AAAA,UAC7B,IAAI,IAAgC,OAAO,YAAY,CAAC,MAAM,cAAc,UAAU,OAAO,GAAG,OAAO,CAAC;AAAA,QAC1G;AACA,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter"]}
1
+ {"version":3,"sources":["../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport {\n isPayloadDivinerQueryPayload,\n PayloadDivinerConfigSchema,\n PayloadDivinerParams,\n PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<\n TParams extends PayloadDivinerParams = PayloadDivinerParams,\n TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = (await archivist.all?.()) as TOut[]\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof TOut\n if (Array.isArray(filter)) {\n all = all.filter((payload) =>\n filter.every((value) => {\n const prop = payload?.[property]\n //TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n return Array.isArray(prop) && prop.includes?.(value)\n }),\n )\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(all.map<Promise<[string, TOut]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]))\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AAEzB,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,qBAAqB;AAGvB,IAAM,uBAAN,cAKG,eAA+C;AAAA,EACvD,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,cAAc,UAAmC;AACxE,UAAM,SAAS,SAAS,UAAU,OAAO,4BAA4B,GAAG,IAAI,GAAG,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,YAAY,SAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAO,MAAM,UAAU,MAAM;AACjC,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,SAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI;AAAA,cAAO,CAAC,YAChBA,QAAO,MAAM,CAAC,UAAU;AACtB,sBAAMC,QAAO,UAAU,QAAQ;AAE/B,uBAAO,MAAM,QAAQA,KAAI,KAAKA,MAAK,WAAW,KAAK;AAAA,cACrD,CAAC;AAAA,YACH;AAAA,UACF,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,YAAY,UAAU,QAAQ,MAAMD,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ,IAAI,IAAI,IAA6B,OAAO,YAAY,CAAC,MAAM,cAAc,UAAU,OAAO,GAAG,OAAO,CAAC,CAAC;AACzI,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","prop"]}
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -1,8 +1,9 @@
1
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model';
1
2
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
2
- import { PayloadDivinerParams } from '@xyo-network/diviner-payload-model';
3
+ import { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
3
4
  import { Payload } from '@xyo-network/payload-model';
4
- export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
5
+ export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
5
6
  static configSchemas: "network.xyo.diviner.payload.config"[];
6
- protected divineHandler(payloads?: Payload[]): Promise<Payload[]>;
7
+ protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
7
8
  }
8
9
  //# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAA4D,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AACnI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,cAAc,CAAC,OAAO,CAAC;IAC5H,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CA6CjF"}
1
+ {"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AAClF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAGL,oBAAoB,EACpB,0BAA0B,EAC3B,MAAM,oCAAoC,CAAA;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,qBAAa,oBAAoB,CAC/B,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,GAAG,SAAS,0BAA0B,GAAG,0BAA0B,EACnE,IAAI,SAAS,OAAO,GAAG,OAAO,EAC9B,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,CACxI,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;IACtD,OAAgB,aAAa,yCAA+B;cAEnC,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CAiD1E"}
@@ -26,9 +26,9 @@ module.exports = __toCommonJS(src_exports);
26
26
 
27
27
  // src/MemoryPayloadDiviner.ts
28
28
  var import_assert = require("@xylabs/assert");
29
- var import_core = require("@xyo-network/core");
30
29
  var import_diviner_payload_abstract = require("@xyo-network/diviner-payload-abstract");
31
30
  var import_diviner_payload_model = require("@xyo-network/diviner-payload-model");
31
+ var import_hash = require("@xyo-network/hash");
32
32
  var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.PayloadDiviner {
33
33
  static configSchemas = [import_diviner_payload_model.PayloadDivinerConfigSchema];
34
34
  async divineHandler(payloads) {
@@ -49,10 +49,13 @@ var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.Payload
49
49
  for (const [prop, filter2] of additionalFilterCriteria) {
50
50
  const property = prop;
51
51
  if (Array.isArray(filter2)) {
52
- all = all.filter((payload) => filter2.every((value) => {
53
- var _a2;
54
- return (_a2 = payload == null ? void 0 : payload[property]) == null ? void 0 : _a2.includes(value);
55
- }));
52
+ all = all.filter(
53
+ (payload) => filter2.every((value) => {
54
+ var _a2;
55
+ const prop2 = payload == null ? void 0 : payload[property];
56
+ return Array.isArray(prop2) && ((_a2 = prop2.includes) == null ? void 0 : _a2.call(prop2, value));
57
+ })
58
+ );
56
59
  } else {
57
60
  all = all.filter((payload) => (payload == null ? void 0 : payload[property]) === filter2);
58
61
  }
@@ -61,9 +64,7 @@ var MemoryPayloadDiviner = class extends import_diviner_payload_abstract.Payload
61
64
  const parsedLimit = limit || all.length;
62
65
  const parsedOffset = offset || 0;
63
66
  return offset !== void 0 ? all.slice(parsedOffset, parsedLimit) : (async () => {
64
- const allPairs = await Promise.all(
65
- all.map(async (payload) => [await import_core.PayloadHasher.hashAsync(payload), payload])
66
- );
67
+ const allPairs = await Promise.all(all.map(async (payload) => [await import_hash.PayloadHasher.hashAsync(payload), payload]));
67
68
  if (hash) {
68
69
  while (allPairs.length > 0 && allPairs[0][0] !== hash) {
69
70
  allPairs.shift();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/index.ts","../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["export * from './MemoryPayloadDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema, PayloadDivinerParams } from '@xyo-network/diviner-payload-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: Payload[]): Promise<Payload[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = await archivist.all?.()\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof Payload\n if (Array.isArray(filter)) {\n all = all.filter((payload) => filter.every((value) => payload?.[property]?.includes(value)))\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(\n all.map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAyB;AACzB,kBAA8B;AAC9B,sCAA+B;AAC/B,mCAA+F;AAGxF,IAAM,uBAAN,cAAgG,+CAAwB;AAAA,EAC7H,OAAgB,gBAAgB,CAAC,uDAA0B;AAAA,EAE3D,MAAyB,cAAc,UAA0C;AATnF;AAUI,UAAM,aAAS,yBAAS,0CAAU,OAAO,+DAAjB,mBAAgD,OAAO,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,gBAAY,wBAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAM,QAAM,eAAU,QAAV;AAChB,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,mCAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI,OAAO,CAAC,YAAYA,QAAO,MAAM,CAAC,UAAO;AAxB/D,kBAAAC;AAwBkE,sBAAAA,MAAA,mCAAU,cAAV,gBAAAA,IAAqB,SAAS;AAAA,aAAM,CAAC;AAAA,UAC7F,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,aAAY,mCAAU,eAAcD,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ;AAAA,UAC7B,IAAI,IAAgC,OAAO,YAAY,CAAC,MAAM,0BAAc,UAAU,OAAO,GAAG,OAAO,CAAC;AAAA,QAC1G;AACA,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","_a"]}
1
+ {"version":3,"sources":["../../src/index.ts","../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["export * from './MemoryPayloadDiviner'\n","import { assertEx } from '@xylabs/assert'\nimport { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport {\n isPayloadDivinerQueryPayload,\n PayloadDivinerConfigSchema,\n PayloadDivinerParams,\n PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<\n TParams extends PayloadDivinerParams = PayloadDivinerParams,\n TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = (await archivist.all?.()) as TOut[]\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof TOut\n if (Array.isArray(filter)) {\n all = all.filter((payload) =>\n filter.every((value) => {\n const prop = payload?.[property]\n //TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n return Array.isArray(prop) && prop.includes?.(value)\n }),\n )\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(all.map<Promise<[string, TOut]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]))\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,oBAAyB;AAEzB,sCAA+B;AAC/B,mCAKO;AACP,kBAA8B;AAGvB,IAAM,uBAAN,cAKG,+CAA+C;AAAA,EACvD,OAAgB,gBAAgB,CAAC,uDAA0B;AAAA,EAE3D,MAAyB,cAAc,UAAmC;AApB5E;AAqBI,UAAM,aAAS,yBAAS,0CAAU,OAAO,+DAAjB,mBAAgD,OAAO,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,gBAAY,wBAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAO,QAAM,eAAU,QAAV;AACjB,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,mCAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI;AAAA,cAAO,CAAC,YAChBA,QAAO,MAAM,CAAC,UAAU;AApCtC,oBAAAC;AAqCgB,sBAAMC,QAAO,mCAAU;AAEvB,uBAAO,MAAM,QAAQA,KAAI,OAAKD,MAAAC,MAAK,aAAL,gBAAAD,IAAA,KAAAC,OAAgB;AAAA,cAChD,CAAC;AAAA,YACH;AAAA,UACF,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,aAAY,mCAAU,eAAcF,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ,IAAI,IAAI,IAA6B,OAAO,YAAY,CAAC,MAAM,0BAAc,UAAU,OAAO,GAAG,OAAO,CAAC,CAAC;AACzI,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","_a","prop"]}
@@ -1,8 +1,11 @@
1
1
  // src/MemoryPayloadDiviner.ts
2
2
  import { assertEx } from "@xylabs/assert";
3
- import { PayloadHasher } from "@xyo-network/core";
4
3
  import { PayloadDiviner } from "@xyo-network/diviner-payload-abstract";
5
- import { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema } from "@xyo-network/diviner-payload-model";
4
+ import {
5
+ isPayloadDivinerQueryPayload,
6
+ PayloadDivinerConfigSchema
7
+ } from "@xyo-network/diviner-payload-model";
8
+ import { PayloadHasher } from "@xyo-network/hash";
6
9
  var MemoryPayloadDiviner = class extends PayloadDiviner {
7
10
  static configSchemas = [PayloadDivinerConfigSchema];
8
11
  async divineHandler(payloads) {
@@ -23,10 +26,13 @@ var MemoryPayloadDiviner = class extends PayloadDiviner {
23
26
  for (const [prop, filter2] of additionalFilterCriteria) {
24
27
  const property = prop;
25
28
  if (Array.isArray(filter2)) {
26
- all = all.filter((payload) => filter2.every((value) => {
27
- var _a2;
28
- return (_a2 = payload == null ? void 0 : payload[property]) == null ? void 0 : _a2.includes(value);
29
- }));
29
+ all = all.filter(
30
+ (payload) => filter2.every((value) => {
31
+ var _a2;
32
+ const prop2 = payload == null ? void 0 : payload[property];
33
+ return Array.isArray(prop2) && ((_a2 = prop2.includes) == null ? void 0 : _a2.call(prop2, value));
34
+ })
35
+ );
30
36
  } else {
31
37
  all = all.filter((payload) => (payload == null ? void 0 : payload[property]) === filter2);
32
38
  }
@@ -35,9 +41,7 @@ var MemoryPayloadDiviner = class extends PayloadDiviner {
35
41
  const parsedLimit = limit || all.length;
36
42
  const parsedOffset = offset || 0;
37
43
  return offset !== void 0 ? all.slice(parsedOffset, parsedLimit) : (async () => {
38
- const allPairs = await Promise.all(
39
- all.map(async (payload) => [await PayloadHasher.hashAsync(payload), payload])
40
- );
44
+ const allPairs = await Promise.all(all.map(async (payload) => [await PayloadHasher.hashAsync(payload), payload]));
41
45
  if (hash) {
42
46
  while (allPairs.length > 0 && allPairs[0][0] !== hash) {
43
47
  allPairs.shift();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { PayloadHasher } from '@xyo-network/core'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema, PayloadDivinerParams } from '@xyo-network/diviner-payload-model'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: Payload[]): Promise<Payload[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = await archivist.all?.()\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof Payload\n if (Array.isArray(filter)) {\n all = all.filter((payload) => filter.every((value) => payload?.[property]?.includes(value)))\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(\n all.map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),\n )\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAC9B,SAAS,sBAAsB;AAC/B,SAAS,8BAA8B,kCAAwD;AAGxF,IAAM,uBAAN,cAAgG,eAAwB;AAAA,EAC7H,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,cAAc,UAA0C;AATnF;AAUI,UAAM,SAAS,UAAS,0CAAU,OAAO,kCAAjB,mBAAgD,OAAO,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,YAAY,SAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAM,QAAM,eAAU,QAAV;AAChB,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,mCAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI,OAAO,CAAC,YAAYA,QAAO,MAAM,CAAC,UAAO;AAxB/D,kBAAAC;AAwBkE,sBAAAA,MAAA,mCAAU,cAAV,gBAAAA,IAAqB,SAAS;AAAA,aAAM,CAAC;AAAA,UAC7F,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,aAAY,mCAAU,eAAcD,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ;AAAA,UAC7B,IAAI,IAAgC,OAAO,YAAY,CAAC,MAAM,cAAc,UAAU,OAAO,GAAG,OAAO,CAAC;AAAA,QAC1G;AACA,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","_a"]}
1
+ {"version":3,"sources":["../../src/MemoryPayloadDiviner.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport {\n isPayloadDivinerQueryPayload,\n PayloadDivinerConfigSchema,\n PayloadDivinerParams,\n PayloadDivinerQueryPayload,\n} from '@xyo-network/diviner-payload-model'\nimport { PayloadHasher } from '@xyo-network/hash'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport class MemoryPayloadDiviner<\n TParams extends PayloadDivinerParams = PayloadDivinerParams,\n TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\n static override configSchemas = [PayloadDivinerConfigSchema]\n\n protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')\n if (!filter) return []\n const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const { schemas, limit, offset, hash, order, schema, ...props } = filter\n let all = (await archivist.all?.()) as TOut[]\n if (all) {\n if (order === 'desc') all = all.reverse()\n if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))\n if (Object.keys(props).length > 0) {\n const additionalFilterCriteria = Object.entries(props)\n for (const [prop, filter] of additionalFilterCriteria) {\n const property = prop as keyof TOut\n if (Array.isArray(filter)) {\n all = all.filter((payload) =>\n filter.every((value) => {\n const prop = payload?.[property]\n //TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?\n return Array.isArray(prop) && prop.includes?.(value)\n }),\n )\n } else {\n all = all.filter((payload) => payload?.[property] === filter)\n }\n }\n }\n const parsedLimit = limit || all.length\n const parsedOffset = offset || 0\n return offset !== undefined\n ? all.slice(parsedOffset, parsedLimit)\n : (async () => {\n const allPairs = await Promise.all(all.map<Promise<[string, TOut]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]))\n if (hash) {\n //remove all until found\n while (allPairs.length > 0 && allPairs[0][0] !== hash) {\n allPairs.shift()\n }\n //remove it if found\n if (allPairs.length > 0 && allPairs[0][0] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([, payload]) => payload)\n })()\n } else {\n throw Error('Archivist does not support \"all\"')\n }\n }\n}\n"],"mappings":";AAAA,SAAS,gBAAgB;AAEzB,SAAS,sBAAsB;AAC/B;AAAA,EACE;AAAA,EACA;AAAA,OAGK;AACP,SAAS,qBAAqB;AAGvB,IAAM,uBAAN,cAKG,eAA+C;AAAA,EACvD,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,cAAc,UAAmC;AApB5E;AAqBI,UAAM,SAAS,UAAS,0CAAU,OAAO,kCAAjB,mBAAgD,OAAO,uBAAuB;AACtG,QAAI,CAAC;AAAQ,aAAO,CAAC;AACrB,UAAM,YAAY,SAAS,MAAM,KAAK,cAAc,GAAG,6BAA6B;AAEpF,UAAM,EAAE,SAAS,OAAO,QAAQ,MAAM,OAAO,QAAQ,GAAG,MAAM,IAAI;AAClE,QAAI,MAAO,QAAM,eAAU,QAAV;AACjB,QAAI,KAAK;AACP,UAAI,UAAU;AAAQ,cAAM,IAAI,QAAQ;AACxC,UAAI,mCAAS;AAAQ,cAAM,IAAI,OAAO,CAAC,YAAY,QAAQ,SAAS,QAAQ,MAAM,CAAC;AACnF,UAAI,OAAO,KAAK,KAAK,EAAE,SAAS,GAAG;AACjC,cAAM,2BAA2B,OAAO,QAAQ,KAAK;AACrD,mBAAW,CAAC,MAAMA,OAAM,KAAK,0BAA0B;AACrD,gBAAM,WAAW;AACjB,cAAI,MAAM,QAAQA,OAAM,GAAG;AACzB,kBAAM,IAAI;AAAA,cAAO,CAAC,YAChBA,QAAO,MAAM,CAAC,UAAU;AApCtC,oBAAAC;AAqCgB,sBAAMC,QAAO,mCAAU;AAEvB,uBAAO,MAAM,QAAQA,KAAI,OAAKD,MAAAC,MAAK,aAAL,gBAAAD,IAAA,KAAAC,OAAgB;AAAA,cAChD,CAAC;AAAA,YACH;AAAA,UACF,OAAO;AACL,kBAAM,IAAI,OAAO,CAAC,aAAY,mCAAU,eAAcF,OAAM;AAAA,UAC9D;AAAA,QACF;AAAA,MACF;AACA,YAAM,cAAc,SAAS,IAAI;AACjC,YAAM,eAAe,UAAU;AAC/B,aAAO,WAAW,SACd,IAAI,MAAM,cAAc,WAAW,KAClC,YAAY;AACX,cAAM,WAAW,MAAM,QAAQ,IAAI,IAAI,IAA6B,OAAO,YAAY,CAAC,MAAM,cAAc,UAAU,OAAO,GAAG,OAAO,CAAC,CAAC;AACzI,YAAI,MAAM;AAER,iBAAO,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AACrD,qBAAS,MAAM;AAAA,UACjB;AAEA,cAAI,SAAS,SAAS,KAAK,SAAS,CAAC,EAAE,CAAC,MAAM,MAAM;AAClD,qBAAS,MAAM;AAAA,UACjB;AAAA,QACF;AACA,eAAO,SAAS,IAAI,CAAC,CAAC,EAAE,OAAO,MAAM,OAAO;AAAA,MAC9C,GAAG;AAAA,IACT,OAAO;AACL,YAAM,MAAM,kCAAkC;AAAA,IAChD;AAAA,EACF;AACF;","names":["filter","_a","prop"]}
package/package.json CHANGED
@@ -11,18 +11,19 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.13.20",
14
- "@xyo-network/core": "~2.82.0",
15
- "@xyo-network/diviner-payload-abstract": "~2.82.0",
16
- "@xyo-network/diviner-payload-model": "~2.82.0",
17
- "@xyo-network/payload-model": "~2.82.0"
14
+ "@xyo-network/diviner-model": "~2.83.0",
15
+ "@xyo-network/diviner-payload-abstract": "~2.83.0",
16
+ "@xyo-network/diviner-payload-model": "~2.83.0",
17
+ "@xyo-network/hash": "~2.83.0",
18
+ "@xyo-network/payload-model": "~2.83.0"
18
19
  },
19
20
  "devDependencies": {
20
21
  "@xylabs/ts-scripts-yarn3": "^3.2.10",
21
22
  "@xylabs/tsconfig": "^3.2.10",
22
- "@xyo-network/account": "~2.82.0",
23
- "@xyo-network/memory-archivist": "~2.82.0",
24
- "@xyo-network/node-memory": "~2.82.0",
25
- "@xyo-network/payload-builder": "~2.82.0",
23
+ "@xyo-network/account": "~2.83.0",
24
+ "@xyo-network/memory-archivist": "~2.83.0",
25
+ "@xyo-network/node-memory": "~2.83.0",
26
+ "@xyo-network/payload-builder": "~2.83.0",
26
27
  "typescript": "^5.3.2"
27
28
  },
28
29
  "description": "Primary SDK for using XYO Protocol 2.0",
@@ -65,5 +66,5 @@
65
66
  "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
66
67
  },
67
68
  "sideEffects": false,
68
- "version": "2.82.0"
69
+ "version": "2.83.0"
69
70
  }
@@ -1,28 +1,45 @@
1
1
  import { assertEx } from '@xylabs/assert'
2
- import { PayloadHasher } from '@xyo-network/core'
2
+ import { DivinerModule, DivinerModuleEventData } from '@xyo-network/diviner-model'
3
3
  import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'
4
- import { isPayloadDivinerQueryPayload, PayloadDivinerConfigSchema, PayloadDivinerParams } from '@xyo-network/diviner-payload-model'
4
+ import {
5
+ isPayloadDivinerQueryPayload,
6
+ PayloadDivinerConfigSchema,
7
+ PayloadDivinerParams,
8
+ PayloadDivinerQueryPayload,
9
+ } from '@xyo-network/diviner-payload-model'
10
+ import { PayloadHasher } from '@xyo-network/hash'
5
11
  import { Payload } from '@xyo-network/payload-model'
6
12
 
7
- export class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams> extends PayloadDiviner<TParams> {
13
+ export class MemoryPayloadDiviner<
14
+ TParams extends PayloadDivinerParams = PayloadDivinerParams,
15
+ TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,
16
+ TOut extends Payload = Payload,
17
+ TEventData extends DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut> = DivinerModuleEventData<DivinerModule<TParams>, TIn, TOut>,
18
+ > extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
8
19
  static override configSchemas = [PayloadDivinerConfigSchema]
9
20
 
10
- protected override async divineHandler(payloads?: Payload[]): Promise<Payload[]> {
21
+ protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {
11
22
  const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), 'Missing query payload')
12
23
  if (!filter) return []
13
24
  const archivist = assertEx(await this.readArchivist(), 'Unable to resolve archivist')
14
25
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
15
26
  const { schemas, limit, offset, hash, order, schema, ...props } = filter
16
- let all = await archivist.all?.()
27
+ let all = (await archivist.all?.()) as TOut[]
17
28
  if (all) {
18
29
  if (order === 'desc') all = all.reverse()
19
30
  if (schemas?.length) all = all.filter((payload) => schemas.includes(payload.schema))
20
31
  if (Object.keys(props).length > 0) {
21
32
  const additionalFilterCriteria = Object.entries(props)
22
33
  for (const [prop, filter] of additionalFilterCriteria) {
23
- const property = prop as keyof Payload
34
+ const property = prop as keyof TOut
24
35
  if (Array.isArray(filter)) {
25
- all = all.filter((payload) => filter.every((value) => payload?.[property]?.includes(value)))
36
+ all = all.filter((payload) =>
37
+ filter.every((value) => {
38
+ const prop = payload?.[property]
39
+ //TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?
40
+ return Array.isArray(prop) && prop.includes?.(value)
41
+ }),
42
+ )
26
43
  } else {
27
44
  all = all.filter((payload) => payload?.[property] === filter)
28
45
  }
@@ -33,9 +50,7 @@ export class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = Payload
33
50
  return offset !== undefined
34
51
  ? all.slice(parsedOffset, parsedLimit)
35
52
  : (async () => {
36
- const allPairs = await Promise.all(
37
- all.map<Promise<[string, Payload]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]),
38
- )
53
+ const allPairs = await Promise.all(all.map<Promise<[string, TOut]>>(async (payload) => [await PayloadHasher.hashAsync(payload), payload]))
39
54
  if (hash) {
40
55
  //remove all until found
41
56
  while (allPairs.length > 0 && allPairs[0][0] !== hash) {