[Bugfix] Fix complex intersections of allOf/anyOf/properties/required (fix #381)

Author: bcherny

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/parser.ts

@@ -427,6 +427,25 @@ via the \`patternProperty\` "${key.replace('*/', '*\\/')}".`
     )
   }
 
+  if (schema.required) {
+    asts = asts.concat(
+      map(
+        schema.required.filter(
+          _ => !schema.properties?.hasOwnProperty(_) && !schema.patternProperties?.hasOwnProperty(_),
+        ),
+        key => {
+          return {
+            ast: {type: 'UNKNOWN'},
+            isPatternProperty: false,
+            isRequired: true,
+            isUnreachableDefinition: false,
+            keyName: key,
+          }
+        },
+      ),
+    )
+  }
+
   if (options.unreachableDefinitions) {
     asts = asts.concat(
       map(schema.$defs, (value, key: string) => {

src/typesOfSchema.ts

@@ -140,8 +140,8 @@ 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 !('$id' in schema) && ('patternProperties' in schema || 'properties' in schema || 'required' in schema)
   },
   UNTYPED_ARRAY(schema) {
     return schema.type === 'array' && !('items' in schema)