@xyo-network/boundwitness-builder 2.64.10 → 2.65.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.
- package/dist/cjs/Builder.js.map +1 -1
- package/dist/cjs/Query/QueryBoundWitness.js +8 -0
- package/dist/cjs/Query/QueryBoundWitness.js.map +1 -0
- package/dist/cjs/Query/QueryBoundWitnessBuilder.js +31 -0
- package/dist/cjs/Query/QueryBoundWitnessBuilder.js.map +1 -0
- package/dist/cjs/Query/QueryBoundWitnessValidator.js +58 -0
- package/dist/cjs/Query/QueryBoundWitnessValidator.js.map +1 -0
- package/dist/cjs/Query/QueryBoundWitnessWrapper.js +62 -0
- package/dist/cjs/Query/QueryBoundWitnessWrapper.js.map +1 -0
- package/dist/cjs/Query/index.js +8 -0
- package/dist/cjs/Query/index.js.map +1 -0
- package/dist/cjs/index.js +1 -0
- package/dist/cjs/index.js.map +1 -1
- package/dist/esm/Builder.js.map +1 -1
- package/dist/esm/Query/QueryBoundWitness.js +4 -0
- package/dist/esm/Query/QueryBoundWitness.js.map +1 -0
- package/dist/esm/Query/QueryBoundWitnessBuilder.js +26 -0
- package/dist/esm/Query/QueryBoundWitnessBuilder.js.map +1 -0
- package/dist/esm/Query/QueryBoundWitnessValidator.js +47 -0
- package/dist/esm/Query/QueryBoundWitnessValidator.js.map +1 -0
- package/dist/esm/Query/QueryBoundWitnessWrapper.js +46 -0
- package/dist/esm/Query/QueryBoundWitnessWrapper.js.map +1 -0
- package/dist/esm/Query/index.js +5 -0
- package/dist/esm/Query/index.js.map +1 -0
- package/dist/esm/index.js +1 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/types/Builder.d.ts +1 -2
- package/dist/types/Builder.d.ts.map +1 -1
- package/dist/types/Query/QueryBoundWitness.d.ts +17 -0
- package/dist/types/Query/QueryBoundWitness.d.ts.map +1 -0
- package/dist/types/Query/QueryBoundWitnessBuilder.d.ts +12 -0
- package/dist/types/Query/QueryBoundWitnessBuilder.d.ts.map +1 -0
- package/dist/types/Query/QueryBoundWitnessValidator.d.ts +11 -0
- package/dist/types/Query/QueryBoundWitnessValidator.d.ts.map +1 -0
- package/dist/types/Query/QueryBoundWitnessWrapper.d.ts +18 -0
- package/dist/types/Query/QueryBoundWitnessWrapper.d.ts.map +1 -0
- package/dist/types/Query/index.d.ts +5 -0
- package/dist/types/Query/index.d.ts.map +1 -0
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +15 -12
- package/src/Builder.ts +1 -2
- package/src/Query/QueryBoundWitness.ts +13 -0
- package/src/Query/QueryBoundWitnessBuilder.ts +34 -0
- package/src/Query/QueryBoundWitnessValidator.ts +51 -0
- package/src/Query/QueryBoundWitnessWrapper.ts +65 -0
- package/src/Query/index.ts +4 -0
- package/src/index.ts +1 -0
- package/dist/docs.json +0 -3245
package/src/Builder.ts
CHANGED
|
@@ -4,9 +4,8 @@ import { AccountInstance } from '@xyo-network/account-model'
|
|
|
4
4
|
import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model'
|
|
5
5
|
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
|
|
6
6
|
import { Data, PayloadHasher, sortFields } from '@xyo-network/core'
|
|
7
|
-
import { ModuleError } from '@xyo-network/module-model'
|
|
8
7
|
import { PayloadWrapper } from '@xyo-network/payload'
|
|
9
|
-
import { Payload } from '@xyo-network/payload-model'
|
|
8
|
+
import { ModuleError, Payload } from '@xyo-network/payload-model'
|
|
10
9
|
import { Logger } from '@xyo-network/shared'
|
|
11
10
|
import { Mutex } from 'async-mutex'
|
|
12
11
|
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'
|
|
2
|
+
import { Payload } from '@xyo-network/payload-model'
|
|
3
|
+
|
|
4
|
+
export type QueryBoundWitnessSchema = BoundWitnessSchema
|
|
5
|
+
export const QueryBoundWitnessSchema: QueryBoundWitnessSchema = BoundWitnessSchema
|
|
6
|
+
|
|
7
|
+
export type QueryBoundWitness = BoundWitness<{
|
|
8
|
+
query: string
|
|
9
|
+
resultSet?: string
|
|
10
|
+
schema: BoundWitnessSchema
|
|
11
|
+
}>
|
|
12
|
+
|
|
13
|
+
export const isQueryBoundWitness = (x?: Payload | null): x is QueryBoundWitness => isBoundWitness(x) && (x as QueryBoundWitness)?.query !== undefined
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { assertEx } from '@xylabs/assert'
|
|
2
|
+
import { PayloadSetPayload, Query } from '@xyo-network/payload-model'
|
|
3
|
+
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
4
|
+
|
|
5
|
+
import { BoundWitnessBuilder } from '../Builder'
|
|
6
|
+
import { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'
|
|
7
|
+
|
|
8
|
+
export class QueryBoundWitnessBuilder<
|
|
9
|
+
TBoundWitness extends QueryBoundWitness = QueryBoundWitness,
|
|
10
|
+
TQuery extends Query = Query,
|
|
11
|
+
> extends BoundWitnessBuilder<TBoundWitness> {
|
|
12
|
+
private _query: PayloadWrapper<TQuery> | undefined
|
|
13
|
+
private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
|
|
14
|
+
|
|
15
|
+
override async hashableFields(): Promise<TBoundWitness> {
|
|
16
|
+
return {
|
|
17
|
+
...(await super.hashableFields()),
|
|
18
|
+
query: assertEx(await this._query?.hashAsync(), 'No Query Specified'),
|
|
19
|
+
schema: QueryBoundWitnessSchema,
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
query<T extends TQuery | PayloadWrapper<TQuery>>(query: T) {
|
|
24
|
+
this._query = PayloadWrapper.wrap(query)
|
|
25
|
+
this.payload(this._query.payload())
|
|
26
|
+
return this
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
resultSet<T extends PayloadSetPayload | PayloadWrapper<PayloadSetPayload>>(payloadSet: T) {
|
|
30
|
+
this._resultSet = PayloadWrapper.wrap(payloadSet)
|
|
31
|
+
this.payload(this._resultSet.payload())
|
|
32
|
+
return this
|
|
33
|
+
}
|
|
34
|
+
}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { assertEx } from '@xylabs/assert'
|
|
2
|
+
import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
|
|
3
|
+
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
|
|
4
|
+
import { handleError } from '@xyo-network/error'
|
|
5
|
+
import { PayloadSetPayload, Query } from '@xyo-network/payload-model'
|
|
6
|
+
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
7
|
+
|
|
8
|
+
import { QueryBoundWitness, QueryBoundWitnessSchema } from './QueryBoundWitness'
|
|
9
|
+
export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
|
|
10
|
+
private _query: PayloadWrapper<T> | undefined
|
|
11
|
+
|
|
12
|
+
protected override get expectedSchema(): string {
|
|
13
|
+
return QueryBoundWitnessSchema
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
static isQueryBoundWitnessValidator(obj: unknown) {
|
|
17
|
+
return (obj as QueryBoundWitnessValidator)?.constructor === QueryBoundWitnessValidator
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
override async validate() {
|
|
21
|
+
return [
|
|
22
|
+
...(await super.validate()),
|
|
23
|
+
// ...this.validateResultSet()
|
|
24
|
+
]
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
async validateResultSet() {
|
|
28
|
+
const errors: Error[] = []
|
|
29
|
+
try {
|
|
30
|
+
const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')
|
|
31
|
+
const wrapper = BoundWitnessWrapper.parse(this.obj)
|
|
32
|
+
const resultSet = PayloadWrapper.wrap<PayloadSetPayload>((await wrapper.payloadMap())[resultSetHash] as PayloadSetPayload)
|
|
33
|
+
const required = resultSet?.payload().required
|
|
34
|
+
if (required) {
|
|
35
|
+
Object.entries(required).forEach(([key, value]) => {
|
|
36
|
+
const found = wrapper.payloadSchemas.reduce((count, schema) => {
|
|
37
|
+
return count + (schema === key ? 1 : 0)
|
|
38
|
+
}, 0)
|
|
39
|
+
if (found !== value) {
|
|
40
|
+
errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))
|
|
41
|
+
}
|
|
42
|
+
})
|
|
43
|
+
}
|
|
44
|
+
} catch (ex) {
|
|
45
|
+
handleError(ex, (error) => {
|
|
46
|
+
errors.push(error)
|
|
47
|
+
})
|
|
48
|
+
}
|
|
49
|
+
return errors
|
|
50
|
+
}
|
|
51
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { assertEx } from '@xylabs/assert'
|
|
2
|
+
import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
|
|
3
|
+
import { PayloadHasher } from '@xyo-network/core'
|
|
4
|
+
import { Payload, PayloadSetPayload, Query } from '@xyo-network/payload-model'
|
|
5
|
+
import { PayloadWrapper } from '@xyo-network/payload-wrapper'
|
|
6
|
+
import compact from 'lodash/compact'
|
|
7
|
+
|
|
8
|
+
import { QueryBoundWitness } from './QueryBoundWitness'
|
|
9
|
+
import { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'
|
|
10
|
+
|
|
11
|
+
export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
|
|
12
|
+
private _payloadsWithoutQuery: PayloadWrapper<Payload>[] | undefined
|
|
13
|
+
private _query: T | undefined
|
|
14
|
+
private _resultSet: PayloadSetPayload | undefined
|
|
15
|
+
|
|
16
|
+
private isQueryBoundWitnessWrapper = true
|
|
17
|
+
|
|
18
|
+
static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {
|
|
19
|
+
assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')
|
|
20
|
+
switch (typeof obj) {
|
|
21
|
+
case 'object': {
|
|
22
|
+
const castWrapper = obj as QueryBoundWitnessWrapper<T>
|
|
23
|
+
const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)
|
|
24
|
+
/*if (!wrapper.valid) {
|
|
25
|
+
console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)
|
|
26
|
+
}*/
|
|
27
|
+
return wrapper
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
throw Error(`Unable to parse [${typeof obj}]`)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
override getErrors() {
|
|
34
|
+
return new QueryBoundWitnessValidator(this.boundwitness).validate()
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
async getQuery(): Promise<T> {
|
|
38
|
+
const payloadMap = await this.allPayloadMap()
|
|
39
|
+
this._query = this._query ?? (payloadMap[this.boundwitness.query] as T | undefined)
|
|
40
|
+
return assertEx(this._query, `Missing Query [${this.boundwitness}]`)
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
async getResultSet() {
|
|
44
|
+
const resultSetHash = this.boundwitness.resultSet
|
|
45
|
+
const payloadMap = await this.payloadMap()
|
|
46
|
+
return assertEx(
|
|
47
|
+
(this._resultSet = this._resultSet ?? (resultSetHash ? (payloadMap[resultSetHash] as PayloadSetPayload | undefined) : undefined)),
|
|
48
|
+
`Missing resultSet [${resultSetHash}]`,
|
|
49
|
+
)
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
override async getWrappedPayloads(): Promise<PayloadWrapper<Payload>[]> {
|
|
53
|
+
this._payloadsWithoutQuery =
|
|
54
|
+
this._payloadsWithoutQuery ??
|
|
55
|
+
compact(
|
|
56
|
+
(
|
|
57
|
+
await PayloadHasher.filterExclude(
|
|
58
|
+
(await super.getWrappedPayloads()).map((wrapper) => wrapper.payload()),
|
|
59
|
+
this.payload().query,
|
|
60
|
+
)
|
|
61
|
+
).map((payload) => PayloadWrapper.wrap(payload)),
|
|
62
|
+
)
|
|
63
|
+
return this._payloadsWithoutQuery
|
|
64
|
+
}
|
|
65
|
+
}
|
package/src/index.ts
CHANGED