@xyo-network/payload-builder 2.88.3 → 2.89.0-rc.10
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.
- package/dist/browser/Builder.d.cts +31 -21
- package/dist/browser/Builder.d.cts.map +1 -1
- package/dist/browser/Builder.d.mts +31 -21
- package/dist/browser/Builder.d.mts.map +1 -1
- package/dist/browser/Builder.d.ts +31 -21
- package/dist/browser/Builder.d.ts.map +1 -1
- package/dist/browser/BuilderBase.d.cts +17 -0
- package/dist/browser/BuilderBase.d.cts.map +1 -0
- package/dist/browser/BuilderBase.d.mts +17 -0
- package/dist/browser/BuilderBase.d.mts.map +1 -0
- package/dist/browser/BuilderBase.d.ts +17 -0
- package/dist/browser/BuilderBase.d.ts.map +1 -0
- package/dist/browser/Options.d.cts +10 -0
- package/dist/browser/Options.d.cts.map +1 -0
- package/dist/browser/Options.d.mts +10 -0
- package/dist/browser/Options.d.mts.map +1 -0
- package/dist/browser/Options.d.ts +10 -0
- package/dist/browser/Options.d.ts.map +1 -0
- package/dist/browser/index.cjs +136 -38
- package/dist/browser/index.cjs.map +1 -1
- package/dist/browser/index.d.cts +2 -0
- package/dist/browser/index.d.cts.map +1 -1
- package/dist/browser/index.d.mts +2 -0
- package/dist/browser/index.d.mts.map +1 -1
- package/dist/browser/index.d.ts +2 -0
- package/dist/browser/index.d.ts.map +1 -1
- package/dist/browser/index.js +137 -39
- package/dist/browser/index.js.map +1 -1
- package/dist/node/Builder.d.cts +31 -21
- package/dist/node/Builder.d.cts.map +1 -1
- package/dist/node/Builder.d.mts +31 -21
- package/dist/node/Builder.d.mts.map +1 -1
- package/dist/node/Builder.d.ts +31 -21
- package/dist/node/Builder.d.ts.map +1 -1
- package/dist/node/BuilderBase.d.cts +17 -0
- package/dist/node/BuilderBase.d.cts.map +1 -0
- package/dist/node/BuilderBase.d.mts +17 -0
- package/dist/node/BuilderBase.d.mts.map +1 -0
- package/dist/node/BuilderBase.d.ts +17 -0
- package/dist/node/BuilderBase.d.ts.map +1 -0
- package/dist/node/Options.d.cts +10 -0
- package/dist/node/Options.d.cts.map +1 -0
- package/dist/node/Options.d.mts +10 -0
- package/dist/node/Options.d.mts.map +1 -0
- package/dist/node/Options.d.ts +10 -0
- package/dist/node/Options.d.ts.map +1 -0
- package/dist/node/index.cjs +139 -38
- package/dist/node/index.cjs.map +1 -1
- package/dist/node/index.d.cts +2 -0
- package/dist/node/index.d.cts.map +1 -1
- package/dist/node/index.d.mts +2 -0
- package/dist/node/index.d.mts.map +1 -1
- package/dist/node/index.d.ts +2 -0
- package/dist/node/index.d.ts.map +1 -1
- package/dist/node/index.js +138 -38
- package/dist/node/index.js.map +1 -1
- package/package.json +10 -6
- package/src/Builder.ts +100 -38
- package/src/BuilderBase.ts +57 -0
- package/src/Options.ts +10 -0
- package/src/index.ts +2 -0
package/src/Builder.ts
CHANGED
|
@@ -1,58 +1,120 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Hash } from '@xylabs/hex'
|
|
2
2
|
import { AnyObject } from '@xylabs/object'
|
|
3
|
-
import {
|
|
4
|
-
import { Payload } from '@xyo-network/payload-model'
|
|
3
|
+
import { PayloadHasher } from '@xyo-network/hash'
|
|
4
|
+
import { Payload, PayloadWithMeta, WithMeta } from '@xyo-network/payload-model'
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
import { PayloadBuilderBase } from './BuilderBase'
|
|
7
|
+
import { PayloadBuilderOptions } from './Options'
|
|
8
|
+
|
|
9
|
+
export class PayloadBuilder<
|
|
10
|
+
T extends Payload = Payload<AnyObject>,
|
|
11
|
+
O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>,
|
|
12
|
+
> extends PayloadBuilderBase<T, O> {
|
|
13
|
+
static async build<T extends Payload>(payload: T) {
|
|
14
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
15
|
+
const { schema, $hash, $meta, ...fields } = payload as WithMeta<T>
|
|
16
|
+
const builder = new PayloadBuilder<T>({ fields: fields as T, meta: $meta, schema: payload.schema })
|
|
17
|
+
return await builder.build()
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
static async dataHash<T extends Payload>(payload: T): Promise<Hash> {
|
|
21
|
+
return (await this.build(payload)).$hash
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
static async dataHashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {
|
|
25
|
+
return await Promise.all(
|
|
26
|
+
payloads.map(async (payload) => {
|
|
27
|
+
const built = await PayloadBuilder.build(payload)
|
|
28
|
+
return [built, built.$hash]
|
|
29
|
+
}),
|
|
30
|
+
)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
static async dataHashes(payloads: undefined): Promise<undefined>
|
|
34
|
+
static async dataHashes<T extends Payload>(payloads: T[]): Promise<Hash[]>
|
|
35
|
+
static async dataHashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {
|
|
36
|
+
return payloads
|
|
37
|
+
? await Promise.all(
|
|
38
|
+
payloads.map(async (payload) => {
|
|
39
|
+
const built = await PayloadBuilder.build(payload)
|
|
40
|
+
return built.$hash
|
|
41
|
+
}),
|
|
42
|
+
)
|
|
43
|
+
: undefined
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
static async filterExclude<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {
|
|
47
|
+
return await PayloadHasher.filterExcludeByHash(await this.filterExcludeByDataHash(payloads, hash), hash)
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
static async filterExcludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {
|
|
51
|
+
const hashes = Array.isArray(hash) ? hash : [hash]
|
|
52
|
+
return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => !hashes.includes(objHash))?.map((pair) => pair[0])
|
|
53
|
+
}
|
|
9
54
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
private _schema: string
|
|
15
|
-
private _timestamp = Date.now()
|
|
55
|
+
static async filterIncludeByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash[] | Hash): Promise<T[]> {
|
|
56
|
+
const hashes = Array.isArray(hash) ? hash : [hash]
|
|
57
|
+
return (await this.dataHashPairs(payloads)).filter(([_, objHash]) => hashes.includes(objHash))?.map((pair) => pair[0])
|
|
58
|
+
}
|
|
16
59
|
|
|
17
|
-
|
|
18
|
-
this.
|
|
60
|
+
static async findByDataHash<T extends Payload>(payloads: T[] = [], hash: Hash): Promise<T | undefined> {
|
|
61
|
+
return (await this.dataHashPairs(payloads)).find(([_, objHash]) => objHash === hash)?.[0]
|
|
19
62
|
}
|
|
20
63
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
return { _client: this._client, _hash, _timestamp: this._timestamp }
|
|
64
|
+
static async hash<T extends Payload>(payload: T): Promise<Hash> {
|
|
65
|
+
return await PayloadHasher.hash(payload)
|
|
24
66
|
}
|
|
25
67
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
68
|
+
/**
|
|
69
|
+
* Creates an array of payload/hash tuples based on the payloads passed in
|
|
70
|
+
* @param objs Any array of payloads
|
|
71
|
+
* @returns An array of payload/hash tuples
|
|
72
|
+
*/
|
|
73
|
+
static async hashPairs<T extends Payload>(payloads: T[]): Promise<[WithMeta<T>, Hash][]> {
|
|
74
|
+
return await Promise.all(
|
|
75
|
+
payloads.map<Promise<[WithMeta<T>, Hash]>>(async (payload) => {
|
|
76
|
+
const built = await PayloadBuilder.build(payload)
|
|
77
|
+
return [built, await PayloadBuilder.hash(built)]
|
|
78
|
+
}),
|
|
79
|
+
)
|
|
29
80
|
}
|
|
30
81
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
82
|
+
static async hashes(payloads: undefined): Promise<undefined>
|
|
83
|
+
static async hashes<T extends Payload>(payloads: T[]): Promise<Hash[]>
|
|
84
|
+
static async hashes<T extends Payload>(payloads?: T[]): Promise<Hash[] | undefined> {
|
|
85
|
+
return await PayloadHasher.hashes(payloads)
|
|
34
86
|
}
|
|
35
87
|
|
|
36
|
-
async
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
hashableFields = { ...hashableFields, $hash, $meta: this._$meta }
|
|
88
|
+
static async toDataHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {
|
|
89
|
+
const result: Record<Hash, T> = {}
|
|
90
|
+
for (const pair of await this.dataHashPairs(objs)) {
|
|
91
|
+
result[pair[1]] = pair[0]
|
|
41
92
|
}
|
|
42
|
-
return
|
|
93
|
+
return result
|
|
43
94
|
}
|
|
44
95
|
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
96
|
+
/**
|
|
97
|
+
* Creates an object map of payload hashes to payloads based on the payloads passed in
|
|
98
|
+
* @param objs Any array of payloads
|
|
99
|
+
* @returns A map of hashes to payloads
|
|
100
|
+
*/
|
|
101
|
+
static async toHashMap<T extends Payload>(objs: T[]): Promise<Record<Hash, T>> {
|
|
102
|
+
const result: Record<Hash, T> = {}
|
|
103
|
+
for (const pair of await this.hashPairs(objs)) {
|
|
104
|
+
result[pair[1]] = pair[0]
|
|
48
105
|
}
|
|
49
|
-
return
|
|
106
|
+
return result
|
|
50
107
|
}
|
|
51
108
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
109
|
+
async build(): Promise<WithMeta<T>> {
|
|
110
|
+
const dataHashableFields = await this.dataHashableFields()
|
|
111
|
+
const $hash = await PayloadBuilder.hash(dataHashableFields)
|
|
112
|
+
const hashableFields: PayloadWithMeta = { ...dataHashableFields, $hash }
|
|
113
|
+
|
|
114
|
+
//only add $meta if it exists and has at least one field
|
|
115
|
+
if (this._$meta && Object.keys(this._$meta).length > 0) {
|
|
116
|
+
hashableFields['$meta'] = this._$meta
|
|
117
|
+
}
|
|
118
|
+
return hashableFields as WithMeta<T>
|
|
57
119
|
}
|
|
58
120
|
}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { assertEx } from '@xylabs/assert'
|
|
2
|
+
import { AnyObject, JsonObject } from '@xylabs/object'
|
|
3
|
+
import { Promisable } from '@xylabs/promise'
|
|
4
|
+
import { deepOmitPrefixedFields, removeEmptyFields } from '@xyo-network/hash'
|
|
5
|
+
import { Payload, Schema, WithMeta } from '@xyo-network/payload-model'
|
|
6
|
+
|
|
7
|
+
import { PayloadBuilderOptions } from './Options'
|
|
8
|
+
|
|
9
|
+
export class PayloadBuilderBase<T extends Payload = Payload<AnyObject>, O extends PayloadBuilderOptions<T> = PayloadBuilderOptions<T>> {
|
|
10
|
+
protected _$meta?: JsonObject
|
|
11
|
+
protected _fields?: Omit<T, 'schema' | '$hash' | '$meta'>
|
|
12
|
+
protected _schema: Schema
|
|
13
|
+
|
|
14
|
+
constructor(readonly options: O) {
|
|
15
|
+
const { schema, fields, meta } = options
|
|
16
|
+
this._schema = schema
|
|
17
|
+
this._fields = fields
|
|
18
|
+
this._$meta = meta
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
$meta(meta?: JsonObject) {
|
|
22
|
+
this._$meta = meta ?? (this._fields as WithMeta<T>).$meta
|
|
23
|
+
return this
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
async dataHashableFields(): Promise<T> {
|
|
27
|
+
return deepOmitPrefixedFields(await this.hashableFields(), '$')
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
//we do not require sending in $hash since it will be generated anyway
|
|
31
|
+
fields(fields: Omit<WithMeta<T>, '$hash' | 'schema'> & Partial<Pick<WithMeta<T>, '$hash' | 'schema'>>) {
|
|
32
|
+
if (fields) {
|
|
33
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
34
|
+
const { $meta, $hash, schema, ...fieldsOnly } = fields as WithMeta<T>
|
|
35
|
+
if ($meta) {
|
|
36
|
+
this.$meta($meta)
|
|
37
|
+
}
|
|
38
|
+
if (schema) {
|
|
39
|
+
this.schema(schema)
|
|
40
|
+
}
|
|
41
|
+
this._fields = { ...this._fields, ...removeEmptyFields(fieldsOnly) }
|
|
42
|
+
}
|
|
43
|
+
return this
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
hashableFields(): Promisable<T> {
|
|
47
|
+
const schema = assertEx(this._schema, 'Payload: Missing Schema')
|
|
48
|
+
return {
|
|
49
|
+
...removeEmptyFields(deepOmitPrefixedFields(this._fields ?? {}, '_')),
|
|
50
|
+
schema,
|
|
51
|
+
} as T
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
schema(value: Schema) {
|
|
55
|
+
this._schema = value
|
|
56
|
+
}
|
|
57
|
+
}
|
package/src/Options.ts
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Logger } from '@xylabs/logger'
|
|
2
|
+
import { JsonObject } from '@xylabs/object'
|
|
3
|
+
import { Schema } from '@xyo-network/payload-model'
|
|
4
|
+
|
|
5
|
+
export interface PayloadBuilderOptions<T> {
|
|
6
|
+
readonly fields?: Omit<T, 'schema' | '$hash' | '$meta'>
|
|
7
|
+
readonly logger?: Logger
|
|
8
|
+
readonly meta?: JsonObject
|
|
9
|
+
readonly schema: Schema
|
|
10
|
+
}
|
package/src/index.ts
CHANGED