@cfworker/json-schema 1.8.3 → 1.11.0

package/README.md

@@ -6,14 +6,16 @@
 ![](https://badgen.net/bundlephobia/tree-shaking/@cfworker/json-schema)
 ![](https://badgen.net/npm/types/@cfworker/json-schema?icon=typescript)
 
-A JSON schema validator that will run on Cloudflare workers. Supports drafts 4, 7, and 2019-09.
+A JSON schema validator that will run on Cloudflare workers. Supports drafts 4, 7, 2019-09, and 2020-12.
+
+This library is validated against the [json-schema-test-suite](https://github.com/json-schema-org/JSON-Schema-Test-Suite), a series of approximately 4,500 assertions maintained along with the json-schema specification. A small set of test cases are intentionally not supported due to performance constraints or lack of feature use. These list of unsupported features are maintained in [test/unsupported.ts](./test/unsupported.ts). While this library is not the fastest due to lack of code generation, it's consistently among the [most spec compliant](https://json-schema.org/implementations.html#benchmarks).
 
 ## background
 
 _Why another JSON schema validator?_
 
 Cloudflare workers do not have APIs required by [Ajv](https://ajv.js.org/) schema compilation (`eval` or `new Function(code)`).
-If possible use Ajv in a build step to precompile your schema. Otherwise use this library.
+If possible use Ajv in a build step to precompile your schema. Otherwise this library could work for you.
 
 ## basic usage
 

package/dist/dereference.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="@cloudflare/workers-types" />
 import { Schema } from './types.js';
 export declare const schemaKeyword: Record<string, boolean>;
 export declare const schemaArrayKeyword: Record<string, boolean>;

package/dist/dereference.js

@@ -13,6 +13,7 @@ export const schemaKeyword = {
     else: true
 };
 export const schemaArrayKeyword = {
+    prefixItems: true,
     items: true,
     allOf: true,
     anyOf: true,
@@ -54,13 +55,14 @@ export const ignoredKeyword = {
     minProperties: true
 };
 export let initialBaseURI = typeof self !== 'undefined' && self.location
-    ? new URL(self.location.origin + self.location.pathname + location.search)
+    ?
+        new URL(self.location.origin + self.location.pathname + location.search)
     : new URL('https://github.com/cfworker');
 export function dereference(schema, lookup = Object.create(null), baseURI = initialBaseURI, basePointer = '') {
     if (schema && typeof schema === 'object' && !Array.isArray(schema)) {
         const id = schema.$id || schema.id;
         if (id) {
-            const url = new URL(id, baseURI);
+            const url = new URL(id, baseURI.href);
             if (url.hash.length > 1) {
                 lookup[url.href] = schema;
             }
@@ -93,15 +95,23 @@ export function dereference(schema, lookup = Object.create(null), baseURI = init
         });
     }
     if (schema.$ref && schema.__absolute_ref__ === undefined) {
-        const url = new URL(schema.$ref, baseURI);
+        const url = new URL(schema.$ref, baseURI.href);
         url.hash = url.hash;
         Object.defineProperty(schema, '__absolute_ref__', {
             enumerable: false,
             value: url.href
         });
     }
+    if (schema.$recursiveRef && schema.__absolute_recursive_ref__ === undefined) {
+        const url = new URL(schema.$recursiveRef, baseURI.href);
+        url.hash = url.hash;
+        Object.defineProperty(schema, '__absolute_recursive_ref__', {
+            enumerable: false,
+            value: url.href
+        });
+    }
     if (schema.$anchor) {
-        const url = new URL('#' + schema.$anchor, baseURI);
+        const url = new URL('#' + schema.$anchor, baseURI.href);
         lookup[url.href] = schema;
     }
     for (let key in schema) {

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-export declare type SchemaDraft = '4' | '7' | '2019-09';
+export declare type SchemaDraft = '4' | '7' | '2019-09' | '2020-12';
 export declare const enum OutputFormat {
     Flag = 1,
     Basic = 2,
@@ -37,6 +37,7 @@ export interface Schema {
     dependentRequired?: Record<string, string[]>;
     dependentSchemas?: Record<string, Schema>;
     dependencies?: Record<string, Schema | string[]>;
+    prefixItems?: Array<Schema | boolean>[];
     items?: Schema | boolean | Array<Schema | boolean>;
     additionalItems?: Schema | boolean;
     unevaluatedItems?: Schema | boolean;
@@ -55,6 +56,7 @@ export interface Schema {
     maxLength?: number;
     pattern?: string;
     __absolute_ref__?: string;
+    __absolute_recursive_ref__?: string;
     __absolute_uri__?: string;
     [key: string]: any;
 }

package/dist/validate.d.ts

@@ -1,5 +1,3 @@
 import { Schema, SchemaDraft, ValidationResult } from './types.js';
-export declare function validate(instance: any, schema: Schema | boolean, draft?: SchemaDraft, lookup?: Record<string, boolean | Schema>, shortCircuit?: boolean, recursiveAnchor?: Schema | null, instanceLocation?: string, schemaLocation?: string, evaluated?: {
-    properties?: Record<string, boolean>;
-    items?: number;
-}): ValidationResult;
+export declare type Evaluated = Record<string | number, boolean>;
+export declare function validate(instance: any, schema: Schema | boolean, draft?: SchemaDraft, lookup?: Record<string, boolean | Schema>, shortCircuit?: boolean, recursiveAnchor?: Schema | null, instanceLocation?: string, schemaLocation?: string, evaluated?: Evaluated): ValidationResult;

package/dist/validate.js

@@ -3,7 +3,7 @@ import { dereference } from './dereference.js';
 import { fastFormat } from './format.js';
 import { encodePointer } from './pointer.js';
 import { ucs2length } from './ucs2-length.js';
-export function validate(instance, schema, draft = '2019-09', lookup = dereference(schema), shortCircuit = true, recursiveAnchor = null, instanceLocation = '#', schemaLocation = '#', evaluated) {
+export function validate(instance, schema, draft = '2019-09', lookup = dereference(schema), shortCircuit = true, recursiveAnchor = null, instanceLocation = '#', schemaLocation = '#', evaluated = Object.create(null)) {
     if (schema === true) {
         return { valid: true, errors: [] };
     }
@@ -34,18 +34,34 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             }
             else if (Array.isArray(instance)) {
                 instanceType = 'array';
-                evaluated = evaluated || { items: -1 };
             }
             else {
                 instanceType = 'object';
-                evaluated = evaluated || { properties: Object.create(null) };
             }
             break;
         default:
             throw new Error(`Instances of "${rawInstanceType}" type are not supported.`);
     }
-    const { $ref, $recursiveRef, $recursiveAnchor, type: $type, const: $const, enum: $enum, required: $required, not: $not, anyOf: $anyOf, allOf: $allOf, oneOf: $oneOf, if: $if, then: $then, else: $else, format: $format, properties: $properties, patternProperties: $patternProperties, additionalProperties: $additionalProperties, unevaluatedProperties: $unevaluatedProperties, minProperties: $minProperties, maxProperties: $maxProperties, propertyNames: $propertyNames, dependentRequired: $dependentRequired, dependentSchemas: $dependentSchemas, dependencies: $dependencies, items: $items, additionalItems: $additionalItems, unevaluatedItems: $unevaluatedItems, contains: $contains, minContains: $minContains, maxContains: $maxContains, minItems: $minItems, maxItems: $maxItems, uniqueItems: $uniqueItems, minimum: $minimum, maximum: $maximum, exclusiveMinimum: $exclusiveMinimum, exclusiveMaximum: $exclusiveMaximum, multipleOf: $multipleOf, minLength: $minLength, maxLength: $maxLength, pattern: $pattern, __absolute_ref__ } = schema;
+    const { $ref, $recursiveRef, $recursiveAnchor, type: $type, const: $const, enum: $enum, required: $required, not: $not, anyOf: $anyOf, allOf: $allOf, oneOf: $oneOf, if: $if, then: $then, else: $else, format: $format, properties: $properties, patternProperties: $patternProperties, additionalProperties: $additionalProperties, unevaluatedProperties: $unevaluatedProperties, minProperties: $minProperties, maxProperties: $maxProperties, propertyNames: $propertyNames, dependentRequired: $dependentRequired, dependentSchemas: $dependentSchemas, dependencies: $dependencies, prefixItems: $prefixItems, items: $items, additionalItems: $additionalItems, unevaluatedItems: $unevaluatedItems, contains: $contains, minContains: $minContains, maxContains: $maxContains, minItems: $minItems, maxItems: $maxItems, uniqueItems: $uniqueItems, minimum: $minimum, maximum: $maximum, exclusiveMinimum: $exclusiveMinimum, exclusiveMaximum: $exclusiveMaximum, multipleOf: $multipleOf, minLength: $minLength, maxLength: $maxLength, pattern: $pattern, __absolute_ref__, __absolute_recursive_ref__ } = schema;
     const errors = [];
+    if ($recursiveAnchor === true && recursiveAnchor === null) {
+        recursiveAnchor = schema;
+    }
+    if ($recursiveRef === '#') {
+        const refSchema = recursiveAnchor === null
+            ? lookup[__absolute_recursive_ref__]
+            : recursiveAnchor;
+        const keywordLocation = `${schemaLocation}/$recursiveRef`;
+        const result = validate(instance, recursiveAnchor === null ? schema : recursiveAnchor, draft, lookup, shortCircuit, refSchema, instanceLocation, keywordLocation, evaluated);
+        if (!result.valid) {
+            errors.push({
+                instanceLocation,
+                keyword: '$recursiveRef',
+                keywordLocation,
+                error: 'A subschema had errors.'
+            }, ...result.errors);
+        }
+    }
     if ($ref !== undefined) {
         const uri = __absolute_ref__ || $ref;
         const refSchema = lookup[uri];
@@ -71,21 +87,6 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             return { valid: errors.length === 0, errors };
         }
     }
-    if ($recursiveAnchor === true && recursiveAnchor === null) {
-        recursiveAnchor = schema;
-    }
-    if ($recursiveRef === '#') {
-        const keywordLocation = `${schemaLocation}/$recursiveRef`;
-        const result = validate(instance, recursiveAnchor === null ? schema : recursiveAnchor, draft, lookup, shortCircuit, recursiveAnchor, instanceLocation, keywordLocation, evaluated);
-        if (!result.valid) {
-            errors.push({
-                instanceLocation,
-                keyword: '$recursiveRef',
-                keywordLocation,
-                error: 'A subschema had errors.'
-            }, ...result.errors);
-        }
-    }
     if (Array.isArray($type)) {
         let length = $type.length;
         let valid = false;
@@ -178,15 +179,20 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             });
         }
     }
+    let subEvaluateds = [];
     if ($anyOf !== undefined) {
         const keywordLocation = `${schemaLocation}/anyOf`;
         const errorsLength = errors.length;
         let anyValid = false;
         for (let i = 0; i < $anyOf.length; i++) {
             const subSchema = $anyOf[i];
-            const result = validate(instance, subSchema, draft, lookup, shortCircuit, recursiveAnchor, instanceLocation, `${keywordLocation}/${i}`, evaluated);
+            const subEvaluated = Object.create(evaluated);
+            const result = validate(instance, subSchema, draft, lookup, shortCircuit, $recursiveAnchor === true ? recursiveAnchor : null, instanceLocation, `${keywordLocation}/${i}`, subEvaluated);
             errors.push(...result.errors);
             anyValid = anyValid || result.valid;
+            if (result.valid) {
+                subEvaluateds.push(subEvaluated);
+            }
         }
         if (anyValid) {
             errors.length = errorsLength;
@@ -206,9 +212,13 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
         let allValid = true;
         for (let i = 0; i < $allOf.length; i++) {
             const subSchema = $allOf[i];
-            const result = validate(instance, subSchema, draft, lookup, shortCircuit, recursiveAnchor, instanceLocation, `${keywordLocation}/${i}`, evaluated);
+            const subEvaluated = Object.create(evaluated);
+            const result = validate(instance, subSchema, draft, lookup, shortCircuit, $recursiveAnchor === true ? recursiveAnchor : null, instanceLocation, `${keywordLocation}/${i}`, subEvaluated);
             errors.push(...result.errors);
             allValid = allValid && result.valid;
+            if (result.valid) {
+                subEvaluateds.push(subEvaluated);
+            }
         }
         if (allValid) {
             errors.length = errorsLength;
@@ -226,8 +236,12 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
         const keywordLocation = `${schemaLocation}/oneOf`;
         const errorsLength = errors.length;
         const matches = $oneOf.filter((subSchema, i) => {
-            const result = validate(instance, subSchema, draft, lookup, shortCircuit, recursiveAnchor, instanceLocation, `${keywordLocation}/${i}`, evaluated);
+            const subEvaluated = Object.create(evaluated);
+            const result = validate(instance, subSchema, draft, lookup, shortCircuit, $recursiveAnchor === true ? recursiveAnchor : null, instanceLocation, `${keywordLocation}/${i}`, subEvaluated);
             errors.push(...result.errors);
+            if (result.valid) {
+                subEvaluateds.push(subEvaluated);
+            }
             return result.valid;
         }).length;
         if (matches === 1) {
@@ -242,6 +256,9 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             });
         }
     }
+    if (instanceType === 'object' || instanceType === 'array') {
+        Object.assign(evaluated, ...subEvaluateds);
+    }
     if ($if !== undefined) {
         const keywordLocation = `${schemaLocation}/if`;
         const conditionResult = validate(instance, $if, draft, lookup, shortCircuit, recursiveAnchor, instanceLocation, keywordLocation, evaluated).valid;
@@ -381,9 +398,6 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             }
         }
         const thisEvaluated = Object.create(null);
-        if (!evaluated || !evaluated.properties) {
-            throw new Error('evaluated.properties should be an object');
-        }
         let stop = false;
         if ($properties !== undefined) {
             const keywordLocation = `${schemaLocation}/properties`;
@@ -394,7 +408,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 const subInstancePointer = `${instanceLocation}/${encodePointer(key)}`;
                 const result = validate(instance[key], $properties[key], draft, lookup, shortCircuit, recursiveAnchor, subInstancePointer, `${keywordLocation}/${encodePointer(key)}`);
                 if (result.valid) {
-                    evaluated.properties[key] = thisEvaluated[key] = true;
+                    evaluated[key] = thisEvaluated[key] = true;
                 }
                 else {
                     stop = shortCircuit;
@@ -421,7 +435,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                     const subInstancePointer = `${instanceLocation}/${encodePointer(key)}`;
                     const result = validate(instance[key], subSchema, draft, lookup, shortCircuit, recursiveAnchor, subInstancePointer, `${keywordLocation}/${encodePointer(pattern)}`);
                     if (result.valid) {
-                        evaluated.properties[key] = thisEvaluated[key] = true;
+                        evaluated[key] = thisEvaluated[key] = true;
                     }
                     else {
                         stop = shortCircuit;
@@ -444,7 +458,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 const subInstancePointer = `${instanceLocation}/${encodePointer(key)}`;
                 const result = validate(instance[key], $additionalProperties, draft, lookup, shortCircuit, recursiveAnchor, subInstancePointer, keywordLocation);
                 if (result.valid) {
-                    evaluated.properties[key] = true;
+                    evaluated[key] = true;
                 }
                 else {
                     stop = shortCircuit;
@@ -460,11 +474,11 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
         else if (!stop && $unevaluatedProperties !== undefined) {
             const keywordLocation = `${schemaLocation}/unevaluatedProperties`;
             for (const key in instance) {
-                if (!evaluated.properties[key]) {
+                if (!evaluated[key]) {
                     const subInstancePointer = `${instanceLocation}/${encodePointer(key)}`;
                     const result = validate(instance[key], $unevaluatedProperties, draft, lookup, shortCircuit, recursiveAnchor, subInstancePointer, keywordLocation);
                     if (result.valid) {
-                        evaluated.properties[key] = true;
+                        evaluated[key] = true;
                     }
                     else {
                         errors.push({
@@ -495,18 +509,35 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 error: `Array has too few items (${instance.length} < ${$minItems}).`
             });
         }
-        if (!evaluated || evaluated.items === undefined) {
-            throw new Error('evaluated.items should be a number');
-        }
         const length = instance.length;
         let i = 0;
         let stop = false;
+        if ($prefixItems !== undefined) {
+            const keywordLocation = `${schemaLocation}/prefixItems`;
+            const length2 = Math.min($prefixItems.length, length);
+            for (; i < length2; i++) {
+                const result = validate(instance[i], $prefixItems[i], draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, `${keywordLocation}/${i}`);
+                evaluated[i] = true;
+                if (!result.valid) {
+                    stop = shortCircuit;
+                    errors.push({
+                        instanceLocation,
+                        keyword: 'prefixItems',
+                        keywordLocation,
+                        error: `Items did not match schema.`
+                    }, ...result.errors);
+                    if (stop)
+                        break;
+                }
+            }
+        }
         if ($items !== undefined) {
             const keywordLocation = `${schemaLocation}/items`;
             if (Array.isArray($items)) {
                 const length2 = Math.min($items.length, length);
                 for (; i < length2; i++) {
                     const result = validate(instance[i], $items[i], draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, `${keywordLocation}/${i}`);
+                    evaluated[i] = true;
                     if (!result.valid) {
                         stop = shortCircuit;
                         errors.push({
@@ -523,6 +554,7 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
             else {
                 for (; i < length; i++) {
                     const result = validate(instance[i], $items, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, keywordLocation);
+                    evaluated[i] = true;
                     if (!result.valid) {
                         stop = shortCircuit;
                         errors.push({
@@ -536,11 +568,11 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                     }
                 }
             }
-            evaluated.items = Math.max(i, evaluated.items);
             if (!stop && $additionalItems !== undefined) {
                 const keywordLocation = `${schemaLocation}/additionalItems`;
                 for (; i < length; i++) {
                     const result = validate(instance[i], $additionalItems, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, keywordLocation);
+                    evaluated[i] = true;
                     if (!result.valid) {
                         stop = shortCircuit;
                         errors.push({
@@ -551,24 +583,8 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                         }, ...result.errors);
                     }
                 }
-                evaluated.items = Math.max(i, evaluated.items);
             }
         }
-        if (!stop && $unevaluatedItems !== undefined) {
-            const keywordLocation = `${schemaLocation}/unevaluatedItems`;
-            for (i = Math.max(evaluated.items, 0); i < length; i++) {
-                const result = validate(instance[i], $unevaluatedItems, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, keywordLocation);
-                if (!result.valid) {
-                    errors.push({
-                        instanceLocation,
-                        keyword: 'unevaluatedItems',
-                        keywordLocation,
-                        error: `Items did not match unevaluated items schema.`
-                    }, ...result.errors);
-                }
-            }
-            evaluated.items = Math.max(i, evaluated.items);
-        }
         if ($contains !== undefined) {
             if (length === 0 && $minContains === undefined) {
                 errors.push({
@@ -590,13 +606,11 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 const keywordLocation = `${schemaLocation}/contains`;
                 const errorsLength = errors.length;
                 let contained = 0;
-                for (let i = 0; i < length; i++) {
-                    const result = validate(instance[i], $contains, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, keywordLocation);
+                for (let j = 0; j < length; j++) {
+                    const result = validate(instance[j], $contains, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${j}`, keywordLocation);
                     if (result.valid) {
+                        evaluated[j] = true;
                         contained++;
-                        if ($minContains === undefined && $maxContains === undefined) {
-                            break;
-                        }
                     }
                     else {
                         errors.push(...result.errors);
@@ -633,6 +647,24 @@ export function validate(instance, schema, draft = '2019-09', lookup = dereferen
                 }
             }
         }
+        if (!stop && $unevaluatedItems !== undefined) {
+            const keywordLocation = `${schemaLocation}/unevaluatedItems`;
+            for (i; i < length; i++) {
+                if (evaluated[i]) {
+                    continue;
+                }
+                const result = validate(instance[i], $unevaluatedItems, draft, lookup, shortCircuit, recursiveAnchor, `${instanceLocation}/${i}`, keywordLocation);
+                evaluated[i] = true;
+                if (!result.valid) {
+                    errors.push({
+                        instanceLocation,
+                        keyword: 'unevaluatedItems',
+                        keywordLocation,
+                        error: `Items did not match unevaluated items schema.`
+                    }, ...result.errors);
+                }
+            }
+        }
         if ($uniqueItems) {
             for (let j = 0; j < length; j++) {
                 const a = instance[j];

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@cfworker/json-schema",
   "type": "module",
-  "version": "1.8.3",
-  "description": "A JSON schema validator that will run on Cloudflare workers. Supports drafts 4, 7, and 2019-09.",
+  "version": "1.11.0",
+  "description": "A JSON schema validator that will run on Cloudflare workers. Supports drafts 4, 7, 2019-09, and 2020-12.",
   "keywords": [
     "json-schema",
     "jsonschema",
@@ -39,13 +39,12 @@
     "test": "cfworker test test/**/*.spec.ts --nocheck"
   },
   "devDependencies": {
-    "@cfworker/dev": "^1.8.3",
-    "@types/chai": "^4.2.16",
-    "@types/mocha": "^8.2.2",
+    "@cfworker/dev": "^1.11.0",
+    "@types/chai": "^4.2.22",
+    "@types/mocha": "^9.0.0",
     "chai": "^4.3.4",
-    "json-schema-test-suite": "git+https://github.com/json-schema-org/JSON-Schema-Test-Suite#ac63eb7",
-    "mocha": "^8.3.2",
-    "typescript": "^4.2.3"
-  },
-  "gitHead": "674fb1649bd1686f9918ac90436da709381cffb9"
+    "json-schema-test-suite": "git+https://github.com/json-schema-org/JSON-Schema-Test-Suite#76b529f",
+    "mocha": "^9.1.3",
+    "typescript": "^4.5.2"
+  }
 }

package/src/dereference.ts

@@ -16,6 +16,7 @@ export const schemaKeyword: Record<string, boolean> = {
 };
 
 export const schemaArrayKeyword: Record<string, boolean> = {
+  prefixItems: true,
   items: true,
   allOf: true,
   anyOf: true,
@@ -65,8 +66,10 @@ export const ignoredKeyword: Record<string, boolean> = {
  * https://tools.ietf.org/html/rfc3986#section-5.1
  */
 export let initialBaseURI =
+  // @ts-ignore
   typeof self !== 'undefined' && self.location
-    ? new URL(self.location.origin + self.location.pathname + location.search)
+    ? //@ts-ignore
+      new URL(self.location.origin + self.location.pathname + location.search)
     : new URL('https://github.com/cfworker');
 
 export function dereference(
@@ -78,7 +81,7 @@ export function dereference(
   if (schema && typeof schema === 'object' && !Array.isArray(schema)) {
     const id: string = schema.$id || schema.id;
     if (id) {
-      const url = new URL(id, baseURI);
+      const url = new URL(id, baseURI.href);
       if (url.hash.length > 1) {
         lookup[url.href] = schema;
       } else {
@@ -116,7 +119,7 @@ export function dereference(
 
   // if a $ref is found, resolve it's absolute URI.
   if (schema.$ref && schema.__absolute_ref__ === undefined) {
-    const url = new URL(schema.$ref, baseURI);
+    const url = new URL(schema.$ref, baseURI.href);
     url.hash = url.hash; // normalize hash https://url.spec.whatwg.org/#dom-url-hash
     Object.defineProperty(schema, '__absolute_ref__', {
       enumerable: false,
@@ -124,9 +127,19 @@ export function dereference(
     });
   }
 
+  // if a $recursiveRef is found, resolve it's absolute URI.
+  if (schema.$recursiveRef && schema.__absolute_recursive_ref__ === undefined) {
+    const url = new URL(schema.$recursiveRef, baseURI.href);
+    url.hash = url.hash; // normalize hash https://url.spec.whatwg.org/#dom-url-hash
+    Object.defineProperty(schema, '__absolute_recursive_ref__', {
+      enumerable: false,
+      value: url.href
+    });
+  }
+
   // if an $anchor is found, compute it's URI and add it to the mapping.
   if (schema.$anchor) {
-    const url = new URL('#' + schema.$anchor, baseURI);
+    const url = new URL('#' + schema.$anchor, baseURI.href);
     lookup[url.href] = schema;
   }
 

package/src/format.ts

@@ -3,27 +3,36 @@
 const DATE = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
 const DAYS = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
 const TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d(?::?\d\d)?)?$/i;
-const HOSTNAME = /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i;
+const HOSTNAME =
+  /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i;
 // const URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
-const URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+const URIREF =
+  /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
 // uri-template: https://tools.ietf.org/html/rfc6570
-const URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
+const URITEMPLATE =
+  /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|]?(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?(?:,(?:[a-z0-9_]|%[0-9a-f]{2})+(?::[1-9][0-9]{0,3}|\*)?)*\})*$/i;
 // For the source: https://gist.github.com/dperini/729294
 // For test cases: https://mathiasbynens.be/demo/url-regex
-const URL_ = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
+const URL_ =
+  /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
 const UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
 const JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
-const JSON_POINTER_URI_FRAGMENT = /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-const RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+const JSON_POINTER_URI_FRAGMENT =
+  /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
+const RELATIVE_JSON_POINTER =
+  /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
 
 // date: http://tools.ietf.org/html/rfc3339#section-5.6
 const FASTDATE = /^\d\d\d\d-[0-1]\d-[0-3]\d$/;
 // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
-const FASTTIME = /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i;
-const FASTDATETIME = /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i;
+const FASTTIME =
+  /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i;
+const FASTDATETIME =
+  /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i;
 // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
 // const FASTURI = /^(?:[a-z][a-z0-9+-.]*:)(?:\/?\/)?[^\s]*$/i;
-const FASTURIREFERENCE = /^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i;
+const FASTURIREFERENCE =
+  /^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i;
 
 // https://github.com/ExodusMovement/schemasafe/blob/master/src/formats.js
 const EMAIL = (input: string) => {
@@ -50,9 +59,11 @@ const EMAIL = (input: string) => {
 };
 
 // optimized https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9780596802837/ch07s16.html
-const IPV4 = /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/;
+const IPV4 =
+  /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/;
 // optimized http://stackoverflow.com/questions/53497/regular-expression-that-matches-valid-ipv6-addresses
-const IPV6 = /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i;
+const IPV6 =
+  /^((([0-9a-f]{1,4}:){7}([0-9a-f]{1,4}|:))|(([0-9a-f]{1,4}:){6}(:[0-9a-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){5}(((:[0-9a-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9a-f]{1,4}:){4}(((:[0-9a-f]{1,4}){1,3})|((:[0-9a-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){3}(((:[0-9a-f]{1,4}){1,4})|((:[0-9a-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){2}(((:[0-9a-f]{1,4}){1,5})|((:[0-9a-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9a-f]{1,4}:){1}(((:[0-9a-f]{1,4}){1,6})|((:[0-9a-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9a-f]{1,4}){1,7})|((:[0-9a-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))$/i;
 
 // https://github.com/ExodusMovement/schemasafe/blob/master/src/formats.js
 const DURATION = (input: string) =>
@@ -141,7 +152,8 @@ function date_time(str: string) {
 }
 
 const NOT_URI_FRAGMENT = /\/|:/;
-const URI_PATTERN = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
+const URI_PATTERN =
+  /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
 
 function uri(str: string): boolean {
   // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."

package/src/types.ts

@@ -1,4 +1,4 @@
-export type SchemaDraft = '4' | '7' | '2019-09';
+export type SchemaDraft = '4' | '7' | '2019-09' | '2020-12';
 
 export const enum OutputFormat {
   Flag = 1 << 0,
@@ -51,6 +51,7 @@ export interface Schema {
   dependentSchemas?: Record<string, Schema>;
   dependencies?: Record<string, Schema | string[]>;
 
+  prefixItems?: Array<Schema | boolean>[];
   items?: Schema | boolean | Array<Schema | boolean>;
   additionalItems?: Schema | boolean;
   unevaluatedItems?: Schema | boolean;
@@ -72,6 +73,7 @@ export interface Schema {
   pattern?: string;
 
   __absolute_ref__?: string;
+  __absolute_recursive_ref__?: string;
   __absolute_uri__?: string;
 
   [key: string]: any;

package/src/validate.ts

@@ -11,6 +11,8 @@ import {
 } from './types.js';
 import { ucs2length } from './ucs2-length.js';
 
+export type Evaluated = Record<string | number, boolean>;
+
 export function validate(
   instance: any,
   schema: Schema | boolean,
@@ -20,7 +22,7 @@ export function validate(
   recursiveAnchor: Schema | null = null,
   instanceLocation = '#',
   schemaLocation = '#',
-  evaluated?: { properties?: Record<string, boolean>; items?: number }
+  evaluated: Evaluated = Object.create(null)
 ): ValidationResult {
   if (schema === true) {
     return { valid: true, errors: [] };
@@ -53,10 +55,8 @@ export function validate(
         instanceType = 'null';
       } else if (Array.isArray(instance)) {
         instanceType = 'array';
-        evaluated = evaluated || { items: -1 };
       } else {
         instanceType = 'object';
-        evaluated = evaluated || { properties: Object.create(null) };
       }
       break;
     default:
@@ -95,6 +95,7 @@ export function validate(
     dependentSchemas: $dependentSchemas,
     dependencies: $dependencies,
 
+    prefixItems: $prefixItems,
     items: $items,
     additionalItems: $additionalItems,
     unevaluatedItems: $unevaluatedItems,
@@ -115,30 +116,29 @@ export function validate(
     maxLength: $maxLength,
     pattern: $pattern,
 
-    __absolute_ref__
+    __absolute_ref__,
+    __absolute_recursive_ref__
   } = schema;
 
   const errors: OutputUnit[] = [];
 
-  if ($ref !== undefined) {
-    const uri = __absolute_ref__ || $ref;
-    const refSchema = lookup[uri];
-    if (refSchema === undefined) {
-      let message = `Unresolved $ref "${$ref}".`;
-      if (__absolute_ref__ && __absolute_ref__ !== $ref) {
-        message += `  Absolute URI "${__absolute_ref__}".`;
-      }
-      message += `\nKnown schemas:\n- ${Object.keys(lookup).join('\n- ')}`;
-      throw new Error(message);
-    }
-    const keywordLocation = `${schemaLocation}/$ref`;
+  if ($recursiveAnchor === true && recursiveAnchor === null) {
+    recursiveAnchor = schema;
+  }
+
+  if ($recursiveRef === '#') {
+    const refSchema =
+      recursiveAnchor === null
+        ? (lookup[__absolute_recursive_ref__!] as Schema)
+        : recursiveAnchor;
+    const keywordLocation = `${schemaLocation}/$recursiveRef`;
     const result = validate(
       instance,
-      refSchema,
+      recursiveAnchor === null ? schema : recursiveAnchor,
       draft,
       lookup,
       shortCircuit,
-      recursiveAnchor,
+      refSchema,
       instanceLocation,
       keywordLocation,
       evaluated
@@ -147,27 +147,30 @@ export function validate(
       errors.push(
         {
           instanceLocation,
-          keyword: '$ref',
+          keyword: '$recursiveRef',
           keywordLocation,
           error: 'A subschema had errors.'
         },
         ...result.errors
       );
     }
-    if (draft === '4' || draft === '7') {
-      return { valid: errors.length === 0, errors };
-    }
   }
 
-  if ($recursiveAnchor === true && recursiveAnchor === null) {
-    recursiveAnchor = schema;
-  }
-
-  if ($recursiveRef === '#') {
-    const keywordLocation = `${schemaLocation}/$recursiveRef`;
+  if ($ref !== undefined) {
+    const uri = __absolute_ref__ || $ref;
+    const refSchema = lookup[uri];
+    if (refSchema === undefined) {
+      let message = `Unresolved $ref "${$ref}".`;
+      if (__absolute_ref__ && __absolute_ref__ !== $ref) {
+        message += `  Absolute URI "${__absolute_ref__}".`;
+      }
+      message += `\nKnown schemas:\n- ${Object.keys(lookup).join('\n- ')}`;
+      throw new Error(message);
+    }
+    const keywordLocation = `${schemaLocation}/$ref`;
     const result = validate(
       instance,
-      recursiveAnchor === null ? schema : recursiveAnchor,
+      refSchema,
       draft,
       lookup,
       shortCircuit,
@@ -180,13 +183,16 @@ export function validate(
       errors.push(
         {
           instanceLocation,
-          keyword: '$recursiveRef',
+          keyword: '$ref',
           keywordLocation,
           error: 'A subschema had errors.'
         },
         ...result.errors
       );
     }
+    if (draft === '4' || draft === '7') {
+      return { valid: errors.length === 0, errors };
+    }
   }
 
   if (Array.isArray($type)) {
@@ -295,25 +301,31 @@ export function validate(
     }
   }
 
+  let subEvaluateds: Array<Evaluated> = [];
+
   if ($anyOf !== undefined) {
     const keywordLocation = `${schemaLocation}/anyOf`;
     const errorsLength = errors.length;
     let anyValid = false;
     for (let i = 0; i < $anyOf.length; i++) {
       const subSchema = $anyOf[i];
+      const subEvaluated: Evaluated = Object.create(evaluated);
       const result = validate(
         instance,
         subSchema,
         draft,
         lookup,
         shortCircuit,
-        recursiveAnchor,
+        $recursiveAnchor === true ? recursiveAnchor : null,
         instanceLocation,
         `${keywordLocation}/${i}`,
-        evaluated
+        subEvaluated
       );
       errors.push(...result.errors);
       anyValid = anyValid || result.valid;
+      if (result.valid) {
+        subEvaluateds.push(subEvaluated);
+      }
     }
     if (anyValid) {
       errors.length = errorsLength;
@@ -333,19 +345,23 @@ export function validate(
     let allValid = true;
     for (let i = 0; i < $allOf.length; i++) {
       const subSchema = $allOf[i];
+      const subEvaluated: Evaluated = Object.create(evaluated);
       const result = validate(
         instance,
         subSchema,
         draft,
         lookup,
         shortCircuit,
-        recursiveAnchor,
+        $recursiveAnchor === true ? recursiveAnchor : null,
         instanceLocation,
         `${keywordLocation}/${i}`,
-        evaluated
+        subEvaluated
       );
       errors.push(...result.errors);
       allValid = allValid && result.valid;
+      if (result.valid) {
+        subEvaluateds.push(subEvaluated);
+      }
     }
     if (allValid) {
       errors.length = errorsLength;
@@ -363,18 +379,22 @@ export function validate(
     const keywordLocation = `${schemaLocation}/oneOf`;
     const errorsLength = errors.length;
     const matches = $oneOf.filter((subSchema, i) => {
+      const subEvaluated: Evaluated = Object.create(evaluated);
       const result = validate(
         instance,
         subSchema,
         draft,
         lookup,
         shortCircuit,
-        recursiveAnchor,
+        $recursiveAnchor === true ? recursiveAnchor : null,
         instanceLocation,
         `${keywordLocation}/${i}`,
-        evaluated
+        subEvaluated
       );
       errors.push(...result.errors);
+      if (result.valid) {
+        subEvaluateds.push(subEvaluated);
+      }
       return result.valid;
     }).length;
     if (matches === 1) {
@@ -389,6 +409,10 @@ export function validate(
     }
   }
 
+  if (instanceType === 'object' || instanceType === 'array') {
+    Object.assign(evaluated, ...subEvaluateds);
+  }
+
   if ($if !== undefined) {
     const keywordLocation = `${schemaLocation}/if`;
     const conditionResult = validate(
@@ -519,7 +543,7 @@ export function validate(
       const keywordLocation = `${schemaLocation}/dependantRequired`;
       for (const key in $dependentRequired) {
         if (key in instance) {
-          const required = $dependentRequired[key];
+          const required = $dependentRequired[key] as string[];
           for (const dependantKey of required) {
             if (!(dependantKey in instance)) {
               errors.push({
@@ -568,7 +592,7 @@ export function validate(
       const keywordLocation = `${schemaLocation}/dependencies`;
       for (const key in $dependencies) {
         if (key in instance) {
-          const propsOrSchema = $dependencies[key];
+          const propsOrSchema = $dependencies[key] as Schema | string[];
           if (Array.isArray(propsOrSchema)) {
             for (const dependantKey of propsOrSchema) {
               if (!(dependantKey in instance)) {
@@ -608,9 +632,6 @@ export function validate(
     }
 
     const thisEvaluated = Object.create(null);
-    if (!evaluated || !evaluated.properties) {
-      throw new Error('evaluated.properties should be an object');
-    }
 
     let stop = false;
 
@@ -632,7 +653,7 @@ export function validate(
           `${keywordLocation}/${encodePointer(key)}`
         );
         if (result.valid) {
-          evaluated.properties[key] = thisEvaluated[key] = true;
+          evaluated[key] = thisEvaluated[key] = true;
         } else {
           stop = shortCircuit;
           errors.push(
@@ -672,7 +693,7 @@ export function validate(
             `${keywordLocation}/${encodePointer(pattern)}`
           );
           if (result.valid) {
-            evaluated.properties[key] = thisEvaluated[key] = true;
+            evaluated[key] = thisEvaluated[key] = true;
           } else {
             stop = shortCircuit;
             errors.push(
@@ -707,7 +728,7 @@ export function validate(
           keywordLocation
         );
         if (result.valid) {
-          evaluated.properties[key] = true;
+          evaluated[key] = true;
         } else {
           stop = shortCircuit;
           errors.push(
@@ -724,7 +745,7 @@ export function validate(
     } else if (!stop && $unevaluatedProperties !== undefined) {
       const keywordLocation = `${schemaLocation}/unevaluatedProperties`;
       for (const key in instance) {
-        if (!evaluated.properties[key]) {
+        if (!evaluated[key]) {
           const subInstancePointer = `${instanceLocation}/${encodePointer(
             key
           )}`;
@@ -739,7 +760,7 @@ export function validate(
             keywordLocation
           );
           if (result.valid) {
-            evaluated.properties[key] = true;
+            evaluated[key] = true;
           } else {
             errors.push(
               {
@@ -773,13 +794,41 @@ export function validate(
       });
     }
 
-    if (!evaluated || evaluated.items === undefined) {
-      throw new Error('evaluated.items should be a number');
-    }
-
     const length: number = instance.length;
     let i = 0;
     let stop = false;
+
+    if ($prefixItems !== undefined) {
+      const keywordLocation = `${schemaLocation}/prefixItems`;
+      const length2 = Math.min($prefixItems.length, length);
+      for (; i < length2; i++) {
+        const result = validate(
+          instance[i],
+          $prefixItems[i],
+          draft,
+          lookup,
+          shortCircuit,
+          recursiveAnchor,
+          `${instanceLocation}/${i}`,
+          `${keywordLocation}/${i}`
+        );
+        evaluated[i] = true;
+        if (!result.valid) {
+          stop = shortCircuit;
+          errors.push(
+            {
+              instanceLocation,
+              keyword: 'prefixItems',
+              keywordLocation,
+              error: `Items did not match schema.`
+            },
+            ...result.errors
+          );
+          if (stop) break;
+        }
+      }
+    }
+
     if ($items !== undefined) {
       const keywordLocation = `${schemaLocation}/items`;
       if (Array.isArray($items)) {
@@ -795,6 +844,7 @@ export function validate(
             `${instanceLocation}/${i}`,
             `${keywordLocation}/${i}`
           );
+          evaluated[i] = true;
           if (!result.valid) {
             stop = shortCircuit;
             errors.push(
@@ -821,6 +871,7 @@ export function validate(
             `${instanceLocation}/${i}`,
             keywordLocation
           );
+          evaluated[i] = true;
           if (!result.valid) {
             stop = shortCircuit;
             errors.push(
@@ -837,8 +888,6 @@ export function validate(
         }
       }
 
-      evaluated.items = Math.max(i, evaluated.items);
-
       if (!stop && $additionalItems !== undefined) {
         const keywordLocation = `${schemaLocation}/additionalItems`;
         for (; i < length; i++) {
@@ -852,6 +901,7 @@ export function validate(
             `${instanceLocation}/${i}`,
             keywordLocation
           );
+          evaluated[i] = true;
           if (!result.valid) {
             stop = shortCircuit;
             errors.push(
@@ -865,36 +915,7 @@ export function validate(
             );
           }
         }
-        evaluated.items = Math.max(i, evaluated.items);
-      }
-    }
-
-    if (!stop && $unevaluatedItems !== undefined) {
-      const keywordLocation = `${schemaLocation}/unevaluatedItems`;
-      for (i = Math.max(evaluated.items, 0); i < length; i++) {
-        const result = validate(
-          instance[i],
-          $unevaluatedItems,
-          draft,
-          lookup,
-          shortCircuit,
-          recursiveAnchor,
-          `${instanceLocation}/${i}`,
-          keywordLocation
-        );
-        if (!result.valid) {
-          errors.push(
-            {
-              instanceLocation,
-              keyword: 'unevaluatedItems',
-              keywordLocation,
-              error: `Items did not match unevaluated items schema.`
-            },
-            ...result.errors
-          );
-        }
       }
-      evaluated.items = Math.max(i, evaluated.items);
     }
 
     if ($contains !== undefined) {
@@ -916,22 +937,20 @@ export function validate(
         const keywordLocation = `${schemaLocation}/contains`;
         const errorsLength = errors.length;
         let contained = 0;
-        for (let i = 0; i < length; i++) {
+        for (let j = 0; j < length; j++) {
           const result = validate(
-            instance[i],
+            instance[j],
             $contains,
             draft,
             lookup,
             shortCircuit,
             recursiveAnchor,
-            `${instanceLocation}/${i}`,
+            `${instanceLocation}/${j}`,
             keywordLocation
           );
           if (result.valid) {
+            evaluated[j] = true;
             contained++;
-            if ($minContains === undefined && $maxContains === undefined) {
-              break;
-            }
           } else {
             errors.push(...result.errors);
           }
@@ -970,6 +989,37 @@ export function validate(
       }
     }
 
+    if (!stop && $unevaluatedItems !== undefined) {
+      const keywordLocation = `${schemaLocation}/unevaluatedItems`;
+      for (i; i < length; i++) {
+        if (evaluated[i]) {
+          continue;
+        }
+        const result = validate(
+          instance[i],
+          $unevaluatedItems,
+          draft,
+          lookup,
+          shortCircuit,
+          recursiveAnchor,
+          `${instanceLocation}/${i}`,
+          keywordLocation
+        );
+        evaluated[i] = true;
+        if (!result.valid) {
+          errors.push(
+            {
+              instanceLocation,
+              keyword: 'unevaluatedItems',
+              keywordLocation,
+              error: `Items did not match unevaluated items schema.`
+            },
+            ...result.errors
+          );
+        }
+      }
+    }
+
     if ($uniqueItems) {
       for (let j = 0; j < length; j++) {
         const a = instance[j];

package/tsconfig.json

@@ -1,9 +1,14 @@
 {
   "extends": "../../tsconfig-base",
   "compilerOptions": {
-    "target": "esnext",
-    "lib": ["esnext", "webworker"],
-    "types": ["chai", "mocha"],
+    "target": "ES2021",
+    "lib": ["esnext"],
+    "types": [
+      "chai",
+      "mocha",
+      "@cfworker/worker-types",
+      "@cloudflare/workers-types"
+    ],
     "outDir": "dist",
     "rootDir": "./src"
   },

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020 Jeremy Danyow
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.