Don't modify schema in testers

Author: sdirix

packages/core/src/testers/testers.ts

@@ -47,7 +47,7 @@ import { deriveTypes, hasType, resolveSchema } from '../util';
 export const NOT_APPLICABLE = -1;
 /**
  * A tester is a function that receives an UI schema and a JSON schema and returns a boolean.
- * Optionally, a root JSON schema can be provided, which can be used for resolving refs in the schema.
+ * The rootSchema is handed over as context. Can be used to resolve references.
  */
 export type Tester = (uischema: UISchemaElement, schema: JsonSchema, rootSchema: JsonSchema) => boolean;
 
@@ -403,22 +403,31 @@ export const isObjectArrayControl = and(uiTypeIs('Control'), isObjectArray);
 
 const traverse = (
   any: JsonSchema | JsonSchema[],
-  pred: (obj: JsonSchema) => boolean
+  pred: (obj: JsonSchema) => boolean,
+  rootSchema: JsonSchema
 ): boolean => {
   if (isArray(any)) {
-    return reduce(any, (acc, el) => acc || traverse(el, pred), false);
+    return reduce(any, (acc, el) => acc || traverse(el, pred, rootSchema), false);
   }
 
   if (pred(any)) {
     return true;
   }
+
+  if (any.$ref) {
+    const toTraverse = resolveSchema(rootSchema, any.$ref, rootSchema);
+    if (toTraverse && !toTraverse.$ref) {
+      return traverse(toTraverse, pred, rootSchema);
+    }
+  }
+
   if (any.items) {
-    return traverse(any.items, pred);
+    return traverse(any.items, pred, rootSchema);
   }
   if (any.properties) {
     return reduce(
       toPairs(any.properties),
-      (acc, [_key, val]) => acc || traverse(val, pred),
+      (acc, [_key, val]) => acc || traverse(val, pred, rootSchema),
       false
     );
   }
@@ -436,9 +445,6 @@ export const isObjectArrayWithNesting = (
   }
   const schemaPath = (uischema as ControlElement).scope;
   const resolvedSchema = resolveSchema(schema, schemaPath, rootSchema ?? schema);
-  if (resolvedSchema?.items && (resolvedSchema.items as any).$ref){
-    resolvedSchema.items = resolveSchema(resolvedSchema, 'items', rootSchema ?? schema);
-  }
   const wantedNestingByType: { [key: string]: number } = {
     object: 2,
     array: 1
@@ -463,7 +469,7 @@ export const isObjectArrayWithNesting = (
         }
         wantedNestingByType[val.type] = typeCount - 1;
         return wantedNestingByType[val.type] === 0;
-      })
+      }, rootSchema)
     ) {
       return true;
     }

packages/core/test/testers.test.ts

@@ -801,7 +801,7 @@ test('tester isObjectArrayWithNesting', t => {
   t.true(isObjectArrayWithNesting(uischema, nestedSchema, undefined));
   t.true(isObjectArrayWithNesting(uischema, nestedSchema2, undefined));
   t.true(isObjectArrayWithNesting(uischema, nestedSchema3, undefined));
-  t.true(isObjectArrayWithNesting(uischema, nestedSchemaWithRef, undefined));
+  t.true(isObjectArrayWithNesting(uischema, nestedSchemaWithRef, nestedSchemaWithRef));
 
   t.false(isObjectArrayWithNesting(uischemaOptions.default, schema, undefined));
   t.true(isObjectArrayWithNesting(uischemaOptions.generate, schema, undefined));

packages/core/test/util/path.test.ts

@@ -142,7 +142,7 @@ test('resolve $ref', t => {
   const result = Resolve.schema(schema, '#/properties/foos/items', schema);
   t.deepEqual(result, { type: 'string' });
 });
-test.failing('resolve $ref simple', t => {
+test('resolve $ref simple', t => {
   const schema: JsonSchema = {
     definitions: {
       foo: {
@@ -174,14 +174,14 @@ test.failing('resolve $ref simple', t => {
       bar: {
         type: 'array',
         items: {
-          $ref: '#'
+          $ref: '#/definitions/foo'
         }
       }
     }
   });
   t.not((schema.definitions.foo.properties.bar.items as JsonSchema).$ref, '#');
 });
-test.failing('resolve $ref complicated', t => {
+test('resolve $ref complicated', t => {
   const schema: JsonSchema = {
     definitions: {
       foo: {
@@ -219,19 +219,6 @@ test.failing('resolve $ref complicated', t => {
   };
   const result = Resolve.schema(schema, '#/properties/foos/items', schema);
   t.deepEqual(result, {
-    definitions: {
-      foo2: {
-        type: 'object',
-        properties: {
-          bar: {
-            type: 'array',
-            items: {
-              $ref: '#'
-            }
-          }
-        }
-      }
-    },
     type: 'object',
     properties: {
       bar: {

packages/material/test/renderers/MaterialArrayLayout.test.tsx

@@ -181,9 +181,9 @@ describe('Material array layout tester', () => {
     expect(materialArrayLayoutTester(uischema, schema, undefined)).toBe(-1);
     expect(materialArrayLayoutTester(uischema, nestedSchema, undefined)).toBe(4);
     expect(materialArrayLayoutTester(uischema, nestedSchema2, undefined)).toBe(4);
-    expect(materialArrayLayoutTester(uischema, nestedSchemaWithRef, undefined)).toBe(4);
     expect(materialArrayLayoutTester(uischema, nestedSchemaWithRef, nestedSchemaWithRef)).toBe(4);
-    expect(materialArrayLayoutTester(uischema, nestedSchema2WithRef, undefined)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchemaWithRef, nestedSchemaWithRef)).toBe(4);
+    expect(materialArrayLayoutTester(uischema, nestedSchema2WithRef, nestedSchema2WithRef)).toBe(4);
 
     expect(materialArrayLayoutTester(uischemaOptions.default, schema, undefined)).toBe(-1);
     expect(materialArrayLayoutTester(uischemaOptions.generate, schema, undefined)).toBe(4);