Improve isObjectArray by using deriveType

* isObjectArray is using deriveType * add additional test cases
eclipsesource · Apr 21, 2019 · 83e9544 · 83e9544
1 parent 7453f15
commit 83e9544
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/packages/core/src/testers/index.ts b/packages/core/src/testers/index.ts
@@ -360,12 +360,10 @@ export const isDateTimeControl = and(
 export const isObjectArray = and(
   schemaMatches(
     schema =>
-      !isEmpty(schema) &&
-      schema.type === 'array' &&
-      !isEmpty(schema.items) &&
+      deriveType(schema) === 'array' &&
       !Array.isArray(schema.items) // we don't care about tuples
   ),
-  schemaSubPathMatches('items', schema => schema.type === 'object')
+  schemaSubPathMatches('items', schema => deriveType(schema) === 'object')
 );
 
 /**

diff --git a/packages/core/test/testers.test.ts b/packages/core/test/testers.test.ts
@@ -368,6 +368,45 @@ test('tester isObjectArrayControl', t => {
     }
   };
   t.true(isObjectArrayControl(control, schema));
+  const schema_noType: JsonSchema = {
+    type: 'object',
+    properties: {
+      foo: {
+        items: {
+          type: 'object',
+          properties: {
+            x: { type: 'integer' },
+            y: { type: 'integer' }
+          }
+        }
+      }
+    }
+  };
+  t.true(isObjectArrayControl(control, schema_noType));
+  const schema_innerAllOf: JsonSchema = {
+    type: 'object',
+    properties: {
+      foo: {
+        type: 'array',
+        items: {
+          allOf: [
+            {
+              properties: {
+                x: { type: 'integer' }
+              }
+            },
+            {
+              properties: {
+                y: { type: 'integer' }
+              }
+            },
+
+          ]
+        }
+      }
+    }
+  };
+  t.true(isObjectArrayControl(control, schema_innerAllOf));
 });
 
 test('isBooleanControl', t => {