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

Author: bcherny

src/normalizer.ts

@@ -3,6 +3,7 @@ import {appendToDescription, escapeBlockComment, isSchemaLike, justName, toSafeS
 import {Options} from './'
 import {DereferencedPaths} from './resolver'
 import {isDeepStrictEqual} from 'util'
+import {typesOfSchema} from './typesOfSchema'
 
 type Rule = (
   schema: LinkedJSONSchema,
@@ -222,6 +223,39 @@ rules.set('Transform const to singleton enum', schema => {
   }
 })
 
+rules.set('Propagate additionalProperties=false to all intersection members', schema => {
+  if (schema.additionalProperties !== false) {
+    return
+  }
+  schema.allOf?.forEach(_ => {
+    if ('additionalProperties' in _) {
+      return
+    }
+    if (typesOfSchema(_)[0] !== 'NAMED_SCHEMA' && typesOfSchema(_)[0] !== 'UNNAMED_SCHEMA') {
+      return
+    }
+    _.additionalProperties = false
+  })
+  schema.anyOf?.forEach(_ => {
+    if ('additionalProperties' in _) {
+      return
+    }
+    if (typesOfSchema(_)[0] !== 'NAMED_SCHEMA' && typesOfSchema(_)[0] !== 'UNNAMED_SCHEMA') {
+      return
+    }
+    _.additionalProperties = false
+  })
+  schema.oneOf?.forEach(_ => {
+    if ('additionalProperties' in _) {
+      return
+    }
+    if (typesOfSchema(_)[0] !== 'NAMED_SCHEMA' && typesOfSchema(_)[0] !== 'UNNAMED_SCHEMA') {
+      return
+    }
+    _.additionalProperties = false
+  })
+})
+
 export function normalize(
   rootSchema: LinkedJSONSchema,
   dereferencedPaths: DereferencedPaths,

src/parser.ts

@@ -427,6 +427,20 @@ via the \`patternProperty\` "${key.replace('*/', '*\\/')}".`
     )
   }
 
+  if (schema.required) {
+    asts = asts.concat(
+      map(schema.required, 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)