@json-layout/core 2.5.2 → 2.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-layout/core",
-  "version": "2.5.2",
+  "version": "2.7.0",
   "description": "Compilation and state management utilities for JSON Layout.",
   "type": "module",
   "exports": {
@@ -82,7 +82,7 @@
   },
   "homepage": "https://github.com/json-layout/json-layout#readme",
   "peerDependencies": {
-    "@json-layout/vocabulary": "^2.12.0"
+    "@json-layout/vocabulary": "^2.13.0"
   },
   "dependencies": {
     "ajv": "^8.17.1",
@@ -90,6 +90,7 @@
     "ajv-formats": "^3.0.1",
     "ajv-i18n": "^4.2.0",
     "debug": "^4.3.4",
+    "fast-deep-equal": "^3.1.3",
     "immer": "^10.0.3",
     "magicast": "^0.3.3",
     "marked": "^15.0.7"

package/src/compile/skeleton-node.js

@@ -324,6 +324,14 @@ export function makeSkeletonNode (
           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)
+
+          if (compObject.options !== undefined && !compObject.getOptions) compObject.getOptions = { type: 'js-eval', expr: 'layout.options', pure: true, dataAlias: 'value' }
+          if (compObject.getOptions) pushExpression(expressions, compObject.getOptions)
+
+          if (compObject.props !== undefined && !compObject.getProps) compObject.getProps = { type: 'js-eval', expr: 'layout.props', pure: true, dataAlias: 'value' }
+          if (compObject.getProps) pushExpression(expressions, compObject.getProps)
+
+          if (compObject.transformData) pushExpression(expressions, compObject.transformData)
         }
 
         normalizedLayouts[oneOfPointer] = normalizationResult.layout

package/src/state/index.js

@@ -183,13 +183,20 @@ export class StatefulLayout {
    */
   files = []
 
+  /**
+   * @private
+   * @type {unknown}
+   */
+  _savedData
+
   /**
    * @param {import("../index.js").CompiledLayout} compiledLayout
    * @param {import("../index.js").SkeletonTree} skeletonTree
    * @param {Partial<StatefulLayoutOptions>} options
    * @param {unknown} [data]
+   * @param {unknown} [savedData]
    */
-  constructor (compiledLayout, skeletonTree, options, data) {
+  constructor (compiledLayout, skeletonTree, options, data, savedData) {
     logDataBinding('create stateful layout', compiledLayout, skeletonTree, options, data)
     this._compiledLayout = compiledLayout
     this.skeletonTree = skeletonTree
@@ -197,6 +204,7 @@ export class StatefulLayout {
     this._autofocusTarget = this.options.autofocus ? '' : null
     this._previousAutofocusTarget = null
     this._data = data
+    this._savedData = savedData
     this._previousData = data
     this.initValidationState()
     this.activatedItems = {}
@@ -284,6 +292,7 @@ export class StatefulLayout {
       rehydrate,
       cacheKeys: this._lastCreateStateTreeContext?.cacheKeys ?? {},
       rootData: this._data,
+      savedData: this._savedData,
       files: [],
       nodes: [],
       nodesMap: new Map(),
@@ -362,6 +371,21 @@ export class StatefulLayout {
     return this._lastCreateStateTreeContext.nodes.findIndex(node => node.error && !node.validated) !== -1
   }
 
+  /**
+   * @returns {boolean}
+   */
+  get modified () {
+    if (this._savedData === undefined) return false
+    return !!(this._stateTree.root.modified || this._stateTree.root.childModified)
+  }
+
+  get savedData () { return this._savedData }
+  /** @param {unknown} savedData */
+  set savedData (savedData) {
+    this._savedData = savedData
+    this.updateState()
+  }
+
   /**
    * @private
    * @param {StateNode} node

package/src/state/state-node.js

@@ -5,6 +5,7 @@ import { Display, getChildDisplay } from './utils/display.js'
 import { shallowEqualArray, shallowProduceArray, shallowProduceObject } from './utils/immutable.js'
 import { getRegexp } from './utils/regexps.js'
 import { pathURL } from './utils/urls.js'
+import { resolveDataPath, isNodeModified } from './utils/modified.js'
 
 const logStateNode = debug('jl:state-node')
 const logValidation = debug('jl:validation')
@@ -34,8 +35,8 @@ export const useDefaultData = (data, layout, options) => {
 }
 
 // use Immer for efficient updating with immutability and no-op detection
-/** @type {(draft: import('./types.js').StateNode, key: string | number, fullKey: string, parentFullKey: string | null, dataPath: string, parentDataPath: string | null, skeleton: import('../index.js').SkeletonNode, layout: import('@json-layout/vocabulary').BaseCompObject, width: number, cols: number, data: unknown, error: string | undefined, validated: boolean, options: import('./types.js').StateNodeOptions, titleDepth: number, autofocus: boolean, shouldLoadData: boolean, props: import('@json-layout/vocabulary').StateNodePropsLib, slots: import('@json-layout/vocabulary').Slots | undefined, itemsCacheKey: any, children: import('../index.js').StateNode[] | undefined) => import('../index.js').StateNode} */
-const produceStateNode = produce((draft, key, fullKey, parentFullKey, dataPath, parentDataPath, skeleton, layout, width, cols, data, error, validated, options, titleDepth, autofocus, shouldLoadData, props, slots, itemsCacheKey, children) => {
+/** @type {(draft: import('./types.js').StateNode, key: string | number, fullKey: string, parentFullKey: string | null, dataPath: string, parentDataPath: string | null, skeleton: import('../index.js').SkeletonNode, layout: import('@json-layout/vocabulary').BaseCompObject, width: number, cols: number, data: unknown, error: string | undefined, validated: boolean, options: import('./types.js').StateNodeOptions, titleDepth: number, autofocus: boolean, shouldLoadData: boolean, props: import('@json-layout/vocabulary').StateNodePropsLib, slots: import('@json-layout/vocabulary').Slots | undefined, itemsCacheKey: any, children: import('../index.js').StateNode[] | undefined, modified: boolean | undefined, childModified: boolean | undefined) => import('../index.js').StateNode} */
+const produceStateNode = produce((draft, key, fullKey, parentFullKey, dataPath, parentDataPath, skeleton, layout, width, cols, data, error, validated, options, titleDepth, autofocus, shouldLoadData, props, slots, itemsCacheKey, children, modified, childModified) => {
   draft.messages = layout.messages ? produceStateNodeMessages(draft.messages || {}, layout.messages, options) : options.messages
 
   draft.key = key
@@ -55,6 +56,8 @@ const produceStateNode = produce((draft, key, fullKey, parentFullKey, dataPath,
   draft.error = error
   draft.itemsCacheKey = itemsCacheKey
   draft.childError = children && (children.findIndex(c => c.error || c.childError) !== -1)
+  draft.modified = modified
+  draft.childModified = childModified
   draft.validated = validated
   if (autofocus) {
     draft.autofocus = true
@@ -374,6 +377,10 @@ export function createStateNode (
 ) {
   logStateNode('createStateNode', fullKey)
 
+  // Resolve saved data for this node (needed for cache key and modified computation)
+  const nodeSavedData = context.savedData !== undefined ? resolveDataPath(context.savedData, dataPath) : undefined
+  let suppressChildModified = false
+
   /** @type {import('./types.js').StateNodeCacheKey | null} */
   let cacheKey = null
 
@@ -395,7 +402,8 @@ export function createStateNode (
       context.initial,
       context.rehydrateErrors?.length ?? 0,
       data,
-      titleDepth
+      titleDepth,
+      context.savedData !== undefined ? nodeSavedData : undefined
     ]
     const hasNewErrors = context.errors?.some(e => matchLocalError(e, skeleton, dataPath, parentDataPath))
     if (!hasNewErrors && reusedNode && context.cacheKeys[fullKey] && shallowEqualArray(context.cacheKeys[fullKey], cacheKey)) {
@@ -607,30 +615,39 @@ export function createStateNode (
       const activeChildKey = `${fullKey}/${activeChildTreeIndex}`
       if (context.autofocusTarget === fullKey) context.autofocusTarget = activeChildKey
 
-      const child = createStateNode(
-        context,
-        options,
-        compiledLayout,
-        activeChildTreeIndex,
-        activeChildKey,
-        fullKey,
-        dataPath,
-        dataPath,
-        activeChildNode,
-        null,
-        display,
-        nodeData,
-        { parent: parentContext, data: nodeData },
-        validationState,
-        titleDepth,
-        reusedNode?.children?.[0]
-      )
-      // the oneOf was hydrated
-      if (child.data !== nodeData) {
-        // nodeData = produceHydratedStateNodeData(nodeData, dataPath, child, skeleton.children?.map(childSkeletonKey => compiledLayout.skeletonNodes[childSkeletonKey]))
-        nodeData = child.data
+      const savedDataBackup = context.savedData
+      if (context.savedData !== undefined && isNodeModified(nodeSavedData, nodeData)) {
+        suppressChildModified = true
+        context.savedData = undefined
+      }
+      try {
+        const child = createStateNode(
+          context,
+          options,
+          compiledLayout,
+          activeChildTreeIndex,
+          activeChildKey,
+          fullKey,
+          dataPath,
+          dataPath,
+          activeChildNode,
+          null,
+          display,
+          nodeData,
+          { parent: parentContext, data: nodeData },
+          validationState,
+          titleDepth,
+          reusedNode?.children?.[0]
+        )
+        // the oneOf was hydrated
+        if (child.data !== nodeData) {
+          // nodeData = produceHydratedStateNodeData(nodeData, dataPath, child, skeleton.children?.map(childSkeletonKey => compiledLayout.skeletonNodes[childSkeletonKey]))
+          nodeData = child.data
+        }
+        children = [child]
+      } finally {
+        context.savedData = savedDataBackup
       }
-      children = [child]
     }
   }
 
@@ -698,54 +715,64 @@ export function createStateNode (
       const listItemOptions = layout.listEditMode === 'inline' ? options : produceReadonlyArrayItemOptions(options)
       children = []
       let focusChild = context.autofocusTarget === fullKey
-      for (let i = 0; i < arrayData.length; i++) {
-        const itemData = arrayData[i]
-        const childFullKey = `${fullKey}/${i}`
-        if (focusChild) context.autofocusTarget = childFullKey
-        const child = createStateNode(
-          context,
-          (layout.listEditMode === 'inline-single' && context.activatedItems[fullKey] === i) ? options : listItemOptions,
-          compiledLayout,
-          i,
-          childFullKey,
-          fullKey,
-          `${dataPath}/${i}`,
-          dataPath,
-          childSkeleton,
-          null,
-          display,
-          itemData,
-          { parent: parentContext, data: arrayData },
-          validationState,
-          titleDepth,
-          reusedNode?.children?.[i]
-        )
-        if (child.autofocus || child.autofocusChild !== undefined) focusChild = false
-        children.push(child)
+      // For arrays: check if saved data differs, suppress child modified tracking if so
+      const savedDataBackup = context.savedData
+      if (context.savedData !== undefined && isNodeModified(nodeSavedData, nodeData)) {
+        suppressChildModified = true
+        context.savedData = undefined
       }
+      try {
+        for (let i = 0; i < arrayData.length; i++) {
+          const itemData = arrayData[i]
+          const childFullKey = `${fullKey}/${i}`
+          if (focusChild) context.autofocusTarget = childFullKey
+          const child = createStateNode(
+            context,
+            (layout.listEditMode === 'inline-single' && context.activatedItems[fullKey] === i) ? options : listItemOptions,
+            compiledLayout,
+            i,
+            childFullKey,
+            fullKey,
+            `${dataPath}/${i}`,
+            dataPath,
+            childSkeleton,
+            null,
+            display,
+            itemData,
+            { parent: parentContext, data: arrayData },
+            validationState,
+            titleDepth,
+            reusedNode?.children?.[i]
+          )
+          if (child.autofocus || child.autofocusChild !== undefined) focusChild = false
+          children.push(child)
+        }
 
-      // duplicate active child at the end of the list in case of dialog/menu edition
-      if (context.activatedItems[fullKey] !== undefined && (layout.listEditMode === 'menu' || layout.listEditMode === 'dialog')) {
-        const i = /** @type {number} */(context.activatedItems[fullKey])
-        const activeChild = createStateNode(
-          context,
-          options,
-          compiledLayout,
-          i,
-          `${fullKey}/${i}`,
-          fullKey,
-          `${dataPath}/${i}`,
-          dataPath,
-          childSkeleton,
-          null,
-          new Display(layout.listEditMode === 'menu' ? options.listMenuWidth : options.listDialogWidth),
-          arrayData[i],
-          { parent: parentContext, data: arrayData },
-          validationState,
-          titleDepth,
-          reusedNode?.children?.[i]
-        )
-        children.push(activeChild)
+        // duplicate active child at the end of the list in case of dialog/menu edition
+        if (context.activatedItems[fullKey] !== undefined && (layout.listEditMode === 'menu' || layout.listEditMode === 'dialog')) {
+          const i = /** @type {number} */(context.activatedItems[fullKey])
+          const activeChild = createStateNode(
+            context,
+            options,
+            compiledLayout,
+            i,
+            `${fullKey}/${i}`,
+            fullKey,
+            `${dataPath}/${i}`,
+            dataPath,
+            childSkeleton,
+            null,
+            new Display(layout.listEditMode === 'menu' ? options.listMenuWidth : options.listDialogWidth),
+            arrayData[i],
+            { parent: parentContext, data: arrayData },
+            validationState,
+            titleDepth,
+            reusedNode?.children?.[i]
+          )
+          children.push(activeChild)
+        }
+      } finally {
+        context.savedData = savedDataBackup
       }
     }
   }
@@ -893,6 +920,26 @@ export function createStateNode (
     logGetItems(fullKey, 'list component with unchanged getItems cache key, no fetch will be triggered', itemsCacheKey)
   }
 
+  // Compute modified flags
+  /** @type {boolean | undefined} */
+  let modified
+  /** @type {boolean | undefined} */
+  let childModified
+  if (context.savedData !== undefined) {
+    if (suppressChildModified) {
+      // Array or oneOf that differs from saved — mark as modified, children were not individually compared
+      modified = true
+      childModified = true
+    } else if (children) {
+      // Composite node (including equal arrays/oneOf): aggregate from children
+      modified = false
+      childModified = children.some(c => c.modified || c.childModified) || false
+    } else {
+      // Leaf node: compare directly
+      modified = isNodeModified(nodeSavedData, nodeData)
+    }
+  }
+
   const node = produceStateNode(
     reusedNode ?? /** @type {import('./types.js').StateNode} */({}),
     key,
@@ -914,7 +961,9 @@ export function createStateNode (
     props,
     slots,
     itemsCacheKey,
-    children && shallowProduceArray(reusedNode?.children, children)
+    children && shallowProduceArray(reusedNode?.children, children),
+    modified,
+    childModified
   )
 
   if (cacheKey) {

package/src/state/types.ts

@@ -45,6 +45,8 @@ export interface StateNode {
   data: unknown
   error: string | undefined
   childError: boolean | undefined
+  modified: boolean | undefined
+  childModified: boolean | undefined
   validated: boolean
   width: number
   options: StateNodeOptions
@@ -78,6 +80,7 @@ export interface CreateStateTreeContext {
   rehydrate: boolean
   cacheKeys: Record<string, StateNodeCacheKey>
   rootData: unknown
+  savedData: unknown
   nodes: StateNode[],
   nodesMap: Map<string, StateNode>,
   getItemsDataRequests: StateNode[]
@@ -102,7 +105,8 @@ export type StateNodeCacheKey = [
   boolean,
   number,
   unknown,
-  number
+  number,
+  unknown // savedData resolved for this node
 ]
 
 export interface ValidationState {

package/src/state/utils/modified.js

@@ -0,0 +1,32 @@
+import equal from 'fast-deep-equal'
+
+/**
+ * Resolve a JSON pointer data path against a data object.
+ * @param {unknown} data
+ * @param {string} dataPath - JSON pointer (e.g. '', '/a/b', '/arr/0')
+ * @returns {unknown}
+ */
+export function resolveDataPath (data, dataPath) {
+  if (dataPath === '') return data
+  if (data === undefined || data === null) return undefined
+  const segments = dataPath.slice(1).split('/')
+  let current = data
+  for (const segment of segments) {
+    if (current === undefined || current === null || typeof current !== 'object') return undefined
+    current = /** @type {any} */(current)[segment]
+  }
+  return current
+}
+
+/**
+ * Compare a saved value against a current value.
+ * The caller is responsible for checking if the feature is active (context.savedData !== undefined)
+ * before calling this function.
+ * @param {unknown} savedValue
+ * @param {unknown} currentValue
+ * @returns {boolean}
+ */
+export function isNodeModified (savedValue, currentValue) {
+  if (savedValue === currentValue) return false
+  return !equal(savedValue, currentValue)
+}

package/src/utils/build.js

@@ -8,7 +8,8 @@ export const commonjsDeps = [
   'ajv-formats/dist/formats.js',
   'ajv-i18n',
   'ajv-errors',
-  'debug'
+  'debug',
+  'fast-deep-equal'
 ]
 
 /** @type {string[][]} */
@@ -19,5 +20,6 @@ export const commonjsDepsPaths = [
   ['@json-layout/core', 'ajv-formats/dist/formats.js'],
   ['@json-layout/core', 'ajv-i18n'],
   ['@json-layout/core', 'ajv-errors'],
-  ['@json-layout/core', 'debug']
+  ['@json-layout/core', 'debug'],
+  ['@json-layout/core', 'fast-deep-equal']
 ]