@json-layout/core 0.35.0 → 1.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/core",
-  "version": "0.35.0",
+  "version": "1.0.0",
   "description": "Compilation and state management utilities for JSON Layout.",
   "type": "module",
   "exports": {
@@ -59,7 +59,7 @@
   },
   "homepage": "https://github.com/json-layout/json-layout#readme",
   "dependencies": {
-    "@json-layout/vocabulary": "^0.23.2",
+    "@json-layout/vocabulary": "^1.0.0",
     "ajv": "^8.12.0",
     "ajv-errors": "^3.0.0",
     "ajv-formats": "^2.1.1",

package/src/compile/skeleton-node.js

@@ -1,5 +1,5 @@
 // import Debug from 'debug'
-import { normalizeLayoutFragment, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout, getSchemaFragmentType, isCompositeLayout } from '@json-layout/vocabulary'
+import { normalizeLayoutFragment, isSwitchStruct, isGetItemsExpression, isGetItemsFetch, isItemsLayout, getSchemaFragmentType, isCompositeLayout, childIsCompObject } from '@json-layout/vocabulary'
 import { makeSkeletonTree } from './skeleton-tree.js'
 import { partialResolveRefs } from './utils/resolve-refs.js'
 
@@ -92,9 +92,23 @@ export function makeSkeletonNode (
     }
   }
 
+  /**
+   * @param {import('@json-layout/vocabulary').Child} child
+   */
+  const prepareLayoutChild = (child) => {
+    if (child.if) pushExpression(expressions, child.if)
+    if (childIsCompObject(child)) {
+      for (const grandChild of child.children) prepareLayoutChild(grandChild)
+    }
+  }
+
   const compObjects = isSwitchStruct(normalizedLayout) ? normalizedLayout.switch : [normalizedLayout]
+
   for (const compObject of compObjects) {
     if (compObject.if) pushExpression(expressions, compObject.if)
+    if (isCompositeLayout(compObject, options.components)) {
+      for (const child of compObject.children) prepareLayoutChild(child)
+    }
 
     if (schema.const !== undefined && compObject.constData === undefined) compObject.constData = schema.const
     if (compObject.constData !== undefined && !compObject.getConstData) compObject.getConstData = { type: 'js-eval', expr: 'layout.constData', pure: true, dataAlias: 'value' }

package/src/state/state-node.js

@@ -242,6 +242,7 @@ export function evalExpression (expressions, expression, data, options, display,
 
 /**
  * @param {import('@json-layout/vocabulary').NormalizedLayout} normalizedLayout
+ * @param {import('@json-layout/vocabulary').Child | null} childDefinition
  * @param {import('./types.js').StateNodeOptions} options
  * @param {import('../index.js').CompiledLayout} compiledLayout
  * @param {import('./utils/display.js').Display} display
@@ -250,7 +251,7 @@ export function evalExpression (expressions, expression, data, options, display,
  * @param {import('../compile/types.js').ParentContextExpression | null} parentContext
  * @returns {import('@json-layout/vocabulary').BaseCompObject}
  */
-const getCompObject = (normalizedLayout, options, compiledLayout, display, data, rootData, parentContext) => {
+const getCompObject = (normalizedLayout, childDefinition, options, compiledLayout, display, data, rootData, parentContext) => {
   if (isSwitchStruct(normalizedLayout)) {
     for (const compObject of normalizedLayout.switch) {
       if (!compObject.if || !!evalExpression(compiledLayout.expressions, compObject.if, data, options, display, compObject, compiledLayout.validates, rootData, parentContext)) {
@@ -258,13 +259,13 @@ const getCompObject = (normalizedLayout, options, compiledLayout, display, data,
       }
     }
   } else {
-    if (normalizedLayout.if) {
-      if (evalExpression(compiledLayout.expressions, normalizedLayout.if, data, options, display, normalizedLayout, compiledLayout.validates, rootData, parentContext)) {
-        return normalizedLayout
-      }
-    } else {
-      return normalizedLayout
+    if (childDefinition?.if && !evalExpression(compiledLayout.expressions, childDefinition.if, data, options, display, normalizedLayout, compiledLayout.validates, rootData, parentContext)) {
+      return { comp: 'none' }
+    }
+    if (normalizedLayout.if && !evalExpression(compiledLayout.expressions, normalizedLayout.if, data, options, display, normalizedLayout, compiledLayout.validates, rootData, parentContext)) {
+      return { comp: 'none' }
     }
+    return normalizedLayout
   }
   return { comp: 'none' }
 }
@@ -347,7 +348,7 @@ export function createStateNode (
   const normalizedLayout = childDefinition && childIsCompObject(childDefinition)
     ? childDefinition
     : compiledLayout.normalizedLayouts[skeleton.pointer]
-  const layout = getCompObject(normalizedLayout, parentOptions, compiledLayout, parentDisplay, data, context.rootData, parentContext)
+  const layout = getCompObject(normalizedLayout, childDefinition, parentOptions, compiledLayout, parentDisplay, data, context.rootData, parentContext)
   const [display, cols] = getChildDisplay(parentDisplay, childDefinition?.cols ?? layout.cols)
 
   const options = layout.getOptions