fix: handle object type placed among other types

Author: P0lip

src/components/__tests__/Property.spec.tsx

@@ -80,6 +80,35 @@ describe('Property component', () => {
   });
 
   describe('properties counter', () => {
+    test('given an object among other types, should still display the counter', () => {
+      const treeNode: SchemaTreeListNode = {
+        id: 'foo',
+        name: '',
+        parent: null,
+      };
+
+      const schema: JSONSchema4 = {
+        type: ['string', 'object'],
+        properties: {
+          foo: {
+            type: 'array',
+            items: {
+              type: 'integer',
+            },
+          },
+        },
+      };
+
+      metadataStore.set(treeNode, {
+        schemaNode: walk(schema).next().value.node,
+        path: [],
+        schema,
+      });
+
+      const wrapper = shallow(<Property node={treeNode} />);
+      expect(wrapper.findWhere(el => /^{\d\}$/.test(el.text())).first()).toHaveText('{1}');
+    });
+
     it('given missing properties property, should not display the counter', () => {
       const treeNode: SchemaTreeListNode = {
         id: 'foo',
@@ -98,7 +127,7 @@ describe('Property component', () => {
       });
 
       const wrapper = shallow(<Property node={treeNode} />);
-      expect(wrapper.findWhere(el => /^\{\d\}$/.test(el.text()))).not.toExist();
+      expect(wrapper.findWhere(el => /^{\d\}$/.test(el.text()))).not.toExist();
     });
 
     it('given nullish properties property, should not display the counter', () => {
@@ -120,7 +149,7 @@ describe('Property component', () => {
       });
 
       const wrapper = shallow(<Property node={treeNode} />);
-      expect(wrapper.findWhere(el => /^\{\d\}$/.test(el.text()))).not.toExist();
+      expect(wrapper.findWhere(el => /^{\d\}$/.test(el.text()))).not.toExist();
     });
 
     it('given object properties property, should display the counter', () => {
@@ -142,7 +171,7 @@ describe('Property component', () => {
       });
 
       const wrapper = shallow(<Property node={treeNode} />);
-      expect(wrapper.findWhere(el => /^\{\d\}$/.test(el.text())).first()).toHaveText('{0}');
+      expect(wrapper.findWhere(el => /^{\d\}$/.test(el.text())).first()).toHaveText('{0}');
     });
   });
 
@@ -170,6 +199,33 @@ describe('Property component', () => {
       expect(wrapper.find('div').first()).toHaveText('foo');
     });
 
+    test('given an object among other types, should still display its properties', () => {
+      const schema: JSONSchema4 = {
+        type: ['string', 'object'],
+        properties: {
+          foo: {
+            type: 'array',
+            items: {
+              type: 'integer',
+            },
+          },
+        },
+      };
+
+      const tree = new SchemaTree(schema, new TreeState(), {
+        expandedDepth: Infinity,
+        mergeAllOf: false,
+        resolveRef: void 0,
+        shouldResolveEagerly: false,
+        onPopulate: void 0,
+      });
+
+      tree.populate();
+
+      const wrapper = shallow(<Property node={tree.itemAt(1)!} />);
+      expect(wrapper.find('div').first()).toHaveText('foo');
+    });
+
     test('given an array of objects, should display names of those properties', () => {
       const schema: JSONSchema4 = {
         type: 'array',

src/components/shared/Property.tsx

@@ -31,7 +31,7 @@ function shouldShowPropertyName(treeNode: SchemaTreeListNode) {
       return false;
     }
 
-    let type = schemaNode.type;
+    let type = getPrimaryType(schemaNode);
 
     if (type === SchemaKind.Array && (schemaNode as IArrayNode).items) {
       type = getPrimaryType((schemaNode as IArrayNode).items!);
@@ -53,7 +53,7 @@ export const Property: React.FunctionComponent<IProperty> = ({ node: treeNode, o
   const subtype = isArrayNodeWithItems(node) ? (hasRefItems(node) ? '$ref' : inferType(node.items)) : void 0;
 
   const childrenCount = React.useMemo<number | null>(() => {
-    if (type === SchemaKind.Object) {
+    if (type === SchemaKind.Object || (Array.isArray(type) && type.includes(SchemaKind.Object))) {
       return count((node as IObjectNode).properties);
     }
 

src/tree/__tests__/tree.spec.ts

@@ -1170,4 +1170,43 @@ describe('SchemaTree', () => {
       expect(onPopulate).nthCalledWith(2, tree, tree.itemAt(0));
     });
   });
+
+  describe('tree correctness', () => {
+    // you can put tests verifying whether we generate expected tree
+    test('given multiple object and string type, should process properties', () => {
+      const schema: JSONSchema4 = {
+        type: ['string', 'object'],
+        properties: {
+          ids: {
+            type: 'array',
+            items: {
+              type: 'integer',
+            },
+          },
+        },
+      };
+
+      const tree = new SchemaTree(schema, new SchemaTreeState(), {
+        expandedDepth: Infinity,
+        mergeAllOf: true,
+        resolveRef: void 0,
+        shouldResolveEagerly: true,
+        onPopulate: void 0,
+      });
+
+      tree.populate();
+      expect(printTree(tree)).toMatchInlineSnapshot(`
+        "└─ #
+           ├─ type
+           │  ├─ 0: string
+           │  └─ 1: object
+           └─ children
+              └─ 0
+                 └─ #/properties/ids
+                    ├─ type: array
+                    └─ subtype: integer
+        "
+      `);
+    });
+  });
 });