schema-shield 1.0.5 → 1.1.0

package/dist/keywords/array-keywords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/array-keywords.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA+F3C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAkTzD,CAAC"}
+{"version":3,"file":"array-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/array-keywords.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA+F3C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CA8TzD,CAAC"}

package/dist/keywords/number-keywords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"number-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/number-keywords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CA2F1D,CAAC"}
+{"version":3,"file":"number-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/number-keywords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAyG1D,CAAC"}

package/dist/keywords/object-keywords.d.ts

@@ -1,3 +1,9 @@
-import { KeywordFunction } from "../index";
+import type { KeywordFunction, SchemaShield } from "../index";
+interface ApplyPropertyDefaultsFunction {
+    (schema: Record<string, any>, data: any, instance: SchemaShield): void;
+}
+export declare const applyPropertyDefaults: ApplyPropertyDefaultsFunction;
+export declare const applyEmptyPropertyDefaults: ApplyPropertyDefaultsFunction;
 export declare const ObjectKeywords: Record<string, KeywordFunction | false>;
+export {};
 //# sourceMappingURL=object-keywords.d.ts.map

package/dist/keywords/object-keywords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/object-keywords.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AA8F3C,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CA2YlE,CAAC"}
+{"version":3,"file":"object-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/object-keywords.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAW9D,UAAU,6BAA6B;IACrC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;CACxE;AAgCD,eAAO,MAAM,qBAAqB,+BAAqC,CAAC;AACxE,eAAO,MAAM,0BAA0B,+BAAoC,CAAC;AAqF5E,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,KAAK,CAgWlE,CAAC"}

package/dist/keywords/other-keywords.d.ts

@@ -1,3 +1,19 @@
-import { KeywordFunction } from "../index";
+import type { KeywordFunction, ValidateFunction, ValidateSubschemaFunction } from "../index";
+import type { DefineErrorFunction } from "../utils/main-utils";
+type CombinatorKey = "allOf" | "anyOf" | "oneOf";
+type DefaultMutation = {
+    target: Record<string, any>;
+    key: string;
+    value: any;
+};
+type TransactionHooks = {
+    savepoint: () => number;
+    rollback: (savepoint: number) => void;
+    capture: (savepoint: number) => DefaultMutation[];
+    restore: (mutations: DefaultMutation[]) => void;
+};
+export declare function createCombinatorValidator(key: CombinatorKey, schema: any, defineError: DefineErrorFunction, validateSubschema?: ValidateSubschemaFunction, transactions?: TransactionHooks): ValidateFunction;
+export declare function prepareCombinatorEntries(schema: any): void;
 export declare const OtherKeywords: Record<string, KeywordFunction>;
+export {};
 //# sourceMappingURL=other-keywords.d.ts.map

package/dist/keywords/other-keywords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"other-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/other-keywords.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAkD3C,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CA0UzD,CAAC"}
+{"version":3,"file":"other-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/other-keywords.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,eAAe,EAEf,gBAAgB,EAChB,yBAAyB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAkD/D,KAAK,aAAa,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;AACjD,KAAK,eAAe,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAA;CAAE,CAAC;AAChF,KAAK,gBAAgB,GAAG;IACtB,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB,QAAQ,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,OAAO,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,eAAe,EAAE,CAAC;IAClD,OAAO,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,KAAK,IAAI,CAAC;CACjD,CAAC;AAqFF,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,mBAAmB,EAChC,iBAAiB,CAAC,EAAE,yBAAyB,EAC7C,YAAY,CAAC,EAAE,gBAAgB,GAC9B,gBAAgB,CA0ElB;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,GAAG,QAUnD;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAqJzD,CAAC"}

package/dist/keywords/string-keywords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/string-keywords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3D,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAiK1D,CAAC"}
+{"version":3,"file":"string-keywords.d.ts","sourceRoot":"","sources":["../../lib/keywords/string-keywords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,eAAe,EAAE,MAAM,UAAU,CAAC;AA+B3D,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAmL1D,CAAC"}

package/dist/utils/deep-freeze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deep-freeze.d.ts","sourceRoot":"","sources":["../../lib/utils/deep-freeze.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CACxB,GAAG,EAAE,GAAG,EACR,oBAAoB,GAAE,OAAe,EACrC,IAAI,kBAAgB,GACnB,GAAG,CAkCL;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAO1C;AAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAuBzB,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,GAAG,EAAE,CAAC,EACN,mBAAmB,UAAQ,EAC3B,IAAI,uBAAgB,GACnB,CAAC,CAmIH"}
+{"version":3,"file":"deep-freeze.d.ts","sourceRoot":"","sources":["../../lib/utils/deep-freeze.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CACxB,GAAG,EAAE,GAAG,EACR,oBAAoB,GAAE,OAAe,EACrC,IAAI,kBAAgB,GACnB,GAAG,CAkCL;AAED,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAO1C;AAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAuBzB,wBAAgB,iBAAiB,CAAC,CAAC,EACjC,GAAG,EAAE,CAAC,EACN,mBAAmB,UAAQ,EAC3B,IAAI,uBAAgB,GACnB,CAAC,CAmIH"}

package/dist/utils/main-utils.d.ts

@@ -1,4 +1,6 @@
-import { CompiledSchema } from "../index";
+import type { CompiledSchema } from "../index";
+export declare function definePropertyOrThrow<T extends object>(target: T, key: PropertyKey, descriptor: PropertyDescriptor): T;
+export declare function hasOwn(target: any, key: PropertyKey): boolean;
 interface ErrorTree {
     message: string;
     keyword: string;
@@ -9,6 +11,7 @@ interface ErrorTree {
     cause?: ErrorTree;
 }
 export declare class ValidationError extends Error {
+    code?: string;
     message: string;
     item?: string | number;
     keyword: string;
@@ -18,9 +21,7 @@ export declare class ValidationError extends Error {
     data?: any;
     schema?: CompiledSchema;
     constructor(message: string);
-    private _getCause;
     getCause(): ValidationError;
-    private _getTree;
     getTree(): ErrorTree;
     getPath(): {
         schemaPath: string;
@@ -28,6 +29,7 @@ export declare class ValidationError extends Error {
     };
 }
 export interface DefineErrorOptions {
+    code?: string;
     item?: any;
     cause?: ValidationError | true;
     data?: any;
@@ -36,9 +38,10 @@ export interface DefineErrorFunction {
     (message: string, options?: DefineErrorOptions): ValidationError | void | true;
 }
 export declare function getDefinedErrorFunctionForKey(key: string, schema: CompiledSchema, failFast: boolean): DefineErrorFunction;
+export declare function escapeJsonPointerToken(value: string | number): string;
 export declare function getUTF16Length(str: any): number;
 export declare function isCompiledSchema(subSchema: any): subSchema is CompiledSchema;
-export declare function getNamedFunction<T>(name: string, fn: T): T;
+export declare function getNamedFunction<T extends object>(name: string, fn: T): T;
 export declare function resolvePath(root: any, path: string): any;
 export declare function areCloseEnough(a: number, b: number, epsilon?: number): boolean;
 export {};

package/dist/utils/main-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-utils.d.ts","sourceRoot":"","sources":["../../lib/utils/main-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,qBAAa,eAAgB,SAAQ,KAAK;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAM;IACxB,YAAY,EAAE,MAAM,CAAM;IAC1B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE,MAAM;IAK3B,OAAO,CAAC,SAAS;IA0BjB,QAAQ,IAAI,eAAe;IAI3B,OAAO,CAAC,QAAQ;IAiBhB,OAAO,IAAI,SAAS;IAKpB,OAAO;;;;CAOR;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,mBAAmB;IAClC,CACE,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC3B,eAAe,GAAG,IAAI,GAAG,IAAI,CAAC;CAClC;AAID,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,OAAO,uBAuBlB;AAED,wBAAgB,cAAc,CAAC,GAAG,KAAA,UAUjC;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,IAAI,cAAc,CAO5E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAE1D;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAwCxD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,OAAO,CAE7E"}
+{"version":3,"file":"main-utils.d.ts","sourceRoot":"","sources":["../../lib/utils/main-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAO/C,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACpD,MAAM,EAAE,CAAC,EACT,GAAG,EAAE,WAAW,EAChB,UAAU,EAAE,kBAAkB,GAC7B,CAAC,CAKH;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAE7D;AAED,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,qBAAa,eAAgB,SAAQ,KAAK;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAM;IACxB,YAAY,EAAE,MAAM,CAAM;IAC1B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,CAAC,EAAE,cAAc,CAAC;gBAEZ,OAAO,EAAE,MAAM;IAK3B,QAAQ,IAAI,eAAe;IAqC3B,OAAO,IAAI,SAAS;IA8BpB,OAAO;;;;CAOR;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,eAAe,GAAG,IAAI,CAAC;IAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,WAAW,mBAAmB;IAClC,CACE,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,kBAAkB,GAC3B,eAAe,GAAG,IAAI,GAAG,IAAI,CAAC;CAClC;AAID,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,OAAO,uBA0BlB;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,cAAc,CAAC,GAAG,KAAA,UAUjC;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,GAAG,GAAG,SAAS,IAAI,cAAc,CAO5E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,CAEzE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAwCxD;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,SAAQ,GAAG,OAAO,CAE7E"}

package/lib/formats.ts

@@ -11,7 +11,6 @@ const EMAIL_REGEX =
   /^(?!\.)(?!.*\.$)[a-z0-9!#$%&'*+/=?^_`{|}~-]{1,20}(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]{1,21}){0,2}@[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]{0,60}[a-z0-9])?){0,3}$/i;
 const HOSTNAME_REGEX =
   /^[a-z0-9][a-z0-9-]{0,62}(?:\.[a-z0-9][a-z0-9-]{0,62})*[a-z0-9]$/i;
-const DATE_REGEX = /^(\d{4})-(\d{2})-(\d{2})$/;
 const TIME_REGEX =
   /^([01]\d|2[0-3]):([0-5]\d):([0-5]\d)(\.\d+)?(Z|([+-])([01]\d|2[0-3]):([0-5]\d))$/;
 const URI_REFERENCE_REGEX =
@@ -112,6 +111,27 @@ function isHexCharCode(code: number) {
   );
 }
 
+function hasValidPercentEncoding(data: string) {
+  for (let index = 0; index < data.length; index++) {
+    const code = data.charCodeAt(index);
+    if (code === 92) {
+      return false;
+    }
+    if (code !== 37) {
+      continue;
+    }
+    if (
+      index + 2 >= data.length ||
+      !isHexCharCode(data.charCodeAt(index + 1)) ||
+      !isHexCharCode(data.charCodeAt(index + 2))
+    ) {
+      return false;
+    }
+    index += 2;
+  }
+  return true;
+}
+
 function isValidIpv6(data: string) {
   const length = data.length;
   if (length === 0) {
@@ -249,7 +269,7 @@ function isValidJsonPointer(data: string) {
 
 function isValidRelativeJsonPointer(data: string) {
   if (data.length === 0) {
-    return true;
+    return false;
   }
 
   let i = 0;
@@ -265,6 +285,10 @@ function isValidRelativeJsonPointer(data: string) {
     return false;
   }
 
+  if (i > 1 && data.charCodeAt(0) === 48) {
+    return false;
+  }
+
   if (i === data.length) {
     return true;
   }
@@ -451,7 +475,7 @@ export const Formats: Record<string, FormatFunction | false> = {
     return true;
   },
   uri(data) {
-    return URI_REGEX.test(data);
+    return URI_REGEX.test(data) && hasValidPercentEncoding(data);
   },
   email(data) {
     return EMAIL_REGEX.test(data);
@@ -468,17 +492,19 @@ export const Formats: Record<string, FormatFunction | false> = {
     return HOSTNAME_REGEX.test(data);
   },
   date(data) {
-    const match = DATE_REGEX.exec(data);
-    if (!match) {
+    if (
+      data.length !== 10 ||
+      data.charCodeAt(4) !== 45 ||
+      data.charCodeAt(7) !== 45
+    ) {
       return false;
     }
 
-    const [, yearStr, monthStr, dayStr] = match;
-    const year = Number(yearStr);
-    const month = Number(monthStr);
-    const day = Number(dayStr);
+    const year = parseFourDigits(data, 0);
+    const month = parseTwoDigits(data, 5);
+    const day = parseTwoDigits(data, 8);
 
-    if (month < 1 || month > 12) {
+    if (year < 0 || month < 1 || month > 12) {
       return false;
     }
     if (day < 1) {