@xyo-network/diviner-payload-memory 3.5.2 → 3.6.0-rc.2
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,8 @@
|
|
|
1
1
|
import type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model';
|
|
2
2
|
import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract';
|
|
3
3
|
import type { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model';
|
|
4
|
-
import type { Payload
|
|
4
|
+
import type { Payload } from '@xyo-network/payload-model';
|
|
5
5
|
export declare class MemoryPayloadDiviner<TParams extends PayloadDivinerParams = PayloadDivinerParams, TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload, TOut extends Payload = Payload, TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut>> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
|
|
6
|
-
protected divineHandler(payloads?: TIn[]): Promise<
|
|
6
|
+
protected divineHandler(payloads?: TIn[]): Promise<TOut[]>;
|
|
7
7
|
}
|
|
8
8
|
//# sourceMappingURL=MemoryPayloadDiviner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAG1G,OAAO,KAAK,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"MemoryPayloadDiviner.d.ts","sourceRoot":"","sources":["../../src/MemoryPayloadDiviner.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAA;AACzF,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAA;AAG1G,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIzD,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,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,sBAAsB,CAChH,eAAe,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,EACnC,GAAG,EACH,IAAI,CACL,CACD,SAAQ,cAAc,CAAC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC;cAC7B,aAAa,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;CA6D1E"}
|
package/dist/neutral/index.mjs
CHANGED
|
@@ -10,7 +10,7 @@ import { PayloadBuilder } from "@xyo-network/payload-builder";
|
|
|
10
10
|
|
|
11
11
|
// src/hasTimestamp.ts
|
|
12
12
|
var hasTimestamp = /* @__PURE__ */ __name((payload) => {
|
|
13
|
-
return payload
|
|
13
|
+
return payload.$timestamp !== void 0;
|
|
14
14
|
}, "hasTimestamp");
|
|
15
15
|
|
|
16
16
|
// src/MemoryPayloadDiviner.ts
|
|
@@ -23,9 +23,7 @@ var MemoryPayloadDiviner = class extends PayloadDiviner {
|
|
|
23
23
|
if (!filter) return [];
|
|
24
24
|
const archivist = assertEx(await this.archivistInstance(), () => "Unable to resolve archivist");
|
|
25
25
|
const { schemas, limit, offset, hash, order = "desc", timestamp, ...props } = removeFields(filter, [
|
|
26
|
-
"schema"
|
|
27
|
-
"$meta",
|
|
28
|
-
"$hash"
|
|
26
|
+
"schema"
|
|
29
27
|
]);
|
|
30
28
|
let all = await archivist.all?.();
|
|
31
29
|
if (all) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/MemoryPayloadDiviner.ts","../../src/hasTimestamp.ts"],"sourcesContent":["/* eslint-disable complexity */\nimport { assertEx } from '@xylabs/assert'\nimport { removeFields } from '@xylabs/object'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload
|
|
1
|
+
{"version":3,"sources":["../../src/MemoryPayloadDiviner.ts","../../src/hasTimestamp.ts"],"sourcesContent":["/* eslint-disable complexity */\nimport { assertEx } from '@xylabs/assert'\nimport { removeFields } from '@xylabs/object'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport type { Payload } from '@xyo-network/payload-model'\n\nimport { hasTimestamp } from './hasTimestamp.ts'\n\nexport class MemoryPayloadDiviner<\n TParams extends PayloadDivinerParams = PayloadDivinerParams,\n TIn extends PayloadDivinerQueryPayload = PayloadDivinerQueryPayload,\n TOut extends Payload = Payload,\n TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n DivinerInstance<TParams, TIn, TOut>,\n TIn,\n TOut\n >,\n> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {\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.archivistInstance(), () => 'Unable to resolve archivist')\n const {\n schemas, limit, offset, hash, order = 'desc', timestamp, ...props\n } = removeFields(filter as TIn, ['schema'])\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 (timestamp !== undefined) {\n // If there was no order supplied with the original\n if (filter.order === undefined) {\n // filter for timestamp equality\n all = all.filter(hasTimestamp).filter(payload => payload.timestamp === timestamp)\n } else {\n // filter for greater than/less than or equal to\n all\n = order === 'asc'\n ? all.filter(hasTimestamp).filter(payload => payload.timestamp >= timestamp)\n : all.filter(hasTimestamp).filter(payload => payload.timestamp <= timestamp)\n }\n }\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 all\n = Array.isArray(filter)\n ? 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 : all.filter(payload => payload?.[property] === filter)\n }\n }\n const parsedLimit = limit ?? all.length\n const parsedOffset = offset || 0\n return offset === undefined\n ? (async () => {\n const allPairs = await PayloadBuilder.hashPairs(all)\n if (hash) {\n // remove all until found\n while (allPairs.length > 0 && allPairs[0][1] !== hash) {\n allPairs.shift()\n }\n // remove it if found\n if (allPairs.length > 0 && allPairs[0][1] === hash) {\n allPairs.shift()\n }\n }\n return allPairs.map(([payload]) => payload).slice(parsedOffset, parsedOffset + parsedLimit)\n })()\n : all.slice(parsedOffset, parsedOffset + parsedLimit)\n } else {\n throw new Error('Archivist does not support \"all\"')\n }\n }\n}\n","import type { AnyObject } from '@xylabs/object'\nimport type { Payload } from '@xyo-network/payload-model'\n\nexport const hasTimestamp = <T extends Payload = Payload<AnyObject>>(payload: T): payload is T & { timestamp: number } => {\n return (payload as unknown as { $timestamp: number }).$timestamp !== undefined\n}\n"],"mappings":";;;;AACA,SAASA,gBAAgB;AACzB,SAASC,oBAAoB;AAE7B,SAASC,sBAAsB;AAE/B,SAASC,oCAAoC;AAC7C,SAASC,sBAAsB;;;ACJxB,IAAMC,eAAe,wBAAyCC,YAAAA;AACnE,SAAQA,QAA8CC,eAAeC;AACvE,GAF4B;;;ADSrB,IAAMC,uBAAN,cASGC,eAAAA;EArBV,OAqBUA;;;EACR,MAAyBC,cAAcC,UAAmC;AACxE,UAAMC,SAASC,SAASF,UAAUC,OAAOE,4BAAAA,GAA+BC,IAAAA,GAAO,MAAM,uBAAA;AACrF,QAAI,CAACH,OAAQ,QAAO,CAAA;AACpB,UAAMI,YAAYH,SAAS,MAAM,KAAKI,kBAAiB,GAAI,MAAM,6BAAA;AACjE,UAAM,EACJC,SAASC,OAAOC,QAAQC,MAAMC,QAAQ,QAAQC,WAAW,GAAGC,MAAAA,IAC1DC,aAAab,QAAe;MAAC;KAAS;AAC1C,QAAIc,MAAO,MAAMV,UAAUU,MAAG;AAC9B,QAAIA,KAAK;AACP,UAAIJ,UAAU,OAAQI,OAAMA,IAAIC,QAAO;AACvC,UAAIT,SAASU,OAAQF,OAAMA,IAAId,OAAOiB,CAAAA,YAAWX,QAAQY,SAASD,QAAQE,MAAM,CAAA;AAChF,UAAIR,cAAcS,QAAW;AAE3B,YAAIpB,OAAOU,UAAUU,QAAW;AAE9BN,gBAAMA,IAAId,OAAOqB,YAAAA,EAAcrB,OAAOiB,CAAAA,YAAWA,QAAQN,cAAcA,SAAAA;QACzE,OAAO;AAELG,gBACIJ,UAAU,QACRI,IAAId,OAAOqB,YAAAA,EAAcrB,OAAOiB,CAAAA,YAAWA,QAAQN,aAAaA,SAAAA,IAChEG,IAAId,OAAOqB,YAAAA,EAAcrB,OAAOiB,CAAAA,YAAWA,QAAQN,aAAaA,SAAAA;QACxE;MACF;AACA,UAAIW,OAAOC,KAAKX,KAAAA,EAAOI,SAAS,GAAG;AACjC,cAAMQ,2BAA2BF,OAAOG,QAAQb,KAAAA;AAChD,mBAAW,CAACc,MAAM1B,OAAAA,KAAWwB,0BAA0B;AACrD,gBAAMG,WAAWD;AACjBZ,gBACIc,MAAMC,QAAQ7B,OAAAA,IACZc,IAAId,OAAOiB,CAAAA,YACTjB,QAAO8B,MAAM,CAACC,UAAAA;AACZ,kBAAML,QAAOT,UAAUU,QAAAA;AAEvB,mBAAOC,MAAMC,QAAQH,KAAAA,KAASA,MAAKR,WAAWa,KAAAA;UAChD,CAAA,CAAA,IACFjB,IAAId,OAAOiB,CAAAA,YAAWA,UAAUU,QAAAA,MAAc3B,OAAAA;QACtD;MACF;AACA,YAAMgC,cAAczB,SAASO,IAAIE;AACjC,YAAMiB,eAAezB,UAAU;AAC/B,aAAOA,WAAWY,UACb,YAAA;AACC,cAAMc,WAAW,MAAMC,eAAeC,UAAUtB,GAAAA;AAChD,YAAIL,MAAM;AAER,iBAAOyB,SAASlB,SAAS,KAAKkB,SAAS,CAAA,EAAG,CAAA,MAAOzB,MAAM;AACrDyB,qBAASG,MAAK;UAChB;AAEA,cAAIH,SAASlB,SAAS,KAAKkB,SAAS,CAAA,EAAG,CAAA,MAAOzB,MAAM;AAClDyB,qBAASG,MAAK;UAChB;QACF;AACA,eAAOH,SAASI,IAAI,CAAC,CAACrB,OAAAA,MAAaA,OAAAA,EAASsB,MAAMN,cAAcA,eAAeD,WAAAA;MACjF,GAAA,IACAlB,IAAIyB,MAAMN,cAAcA,eAAeD,WAAAA;IAC7C,OAAO;AACL,YAAM,IAAIQ,MAAM,kCAAA;IAClB;EACF;AACF;","names":["assertEx","removeFields","PayloadDiviner","isPayloadDivinerQueryPayload","PayloadBuilder","hasTimestamp","payload","$timestamp","undefined","MemoryPayloadDiviner","PayloadDiviner","divineHandler","payloads","filter","assertEx","isPayloadDivinerQueryPayload","pop","archivist","archivistInstance","schemas","limit","offset","hash","order","timestamp","props","removeFields","all","reverse","length","payload","includes","schema","undefined","hasTimestamp","Object","keys","additionalFilterCriteria","entries","prop","property","Array","isArray","every","value","parsedLimit","parsedOffset","allPairs","PayloadBuilder","hashPairs","shift","map","slice","Error"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyo-network/diviner-payload-memory",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0-rc.2",
|
|
4
4
|
"description": "Primary SDK for using XYO Protocol 2.0",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -29,26 +29,27 @@
|
|
|
29
29
|
"module": "dist/neutral/index.mjs",
|
|
30
30
|
"types": "dist/neutral/index.d.ts",
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@xylabs/assert": "^4.4.
|
|
33
|
-
"@xylabs/object": "^4.4.
|
|
34
|
-
"@xyo-network/diviner-model": "^3.
|
|
35
|
-
"@xyo-network/diviner-payload-abstract": "^3.
|
|
36
|
-
"@xyo-network/diviner-payload-model": "^3.
|
|
37
|
-
"@xyo-network/payload-builder": "^3.
|
|
38
|
-
"@xyo-network/payload-model": "^3.
|
|
32
|
+
"@xylabs/assert": "^4.4.12",
|
|
33
|
+
"@xylabs/object": "^4.4.12",
|
|
34
|
+
"@xyo-network/diviner-model": "^3.6.0-rc.2",
|
|
35
|
+
"@xyo-network/diviner-payload-abstract": "^3.6.0-rc.2",
|
|
36
|
+
"@xyo-network/diviner-payload-model": "^3.6.0-rc.2",
|
|
37
|
+
"@xyo-network/payload-builder": "^3.6.0-rc.2",
|
|
38
|
+
"@xyo-network/payload-model": "^3.6.0-rc.2"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@xylabs/delay": "^4.4.
|
|
41
|
+
"@xylabs/delay": "^4.4.12",
|
|
42
42
|
"@xylabs/ts-scripts-yarn3": "^4.2.4",
|
|
43
43
|
"@xylabs/tsconfig": "^4.2.4",
|
|
44
|
-
"@xylabs/vitest-extended": "^4.4.
|
|
45
|
-
"@xyo-network/archivist-memory": "^3.
|
|
46
|
-
"@xyo-network/node-memory": "^3.
|
|
47
|
-
"@xyo-network/payload-builder": "^3.
|
|
44
|
+
"@xylabs/vitest-extended": "^4.4.12",
|
|
45
|
+
"@xyo-network/archivist-memory": "^3.6.0-rc.2",
|
|
46
|
+
"@xyo-network/node-memory": "^3.6.0-rc.2",
|
|
47
|
+
"@xyo-network/payload-builder": "^3.6.0-rc.2",
|
|
48
48
|
"typescript": "^5.7.2",
|
|
49
|
-
"vitest": "^2.1.
|
|
49
|
+
"vitest": "^2.1.8"
|
|
50
50
|
},
|
|
51
51
|
"publishConfig": {
|
|
52
52
|
"access": "public"
|
|
53
|
-
}
|
|
53
|
+
},
|
|
54
|
+
"stableVersion": "3.5.2"
|
|
54
55
|
}
|
|
@@ -6,7 +6,7 @@ import { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'
|
|
|
6
6
|
import type { PayloadDivinerParams, PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
|
|
7
7
|
import { isPayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'
|
|
8
8
|
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
9
|
-
import type { Payload
|
|
9
|
+
import type { Payload } from '@xyo-network/payload-model'
|
|
10
10
|
|
|
11
11
|
import { hasTimestamp } from './hasTimestamp.ts'
|
|
12
12
|
|
|
@@ -20,14 +20,14 @@ export class MemoryPayloadDiviner<
|
|
|
20
20
|
TOut
|
|
21
21
|
>,
|
|
22
22
|
> extends PayloadDiviner<TParams, TIn, TOut, TEventData> {
|
|
23
|
-
protected override async divineHandler(payloads?: TIn[]): Promise<
|
|
23
|
+
protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {
|
|
24
24
|
const filter = assertEx(payloads?.filter(isPayloadDivinerQueryPayload)?.pop(), () => 'Missing query payload')
|
|
25
25
|
if (!filter) return []
|
|
26
26
|
const archivist = assertEx(await this.archivistInstance(), () => 'Unable to resolve archivist')
|
|
27
27
|
const {
|
|
28
28
|
schemas, limit, offset, hash, order = 'desc', timestamp, ...props
|
|
29
|
-
} = removeFields(filter as
|
|
30
|
-
let all = (await archivist.all?.()) as
|
|
29
|
+
} = removeFields(filter as TIn, ['schema'])
|
|
30
|
+
let all = (await archivist.all?.()) as TOut[]
|
|
31
31
|
if (all) {
|
|
32
32
|
if (order === 'desc') all = all.reverse()
|
|
33
33
|
if (schemas?.length) all = all.filter(payload => schemas.includes(payload.schema))
|
|
@@ -51,11 +51,11 @@ export class MemoryPayloadDiviner<
|
|
|
51
51
|
all
|
|
52
52
|
= Array.isArray(filter)
|
|
53
53
|
? all.filter(payload =>
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
54
|
+
filter.every((value) => {
|
|
55
|
+
const prop = payload?.[property]
|
|
56
|
+
// TODO: This seems to be written just to check arrays, and now that $meta is there, need to check type?
|
|
57
|
+
return Array.isArray(prop) && prop.includes?.(value)
|
|
58
|
+
}))
|
|
59
59
|
: all.filter(payload => payload?.[property] === filter)
|
|
60
60
|
}
|
|
61
61
|
}
|
package/src/hasTimestamp.ts
CHANGED
|
@@ -2,5 +2,5 @@ import type { AnyObject } from '@xylabs/object'
|
|
|
2
2
|
import type { Payload } from '@xyo-network/payload-model'
|
|
3
3
|
|
|
4
4
|
export const hasTimestamp = <T extends Payload = Payload<AnyObject>>(payload: T): payload is T & { timestamp: number } => {
|
|
5
|
-
return (payload as unknown as { timestamp: number })
|
|
5
|
+
return (payload as unknown as { $timestamp: number }).$timestamp !== undefined
|
|
6
6
|
}
|