Improve toDataPath to replace all occurences

* extend regex to replace all occurences * add test cases
eclipsesource · Apr 21, 2019 · d761e82 · d761e82
1 parent 7453f15
commit d761e82
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/packages/core/src/util/path.ts b/packages/core/src/util/path.ts
@@ -54,9 +54,9 @@ export const compose = (path1: string, path2: string) => {
  */
 export const toDataPathSegments = (schemaPath: string): string[] => {
   const s = schemaPath
-    .replace(/anyOf\/[\d]\//, '')
-    .replace(/allOf\/[\d]\//, '')
-    .replace(/oneOf\/[\d]\//, '');
+    .replace(/anyOf\/[\d]\//g, '')
+    .replace(/allOf\/[\d]\//g, '')
+    .replace(/oneOf\/[\d]\//g, '');
   const segments = s.split('/');
 
   const startFromRoot = segments[0] === '#' || segments[0] === '';

diff --git a/packages/core/test/util/path.test.ts b/packages/core/test/util/path.test.ts
@@ -43,6 +43,23 @@ test('resolve ', t => {
 test('toDataPath ', t => {
   t.is(toDataPath('#/properties/foo/properties/bar'), 'foo.bar');
 });
+test('toDataPath replace anyOf', t => {
+  t.is(toDataPath('/anyOf/1/properties/foo/anyOf/1/properties/bar'), 'foo.bar');
+});
+test('toDataPath replace allOf', t => {
+  t.is(toDataPath('/allOf/1/properties/foo/allOf/1/properties/bar'), 'foo.bar');
+});
+test('toDataPath replace oneOf', t => {
+  t.is(toDataPath('/oneOf/1/properties/foo/oneOf/1/properties/bar'), 'foo.bar');
+});
+test('toDataPath replace all combinators', t => {
+  t.is(
+    toDataPath(
+      '/oneOf/1/properties/foo/anyOf/1/properties/bar/allOf/1/properties/foobar'
+    ),
+    'foo.bar.foobar'
+  );
+});
 test('toDataPath use of keywords', t => {
   t.is(toDataPath('#/properties/properties'), 'properties');
 });