Merge commit 'refs/pull/20/head' of https://github.com/hackolade/Avro

Handling of pattern fields
hackolade · Jan 29, 2021 · eaee577 · eaee577
2 parents 6709cbd + 65310e1
commit eaee577
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Avro",
-    "version": "0.1.55",
+    "version": "0.1.56",
     "versionDate": "2021-01-29",
     "author": "hackolade",
     "engines": {

diff --git a/reverse_engineering/helpers/adaptJsonSchema.js b/reverse_engineering/helpers/adaptJsonSchema.js
@@ -125,10 +125,10 @@ const handleEmptyDefaultInProperties = field => {
 			return { ...properties, [key]: updatedProperty };
 		}
 
-		const complexProperties = ['properties', 'items'];
+		const complexProperties = ['patternProperties', 'properties', 'items'];
 
 		const propertyWithChoice = {
-			..._.omit(updatedProperty, complexProperties),
+			..._.omit(updatedProperty, [ ...complexProperties, 'type' ]),
 			oneOf: updatedProperty.type.map(type => {
 				if (!isComplexType(type)) {
 					return {
@@ -138,7 +138,7 @@ const handleEmptyDefaultInProperties = field => {
 				}
 
 				return {
-					..._.omit(updatedProperty, type === 'array' ? 'properties' : 'items'),
+					..._.omit(updatedProperty, type === 'array' ? ['patternProperties', 'properties'] : 'items'),
 					type
 				};
 			})