@xyo-network/payload-validator 2.42.17 → 2.42.19

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 (11) hide show
  1. package/dist/cjs/Validator.d.ts +3 -2
  2. package/dist/cjs/Validator.d.ts.map +1 -1
  3. package/dist/cjs/Validator.js +2 -1
  4. package/dist/cjs/Validator.js.map +1 -1
  5. package/dist/docs.json +153 -64
  6. package/dist/esm/Validator.d.ts +3 -2
  7. package/dist/esm/Validator.d.ts.map +1 -1
  8. package/dist/esm/Validator.js +3 -1
  9. package/dist/esm/Validator.js.map +1 -1
  10. package/package.json +3 -3
  11. package/src/Validator.ts +5 -3
package/dist/cjs/Validator.d.ts CHANGED
@@ -3,9 +3,10 @@ import { XyoPayload } from '@xyo-network/payload-model';
3
3
  export type AllValidator = {
4
4
  all(): Error[];
5
5
  };
6
- export type AllValidatorFactory = () => AllValidator;
6
+ export type AllValidatorFactory = (schema: string) => AllValidator;
7
7
  export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
8
- private static schemaNameValidatorFactory;
8
+ protected static schemaNameValidatorFactory: AllValidatorFactory | null;
9
+ protected payload: XyoPayload;
9
10
  private _schemaValidator?;
10
11
  constructor(payload: T);
11
12
  get schemaValidator(): AllValidator | undefined;
package/dist/cjs/Validator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,IAAI,KAAK,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,YAAY,CAAA;AAEpD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAClH,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAmC;IAE5E,OAAO,CAAC,gBAAgB,CAAC,CAAc;gBAE3B,OAAO,EAAE,CAAC;IAItB,IAAI,eAAe,6BAMlB;WAEa,6BAA6B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIxE,UAAU;IAUV,QAAQ;CAKhB"}
1
+ {"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,IAAI,KAAK,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAA;AAElE,qBAAa,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAClH,SAAS,CAAC,MAAM,CAAC,0BAA0B,EAAE,mBAAmB,GAAG,IAAI,CAAO;IAC9E,SAAS,CAAC,OAAO,EAAE,UAAU,CAAA;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAAc;gBAE3B,OAAO,EAAE,CAAC;IAKtB,IAAI,eAAe,6BAMlB;WAEa,6BAA6B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIxE,UAAU;IAUV,QAAQ;CAKhB"}
package/dist/cjs/Validator.js CHANGED
@@ -5,10 +5,11 @@ const core_1 = require("@xyo-network/core");
5
5
  class PayloadValidator extends core_1.XyoValidatorBase {
6
6
  constructor(payload) {
7
7
  super(payload);
8
+ this.payload = payload;
8
9
  }
9
10
  get schemaValidator() {
10
11
  var _a, _b;
11
- this._schemaValidator = (_a = this._schemaValidator) !== null && _a !== void 0 ? _a : (_b = PayloadValidator.schemaNameValidatorFactory) === null || _b === void 0 ? void 0 : _b.call(PayloadValidator);
12
+ this._schemaValidator = (_a = this._schemaValidator) !== null && _a !== void 0 ? _a : (_b = PayloadValidator.schemaNameValidatorFactory) === null || _b === void 0 ? void 0 : _b.call(PayloadValidator, this.payload.schema);
12
13
  if (!this._schemaValidator) {
13
14
  console.warn('No schema name validator set');
14
15
  }
package/dist/cjs/Validator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAS/D,MAAa,gBAAoD,SAAQ,uBAAmB;IAK1F,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,eAAe;;QACjB,IAAI,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,MAAA,gBAAgB,CAAC,0BAA0B,gEAAI,CAAA;QAChG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;SAC7C;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,OAAmC;QAC7E,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAA;IAC3C,CAAC;IAEM,UAAU;;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,EAAE,mCAAI,EAAE,CAAC,CAAC,CAAA;SACpD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;;AAnCH,4CAoCC;AAnCgB,2CAA0B,GAA+B,IAAI,CAAA"}
1
+ {"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAS/D,MAAa,gBAAoD,SAAQ,uBAAmB;IAM1F,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,IAAI,eAAe;;QACjB,IAAI,CAAC,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,MAAA,gBAAgB,CAAC,0BAA0B,iEAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnH,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;SAC7C;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,OAAmC;QAC7E,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAA;IAC3C,CAAC;IAEM,UAAU;;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,GAAG,EAAE,mCAAI,EAAE,CAAC,CAAC,CAAA;SACpD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC;;AArCH,4CAsCC;AArCkB,2CAA0B,GAA+B,IAAI,CAAA"}
package/dist/docs.json CHANGED
@@ -7,14 +7,14 @@
7
7
  "originalName": "",
8
8
  "children": [
9
9
  {
10
- "id": 8,
10
+ "id": 9,
11
11
  "name": "PayloadValidator",
12
12
  "kind": 128,
13
13
  "kindString": "Class",
14
14
  "flags": {},
15
15
  "children": [
16
16
  {
17
- "id": 13,
17
+ "id": 14,
18
18
  "name": "constructor",
19
19
  "kind": 512,
20
20
  "kindString": "Constructor",
@@ -22,21 +22,21 @@
22
22
  "sources": [
23
23
  {
24
24
  "fileName": "payload/packages/validator/src/Validator.ts",
25
- "line": 15,
25
+ "line": 16,
26
26
  "character": 2,
27
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L15"
27
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L16"
28
28
  }
29
29
  ],
30
30
  "signatures": [
31
31
  {
32
- "id": 14,
32
+ "id": 15,
33
33
  "name": "new PayloadValidator",
34
34
  "kind": 16384,
35
35
  "kindString": "Constructor signature",
36
36
  "flags": {},
37
37
  "typeParameter": [
38
38
  {
39
- "id": 19,
39
+ "id": 20,
40
40
  "name": "T",
41
41
  "kind": 131072,
42
42
  "kindString": "Type parameter",
@@ -55,14 +55,14 @@
55
55
  {
56
56
  "type": "reflection",
57
57
  "declaration": {
58
- "id": 15,
58
+ "id": 16,
59
59
  "name": "__type",
60
60
  "kind": 65536,
61
61
  "kindString": "Type literal",
62
62
  "flags": {},
63
63
  "children": [
64
64
  {
65
- "id": 16,
65
+ "id": 17,
66
66
  "name": "schema",
67
67
  "kind": 1024,
68
68
  "kindString": "Property",
@@ -84,7 +84,7 @@
84
84
  {
85
85
  "title": "Properties",
86
86
  "children": [
87
- 16
87
+ 17
88
88
  ]
89
89
  }
90
90
  ],
@@ -113,14 +113,14 @@
113
113
  {
114
114
  "type": "reflection",
115
115
  "declaration": {
116
- "id": 17,
116
+ "id": 18,
117
117
  "name": "__type",
118
118
  "kind": 65536,
119
119
  "kindString": "Type literal",
120
120
  "flags": {},
121
121
  "children": [
122
122
  {
123
- "id": 18,
123
+ "id": 19,
124
124
  "name": "schema",
125
125
  "kind": 1024,
126
126
  "kindString": "Property",
@@ -142,7 +142,7 @@
142
142
  {
143
143
  "title": "Properties",
144
144
  "children": [
145
- 18
145
+ 19
146
146
  ]
147
147
  }
148
148
  ],
@@ -161,25 +161,25 @@
161
161
  ],
162
162
  "parameters": [
163
163
  {
164
- "id": 20,
164
+ "id": 21,
165
165
  "name": "payload",
166
166
  "kind": 32768,
167
167
  "kindString": "Parameter",
168
168
  "flags": {},
169
169
  "type": {
170
170
  "type": "reference",
171
- "id": 19,
171
+ "id": 20,
172
172
  "name": "T"
173
173
  }
174
174
  }
175
175
  ],
176
176
  "type": {
177
177
  "type": "reference",
178
- "id": 8,
178
+ "id": 9,
179
179
  "typeArguments": [
180
180
  {
181
181
  "type": "reference",
182
- "id": 19,
182
+ "id": 20,
183
183
  "name": "T"
184
184
  }
185
185
  ],
@@ -197,7 +197,7 @@
197
197
  }
198
198
  },
199
199
  {
200
- "id": 21,
200
+ "id": 25,
201
201
  "name": "_schemaValidator",
202
202
  "kind": 1024,
203
203
  "kindString": "Property",
@@ -208,9 +208,9 @@
208
208
  "sources": [
209
209
  {
210
210
  "fileName": "payload/packages/validator/src/Validator.ts",
211
- "line": 13,
211
+ "line": 14,
212
212
  "character": 10,
213
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L13"
213
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L14"
214
214
  }
215
215
  ],
216
216
  "type": {
@@ -220,7 +220,7 @@
220
220
  }
221
221
  },
222
222
  {
223
- "id": 28,
223
+ "id": 32,
224
224
  "name": "obj",
225
225
  "kind": 1024,
226
226
  "kindString": "Property",
@@ -236,7 +236,7 @@
236
236
  ],
237
237
  "type": {
238
238
  "type": "reference",
239
- "id": 19,
239
+ "id": 20,
240
240
  "name": "T"
241
241
  },
242
242
  "inheritedFrom": {
@@ -245,20 +245,95 @@
245
245
  }
246
246
  },
247
247
  {
248
- "id": 9,
248
+ "id": 22,
249
+ "name": "payload",
250
+ "kind": 1024,
251
+ "kindString": "Property",
252
+ "flags": {
253
+ "isProtected": true
254
+ },
255
+ "sources": [
256
+ {
257
+ "fileName": "payload/packages/validator/src/Validator.ts",
258
+ "line": 12,
259
+ "character": 12,
260
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L12"
261
+ }
262
+ ],
263
+ "type": {
264
+ "type": "intersection",
265
+ "types": [
266
+ {
267
+ "type": "reference",
268
+ "name": "SchemaFields"
269
+ },
270
+ {
271
+ "type": "reference",
272
+ "name": "PayloadFields"
273
+ },
274
+ {
275
+ "type": "reflection",
276
+ "declaration": {
277
+ "id": 23,
278
+ "name": "__type",
279
+ "kind": 65536,
280
+ "kindString": "Type literal",
281
+ "flags": {},
282
+ "children": [
283
+ {
284
+ "id": 24,
285
+ "name": "schema",
286
+ "kind": 1024,
287
+ "kindString": "Property",
288
+ "flags": {},
289
+ "sources": [
290
+ {
291
+ "fileName": "payload/packages/model/dist/esm/XyoPayload.d.ts",
292
+ "line": 19,
293
+ "character": 4
294
+ }
295
+ ],
296
+ "type": {
297
+ "type": "intrinsic",
298
+ "name": "string"
299
+ }
300
+ }
301
+ ],
302
+ "groups": [
303
+ {
304
+ "title": "Properties",
305
+ "children": [
306
+ 24
307
+ ]
308
+ }
309
+ ],
310
+ "sources": [
311
+ {
312
+ "fileName": "payload/packages/model/dist/esm/XyoPayload.d.ts",
313
+ "line": 18,
314
+ "character": 17
315
+ }
316
+ ]
317
+ }
318
+ }
319
+ ]
320
+ }
321
+ },
322
+ {
323
+ "id": 10,
249
324
  "name": "schemaNameValidatorFactory",
250
325
  "kind": 1024,
251
326
  "kindString": "Property",
252
327
  "flags": {
253
- "isPrivate": true,
328
+ "isProtected": true,
254
329
  "isStatic": true
255
330
  },
256
331
  "sources": [
257
332
  {
258
333
  "fileName": "payload/packages/validator/src/Validator.ts",
259
334
  "line": 11,
260
- "character": 17,
261
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L11"
335
+ "character": 19,
336
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L11"
262
337
  }
263
338
  ],
264
339
  "type": {
@@ -278,7 +353,7 @@
278
353
  "defaultValue": "null"
279
354
  },
280
355
  {
281
- "id": 22,
356
+ "id": 26,
282
357
  "name": "schemaValidator",
283
358
  "kind": 262144,
284
359
  "kindString": "Accessor",
@@ -286,13 +361,13 @@
286
361
  "sources": [
287
362
  {
288
363
  "fileName": "payload/packages/validator/src/Validator.ts",
289
- "line": 19,
364
+ "line": 21,
290
365
  "character": 6,
291
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L19"
366
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L21"
292
367
  }
293
368
  ],
294
369
  "getSignature": {
295
- "id": 23,
370
+ "id": 27,
296
371
  "name": "schemaValidator",
297
372
  "kind": 524288,
298
373
  "kindString": "Get signature",
@@ -314,7 +389,7 @@
314
389
  }
315
390
  },
316
391
  {
317
- "id": 29,
392
+ "id": 33,
318
393
  "name": "stringKeyObj",
319
394
  "kind": 262144,
320
395
  "kindString": "Accessor",
@@ -329,7 +404,7 @@
329
404
  }
330
405
  ],
331
406
  "getSignature": {
332
- "id": 30,
407
+ "id": 34,
333
408
  "name": "stringKeyObj",
334
409
  "kind": 524288,
335
410
  "kindString": "Get signature",
@@ -349,7 +424,7 @@
349
424
  }
350
425
  },
351
426
  {
352
- "id": 24,
427
+ "id": 28,
353
428
  "name": "schemaName",
354
429
  "kind": 2048,
355
430
  "kindString": "Method",
@@ -359,14 +434,14 @@
359
434
  "sources": [
360
435
  {
361
436
  "fileName": "payload/packages/validator/src/Validator.ts",
362
- "line": 31,
437
+ "line": 33,
363
438
  "character": 9,
364
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L31"
439
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L33"
365
440
  }
366
441
  ],
367
442
  "signatures": [
368
443
  {
369
- "id": 25,
444
+ "id": 29,
370
445
  "name": "schemaName",
371
446
  "kind": 4096,
372
447
  "kindString": "Call signature",
@@ -384,7 +459,7 @@
384
459
  ]
385
460
  },
386
461
  {
387
- "id": 26,
462
+ "id": 30,
388
463
  "name": "validate",
389
464
  "kind": 2048,
390
465
  "kindString": "Method",
@@ -394,14 +469,14 @@
394
469
  "sources": [
395
470
  {
396
471
  "fileName": "payload/packages/validator/src/Validator.ts",
397
- "line": 41,
472
+ "line": 43,
398
473
  "character": 9,
399
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L41"
474
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L43"
400
475
  }
401
476
  ],
402
477
  "signatures": [
403
478
  {
404
- "id": 27,
479
+ "id": 31,
405
480
  "name": "validate",
406
481
  "kind": 4096,
407
482
  "kindString": "Call signature",
@@ -435,7 +510,7 @@
435
510
  }
436
511
  },
437
512
  {
438
- "id": 10,
513
+ "id": 11,
439
514
  "name": "setSchemaNameValidatorFactory",
440
515
  "kind": 2048,
441
516
  "kindString": "Method",
@@ -446,21 +521,21 @@
446
521
  "sources": [
447
522
  {
448
523
  "fileName": "payload/packages/validator/src/Validator.ts",
449
- "line": 27,
524
+ "line": 29,
450
525
  "character": 16,
451
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L27"
526
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L29"
452
527
  }
453
528
  ],
454
529
  "signatures": [
455
530
  {
456
- "id": 11,
531
+ "id": 12,
457
532
  "name": "setSchemaNameValidatorFactory",
458
533
  "kind": 4096,
459
534
  "kindString": "Call signature",
460
535
  "flags": {},
461
536
  "parameters": [
462
537
  {
463
- "id": 12,
538
+ "id": 13,
464
539
  "name": "factory",
465
540
  "kind": 32768,
466
541
  "kindString": "Parameter",
@@ -493,30 +568,31 @@
493
568
  {
494
569
  "title": "Constructors",
495
570
  "children": [
496
- 13
571
+ 14
497
572
  ]
498
573
  },
499
574
  {
500
575
  "title": "Properties",
501
576
  "children": [
502
- 21,
503
- 28,
504
- 9
577
+ 25,
578
+ 32,
579
+ 22,
580
+ 10
505
581
  ]
506
582
  },
507
583
  {
508
584
  "title": "Accessors",
509
585
  "children": [
510
- 22,
511
- 29
586
+ 26,
587
+ 33
512
588
  ]
513
589
  },
514
590
  {
515
591
  "title": "Methods",
516
592
  "children": [
517
- 24,
518
- 26,
519
- 10
593
+ 28,
594
+ 30,
595
+ 11
520
596
  ]
521
597
  }
522
598
  ],
@@ -525,12 +601,12 @@
525
601
  "fileName": "payload/packages/validator/src/Validator.ts",
526
602
  "line": 10,
527
603
  "character": 13,
528
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L10"
604
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L10"
529
605
  }
530
606
  ],
531
607
  "typeParameters": [
532
608
  {
533
- "id": 31,
609
+ "id": 35,
534
610
  "name": "T",
535
611
  "kind": 131072,
536
612
  "kindString": "Type parameter",
@@ -551,7 +627,7 @@
551
627
  "typeArguments": [
552
628
  {
553
629
  "type": "reference",
554
- "id": 19,
630
+ "id": 20,
555
631
  "name": "T"
556
632
  }
557
633
  ],
@@ -564,7 +640,7 @@
564
640
  "typeArguments": [
565
641
  {
566
642
  "type": "reference",
567
- "id": 19,
643
+ "id": 20,
568
644
  "name": "T"
569
645
  }
570
646
  ],
@@ -583,7 +659,7 @@
583
659
  "fileName": "payload/packages/validator/src/Validator.ts",
584
660
  "line": 4,
585
661
  "character": 12,
586
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
662
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
587
663
  }
588
664
  ],
589
665
  "type": {
@@ -606,7 +682,7 @@
606
682
  "fileName": "payload/packages/validator/src/Validator.ts",
607
683
  "line": 5,
608
684
  "character": 2,
609
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L5"
685
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L5"
610
686
  }
611
687
  ],
612
688
  "signatures": [
@@ -642,7 +718,7 @@
642
718
  "fileName": "payload/packages/validator/src/Validator.ts",
643
719
  "line": 4,
644
720
  "character": 27,
645
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
721
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
646
722
  }
647
723
  ]
648
724
  }
@@ -659,7 +735,7 @@
659
735
  "fileName": "payload/packages/validator/src/Validator.ts",
660
736
  "line": 8,
661
737
  "character": 12,
662
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
738
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
663
739
  }
664
740
  ],
665
741
  "type": {
@@ -675,7 +751,7 @@
675
751
  "fileName": "payload/packages/validator/src/Validator.ts",
676
752
  "line": 8,
677
753
  "character": 34,
678
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
754
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
679
755
  }
680
756
  ],
681
757
  "signatures": [
@@ -685,6 +761,19 @@
685
761
  "kind": 4096,
686
762
  "kindString": "Call signature",
687
763
  "flags": {},
764
+ "parameters": [
765
+ {
766
+ "id": 8,
767
+ "name": "schema",
768
+ "kind": 32768,
769
+ "kindString": "Parameter",
770
+ "flags": {},
771
+ "type": {
772
+ "type": "intrinsic",
773
+ "name": "string"
774
+ }
775
+ }
776
+ ],
688
777
  "type": {
689
778
  "type": "reference",
690
779
  "id": 1,
@@ -700,7 +789,7 @@
700
789
  {
701
790
  "title": "Classes",
702
791
  "children": [
703
- 8
792
+ 9
704
793
  ]
705
794
  },
706
795
  {
@@ -716,7 +805,7 @@
716
805
  "fileName": "payload/packages/validator/src/index.ts",
717
806
  "line": 1,
718
807
  "character": 0,
719
- "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/index.ts#L1"
808
+ "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/25ee90b46/packages/protocol/packages/payload/packages/validator/src/index.ts#L1"
720
809
  }
721
810
  ]
722
811
  }
package/dist/esm/Validator.d.ts CHANGED
@@ -3,9 +3,10 @@ import { XyoPayload } from '@xyo-network/payload-model';
3
3
  export type AllValidator = {
4
4
  all(): Error[];
5
5
  };
6
- export type AllValidatorFactory = () => AllValidator;
6
+ export type AllValidatorFactory = (schema: string) => AllValidator;
7
7
  export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
8
- private static schemaNameValidatorFactory;
8
+ protected static schemaNameValidatorFactory: AllValidatorFactory | null;
9
+ protected payload: XyoPayload;
9
10
  private _schemaValidator?;
10
11
  constructor(payload: T);
11
12
  get schemaValidator(): AllValidator | undefined;
package/dist/esm/Validator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,IAAI,KAAK,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,YAAY,CAAA;AAEpD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAClH,OAAO,CAAC,MAAM,CAAC,0BAA0B,CAAmC;IAE5E,OAAO,CAAC,gBAAgB,CAAC,CAAc;gBAE3B,OAAO,EAAE,CAAC;IAItB,IAAI,eAAe,6BAMlB;WAEa,6BAA6B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIxE,UAAU;IAUV,QAAQ;CAKhB"}
1
+ {"version":3,"file":"Validator.d.ts","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,YAAY,GAAG;IACzB,GAAG,IAAI,KAAK,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAA;AAElE,qBAAa,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAE,YAAW,SAAS,CAAC,CAAC,CAAC;IAClH,SAAS,CAAC,MAAM,CAAC,0BAA0B,EAAE,mBAAmB,GAAG,IAAI,CAAO;IAC9E,SAAS,CAAC,OAAO,EAAE,UAAU,CAAA;IAE7B,OAAO,CAAC,gBAAgB,CAAC,CAAc;gBAE3B,OAAO,EAAE,CAAC;IAKtB,IAAI,eAAe,6BAMlB;WAEa,6BAA6B,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAIxE,UAAU;IAUV,QAAQ;CAKhB"}
package/dist/esm/Validator.js CHANGED
@@ -1,12 +1,14 @@
1
1
  import { XyoValidatorBase } from '@xyo-network/core';
2
2
  export class PayloadValidator extends XyoValidatorBase {
3
3
  static schemaNameValidatorFactory = null;
4
+ payload;
4
5
  _schemaValidator;
5
6
  constructor(payload) {
6
7
  super(payload);
8
+ this.payload = payload;
7
9
  }
8
10
  get schemaValidator() {
9
- this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.();
11
+ this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.(this.payload.schema);
10
12
  if (!this._schemaValidator) {
11
13
  console.warn('No schema name validator set');
12
14
  }
package/dist/esm/Validator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAS/D,MAAM,OAAO,gBAAoD,SAAQ,gBAAmB;IAClF,MAAM,CAAC,0BAA0B,GAA+B,IAAI,CAAA;IAEpE,gBAAgB,CAAe;IAEvC,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;IAChB,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,0BAA0B,EAAE,EAAE,CAAA;QAChG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;SAC7C;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,OAAmC;QAC7E,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAA;IAC3C,CAAC;IAEM,UAAU;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;SACpD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC"}
1
+ {"version":3,"file":"Validator.js","sourceRoot":"","sources":["../../src/Validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAS/D,MAAM,OAAO,gBAAoD,SAAQ,gBAAmB;IAChF,MAAM,CAAC,0BAA0B,GAA+B,IAAI,CAAA;IACpE,OAAO,CAAY;IAErB,gBAAgB,CAAe;IAEvC,YAAY,OAAU;QACpB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACnH,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;SAC7C;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAA;IAC9B,CAAC;IAEM,MAAM,CAAC,6BAA6B,CAAC,OAAmC;QAC7E,IAAI,CAAC,0BAA0B,GAAG,OAAO,CAAA;IAC3C,CAAC;IAEM,UAAU;QACf,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE;YACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAA;SACrC;aAAM;YACL,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;SACpD;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,QAAQ;QACb,MAAM,MAAM,GAAY,EAAE,CAAA;QAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA;QACjC,OAAO,MAAM,CAAA;IACf,CAAC"}
package/package.json CHANGED
@@ -10,8 +10,8 @@
10
10
  "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
11
11
  },
12
12
  "dependencies": {
13
- "@xyo-network/core": "^2.42.18",
14
- "@xyo-network/payload-model": "^2.42.17"
13
+ "@xyo-network/core": "^2.42.20",
14
+ "@xyo-network/payload-model": "^2.42.19"
15
15
  },
16
16
  "devDependencies": {
17
17
  "@xylabs/ts-scripts-yarn3": "^2.11.16"
@@ -49,5 +49,5 @@
49
49
  },
50
50
  "sideEffects": false,
51
51
  "types": "dist/esm/index.d.ts",
52
- "version": "2.42.17"
52
+ "version": "2.42.19"
53
53
  }
package/src/Validator.ts CHANGED
@@ -5,19 +5,21 @@ export type AllValidator = {
5
5
  all(): Error[]
6
6
  }
7
7
 
8
- export type AllValidatorFactory = () => AllValidator
8
+ export type AllValidatorFactory = (schema: string) => AllValidator
9
9
 
10
10
  export class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
11
- private static schemaNameValidatorFactory: AllValidatorFactory | null = null
11
+ protected static schemaNameValidatorFactory: AllValidatorFactory | null = null
12
+ protected payload: XyoPayload
12
13
 
13
14
  private _schemaValidator?: AllValidator
14
15
 
15
16
  constructor(payload: T) {
16
17
  super(payload)
18
+ this.payload = payload
17
19
  }
18
20
 
19
21
  get schemaValidator() {
20
- this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.()
22
+ this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.(this.payload.schema)
21
23
  if (!this._schemaValidator) {
22
24
  console.warn('No schema name validator set')
23
25
  }