@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.
Files changed (61) hide show
  1. package/dist/browser/Builder.d.cts +31 -21
  2. package/dist/browser/Builder.d.cts.map +1 -1
  3. package/dist/browser/Builder.d.mts +31 -21
  4. package/dist/browser/Builder.d.mts.map +1 -1
  5. package/dist/browser/Builder.d.ts +31 -21
  6. package/dist/browser/Builder.d.ts.map +1 -1
  7. package/dist/browser/BuilderBase.d.cts +17 -0
  8. package/dist/browser/BuilderBase.d.cts.map +1 -0
  9. package/dist/browser/BuilderBase.d.mts +17 -0
  10. package/dist/browser/BuilderBase.d.mts.map +1 -0
  11. package/dist/browser/BuilderBase.d.ts +17 -0
  12. package/dist/browser/BuilderBase.d.ts.map +1 -0
  13. package/dist/browser/Options.d.cts +10 -0
  14. package/dist/browser/Options.d.cts.map +1 -0
  15. package/dist/browser/Options.d.mts +10 -0
  16. package/dist/browser/Options.d.mts.map +1 -0
  17. package/dist/browser/Options.d.ts +10 -0
  18. package/dist/browser/Options.d.ts.map +1 -0
  19. package/dist/browser/index.cjs +136 -38
  20. package/dist/browser/index.cjs.map +1 -1
  21. package/dist/browser/index.d.cts +2 -0
  22. package/dist/browser/index.d.cts.map +1 -1
  23. package/dist/browser/index.d.mts +2 -0
  24. package/dist/browser/index.d.mts.map +1 -1
  25. package/dist/browser/index.d.ts +2 -0
  26. package/dist/browser/index.d.ts.map +1 -1
  27. package/dist/browser/index.js +137 -39
  28. package/dist/browser/index.js.map +1 -1
  29. package/dist/node/Builder.d.cts +31 -21
  30. package/dist/node/Builder.d.cts.map +1 -1
  31. package/dist/node/Builder.d.mts +31 -21
  32. package/dist/node/Builder.d.mts.map +1 -1
  33. package/dist/node/Builder.d.ts +31 -21
  34. package/dist/node/Builder.d.ts.map +1 -1
  35. package/dist/node/BuilderBase.d.cts +17 -0
  36. package/dist/node/BuilderBase.d.cts.map +1 -0
  37. package/dist/node/BuilderBase.d.mts +17 -0
  38. package/dist/node/BuilderBase.d.mts.map +1 -0
  39. package/dist/node/BuilderBase.d.ts +17 -0
  40. package/dist/node/BuilderBase.d.ts.map +1 -0
  41. package/dist/node/Options.d.cts +10 -0
  42. package/dist/node/Options.d.cts.map +1 -0
  43. package/dist/node/Options.d.mts +10 -0
  44. package/dist/node/Options.d.mts.map +1 -0
  45. package/dist/node/Options.d.ts +10 -0
  46. package/dist/node/Options.d.ts.map +1 -0
  47. package/dist/node/index.cjs +139 -38
  48. package/dist/node/index.cjs.map +1 -1
  49. package/dist/node/index.d.cts +2 -0
  50. package/dist/node/index.d.cts.map +1 -1
  51. package/dist/node/index.d.mts +2 -0
  52. package/dist/node/index.d.mts.map +1 -1
  53. package/dist/node/index.d.ts +2 -0
  54. package/dist/node/index.d.ts.map +1 -1
  55. package/dist/node/index.js +138 -38
  56. package/dist/node/index.js.map +1 -1
  57. package/package.json +10 -6
  58. package/src/Builder.ts +100 -38
  59. package/src/BuilderBase.ts +57 -0
  60. package/src/Options.ts +10 -0
  61. package/src/index.ts +2 -0
package/src/Builder.ts CHANGED
@@ -1,58 +1,120 @@
1
- import { assertEx } from '@xylabs/assert'
1
+ import { Hash } from '@xylabs/hex'
2
2
  import { AnyObject } from '@xylabs/object'
3
- import { deepOmitUnderscoreFields, PayloadHasher, removeEmptyFields } from '@xyo-network/hash'
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
- export interface PayloadBuilderOptions {
7
- schema: string
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
- export class PayloadBuilder<T extends Payload = Payload<AnyObject>> {
11
- private _$meta?: AnyObject
12
- private _client = 'js'
13
- private _fields: Partial<T> = {}
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
- constructor({ schema }: PayloadBuilderOptions) {
18
- this._schema = schema
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
- get externalMeta() {
22
- const _hash = PayloadHasher.hashAsync(this.hashableFields)
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
- get schema() {
27
- this._schema = this._schema ?? this._fields['schema']
28
- return this._schema
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
- $meta(fields?: AnyObject) {
32
- this._$meta = fields
33
- return this
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 build(withExternalMeta = false) {
37
- let hashableFields = this.hashableFields()
38
- if (this._$meta) {
39
- const $hash = await PayloadHasher.hashAsync(hashableFields)
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 withExternalMeta ? { ...hashableFields, ...this.externalMeta } : hashableFields
93
+ return result
43
94
  }
44
95
 
45
- fields(fields?: Partial<T>) {
46
- if (fields) {
47
- this._fields = { ...this._fields, ...removeEmptyFields(fields) }
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 this
106
+ return result
50
107
  }
51
108
 
52
- hashableFields() {
53
- return {
54
- ...removeEmptyFields(deepOmitUnderscoreFields(this._fields)),
55
- schema: assertEx(this.schema, 'Payload: Missing Schema'),
56
- } as T
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
@@ -1 +1,3 @@
1
1
  export * from './Builder'
2
+ export * from './BuilderBase'
3
+ export * from './Options'