Bump version to 2.13.1 and update dist files

bhch · bhch · commit c3f0d7c73f6b · 2023-12-02T18:40:48.000+05:30
diff --git a/dist/react-json-form.cjs b/dist/react-json-form.cjs
@@ -429,9 +429,12 @@ function getSyncedObject(data, schema, getRef) {
     }
 
     if (!data.hasOwnProperty(key)) {
-      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
+      /* This key is declared in schema but it's not present in the data.
+         So we can use blank data here.
+      */
+      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'oneOf') newData[key] = getBlankOneOf(schemaValue, getRef);else if (type === 'anyOf') newData[key] = getBlankAntOf(schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
     } else {
-      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else {
+      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else if (type === 'oneOf') newData[key] = getSyncedOneOf(data[key], schemaValue, getRef);else if (type === 'anyOf') newData[key] = getSyncedAnyOf(data[key], schemaValue, getRef);else {
         // if the current value is not in choices, we reset to blank
         if (!valueInChoices(schemaValue, data[key])) data[key] = '';
 
@@ -446,6 +449,8 @@ function getSyncedObject(data, schema, getRef) {
     if (schemaValue.hasOwnProperty('const')) newData[key] = schemaValue.const;
   }
 
+  if (schema.hasOwnProperty('oneOf')) newData = _extends({}, newData, getSyncedOneOf(data, schema, getRef));
+  if (schema.hasOwnProperty('anyOf')) newData = _extends({}, newData, getSyncedAnyOf(data, schema, getRef));
   return newData;
 }
 
@@ -539,6 +544,13 @@ function findMatchingSubschemaIndex(data, schema, getRef, schemaName) {
     }
   }
 
+  if (index === null) {
+    // still no match found
+    if (data === null) // for null data, return the first subschema and hope for the best
+      index = 1;else // for anything else, throw error
+      throw new Error("No matching subschema found in '" + schemaName + "' for data '" + data + "' (type: " + dataType + ")");
+  }
+
   return index;
 }
 function dataObjectMatchesSchema(data, subschema) {
diff --git a/dist/react-json-form.js b/dist/react-json-form.js
diff --git a/dist/react-json-form.modern.js b/dist/react-json-form.modern.js
@@ -423,9 +423,12 @@ function getSyncedObject(data, schema, getRef) {
     }
 
     if (!data.hasOwnProperty(key)) {
-      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
+      /* This key is declared in schema but it's not present in the data.
+         So we can use blank data here.
+      */
+      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'oneOf') newData[key] = getBlankOneOf(schemaValue, getRef);else if (type === 'anyOf') newData[key] = getBlankAntOf(schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
     } else {
-      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else {
+      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else if (type === 'oneOf') newData[key] = getSyncedOneOf(data[key], schemaValue, getRef);else if (type === 'anyOf') newData[key] = getSyncedAnyOf(data[key], schemaValue, getRef);else {
         // if the current value is not in choices, we reset to blank
         if (!valueInChoices(schemaValue, data[key])) data[key] = '';
 
@@ -440,6 +443,8 @@ function getSyncedObject(data, schema, getRef) {
     if (schemaValue.hasOwnProperty('const')) newData[key] = schemaValue.const;
   }
 
+  if (schema.hasOwnProperty('oneOf')) newData = _extends({}, newData, getSyncedOneOf(data, schema, getRef));
+  if (schema.hasOwnProperty('anyOf')) newData = _extends({}, newData, getSyncedAnyOf(data, schema, getRef));
   return newData;
 }
 
@@ -533,6 +538,13 @@ function findMatchingSubschemaIndex(data, schema, getRef, schemaName) {
     }
   }
 
+  if (index === null) {
+    // still no match found
+    if (data === null) // for null data, return the first subschema and hope for the best
+      index = 1;else // for anything else, throw error
+      throw new Error("No matching subschema found in '" + schemaName + "' for data '" + data + "' (type: " + dataType + ")");
+  }
+
   return index;
 }
 function dataObjectMatchesSchema(data, subschema) {
diff --git a/dist/react-json-form.module.js b/dist/react-json-form.module.js
@@ -423,9 +423,12 @@ function getSyncedObject(data, schema, getRef) {
     }
 
     if (!data.hasOwnProperty(key)) {
-      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
+      /* This key is declared in schema but it's not present in the data.
+         So we can use blank data here.
+      */
+      if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'oneOf') newData[key] = getBlankOneOf(schemaValue, getRef);else if (type === 'anyOf') newData[key] = getBlankAntOf(schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ || null;else if (type === 'integer' || type === 'number') newData[key] = default_ === 0 ? 0 : default_ || null;else newData[key] = default_ || '';
     } else {
-      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else {
+      if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else if (type === 'oneOf') newData[key] = getSyncedOneOf(data[key], schemaValue, getRef);else if (type === 'anyOf') newData[key] = getSyncedAnyOf(data[key], schemaValue, getRef);else {
         // if the current value is not in choices, we reset to blank
         if (!valueInChoices(schemaValue, data[key])) data[key] = '';
 
@@ -440,6 +443,8 @@ function getSyncedObject(data, schema, getRef) {
     if (schemaValue.hasOwnProperty('const')) newData[key] = schemaValue.const;
   }
 
+  if (schema.hasOwnProperty('oneOf')) newData = _extends({}, newData, getSyncedOneOf(data, schema, getRef));
+  if (schema.hasOwnProperty('anyOf')) newData = _extends({}, newData, getSyncedAnyOf(data, schema, getRef));
   return newData;
 }
 
@@ -533,6 +538,13 @@ function findMatchingSubschemaIndex(data, schema, getRef, schemaName) {
     }
   }
 
+  if (index === null) {
+    // still no match found
+    if (data === null) // for null data, return the first subschema and hope for the best
+      index = 1;else // for anything else, throw error
+      throw new Error("No matching subschema found in '" + schemaName + "' for data '" + data + "' (type: " + dataType + ")");
+  }
+
   return index;
 }
 function dataObjectMatchesSchema(data, subschema) {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bhch/react-json-form",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "Create forms using JSON Schema",
   "publishConfig": {
     "access": "public"

Original file line number	Diff line number	Diff line change
`@@ -429,9 +429,12 @@ function getSyncedObject(data, schema, getRef) {`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`if (!data.hasOwnProperty(key)) {`
`432`		`- if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ \|\| null;else if (type === 'integer' \|\| type === 'number') newData[key] = default_ === 0 ? 0 : default_ \|\| null;else newData[key] = default_ \|\| '';`
	`432`	`+ /* This key is declared in schema but it's not present in the data.`
	`433`	`+ So we can use blank data here.`
	`434`	`+ */`
	`435`	+ if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'oneOf') newData[key] = getBlankOneOf(schemaValue, getRef);else if (type === 'anyOf') newData[key] = getBlankAntOf(schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ \|\| null;else if (type === 'integer' \|\| type === 'number') newData[key] = default_ === 0 ? 0 : default_ \|\| null;else newData[key] = default_ \|\| '';
`433`	`436`	`} else {`
`434`		`- if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else {`
	`437`	`+ if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else if (type === 'oneOf') newData[key] = getSyncedOneOf(data[key], schemaValue, getRef);else if (type === 'anyOf') newData[key] = getSyncedAnyOf(data[key], schemaValue, getRef);else {`
`435`	`438`	`// if the current value is not in choices, we reset to blank`
`436`	`439`	`if (!valueInChoices(schemaValue, data[key])) data[key] = '';`
`437`	`440`
`@@ -446,6 +449,8 @@ function getSyncedObject(data, schema, getRef) {`
`446`	`449`	`if (schemaValue.hasOwnProperty('const')) newData[key] = schemaValue.const;`
`447`	`450`	`}`
`448`	`451`
	`452`	`+ if (schema.hasOwnProperty('oneOf')) newData = _extends({}, newData, getSyncedOneOf(data, schema, getRef));`
	`453`	`+ if (schema.hasOwnProperty('anyOf')) newData = _extends({}, newData, getSyncedAnyOf(data, schema, getRef));`
`449`	`454`	`return newData;`
`450`	`455`	`}`
`451`	`456`
`@@ -539,6 +544,13 @@ function findMatchingSubschemaIndex(data, schema, getRef, schemaName) {`
`539`	`544`	`}`
`540`	`545`	`}`
`541`	`546`
	`547`	`+ if (index === null) {`
	`548`	`+ // still no match found`
	`549`	`+ if (data === null) // for null data, return the first subschema and hope for the best`
	`550`	`+ index = 1;else // for anything else, throw error`
	`551`	`+ throw new Error("No matching subschema found in '" + schemaName + "' for data '" + data + "' (type: " + dataType + ")");`
	`552`	`+ }`
	`553`	`+`
`542`	`554`	`return index;`
`543`	`555`	`}`
`544`	`556`	`function dataObjectMatchesSchema(data, subschema) {`
Original file line number	Diff line number	Diff line change
`@@ -423,9 +423,12 @@ function getSyncedObject(data, schema, getRef) {`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`if (!data.hasOwnProperty(key)) {`
`426`		`- if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ \|\| null;else if (type === 'integer' \|\| type === 'number') newData[key] = default_ === 0 ? 0 : default_ \|\| null;else newData[key] = default_ \|\| '';`
	`426`	`+ /* This key is declared in schema but it's not present in the data.`
	`427`	`+ So we can use blank data here.`
	`428`	`+ */`
	`429`	+ if (type === 'array') newData[key] = getSyncedArray([], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject({}, schemaValue, getRef);else if (type === 'oneOf') newData[key] = getBlankOneOf(schemaValue, getRef);else if (type === 'anyOf') newData[key] = getBlankAntOf(schemaValue, getRef);else if (type === 'boolean') newData[key] = default_ === false ? false : default_ \|\| null;else if (type === 'integer' \|\| type === 'number') newData[key] = default_ === 0 ? 0 : default_ \|\| null;else newData[key] = default_ \|\| '';
`427`	`430`	`} else {`
`428`		`- if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else {`
	`431`	`+ if (type === 'array') newData[key] = getSyncedArray(data[key], schemaValue, getRef);else if (type === 'object') newData[key] = getSyncedObject(data[key], schemaValue, getRef);else if (type === 'oneOf') newData[key] = getSyncedOneOf(data[key], schemaValue, getRef);else if (type === 'anyOf') newData[key] = getSyncedAnyOf(data[key], schemaValue, getRef);else {`
`429`	`432`	`// if the current value is not in choices, we reset to blank`
`430`	`433`	`if (!valueInChoices(schemaValue, data[key])) data[key] = '';`
`431`	`434`
`@@ -440,6 +443,8 @@ function getSyncedObject(data, schema, getRef) {`
`440`	`443`	`if (schemaValue.hasOwnProperty('const')) newData[key] = schemaValue.const;`
`441`	`444`	`}`
`442`	`445`
	`446`	`+ if (schema.hasOwnProperty('oneOf')) newData = _extends({}, newData, getSyncedOneOf(data, schema, getRef));`
	`447`	`+ if (schema.hasOwnProperty('anyOf')) newData = _extends({}, newData, getSyncedAnyOf(data, schema, getRef));`
`443`	`448`	`return newData;`
`444`	`449`	`}`
`445`	`450`
`@@ -533,6 +538,13 @@ function findMatchingSubschemaIndex(data, schema, getRef, schemaName) {`
`533`	`538`	`}`
`534`	`539`	`}`
`535`	`540`
	`541`	`+ if (index === null) {`
	`542`	`+ // still no match found`
	`543`	`+ if (data === null) // for null data, return the first subschema and hope for the best`
	`544`	`+ index = 1;else // for anything else, throw error`
	`545`	`+ throw new Error("No matching subschema found in '" + schemaName + "' for data '" + data + "' (type: " + dataType + ")");`
	`546`	`+ }`
	`547`	`+`
`536`	`548`	`return index;`
`537`	`549`	`}`
`538`	`550`	`function dataObjectMatchesSchema(data, subschema) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@bhch/react-json-form",`
`3`		`- "version": "2.13.0",`
	`3`	`+ "version": "2.13.1",`
`4`	`4`	`"description": "Create forms using JSON Schema",`
`5`	`5`	`"publishConfig": {`
`6`	`6`	`"access": "public"`