@hyperjump/json-schema 1.2.4 → 1.2.6

package/draft-04/additionalItems.js

@@ -23,7 +23,16 @@ const interpret = ([numberOfItems, additionalItems], instance, ast, dynamicAncho
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  if (!interpret(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/lib/fetch.js

@@ -9,10 +9,11 @@ export default async (url, options) => {
     const filePath = Url.fileURLToPath(url);
     const fd = await fs.open(filePath);
     const stream = fd.createReadStream();
-    return new Response(stream, {
-      url: url,
+    const response = new Response(stream, {
       headers: { "Content-Type": MediaTypes.getContentType(filePath) }
     });
+    Object.defineProperty(response, "url", { value: url });
+    return response;
   } else {
     return fetch(url, options);
   }

package/lib/keywords/items.js

@@ -8,8 +8,8 @@ const id = "https://json-schema.org/keyword/items";
 
 const compile = async (schema, ast, parentSchema) => {
   const prefixItemKeyword = getKeywordName(schema.dialectId, "https://json-schema.org/keyword/prefixItems");
-  const items = await Schema.step(prefixItemKeyword, parentSchema);
-  const numberOfPrefixItems = Schema.typeOf(items, "array") ? Schema.length(items) : 0;
+  const prefixItems = await Schema.step(prefixItemKeyword, parentSchema);
+  const numberOfPrefixItems = Schema.typeOf(prefixItems, "array") ? Schema.length(prefixItems) : 0;
 
   return [numberOfPrefixItems, await Validation.compile(schema, ast)];
 };
@@ -23,7 +23,16 @@ const interpret = ([numberOfPrefixItems, items], instance, ast, dynamicAnchors)
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  if (!interpret(keywordValue, instance, ast, dynamicAnchors)) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = keywordValue[0]; ndx < Instance.length(instance); ndx++) {
+    evaluatedIndexes.add(ndx);
+  }
+
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/lib/keywords/unevaluatedItems.js

@@ -21,7 +21,18 @@ const interpret = ([schemaUrl, unevaluatedItems], instance, ast, dynamicAnchors)
 };
 
 const collectEvaluatedItems = (keywordValue, instance, ast, dynamicAnchors) => {
-  return interpret(keywordValue, instance, ast, dynamicAnchors) && new Set(Instance.map((item, ndx) => ndx, instance));
+  const itemIndexes = Validation.collectEvaluatedItems(keywordValue[0], instance, ast, dynamicAnchors, true);
+  if (!itemIndexes) {
+    return false;
+  }
+
+  const evaluatedIndexes = new Set();
+  for (let ndx = 0; ndx < Instance.length(instance); ndx++) {
+    if (!itemIndexes.has(ndx)) {
+      evaluatedIndexes.add(ndx);
+    }
+  }
+  return evaluatedIndexes;
 };
 
 export default { id, compile, interpret, collectEvaluatedItems };

package/lib/openapi.js

@@ -11,7 +11,9 @@ addMediaTypePlugin("application/openapi+json", {
     let defaultDialect;
     const version = doc.openapi || contentTypeParameters.version;
 
-    if (is30(version)) {
+    if (!version) {
+      throw Error("Invalid OpenAPI document. Add the 'openapi' field and try again.");
+    } else if (is30(version)) {
       defaultDialect = "https://spec.openapis.org/oas/3.0/schema";
     } else if (is31(version)) {
       if (!("jsonSchemaDialect" in doc) || doc.jsonSchemaDialect === "https://spec.openapis.org/oas/3.1/dialect/base") {
@@ -20,7 +22,7 @@ addMediaTypePlugin("application/openapi+json", {
         defaultDialect = `https://spec.openapis.org/oas/3.1/schema-${encodeURIComponent(doc.jsonSchemaDialect)}`;
       }
     } else {
-      throw Error("Invalid OpenAPI document. Add the 'openapi' field and try again.");
+      throw Error(`Encountered unsupported OpenAPI version '${version}' in ${response.url}`);
     }
 
     return [doc, defaultDialect];

package/openapi-3-0/index.d.ts

@@ -33,28 +33,28 @@ export type OasSchema30 = {
   anyOf?: OasSchema30[];
   oneOf?: OasSchema30[];
   not?: OasSchema30;
-  example: Json;
-  discriminator: Discriminator;
-  externalDocs: ExternalDocs;
-  xml: Xml;
+  example?: Json;
+  discriminator?: Discriminator;
+  externalDocs?: ExternalDocs;
+  xml?: Xml;
 };
 
 type Discriminator = {
   propertyName: string;
-  mappings: Record<string, string>;
+  mappings?: Record<string, string>;
 };
 
 type ExternalDocs = {
   url: string;
-  description: string;
+  description?: string;
 };
 
 type Xml = {
-  name: string;
-  namespace: string;
-  prefix: string;
-  attribute: boolean;
-  wrapped: boolean;
+  name?: string;
+  namespace?: string;
+  prefix?: string;
+  attribute?: boolean;
+  wrapped?: boolean;
 };
 
 export * from "../lib/index.js";

package/openapi-3-0/schema/2021-09-28.js

@@ -193,16 +193,7 @@ export default {
         "schemas": {
           "type": "object",
           "patternProperties": {
-            "^[a-zA-Z0-9\\.\\-_]+$": {
-              "oneOf": [
-                {
-                  "$ref": "#/definitions/Schema"
-                },
-                {
-                  "$ref": "#/definitions/Reference"
-                }
-              ]
-            }
+            "^[a-zA-Z0-9\\.\\-_]+$": { "$ref": "#/definitions/Schema" }
           }
         },
         "responses": {
@@ -384,16 +375,7 @@ export default {
     "MediaType": {
       "type": "object",
       "properties": {
-        "schema": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Schema"
-            },
-            {
-              "$ref": "#/definitions/Reference"
-            }
-          ]
-        },
+        "schema": { "$ref": "#/definitions/Schema" },
         "example": {
         },
         "examples": {
@@ -481,16 +463,7 @@ export default {
           "type": "boolean",
           "default": false
         },
-        "schema": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Schema"
-            },
-            {
-              "$ref": "#/definitions/Reference"
-            }
-          ]
-        },
+        "schema": { "$ref": "#/definitions/Schema" },
         "content": {
           "type": "object",
           "additionalProperties": {
@@ -853,16 +826,7 @@ export default {
           "type": "boolean",
           "default": false
         },
-        "schema": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/Schema"
-            },
-            {
-              "$ref": "#/definitions/Reference"
-            }
-          ]
-        },
+        "schema": { "$ref": "#/definitions/Schema" },
         "content": {
           "type": "object",
           "additionalProperties": {

package/openapi-3-1/index.d.ts

@@ -61,28 +61,28 @@ export type OasSchema31 = boolean | {
   contentMediaType?: string;
   contentEncoding?: string;
   contentSchema?: OasSchema31;
-  example: Json;
-  discriminator: Discriminator;
-  externalDocs: ExternalDocs;
-  xml: Xml;
+  example?: Json;
+  discriminator?: Discriminator;
+  externalDocs?: ExternalDocs;
+  xml?: Xml;
 };
 
 type Discriminator = {
   propertyName: string;
-  mappings: Record<string, string>;
+  mappings?: Record<string, string>;
 };
 
 type ExternalDocs = {
   url: string;
-  description: string;
+  description?: string;
 };
 
 type Xml = {
-  name: string;
-  namespace: string;
-  prefix: string;
-  attribute: boolean;
-  wrapped: boolean;
+  name?: string;
+  namespace?: string;
+  prefix?: string;
+  attribute?: boolean;
+  wrapped?: boolean;
 };
 
 export * from "../lib/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperjump/json-schema",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A JSON Schema validator with support for custom keywords, vocabularies, and dialects",
   "type": "module",
   "main": "./stable/index.js",