refactor: draft-2020-12 use schemaNode for items boolean schema

Author: sagold

src/draft2019-09/keywords/additionalItems.ts

@@ -1,4 +1,3 @@
-import { isObject } from "../../utils/isObject";
 import { Keyword, JsonSchemaResolverParams, JsonSchemaValidatorParams, ValidationResult } from "../../Keyword";
 import { SchemaNode } from "../../types";
 import { getValue } from "../../utils/getValue";
@@ -19,7 +18,7 @@ export const additionalItemsKeyword: Keyword = {
 // must come as last resolver
 export function parseAdditionalItems(node: SchemaNode) {
     const { schema, evaluationPath, schemaLocation } = node;
-    if ((isObject(schema.additionalItems) || schema.additionalItems === true) && Array.isArray(schema.items)) {
+    if (schema.additionalItems != null && Array.isArray(schema.items)) {
         node.items = node.compileSchema(
             schema.additionalItems,
             `${evaluationPath}/additionalItems`,
@@ -39,7 +38,7 @@ function additionalItemsResolver({ node, key, data }: JsonSchemaResolverParams)
 
 function validateAdditionalItems({ node, data, pointer, path }: JsonSchemaValidatorParams) {
     const { schema } = node;
-    if (!Array.isArray(data) || data.length === 0) {
+    if (!Array.isArray(data) || data.length === 0 || node.items == null) {
         // - no items to validate
         return;
     }
@@ -51,10 +50,8 @@ function validateAdditionalItems({ node, data, pointer, path }: JsonSchemaValida
     const errors: ValidationResult[] = [];
     for (let i = startIndex; i < data.length; i += 1) {
         const item = data[i];
-        if (node.items) {
-            const validationResult = validateNode(node.items, item, `${pointer}/${i}`, path);
-            validationResult && errors.push(...validationResult);
-        } else if (schema.additionalItems === false) {
+        // @ts-expect-error boolean-schema
+        if (node.items?.schema === false) {
             errors.push(
                 node.createError("additional-items-error", {
                     key: i,
@@ -63,6 +60,10 @@ function validateAdditionalItems({ node, data, pointer, path }: JsonSchemaValida
                     schema
                 })
             );
+            // @ts-expect-error boolean-schema
+        } else if (node.items.schema !== true) {
+            const validationResult = validateNode(node.items, item, `${pointer}/${i}`, path);
+            validationResult && errors.push(...validationResult);
         }
     }
     return errors;

src/draft2019-09/keywords/items.ts

@@ -1,6 +1,5 @@
 import { Keyword, JsonSchemaResolverParams, JsonSchemaValidatorParams, ValidationResult } from "../../Keyword";
 import { SchemaNode } from "../../types";
-import { isObject } from "../../utils/isObject";
 import { validateNode } from "../../validateNode";
 
 export const itemsKeyword: Keyword = {
@@ -24,17 +23,17 @@ function itemsResolver({ node, key }: JsonSchemaResolverParams) {
 
 export function parseItems(node: SchemaNode) {
     const { schema, evaluationPath } = node;
-    if (isObject(schema.items)) {
+    if (Array.isArray(schema.items)) {
+        node.prefixItems = schema.items.map((itemSchema, index) =>
+            node.compileSchema(itemSchema, `${evaluationPath}/items/${index}`, `${node.schemaLocation}/items/${index}`)
+        );
+    } else if (schema.items != null) {
         const propertyNode = node.compileSchema(
             schema.items,
             `${evaluationPath}/items`,
             `${node.schemaLocation}/items`
         );
         node.items = propertyNode;
-    } else if (Array.isArray(schema.items)) {
-        node.prefixItems = schema.items.map((itemSchema, index) =>
-            node.compileSchema(itemSchema, `${evaluationPath}/items/${index}`, `${node.schemaLocation}/items/${index}`)
-        );
     }
 }
 
@@ -64,7 +63,8 @@ function validateItems({ node, data, pointer = "#", path }: JsonSchemaValidatorP
         return errors;
     }
 
-    if (node.items) {
+    // @ts-expect-error boolean schema
+    if (node.items.schema !== true) {
         for (let i = 0; i < data.length; i += 1) {
             const itemData = data[i];
             const result = validateNode(node.items, itemData, `${pointer}/${i}`, path);

src/getNodeChild.ts

@@ -36,6 +36,12 @@ export function getNodeChild(
     for (const resolver of node.resolvers) {
         const schemaNode = resolver({ data, key, node });
         if (isSchemaNode(schemaNode)) {
+            // @ts-expect-error boolean schema
+            if (schemaNode.schema === true) {
+                const generatedNode = schemaNode.compileSchema(schemaNode.createSchema(getValue(data, key)));
+                return { node: generatedNode, error: undefined };
+            }
+
             return { node: schemaNode, error: undefined };
         }
         if (isJsonError(schemaNode)) {

src/keywords/items.ts

@@ -1,6 +1,5 @@
 import { Keyword, JsonSchemaResolverParams, JsonSchemaValidatorParams, ValidationResult } from "../Keyword";
 import { SchemaNode } from "../types";
-import { isObject } from "../utils/isObject";
 import { validateNode } from "../validateNode";
 
 export const itemsKeyword: Keyword = {
@@ -24,7 +23,7 @@ function itemsResolver({ node, key }: JsonSchemaResolverParams) {
 
 export function parseItems(node: SchemaNode) {
     const { schema, evaluationPath } = node;
-    if (isObject(schema.items)) {
+    if (schema.items != null) {
         const propertyNode = node.compileSchema(
             schema.items,
             `${evaluationPath}/items`,