fix: allOf withing $ref within allOf (#368) (#375)

Author: LEVI-RIVKIN

index.js

@@ -819,6 +819,12 @@ function buildCode (location, code, laterCode, name) {
     `
   }
 
+  if (schema.allOf) {
+    const builtCode = buildCodeWithAllOfs(location, code, laterCode, name)
+    code = builtCode.code
+    laterCode = builtCode.laterCode
+  }
+
   return { code: code, laterCode: laterCode }
 }
 

test/allof.test.js

@@ -277,6 +277,58 @@ test('object with multiple $refs in allOf', (t) => {
   t.equal(value, '{"id1":1,"id2":2}')
 })
 
+test('allOf with nested allOf in $ref', (t) => {
+  t.plan(1)
+
+  const schema = {
+    title: 'allOf with nested allOf in $ref',
+    type: 'object',
+    definitions: {
+      group: {
+        type: 'object',
+        allOf: [{
+          properties: {
+            id2: {
+              type: 'integer'
+            }
+          }
+        }, {
+          properties: {
+            id3: {
+              type: 'integer'
+            }
+          }
+        }]
+      }
+    },
+    allOf: [
+      {
+        type: 'object',
+        properties: {
+          id1: {
+            type: 'integer'
+          }
+        },
+        required: [
+          'id1'
+        ]
+      },
+      {
+        $ref: '#/definitions/group'
+      }
+    ]
+  }
+
+  const stringify = build(schema)
+  const value = stringify({
+    id1: 1,
+    id2: 2,
+    id3: 3,
+    id4: 4 // extra prop shouldn't be in result
+  })
+  t.equal(value, '{"id1":1,"id2":2,"id3":3}')
+})
+
 test('object with external $refs in allOf', (t) => {
   t.plan(1)