@json-layout/core 1.10.9 → 1.10.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/core",
-  "version": "1.10.9",
+  "version": "1.10.11",
   "description": "Compilation and state management utilities for JSON Layout.",
   "type": "module",
   "exports": {

package/src/state/state-node.js

@@ -114,9 +114,9 @@ const produceStateNodeData = produce((draft, parentDataPath, children, additiona
         if (child.data === undefined || child.data === null) continue
         if (children.length > 1) {
           for (const key of Object.keys(child.data)) {
-            if (child.skeleton.propertyKeys.includes(key) || !children.some(c => c.key !== child.key && c.skeleton.propertyKeys.includes(key))) {
-              draft[key] = /** @type {any} */(child.data)[key]
-            }
+            if (children.some(c => c.key === key)) continue
+            if (!child.skeleton.propertyKeys.includes(key) && children.some(c => c.key !== child.key && c.skeleton.propertyKeys.includes(key))) continue
+            draft[key] = /** @type {any} */(child.data)[key]
           }
         } else {
           Object.assign(draft, child.data)
@@ -187,7 +187,7 @@ const produceCompositeChildrenOptions = produce((draft, section) => {
  * @param {string | null} parentDataPath
  * @returns {boolean}
  */
-const matchError = (error, skeleton, dataPath, parentDataPath) => {
+const matchLocalError = (error, skeleton, dataPath, parentDataPath) => {
   const originalError = error.params?.errors?.[0] ?? error
   if (parentDataPath === originalError.instancePath && originalError.params?.missingProperty === skeleton.key) {
     return true
@@ -204,22 +204,51 @@ const matchError = (error, skeleton, dataPath, parentDataPath) => {
 
 /**
  * should match if an error belongs to a child of the current node but the child was not displayed
+ * @param {import('../index.js').CompiledLayout} compiledLayout
  * @param {import('ajv').ErrorObject} error
  * @param {import('../index.js').SkeletonNode} skeleton
  * @param {string} dataPath
  * @param {string | null} parentDataPath
  * @returns {boolean}
  */
-const matchChildError = (error, skeleton, dataPath, parentDataPath) => {
+const matchChildError = (compiledLayout, error, skeleton, dataPath, parentDataPath) => {
   const originalError = error.params?.errors?.[0] ?? error
-  if (!(
-    originalError.schemaPath === skeleton.pointer ||
-    originalError.schemaPath.startsWith(skeleton.pointer + '/')
-  ) && !(
-    originalError.schemaPath === skeleton.refPointer ||
-    originalError.schemaPath.startsWith(skeleton.refPointer + '/')
-  )) return false
-  if (originalError.instancePath.startsWith(dataPath)) return true
+  if (!originalError.instancePath.startsWith(dataPath)) return false
+  if (originalError.schemaPath === skeleton.pointer || originalError.schemaPath.startsWith(skeleton.pointer + '/') || originalError.schemaPath === skeleton.refPointer || originalError.schemaPath.startsWith(skeleton.refPointer + '/')) return true
+  if (skeleton.children) {
+    for (const c of skeleton.children) {
+      const childSkeleton = compiledLayout.skeletonNodes[c]
+      if (!childSkeleton) continue
+      if (matchPointerError(error, childSkeleton.pointer, childSkeleton.refPointer, dataPath, parentDataPath)) return true
+    }
+  }
+  if (skeleton.childrenTrees) {
+    for (const c of skeleton.childrenTrees) {
+      const childTree = compiledLayout.skeletonTrees[c]
+      if (!childTree) continue
+      if (matchPointerError(error, childTree.root, childTree.refPointer, dataPath, parentDataPath)) return true
+    }
+  }
+  return false
+}
+
+/**
+ * should match if an error belongs to a child of the current node but the child was not displayed
+ * @param {import('ajv').ErrorObject} error
+ * @param {string} pointer1
+ * @param {string} pointer2
+ * @param {string} dataPath
+ * @param {string | null} parentDataPath
+ * @returns {boolean}
+ */
+const matchPointerError = (error, pointer1, pointer2, dataPath, parentDataPath) => {
+  const originalError = error.params?.errors?.[0] ?? error
+  if (!originalError.instancePath.startsWith(dataPath)) return false
+  if (originalError.schemaPath === pointer1 ||
+          originalError.schemaPath.startsWith(pointer2 + '/') ||
+          originalError.schemaPath === pointer2 ||
+          originalError.schemaPath.startsWith(pointer2 + '/')
+  ) return true
   return false
 }
 
@@ -442,25 +471,36 @@ export function createStateNode (
 
   if (key === '$oneOf' && skeleton.childrenTrees) {
     // find the oneOf child that was either previously selected, if none were selected select the child that is valid with current data
-    const activeChildTreeIndex = /** @type {number} */(fullKey in context.activatedItems ? context.activatedItems[fullKey] : skeleton.childrenTrees?.findIndex((childTree) => compiledLayout.validates[compiledLayout.skeletonTrees[childTree].refPointer](data)))
+    const validChildTreeIndex = skeleton.childrenTrees?.findIndex((childTree) => compiledLayout.validates[compiledLayout.skeletonTrees[childTree].refPointer](data))
+    const activeChildTreeIndex = /** @type {number} */(fullKey in context.activatedItems ? context.activatedItems[fullKey] : validChildTreeIndex)
     if (activeChildTreeIndex !== -1) {
+      const activeChildTree = compiledLayout.skeletonTrees[skeleton.childrenTrees[activeChildTreeIndex]]
+      const activeChildNode = compiledLayout.skeletonNodes[activeChildTree.root]
       if (!(fullKey in context.activatedItems)) context.autoActivatedItems[fullKey] = activeChildTreeIndex
       context.errors = context.errors?.filter(error => {
-        const originalError = error.params?.errors?.[0] ?? error
-        // console.log(originalError.schemaPath, skeleton.pointer, skeleton.refPointer)
         // if an item was selected, remove the oneOf error
-        if (matchError(error, skeleton, dataPath, parentDataPath)) return false
+        if (matchLocalError(error, skeleton, dataPath, parentDataPath)) {
+          return false
+        }
         // also remove the errors from other children of the oneOf
-        if (matchChildError(error, skeleton, dataPath, parentDataPath)) {
-          if (originalError.schemaPath.startsWith(skeleton.pointer) && !originalError.schemaPath.startsWith(skeleton.pointer + '/' + activeChildTreeIndex)) return false
-          if (originalError.schemaPath.startsWith(skeleton.refPointer) && !originalError.schemaPath.startsWith(skeleton.refPointer + '/' + activeChildTreeIndex)) return false
+        if (matchChildError(compiledLayout, error, skeleton, dataPath, parentDataPath) && !matchPointerError(error, activeChildNode.pointer, activeChildNode.refPointer, dataPath, parentDataPath)) {
+          return false
         }
         return true
       })
-      // console.log(context.errors?.map(error => error.params?.errors?.[0] ?? error))
+      if (context.additionalPropertiesErrors) {
+        // remove additional properties errors if the oneOf has no valid children
+        context.additionalPropertiesErrors = context.additionalPropertiesErrors?.filter(error => {
+          // also remove the additional errors from other children of the oneOf
+          if (matchChildError(compiledLayout, error, skeleton, dataPath, parentDataPath) && !matchPointerError(error, activeChildNode.pointer, activeChildNode.refPointer, dataPath, parentDataPath)) {
+            return false
+          }
+          return true
+        })
+      }
       const activeChildKey = `${fullKey}/${activeChildTreeIndex}`
       if (context.autofocusTarget === fullKey) context.autofocusTarget = activeChildKey
-      const activeChildTree = compiledLayout.skeletonTrees[skeleton.childrenTrees[activeChildTreeIndex]]
+
       children = [
         createStateNode(
           context,
@@ -471,7 +511,7 @@ export function createStateNode (
           fullKey,
           dataPath,
           dataPath,
-          compiledLayout.skeletonNodes[activeChildTree.root],
+          activeChildNode,
           null,
           display,
           data,
@@ -562,14 +602,14 @@ export function createStateNode (
     }
   }
 
-  let error = context.errors?.find(e => matchError(e, skeleton, dataPath, parentDataPath))
+  let error = context.errors?.find(e => matchLocalError(e, skeleton, dataPath, parentDataPath))
 
   // findLast in following lines is important because we want to keep the error of the highest child (deepest errors are listed first)
   if (!error && !isCompositeLayout(layout, compiledLayout.components) && layout.comp !== 'slot') {
-    error = context.errors?.findLast(e => matchChildError(e, skeleton, dataPath, parentDataPath))
+    error = context.errors?.findLast(e => matchChildError(compiledLayout, e, skeleton, dataPath, parentDataPath))
   }
   if (!error && context.rehydrate && context.rehydrateErrors) {
-    error = context.rehydrateErrors?.findLast(e => matchChildError(e, skeleton, dataPath, parentDataPath))
+    error = context.rehydrateErrors?.findLast(e => matchChildError(compiledLayout, e, skeleton, dataPath, parentDataPath))
   }
 
   // capture errors so that they are not repeated in parent nodes
@@ -578,10 +618,10 @@ export function createStateNode (
       logValidation(`${fullKey} capture validation error on node`, error)
       context.errors = context.errors?.filter(e => error !== e)
       if (!isCompositeLayout(layout, compiledLayout.components) && layout.comp !== 'slot') {
-        context.errors = context.errors?.filter(e => !matchChildError(e, skeleton, dataPath, parentDataPath))
+        context.errors = context.errors?.filter(e => !matchChildError(compiledLayout, e, skeleton, dataPath, parentDataPath))
       }
       if (context.rehydrate && context.rehydrateErrors) {
-        context.rehydrateErrors = context.rehydrateErrors?.filter(e => !matchChildError(e, skeleton, dataPath, parentDataPath))
+        context.rehydrateErrors = context.rehydrateErrors?.filter(e => !matchChildError(compiledLayout, e, skeleton, dataPath, parentDataPath))
       }
     }
   }

package/types/state/state-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-node.d.ts","sourceRoot":"","sources":["../../src/state/state-node.js"],"names":[],"mappings":"AAiOA;;;;;;;;;;;GAWG;AACH,4CAXW,OAAO,aAAa,EAAE,kBAAkB,EAAE,cAC1C,OAAO,yBAAyB,EAAE,UAAU,QAC5C,GAAG,WACH,OAAO,YAAY,EAAE,gBAAgB,WACrC,OAAO,oBAAoB,EAAE,OAAO,UACpC,OAAO,yBAAyB,EAAE,cAAc,aAChD,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,gBAAgB,CAAC,YAC9C,OAAO,iBACP,OAAO,qBAAqB,EAAE,uBAAuB,GAAG,IAAI,GAC1D,GAAG,CAsBf;AAiCD;;;;;;;;;;;;;;;;;;GAkBG;AACH,yCAjBW,OAAO,YAAY,EAAE,sBAAsB,iBAC3C,OAAO,YAAY,EAAE,gBAAgB,kBACrC,OAAO,aAAa,EAAE,cAAc,OACpC,MAAM,GAAG,MAAM,WACf,MAAM,iBACN,MAAM,GAAG,IAAI,YACb,MAAM,kBACN,MAAM,GAAG,IAAI,YACb,OAAO,aAAa,EAAE,YAAY,mBAClC,OAAO,yBAAyB,EAAE,KAAK,GAAG,IAAI,iBAC9C,OAAO,oBAAoB,EAAE,OAAO,QACpC,OAAO,iBACP,OAAO,qBAAqB,EAAE,uBAAuB,GAAG,IAAI,mBAC5D,OAAO,YAAY,EAAE,eAAe,eACpC,OAAO,YAAY,EAAE,SAAS,GAC5B,OAAO,YAAY,EAAE,SAAS,CA2b1C;AAltBM,qCALI,OAAO,UACP,OAAO,yBAAyB,EAAE,cAAc,WAChD,OAAO,YAAY,EAAE,gBAAgB,GACnC,OAAO,CAMnB;AAgtBD,uFAAuF;AACvF,iCADW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,KAAK,GAAG,CAgBjF;AAEF,kKAAkK;AAClK,8BADW,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,OAAO,yBAAyB,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,yBAAyB,EAAE,WAAW,KAAK,GAAG,CAY7J"}
+{"version":3,"file":"state-node.d.ts","sourceRoot":"","sources":["../../src/state/state-node.js"],"names":[],"mappings":"AA8PA;;;;;;;;;;;GAWG;AACH,4CAXW,OAAO,aAAa,EAAE,kBAAkB,EAAE,cAC1C,OAAO,yBAAyB,EAAE,UAAU,QAC5C,GAAG,WACH,OAAO,YAAY,EAAE,gBAAgB,WACrC,OAAO,oBAAoB,EAAE,OAAO,UACpC,OAAO,yBAAyB,EAAE,cAAc,aAChD,MAAM,CAAC,MAAM,EAAE,OAAO,KAAK,EAAE,gBAAgB,CAAC,YAC9C,OAAO,iBACP,OAAO,qBAAqB,EAAE,uBAAuB,GAAG,IAAI,GAC1D,GAAG,CAsBf;AAiCD;;;;;;;;;;;;;;;;;;GAkBG;AACH,yCAjBW,OAAO,YAAY,EAAE,sBAAsB,iBAC3C,OAAO,YAAY,EAAE,gBAAgB,kBACrC,OAAO,aAAa,EAAE,cAAc,OACpC,MAAM,GAAG,MAAM,WACf,MAAM,iBACN,MAAM,GAAG,IAAI,YACb,MAAM,kBACN,MAAM,GAAG,IAAI,YACb,OAAO,aAAa,EAAE,YAAY,mBAClC,OAAO,yBAAyB,EAAE,KAAK,GAAG,IAAI,iBAC9C,OAAO,oBAAoB,EAAE,OAAO,QACpC,OAAO,iBACP,OAAO,qBAAqB,EAAE,uBAAuB,GAAG,IAAI,mBAC5D,OAAO,YAAY,EAAE,eAAe,eACpC,OAAO,YAAY,EAAE,SAAS,GAC5B,OAAO,YAAY,EAAE,SAAS,CAsc1C;AA1vBM,qCALI,OAAO,UACP,OAAO,yBAAyB,EAAE,cAAc,WAChD,OAAO,YAAY,EAAE,gBAAgB,GACnC,OAAO,CAMnB;AAwvBD,uFAAuF;AACvF,iCADW,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,KAAK,GAAG,CAgBjF;AAEF,kKAAkK;AAClK,8BADW,CAAC,YAAY,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,OAAO,yBAAyB,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,yBAAyB,EAAE,WAAW,KAAK,GAAG,CAY7J"}