[Bugfix] Fix complex intersections of allOf/anyOf/properties/required (…

…fix #381)

src/normalizer.ts

@@ -222,6 +222,20 @@ rules.set('Transform const to singleton enum', schema => {
   }
 })
 
+// @see https://json-schema.org/understanding-json-schema/reference/combining#factoring-schemas
+rules.set('Propagate additionalProperties=false to all factors', schema => {
+  const parent = schema[Parent]
+  if (!parent || parent.additionalProperties !== false) {
+    return
+  }
+
+  if (schema.hasOwnProperty('additionalProperties')) {
+    return
+  }
+
+  schema.additionalProperties = false
+})
+
 export function normalize(
   rootSchema: LinkedJSONSchema,
   dereferencedPaths: DereferencedPaths,

src/typesOfSchema.ts

@@ -140,8 +140,14 @@ const matchers: Record<SchemaType, (schema: JSONSchema) => boolean> = {
     }
     return 'enum' in schema
   },
-  UNNAMED_SCHEMA() {
-    return false // Explicitly handled as the default case
+  UNNAMED_SCHEMA(schema) {
+    return Boolean(
+      !('$id' in schema) &&
+        (schema.patternProperties?.length ||
+          schema.properties?.length ||
+          // TODO: fix the typing
+          (schema.required as string[])?.length),
+    )
   },
   UNTYPED_ARRAY(schema) {
     return schema.type === 'array' && !('items' in schema)

test/e2e/allOf.properties.1.ts

@@ -0,0 +1,15 @@
+export const input = {
+  type: 'object',
+  properties: {
+    a: {type: 'string'},
+    b: {type: 'string'},
+    c: {type: 'string'},
+  },
+  allOf: [
+    {required: ['a']},
+    {
+      oneOf: [{required: ['b']}, {required: ['c']}],
+    },
+  ],
+  additionalProperties: false,
+}

test/e2e/allOf.properties.2.ts

@@ -0,0 +1,14 @@
+export const input = {
+  type: 'object',
+  properties: {
+    a: {type: 'string'},
+    b: {type: 'string'},
+    c: {type: 'string'},
+  },
+  allOf: [
+    {required: ['a']},
+    {
+      oneOf: [{required: ['b']}, {required: ['c']}],
+    },
+  ],
+}

test/e2e/allOf.properties.3.ts

@@ -0,0 +1,21 @@
+export const input = {
+  type: 'object',
+  properties: {
+    a: {type: 'string'},
+    b: {type: 'string'},
+    c: {type: 'string'},
+  },
+  allOf: [
+    {required: ['a']},
+    {
+      oneOf: [
+        {required: ['b']},
+        // Non-existent property is invalid, but it's not up to JSTT to validate this
+        // "An object instance is valid against this keyword if every
+        // item in the array is the name of a property in the instance."
+        // @see https://json-schema.org/draft/2020-12/json-schema-validation#name-required
+        {required: ['d']},
+      ],
+    },
+  ],
+}

test/e2e/allOf.ts

@@ -21,7 +21,7 @@ export const input = {
         a: {type: 'string'},
       },
       additionalProperties: false,
-      required: ['a', 'b'],
+      required: ['a'],
     },
   },
   required: ['foo', 'bar'],