@xyo-network/payload-validator - npm Package Compare versions

Comparing version 2.42.17 to 2.42.18

dist/cjs/Validator.d.ts

@@ -6,5 +6,6 @@ import { Validator, XyoValidatorBase } from '@xyo-network/core';
 };
-export type AllValidatorFactory = () => AllValidator;
+export type AllValidatorFactory = (schema: string) => AllValidator;
 export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
-    private static schemaNameValidatorFactory;
+    protected static schemaNameValidatorFactory: AllValidatorFactory | null;
+    protected payload: XyoPayload;
     private _schemaValidator?;
@@ -11,0 +12,0 @@ constructor(payload: T);

dist/cjs/Validator.js

@@ -8,6 +8,7 @@ "use strict";
         super(payload);
+        this.payload = payload;
     }
     get schemaValidator() {
         var _a, _b;
-        this._schemaValidator = (_a = this._schemaValidator) !== null && _a !== void 0 ? _a : (_b = PayloadValidator.schemaNameValidatorFactory) === null || _b === void 0 ? void 0 : _b.call(PayloadValidator);
+        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);
         if (!this._schemaValidator) {
@@ -14,0 +15,0 @@ console.warn('No schema name validator set');

dist/docs.json

@@ -10,3 +10,3 @@ {
 		{
-			"id": 8,
+			"id": 9,
 			"name": "PayloadValidator",
@@ -18,3 +18,3 @@ "kind": 128,
 				{
-					"id": 13,
+					"id": 14,
 					"name": "constructor",
@@ -27,5 +27,5 @@ "kind": 512,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 15,
+							"line": 16,
 							"character": 2,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L15"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L16"
 						}
@@ -35,3 +35,3 @@ ],
 						{
-							"id": 14,
+							"id": 15,
 							"name": "new PayloadValidator",
@@ -43,3 +43,3 @@ "kind": 16384,
 								{
-									"id": 19,
+									"id": 20,
 									"name": "T",
@@ -63,3 +63,3 @@ "kind": 131072,
 												"declaration": {
-													"id": 15,
+													"id": 16,
 													"name": "__type",
@@ -71,3 +71,3 @@ "kind": 65536,
 														{
-															"id": 16,
+															"id": 17,
 															"name": "schema",
@@ -94,3 +94,3 @@ "kind": 1024,
 															"children": [
-																16
+																17
 															]
@@ -124,3 +124,3 @@ }
 												"declaration": {
-													"id": 17,
+													"id": 18,
 													"name": "__type",
@@ -132,3 +132,3 @@ "kind": 65536,
 														{
-															"id": 18,
+															"id": 19,
 															"name": "schema",
@@ -155,3 +155,3 @@ "kind": 1024,
 															"children": [
-																18
+																19
 															]
@@ -175,3 +175,3 @@ }
 								{
-									"id": 20,
+									"id": 21,
 									"name": "payload",
@@ -183,3 +183,3 @@ "kind": 32768,
 										"type": "reference",
-										"id": 19,
+										"id": 20,
 										"name": "T"
@@ -191,7 +191,7 @@ }
 								"type": "reference",
-								"id": 8,
+								"id": 9,
 								"typeArguments": [
 									{
 										"type": "reference",
-										"id": 19,
+										"id": 20,
 										"name": "T"
@@ -214,3 +214,3 @@ }
 				{
-					"id": 21,
+					"id": 25,
 					"name": "_schemaValidator",
@@ -226,5 +226,5 @@ "kind": 1024,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 13,
+							"line": 14,
 							"character": 10,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L13"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L14"
 						}
@@ -239,3 +239,3 @@ ],
 				{
-					"id": 28,
+					"id": 32,
 					"name": "obj",
@@ -256,3 +256,3 @@ "kind": 1024,
 						"type": "reference",
-						"id": 19,
+						"id": 20,
 						"name": "T"
@@ -266,3 +266,78 @@ },
 				{
-					"id": 9,
+					"id": 22,
+					"name": "payload",
+					"kind": 1024,
+					"kindString": "Property",
+					"flags": {
+						"isProtected": true
+					},
+					"sources": [
+						{
+							"fileName": "payload/packages/validator/src/Validator.ts",
+							"line": 12,
+							"character": 12,
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L12"
+						}
+					],
+					"type": {
+						"type": "intersection",
+						"types": [
+							{
+								"type": "reference",
+								"name": "SchemaFields"
+							},
+							{
+								"type": "reference",
+								"name": "PayloadFields"
+							},
+							{
+								"type": "reflection",
+								"declaration": {
+									"id": 23,
+									"name": "__type",
+									"kind": 65536,
+									"kindString": "Type literal",
+									"flags": {},
+									"children": [
+										{
+											"id": 24,
+											"name": "schema",
+											"kind": 1024,
+											"kindString": "Property",
+											"flags": {},
+											"sources": [
+												{
+													"fileName": "payload/packages/model/dist/esm/XyoPayload.d.ts",
+													"line": 19,
+													"character": 4
+												}
+											],
+											"type": {
+												"type": "intrinsic",
+												"name": "string"
+											}
+										}
+									],
+									"groups": [
+										{
+											"title": "Properties",
+											"children": [
+												24
+											]
+										}
+									],
+									"sources": [
+										{
+											"fileName": "payload/packages/model/dist/esm/XyoPayload.d.ts",
+											"line": 18,
+											"character": 17
+										}
+									]
+								}
+							}
+						]
+					}
+				},
+				{
+					"id": 10,
 					"name": "schemaNameValidatorFactory",
@@ -272,3 +347,3 @@ "kind": 1024,
 					"flags": {
-						"isPrivate": true,
+						"isProtected": true,
 						"isStatic": true
@@ -280,4 +355,4 @@ },
 							"line": 11,
-							"character": 17,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L11"
+							"character": 19,
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L11"
 						}
@@ -302,3 +377,3 @@ ],
 				{
-					"id": 22,
+					"id": 26,
 					"name": "schemaValidator",
@@ -311,9 +386,9 @@ "kind": 262144,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 19,
+							"line": 21,
 							"character": 6,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L19"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L21"
 						}
 					],
 					"getSignature": {
-						"id": 23,
+						"id": 27,
 						"name": "schemaValidator",
@@ -340,3 +415,3 @@ "kind": 524288,
 				{
-					"id": 29,
+					"id": 33,
 					"name": "stringKeyObj",
@@ -356,3 +431,3 @@ "kind": 262144,
 					"getSignature": {
-						"id": 30,
+						"id": 34,
 						"name": "stringKeyObj",
@@ -377,3 +452,3 @@ "kind": 524288,
 				{
-					"id": 24,
+					"id": 28,
 					"name": "schemaName",
@@ -388,5 +463,5 @@ "kind": 2048,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 31,
+							"line": 33,
 							"character": 9,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L31"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L33"
 						}
@@ -396,3 +471,3 @@ ],
 						{
-							"id": 25,
+							"id": 29,
 							"name": "schemaName",
@@ -415,3 +490,3 @@ "kind": 4096,
 				{
-					"id": 26,
+					"id": 30,
 					"name": "validate",
@@ -426,5 +501,5 @@ "kind": 2048,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 41,
+							"line": 43,
 							"character": 9,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L41"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L43"
 						}
@@ -434,3 +509,3 @@ ],
 						{
-							"id": 27,
+							"id": 31,
 							"name": "validate",
@@ -469,3 +544,3 @@ "kind": 4096,
 				{
-					"id": 10,
+					"id": 11,
 					"name": "setSchemaNameValidatorFactory",
@@ -481,5 +556,5 @@ "kind": 2048,
 							"fileName": "payload/packages/validator/src/Validator.ts",
-							"line": 27,
+							"line": 29,
 							"character": 16,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L27"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L29"
 						}
@@ -489,3 +564,3 @@ ],
 						{
-							"id": 11,
+							"id": 12,
 							"name": "setSchemaNameValidatorFactory",
@@ -497,3 +572,3 @@ "kind": 4096,
 								{
-									"id": 12,
+									"id": 13,
 									"name": "factory",
@@ -531,3 +606,3 @@ "kind": 32768,
 					"children": [
-						13
+						14
 					]
@@ -538,5 +613,6 @@ },
 					"children": [
-						21,
-						28,
-						9
+						25,
+						32,
+						22,
+						10
 					]
@@ -547,4 +623,4 @@ },
 					"children": [
-						22,
-						29
+						26,
+						33
 					]
@@ -555,5 +631,5 @@ },
 					"children": [
-						24,
-						26,
-						10
+						28,
+						30,
+						11
 					]
@@ -567,3 +643,3 @@ }
 					"character": 13,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L10"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L10"
 				}
@@ -573,3 +649,3 @@ ],
 				{
-					"id": 31,
+					"id": 35,
 					"name": "T",
@@ -595,3 +671,3 @@ "kind": 131072,
 							"type": "reference",
-							"id": 19,
+							"id": 20,
 							"name": "T"
@@ -609,3 +685,3 @@ }
 							"type": "reference",
-							"id": 19,
+							"id": 20,
 							"name": "T"
@@ -629,3 +705,3 @@ }
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
 				}
@@ -653,3 +729,3 @@ ],
 									"character": 2,
-									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L5"
+									"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L5"
 								}
@@ -690,3 +766,3 @@ ],
 							"character": 27,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L4"
 						}
@@ -708,3 +784,3 @@ ]
 					"character": 12,
-					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
+					"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
 				}
@@ -725,3 +801,3 @@ ],
 							"character": 34,
-							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
+							"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/Validator.ts#L8"
 						}
@@ -736,2 +812,15 @@ ],
 							"flags": {},
+							"parameters": [
+								{
+									"id": 8,
+									"name": "schema",
+									"kind": 32768,
+									"kindString": "Parameter",
+									"flags": {},
+									"type": {
+										"type": "intrinsic",
+										"name": "string"
+									}
+								}
+							],
 							"type": {
@@ -752,3 +841,3 @@ "type": "reference",
 			"children": [
-				8
+				9
 			]
@@ -769,5 +858,5 @@ },
 			"character": 0,
-			"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/c269dbc10/packages/protocol/packages/payload/packages/validator/src/index.ts#L1"
+			"url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/12ad73647/packages/protocol/packages/payload/packages/validator/src/index.ts#L1"
 		}
 	]
 }

dist/esm/Validator.d.ts

@@ -6,5 +6,6 @@ import { Validator, XyoValidatorBase } from '@xyo-network/core';
 };
-export type AllValidatorFactory = () => AllValidator;
+export type AllValidatorFactory = (schema: string) => AllValidator;
 export declare class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
-    private static schemaNameValidatorFactory;
+    protected static schemaNameValidatorFactory: AllValidatorFactory | null;
+    protected payload: XyoPayload;
     private _schemaValidator?;
@@ -11,0 +12,0 @@ constructor(payload: T);

dist/esm/Validator.js

 import { XyoValidatorBase } from '@xyo-network/core';
 export class PayloadValidator extends XyoValidatorBase {
     static schemaNameValidatorFactory = null;
+    payload;
     _schemaValidator;
     constructor(payload) {
         super(payload);
+        this.payload = payload;
     }
     get schemaValidator() {
-        this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.();
+        this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.(this.payload.schema);
         if (!this._schemaValidator) {
@@ -11,0 +13,0 @@ console.warn('No schema name validator set');

package.json

@@ -13,4 +13,4 @@ {
   "dependencies": {
-    "@xyo-network/core": "^2.42.18",
-    "@xyo-network/payload-model": "^2.42.17"
+    "@xyo-network/core": "^2.42.19",
+    "@xyo-network/payload-model": "^2.42.18"
   },
@@ -53,3 +53,3 @@ "devDependencies": {
   "types": "dist/esm/index.d.ts",
-  "version": "2.42.17"
+  "version": "2.42.18"
 }

src/Validator.ts

@@ -8,6 +8,7 @@ import { Validator, XyoValidatorBase } from '@xyo-network/core'
 
-export type AllValidatorFactory = () => AllValidator
+export type AllValidatorFactory = (schema: string) => AllValidator
 
 export class PayloadValidator<T extends XyoPayload = XyoPayload> extends XyoValidatorBase<T> implements Validator<T> {
-  private static schemaNameValidatorFactory: AllValidatorFactory | null = null
+  protected static schemaNameValidatorFactory: AllValidatorFactory | null = null
+  protected payload: XyoPayload
 
@@ -18,6 +19,7 @@ private _schemaValidator?: AllValidator
     super(payload)
+    this.payload = payload
   }
 
   get schemaValidator() {
-    this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.()
+    this._schemaValidator = this._schemaValidator ?? PayloadValidator.schemaNameValidatorFactory?.(this.payload.schema)
     if (!this._schemaValidator) {
@@ -24,0 +26,0 @@ console.warn('No schema name validator set')

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

41910

increased by6.82%

Lines of code

1007

increased by10.54%

Number of medium supply chain risk alerts

0

decreased by-100%

Dependency changes

• Updated@xyo-network/core@^2.42.19

• Updated@xyo-network/payload-model@^2.42.18