@json-layout/core 1.15.8 → 1.15.9

package/package.json

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

package/src/compile/index.js

@@ -71,6 +71,27 @@ export function compile (_schema, partialOptions = {}) {
     'main'
   )
 
+  while (true) {
+    let updatedPropertyKeys = false
+    for (const skeletonNode of Object.values(skeletonNodes)) {
+      for (const propertyKey of [...skeletonNode.propertyKeys]) {
+        if (propertyKey.startsWith('$')) {
+          const referencedNode = skeletonNodes[propertyKey.replace('$', '')]
+          skeletonNode.propertyKeys = [...new Set(skeletonNode.propertyKeys.filter(p => p !== propertyKey).concat(referencedNode.propertyKeys))]
+          updatedPropertyKeys = true
+        }
+      }
+      for (const roPropertyKey of [...skeletonNode.roPropertyKeys]) {
+        if (roPropertyKey.startsWith('$')) {
+          const referencedNode = skeletonNodes[roPropertyKey.replace('$', '')]
+          skeletonNode.roPropertyKeys = [...new Set(skeletonNode.roPropertyKeys.filter(p => p !== roPropertyKey).concat(referencedNode.roPropertyKeys))]
+          updatedPropertyKeys = true
+        }
+      }
+    }
+    if (!updatedPropertyKeys) break
+  }
+
   options.ajv.removeSchema(schema.$id) // just in case it was previously added
   options.ajv.addSchema(schema)
 

package/src/compile/skeleton-node.js

@@ -258,7 +258,8 @@ export function makeSkeletonNode (
               'object'
             )
           }
-          node.propertyKeys = node.propertyKeys.concat(skeletonNodes[dependentPointer].propertyKeys)
+          node.propertyKeys.push('$' + dependentPointer)
+          node.roPropertyKeys.push('$' + dependentPointer)
           node.children.push(dependentPointer)
         }
       }
@@ -288,8 +289,8 @@ export function makeSkeletonNode (
             'object'
           )
         }
-        node.propertyKeys = node.propertyKeys.concat(skeletonNodes[childPointer].propertyKeys)
-        node.roPropertyKeys = node.roPropertyKeys.concat(skeletonNodes[childPointer].roPropertyKeys)
+        node.propertyKeys.push('$' + childPointer)
+        node.roPropertyKeys.push('$' + childPointer)
         node.children = node.children ?? []
         node.children.push(childPointer)
       }
@@ -309,13 +310,14 @@ export function makeSkeletonNode (
           type,
           nullable
         )
-        if (!isSwitchStruct(normalizationResult.layout)) {
+        const compObjects = isSwitchStruct(normalizationResult.layout) ? normalizationResult.layout.switch : [normalizationResult.layout]
+        for (const compObject of compObjects) {
           let defaultData
           if ('default' in schema && (options.useDefault === 'data' || options.useDefault === true || required)) defaultData = schema.default
           else defaultData = nullable ? null : {}
-          if (normalizationResult.layout.defaultData === undefined) normalizationResult.layout.defaultData = defaultData
-          if (normalizationResult.layout.defaultData !== undefined && !normalizationResult.layout.getDefaultData) normalizationResult.layout.getDefaultData = { type: 'js-eval', expr: 'layout.defaultData', pure: true, dataAlias: 'value' }
-          if (normalizationResult.layout.getDefaultData) pushExpression(expressions, normalizationResult.layout.getDefaultData)
+          if (compObject.defaultData === undefined) compObject.defaultData = defaultData
+          if (compObject.defaultData !== undefined && !compObject.getDefaultData) compObject.getDefaultData = { type: 'js-eval', expr: 'layout.defaultData', pure: true, dataAlias: 'value' }
+          if (compObject.getDefaultData) pushExpression(expressions, compObject.getDefaultData)
         }
 
         normalizedLayouts[oneOfPointer] = normalizationResult.layout
@@ -326,9 +328,9 @@ export function makeSkeletonNode (
       /** @type {string[]} */
       const childrenTrees = []
       /** @type {string[]} */
-      let propertyKeys = []
+      const propertyKeys = []
       /** @type {string[]} */
-      let roPropertyKeys = []
+      const roPropertyKeys = []
       for (let i = 0; i < schema.oneOf.length; i++) {
         if (!schema.oneOf[i].type) schema.oneOf[i].type = type
         const childTreePointer = `${oneOfPointer}/${i}`
@@ -353,12 +355,8 @@ export function makeSkeletonNode (
           )
         }
         childrenTrees.push(childTreePointer)
-        // @ts-ignore
-        if (skeletonTrees[childTreePointer] !== 'recursing') {
-          const rootSkeletonNode = skeletonNodes[skeletonTrees[childTreePointer].root]
-          propertyKeys = propertyKeys.concat(rootSkeletonNode.propertyKeys)
-          roPropertyKeys = roPropertyKeys.concat(rootSkeletonNode.roPropertyKeys)
-        }
+        propertyKeys.push('$' + childTreePointer)
+        roPropertyKeys.push('$' + childTreePointer)
       }
       if (!skeletonNodes[oneOfPointer]) {
         skeletonNodes[oneOfPointer] = {
@@ -467,8 +465,8 @@ export function makeSkeletonNode (
           )
         }
         node.children = node.children ?? []
-        node.propertyKeys = node.propertyKeys.concat(skeletonNodes[childPointer].propertyKeys)
-        node.roPropertyKeys = node.roPropertyKeys.concat(skeletonNodes[childPointer].roPropertyKeys)
+        node.propertyKeys.push('$' + childPointer)
+        node.roPropertyKeys.push('$' + childPointer)
         node.children.push(childPointer)
       }
       if (schema.else) {
@@ -496,8 +494,8 @@ export function makeSkeletonNode (
           )
         }
         node.children = node.children ?? []
-        node.propertyKeys = node.propertyKeys.concat(skeletonNodes[childPointer].propertyKeys)
-        node.roPropertyKeys = node.roPropertyKeys.concat(skeletonNodes[childPointer].roPropertyKeys)
+        node.propertyKeys.push('$' + childPointer)
+        node.roPropertyKeys.push('$' + childPointer)
         node.children.push(childPointer)
       }
     }

package/src/state/state-node.js

@@ -776,8 +776,8 @@ export function createStateNode (
       /** @type {unknown[]} */(nodeData ?? []),
         children
       )
-    } else if (Array.isArray(nodeData) && !children) {
-      // case of an array without children nodes, so a select of objects for example
+    } else if (Array.isArray(nodeData) && isItemsLayout(layout, compiledLayout.components)) {
+      // case of a multi-valued select of objects
       const itemsSkeletonTree = skeleton.childrenTrees?.[0] && compiledLayout.skeletonTrees[skeleton.childrenTrees?.[0]]
       const itemsSkeletonNode = (itemsSkeletonTree && compiledLayout.skeletonNodes[itemsSkeletonTree.root]) || null
       nodeData = produceStateNodeDataArray(
@@ -787,8 +787,8 @@ export function createStateNode (
         itemsSkeletonNode?.propertyKeys.length ? itemsSkeletonNode?.propertyKeys : undefined,
         options.readOnlyPropertiesMode === 'remove' ? itemsSkeletonNode?.roPropertyKeys : undefined
       )
-    } else if (typeof nodeData === 'object' && !(nodeData instanceof File) && !children) {
-      // case of an object outside of a composite component, probably a select
+    } else if (typeof nodeData === 'object' && !(nodeData instanceof File) && isItemsLayout(layout, compiledLayout.components)) {
+      // case of a select of objects
       nodeData = cleanNodeData(
         /** @type {Record<string, unknown>} */(nodeData ?? {}),
         dataPath,

package/types/compile/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compile/index.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,iCAJW,MAAM,mBACN,qBAAqB,GACnB,cAAc,CAkG1B;;;;2BAlHY,OAAO,YAAY,EAAE,YAAY;2BACjC,OAAO,YAAY,EAAE,YAAY;6BACjC,OAAO,YAAY,EAAE,cAAc;6BACnC,OAAO,YAAY,EAAE,cAAc;oCACnC,OAAO,YAAY,EAAE,qBAAqB;iCAC1C,OAAO,YAAY,EAAE,kBAAkB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compile/index.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,iCAJW,MAAM,mBACN,qBAAqB,GACnB,cAAc,CAuH1B;;;;2BAvIY,OAAO,YAAY,EAAE,YAAY;2BACjC,OAAO,YAAY,EAAE,YAAY;6BACjC,OAAO,YAAY,EAAE,cAAc;6BACnC,OAAO,YAAY,EAAE,cAAc;oCACnC,OAAO,YAAY,EAAE,qBAAqB;iCAC1C,OAAO,YAAY,EAAE,kBAAkB"}

package/types/compile/skeleton-node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"skeleton-node.d.ts","sourceRoot":"","sources":["../../src/compile/skeleton-node.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;GAkBG;AACH,4CAlBW,GAAG,kBACH,MAAM,WACN,OAAO,YAAY,EAAE,cAAc,cACnC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,iBACxD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,iBACjD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,oBACjD,MAAM,EAAE,oBACR,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,qBACxB,MAAM,CAAC,MAAM,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC,eAClE,OAAO,yBAAyB,EAAE,UAAU,EAAE,OAC9C,MAAM,GAAG,MAAM,WACf,MAAM,YACN,OAAO,cACP,MAAM,cACN,OAAO,cACP,MAAM,GACJ,OAAO,YAAY,EAAE,YAAY,CAgjB7C"}
+{"version":3,"file":"skeleton-node.d.ts","sourceRoot":"","sources":["../../src/compile/skeleton-node.js"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;;GAkBG;AACH,4CAlBW,GAAG,kBACH,MAAM,WACN,OAAO,YAAY,EAAE,cAAc,cACnC,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,iBACxD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,iBACjD,MAAM,CAAC,MAAM,EAAE,OAAO,YAAY,EAAE,YAAY,CAAC,oBACjD,MAAM,EAAE,oBACR,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,qBACxB,MAAM,CAAC,MAAM,EAAE,OAAO,yBAAyB,EAAE,gBAAgB,CAAC,eAClE,OAAO,yBAAyB,EAAE,UAAU,EAAE,OAC9C,MAAM,GAAG,MAAM,WACf,MAAM,YACN,OAAO,cACP,MAAM,cACN,OAAO,cACP,MAAM,GACJ,OAAO,YAAY,EAAE,YAAY,CA8iB7C"}