release: bump version to v9.1.1

Author: Sascha Goldhofer

dist/jsonSchemaLibrary.js

@@ -5,6 +5,7 @@ import { JsonSchema, JsonValidator, JsonError } from "../types";
 import { Draft } from "../draft";
 export declare function resolveAllOf(draft: Draft, data: any, schema?: JsonSchema): JsonSchema | JsonError;
 /**
+ * @attention: subschemas have to be resolved upfront (e.g. if-else that do not apply)
  * Merge all allOf sub schema into a single schema. Returns undefined for
  * missing allOf definition.
  *

dist/lib/features/allOf.d.ts

@@ -27,6 +27,7 @@ export function resolveAllOf(draft, data, schema = draft.rootSchema) {
     return mergedSchema;
 }
 /**
+ * @attention: subschemas have to be resolved upfront (e.g. if-else that do not apply)
  * Merge all allOf sub schema into a single schema. Returns undefined for
  * missing allOf definition.
  *

dist/module/lib/features/allOf.js

@@ -6,6 +6,9 @@
  * @returns json schema defined by if-then-else or undefined
  */
 export function resolveIfSchema(draft, schema, data) {
+    if (schema.if == null) {
+        return undefined;
+    }
     if (schema.if === false) {
         return schema.else;
     }

dist/module/lib/features/if.js

@@ -43,9 +43,25 @@ export function resolveDynamicSchema(draft, schema, data, pointer) {
         }
     }
     // @feature allOf
-    const allOfSchema = mergeAllOfSchema(draft, schema);
-    if (allOfSchema) {
-        resolvedSchema = mergeSchema(resolvedSchema !== null && resolvedSchema !== void 0 ? resolvedSchema : {}, allOfSchema);
+    if (Array.isArray(schema.allOf)) {
+        const allOf = schema.allOf.map((s) => {
+            // before merging allOf schema we need to resolve all subschemas
+            // if not, we would wrongly merge oneOf, if-then statements, etc
+            if (isDynamicSchema(s)) {
+                // copy of reduceSchema
+                let result = resolveDynamicSchema(draft, s, data, pointer);
+                if (result) {
+                    result = mergeSchema(s, result);
+                    return omit(result, ...toOmit);
+                }
+                return undefined;
+            }
+            return s;
+        });
+        if (allOf.length > 0) {
+            const allOfSchema = mergeAllOfSchema(draft, { allOf });
+            resolvedSchema = mergeSchema(resolvedSchema !== null && resolvedSchema !== void 0 ? resolvedSchema : {}, allOfSchema);
+        }
     }
     // @feature anyOf
     const anyOfSchema = mergeValidAnyOfSchema(draft, schema, data);

dist/module/lib/resolveDynamicSchema.js

@@ -1,6 +1,6 @@
 {
     "name": "json-schema-library",
-    "version": "9.1.0",
+    "version": "9.1.1",
     "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",