Fix schemaSubPathMatches tester

Author: edgarmueller

packages/core/src/testers/index.ts

@@ -103,7 +103,7 @@ export const schemaSubPathMatches = (
     return false;
   }
   const schemaPath = uischema.scope;
-  let currentDataSchema: JsonSchema;
+  let currentDataSchema: JsonSchema = schema;
   if (schema.type === 'object') {
     currentDataSchema = resolveSchema(schema, schemaPath);
   }

packages/core/test/testers.test.ts

@@ -1,19 +1,19 @@
 /*
   The MIT License
-  
+
   Copyright (c) 2018 EclipseSource Munich
   https://github.com/eclipsesource/jsonforms
-  
+
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
   in the Software without restriction, including without limitation the rights
   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
   copies of the Software, and to permit persons to whom the Software is
   furnished to do so, subject to the following conditions:
-  
+
   The above copyright notice and this permission notice shall be included in
   all copies or substantial portions of the Software.
-  
+
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -40,6 +40,7 @@ import {
   optionIs,
   or,
   schemaMatches,
+  schemaSubPathMatches,
   schemaTypeIs,
   scopeEndIs,
   scopeEndsWith,
@@ -669,3 +670,23 @@ test('tester isObjectArrayWithNesting', t => {
   t.true(isObjectArrayWithNesting(uischemaOptions.generate, schema));
   t.true(isObjectArrayWithNesting(uischemaOptions.inline, schema));
 });
+
+test('tester schemaSubPathMatches', t => {
+  const schema = {
+    title: 'Things',
+    type: 'array',
+    items: {
+      type: 'number'
+    }
+  };
+  const uischema: ControlElement = {
+    type: 'Control',
+    scope: '#'
+  };
+  t.true(
+    schemaSubPathMatches('items', items => items.type === 'number')(
+      uischema,
+      schema
+    )
+  );
+});

packages/examples/src/1253.ts

@@ -26,6 +26,41 @@ export const uischema = {
 
 const data = {};
 
+const schema2 = {
+  type: 'object',
+  properties: {
+    oneOrMoreThings: {
+      oneOf: [
+        {
+          $ref: '#/definitions/thing'
+        },
+        {
+          $ref: '#/definitions/thingArray'
+        }
+      ]
+    }
+  },
+  definitions: {
+    thing: {
+      title: 'Thing',
+      type: 'string'
+    },
+    thingArray: {
+      title: 'Things',
+      type: 'array',
+      items: {
+        $ref: '#/definitions/thing'
+      }
+    }
+  }
+};
+
+const uischema2 = {
+  type: 'Control',
+  label: 'Value',
+  scope: '#/properties/oneOrMoreThings'
+};
+
 registerExamples([
   {
     name: 'issue-1253',
@@ -35,3 +70,13 @@ registerExamples([
     uischema
   }
 ]);
+
+registerExamples([
+  {
+    name: 'issue-1253-field',
+    label: 'issue 1253 (oneOf) - missing field',
+    data,
+    schema: schema2,
+    uischema: uischema2
+  }
+]);