fix: process combiners placed under arrays

Author: P0lip

src/__fixtures__/todo-allof.schema.json

@@ -0,0 +1,84 @@
+{
+  "type": "array",
+  "items": {
+    "title": "Todo Full",
+    "allOf": [
+      {
+        "title": "Todo Partial",
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "completed": {
+            "type": [
+              "boolean",
+              "null"
+            ]
+          }
+        },
+        "required": [
+          "name",
+          "completed"
+        ],
+        "x-tags": [
+          "Todos"
+        ]
+      },
+      {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "minimum": 0,
+            "maximum": 1000000
+          },
+          "completed_at": {
+            "type": [
+              "string",
+              "null"
+            ],
+            "format": "date-time"
+          },
+          "created_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "updated_at": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "user": {
+            "title": "User",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "The user's full name."
+              },
+              "age": {
+                "type": "number",
+                "minimum": 0,
+                "maximum": 150
+              }
+            },
+            "required": [
+              "name",
+              "age"
+            ],
+            "x-tags": [
+              "Todos"
+            ]
+          }
+        },
+        "required": [
+          "id",
+          "user"
+        ]
+      }
+    ],
+    "x-tags": [
+      "Todos"
+    ]
+  }
+}

src/tree/__tests__/__snapshots__/populateTree.spec.ts.snap

@@ -359,3 +359,88 @@ Object {
   "parent": null,
 }
 `;
+
+exports[`populateTree util should match todo-allof.schema.json 1`] = `
+Object {
+  "children": Array [
+    Object {
+      "children": Array [
+        Object {
+          "children": Array [
+            Object {
+              "children": Array [
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+              ],
+              "id": "random-id",
+              "name": "",
+              "parent": [Circular],
+            },
+            Object {
+              "children": Array [
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+                Object {
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+                Object {
+                  "children": Array [
+                    Object {
+                      "id": "random-id",
+                      "name": "",
+                      "parent": [Circular],
+                    },
+                    Object {
+                      "id": "random-id",
+                      "name": "",
+                      "parent": [Circular],
+                    },
+                  ],
+                  "id": "random-id",
+                  "name": "",
+                  "parent": [Circular],
+                },
+              ],
+              "id": "random-id",
+              "name": "",
+              "parent": [Circular],
+            },
+          ],
+          "id": "random-id",
+          "name": "",
+          "parent": [Circular],
+        },
+      ],
+      "id": "random-id",
+      "name": "",
+      "parent": [Circular],
+    },
+  ],
+  "id": "random-id",
+  "name": "",
+  "parent": null,
+}
+`;

src/tree/__tests__/populateTree.spec.ts

@@ -18,6 +18,7 @@ describe('populateTree util', () => {
     'array-of-objects.json',
     'array-of-refs.json',
     'array-of-allofs.json',
+    'todo-allof.schema.json',
     'tickets.schema.json',
   ])('should match %s', filename => {
     const schema = JSON.parse(fs.readFileSync(path.resolve(BASE_PATH, filename), 'utf8'));

src/tree/populateTree.ts

@@ -5,9 +5,9 @@ import { JSONSchema4 } from 'json-schema';
 import { isObject as _isObject } from 'lodash';
 import { IArrayNode, IObjectNode, SchemaKind, SchemaNode, SchemaTreeListNode } from '../types';
 import { mergeAllOf } from '../utils';
+import { getCombiner } from '../utils/getCombiner';
 import { getPrimaryType } from '../utils/getPrimaryType';
 import { isCombinerNode, isRefNode } from '../utils/guards';
-import { isCombiner } from '../utils/isCombiner';
 import { metadataStore } from './metadata';
 import { walk } from './walk';
 
@@ -106,8 +106,10 @@ function processArray(
       case SchemaKind.Array:
         return processArray(node, schema.items as IObjectNode, level, [...path, 'items'], options);
       default:
-        if (typeof subtype === 'string' && isCombiner(subtype)) {
-          return processArray(node, schema.items as IObjectNode, level, [...path, 'items'], options);
+        const combiner = getCombiner(schema.items);
+        if (combiner) {
+          (node as TreeListParentNode).children = [];
+          populateTree(schema.items, node as TreeListParentNode, level, [...path, 'items'], options);
         }
     }
   }