@json-layout/core 0.26.0 → 0.26.1

package/package.json

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

package/src/state/index.js

@@ -295,6 +295,10 @@ export class StatefulLayout {
       files: [],
       nodes: []
     }
+
+    // @ts-ignore
+    if (this._options._debugCache) createStateTreeContext._debugCache = this._lastCreateStateTreeContext?._debugCache ?? {}
+
     this._stateTree = createStateTree(
       createStateTreeContext,
       this._options,

package/src/state/state-node.js

@@ -270,11 +270,20 @@ export function createStateNode (
 
   // NOTE we have to exclude nodes with errors from the cache, because context.errors is unpurely modified
   // TODO: implement a cleaner way to filter context.errors while being able to reuse nodes with errors
-  if (skeleton.pure && reusedNode && !reusedNode.error && !reusedNode.childError) {
-    cacheKey = [parentOptions, compiledLayout, fullKey, skeleton, childDefinition, parentDisplay.width, validationState, context.activatedItems, context.initial, data]
-    if (context.cacheKeys[fullKey] && shallowEqualArray(context.cacheKeys[fullKey], cacheKey)) {
+  if (skeleton.pure && !reusedNode?.error && !reusedNode?.childError) {
+    const validatedCacheKey = validationState.validatedForm || validationState.validatedChildren.includes(fullKey)
+    cacheKey = [parentOptions, compiledLayout, fullKey, skeleton, childDefinition, parentDisplay.width, validatedCacheKey, context.activatedItems, context.initial, data]
+    if (reusedNode && context.cacheKeys[fullKey] && shallowEqualArray(context.cacheKeys[fullKey], cacheKey)) {
+      // @ts-ignore
+      if (context._debugCache) context._debugCache[fullKey] = (context._debugCache[fullKey] ?? []).concat(['hit'])
       return reusedNode
+    } else {
+      // @ts-ignore
+      if (context._debugCache) context._debugCache[fullKey] = (context._debugCache[fullKey] ?? []).concat(['miss'])
     }
+  } else {
+    // @ts-ignore
+    if (context._debugCache) context._debugCache[fullKey] = (context._debugCache[fullKey] ?? []).concat(['skip'])
   }
 
   const normalizedLayout = childDefinition && childIsCompObject(childDefinition)
@@ -428,19 +437,19 @@ export function createStateNode (
       })
     }
   }
-  const validated = validationState.validatedForm ||
-    validationState.validatedChildren.includes(fullKey) ||
-    (validationState.initialized === false && options.initialValidation === 'always') ||
-    (validationState.initialized === false && options.initialValidation === 'withData' && !isDataEmpty(data))
 
   let nodeData = data
-
   if (nodeData === null && !layout.nullable) nodeData = undefined
 
+  const validated = validationState.validatedForm ||
+    validationState.validatedChildren.includes(fullKey) ||
+    (validationState.initialized === false && options.initialValidation === 'always') ||
+    (validationState.initialized === false && options.initialValidation === 'withData' && !isDataEmpty(nodeData))
+
   /** @type {unknown} */
-  if (typeof nodeData === 'object' && !(nodeData instanceof File)) {
+  if ((typeof nodeData === 'object' || (nodeData === undefined && children?.length)) && !(nodeData instanceof File)) {
     nodeData = produceStateNodeData(
-      /** @type {Record<string, unknown>} */(nodeData ?? {}),
+      /** @type {Record<string, unknown>} */(nodeData ?? (typeof children?.[0]?.key === 'number' ? [] : {})),
       dataPath,
       children,
       context.additionalPropertiesErrors,

package/src/state/types.ts

@@ -76,7 +76,7 @@ export interface FileRef {
   dataPath: string
 }
 
-// [parentOptions, compiledLayout, fullKey, skeleton, childDefinition, parentWidth, validationState, activatedItems, initial, data]
+// [parentOptions, compiledLayout, fullKey, skeleton, childDefinition, parentWidth, validated, activatedItems, initial, data]
 export type StateNodeCacheKey = [
   StateNodeOptions,
   CompiledLayout,
@@ -84,7 +84,7 @@ export type StateNodeCacheKey = [
   SkeletonNode,
   Child | null,
   number,
-  ValidationState,
+  boolean,
   Record<string, number>,
   boolean,
   unknown