json-schema-library 9.3.3 → 9.3.5

package/dist/module/lib/getTemplate.js

@@ -7,7 +7,7 @@ import settings from "./config/settings";
 import { isJsonError } from "./types";
 import { isEmpty } from "./utils/isEmpty";
 import { resolveIfSchema } from "./features/if";
-import { mergeAllOfSchema } from "./features/allOf";
+import { mergeAllOfSchema, resolveSchema } from "./features/allOf";
 import { resolveDependencies } from "./features/dependencies";
 import { mergeSchema } from "./mergeSchema";
 const defaultOptions = settings.templateDefaultOptions;
@@ -57,7 +57,7 @@ function convertValue(type, value) {
  * @param pointer
  * @return resolved json-schema or input-schema
  */
-function createTemplateSchema(draft, schema, data, pointer) {
+function createTemplateSchema(draft, schema, data, pointer, opts) {
     // invalid schema
     if (getTypeOf(schema) !== "object") {
         return Object.assign({ pointer }, schema);
@@ -85,7 +85,16 @@ function createTemplateSchema(draft, schema, data, pointer) {
             .map((allOf, index) => shouldResolveRef(allOf, `${pointer}/allOf/${index}`))
             .reduceRight((next, before) => next && before, true);
         if (mayResolve) {
-            const resolvedSchema = mergeAllOfSchema(draft, schema);
+            // before merging all-of, we need to resolve all if-then-else statesments
+            // we need to udpate data on the way to trigger if-then-else schemas sequentially.
+            // Note that this will make if-then-else order-dependent
+            const allOf = [];
+            let extendedData = copy(data);
+            for (let i = 0; i < schema.allOf.length; i += 1) {
+                allOf.push(resolveSchema(draft, schema.allOf[i], extendedData));
+                extendedData = getTemplate(draft, extendedData, { type: schema.type, ...allOf[i] }, `${pointer}/allOf/${i}`, opts);
+            }
+            const resolvedSchema = mergeAllOfSchema(draft, { allOf });
             if (resolvedSchema) {
                 templateSchema = mergeSchema(templateSchema, resolvedSchema);
             }
@@ -112,7 +121,7 @@ function getTemplate(draft, data, _schema, pointer, opts) {
         throw new Error("Missing pointer");
     }
     // resolve $ref references, allOf and first anyOf definitions
-    let schema = createTemplateSchema(draft, _schema, data, pointer);
+    let schema = createTemplateSchema(draft, _schema, data, pointer, opts);
     if (!isJsonSchema(schema)) {
         return undefined;
     }
@@ -273,7 +282,7 @@ const TYPE = {
             return d;
         }
         // resolve allOf and first anyOf definition
-        const templateSchema = createTemplateSchema(draft, schema.items, data, pointer);
+        const templateSchema = createTemplateSchema(draft, schema.items, data, pointer, opts);
         if (templateSchema === false) {
             return d;
         }

package/dist/module/lib/step.js

@@ -78,7 +78,13 @@ const stepType = {
             if (targetSchema && Array.isArray(targetSchema.oneOf)) {
                 // @special case: this is a mix of a schema and optional definitions
                 // we resolve the schema here and add the original schema to `oneOfSchema`
-                return draft.resolveOneOf(data[key], targetSchema, `${pointer}/${key}`);
+                const resolvedSchema = draft.resolveOneOf(data[key], targetSchema, `${pointer}/${key}`);
+                for (const p in targetSchema) {
+                    if (p !== "oneOf" && resolvedSchema[p] === undefined) {
+                        resolvedSchema[p] = targetSchema[p];
+                    }
+                }
+                return resolvedSchema;
             }
             // resolved schema or error
             if (targetSchema) {

package/lib/features/allOf.ts

@@ -12,7 +12,7 @@ import { resolveIfSchema } from "./if";
  * resolves schema
  * when complete this will have much duplication to step.object etc
  */
-function resolveSchema(draft: Draft, schemaToResolve: JsonSchema, data: unknown): JsonSchema {
+export function resolveSchema(draft: Draft, schemaToResolve: JsonSchema, data: unknown): JsonSchema {
     const schema = { ...(draft.resolveRef(schemaToResolve) ?? {}) };
     const ifSchema = resolveIfSchema(draft, schema, data);
     if (ifSchema) {

package/lib/getTemplate.ts

@@ -8,7 +8,7 @@ import { JsonSchema, JsonPointer, isJsonError } from "./types";
 import { Draft } from "./draft";
 import { isEmpty } from "./utils/isEmpty";
 import { resolveIfSchema } from "./features/if";
-import { mergeAllOfSchema } from "./features/allOf";
+import { mergeAllOfSchema, resolveSchema } from "./features/allOf";
 import { resolveDependencies } from "./features/dependencies";
 import { mergeSchema } from "./mergeSchema";
 
@@ -78,7 +78,8 @@ function createTemplateSchema(
     draft: Draft,
     schema: JsonSchema,
     data: unknown,
-    pointer: JsonPointer
+    pointer: JsonPointer,
+    opts: TemplateOptions
 ): JsonSchema | false {
     // invalid schema
     if (getTypeOf(schema) !== "object") {
@@ -111,7 +112,17 @@ function createTemplateSchema(
             .reduceRight((next, before) => next && before, true);
 
         if (mayResolve) {
-            const resolvedSchema = mergeAllOfSchema(draft, schema);
+            // before merging all-of, we need to resolve all if-then-else statesments
+            // we need to udpate data on the way to trigger if-then-else schemas sequentially.
+            // Note that this will make if-then-else order-dependent
+            const allOf = [];
+            let extendedData = copy(data);
+            for (let i = 0; i < schema.allOf.length; i += 1) {
+                allOf.push(resolveSchema(draft, schema.allOf[i], extendedData));
+                extendedData = getTemplate(draft, extendedData, { type: schema.type, ...allOf[i] }, `${pointer}/allOf/${i}`, opts);
+            }
+
+            const resolvedSchema = mergeAllOfSchema(draft, { allOf });
             if (resolvedSchema) {
                 templateSchema = mergeSchema(templateSchema, resolvedSchema);
             }
@@ -148,7 +159,7 @@ function getTemplate(
     }
 
     // resolve $ref references, allOf and first anyOf definitions
-    let schema = createTemplateSchema(draft, _schema, data, pointer);
+    let schema = createTemplateSchema(draft, _schema, data, pointer, opts);
     if (!isJsonSchema(schema)) {
         return undefined;
     }
@@ -376,7 +387,7 @@ const TYPE: Record<
         }
 
         // resolve allOf and first anyOf definition
-        const templateSchema = createTemplateSchema(draft, schema.items, data, pointer);
+        const templateSchema = createTemplateSchema(draft, schema.items, data, pointer, opts);
         if (templateSchema === false) {
             return d;
         }

package/lib/step.ts

@@ -108,7 +108,17 @@ const stepType: Record<string, StepFunction> = {
             if (targetSchema && Array.isArray(targetSchema.oneOf)) {
                 // @special case: this is a mix of a schema and optional definitions
                 // we resolve the schema here and add the original schema to `oneOfSchema`
-                return draft.resolveOneOf(data[key], targetSchema, `${pointer}/${key}`);
+                const resolvedSchema = draft.resolveOneOf(
+                    data[key],
+                    targetSchema,
+                    `${pointer}/${key}`
+                );
+                for (const p in targetSchema) {
+                    if (p !== "oneOf" && resolvedSchema[p] === undefined) {
+                        resolvedSchema[p] = targetSchema[p];
+                    }
+                }
+                return resolvedSchema;
             }
 
             // resolved schema or error

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "json-schema-library",
-    "version": "9.3.3",
+    "version": "9.3.5",
     "description": "Customizable and hackable json-validator and json-schema utilities for traversal, data generation and validation",
     "module": "dist/module/index.js",
     "types": "dist/index.d.ts",