@acorex/platform 20.6.0-next.9 → 20.6.1

package/fesm2022/acorex-platform-layout-builder.mjs

@@ -5,10 +5,9 @@ import { inject, Injectable, input, model, signal, effect, output, viewChild, Ch
 import { AXPopupService } from '@acorex/components/popup';
 import * as i2 from '@acorex/components/form';
 import { AXFormComponent, AXFormModule } from '@acorex/components/form';
-import { AXPExpressionEvaluatorService } from '@acorex/platform/core';
 import * as i1 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetContainerComponent, AXPPageStatus, AXPWidgetCoreModule } from '@acorex/platform/layout/widget-core';
-import { isEqual, get, cloneDeep } from 'lodash-es';
+import { isEqual, cloneDeep } from 'lodash-es';
 import { Subject, debounceTime, distinctUntilChanged, startWith } from 'rxjs';
 import * as i1$1 from '@acorex/components/button';
 import { AXButtonModule } from '@acorex/components/button';
@@ -19,6 +18,7 @@ import { AXLoadingModule } from '@acorex/components/loading';
 import { AXBasePageComponent } from '@acorex/components/page';
 import * as i5 from '@acorex/core/translation';
 import { AXTranslationModule } from '@acorex/core/translation';
+import { AXPExpressionEvaluatorService } from '@acorex/platform/core';
 
 //#region ----   Inheritance Utilities   ----
 /**
@@ -725,6 +725,14 @@ class FormFieldBuilder extends LayoutContainerMixin {
     setShowLabel(showLabel) {
         return this.setOptions({ showLabel });
     }
+    defaultValue(value) {
+        this.containerState.defaultValue = value;
+        this.inheritanceContext.defaultValue = value;
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
     // Single widget methods with automatic path generation
     addSingleWidget(type, options) {
         if (this.hasWidget) {
@@ -916,7 +924,7 @@ class FieldsetContainerBuilder extends LayoutContainerMixin {
  */
 class ListWidgetBuilder extends WidgetContainerMixin {
     constructor() {
-        super('list');
+        super('data-list');
     }
     setOptions(options) {
         this.containerState.options = { ...this.containerState.options, ...options };
@@ -1201,6 +1209,10 @@ class WidgetBuilder {
         this.inheritanceContext.disabled = condition;
         return this;
     }
+    defaultValue(defaultValue) {
+        this.widgetState.defaultValue = defaultValue;
+        return this;
+    }
     readonly(condition) {
         if (!this.widgetState.options) {
             this.widgetState.options = {};
@@ -1241,6 +1253,9 @@ class WidgetBuilder {
         if (resolved.visible !== undefined) {
             this.widgetState.options['visible'] = resolved.visible;
         }
+        if (context.defaultValue !== undefined) {
+            this.widgetState.defaultValue = context.defaultValue;
+        }
         return this;
     }
     getInheritanceContext() {
@@ -1691,29 +1706,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
 
 class AXPLayoutRendererComponent {
     constructor() {
-        this.evaluatorService = inject(AXPExpressionEvaluatorService);
         this.conversionService = inject(AXPLayoutConversionService);
-        /**
-         * Tracks the latest scheduled evaluation to ensure last-write-wins for async evaluate
-         */
-        this.evaluationRunId = 0;
         /**
          * RxJS subjects for context management
          */
         this.contextUpdateSubject = new Subject();
         this.contextChangeSubject = new Subject();
-        /**
-         * Cache for expression evaluation results
-         */
-        this.expressionCache = new Map();
-        /**
-         * Cache for widget tree comparisons
-         */
-        this.widgetTreeCache = new Map();
-        /**
-         * Last layout hash for change detection
-         */
-        this.lastLayoutHash = '';
         //#region ----   Inputs   ----
         /**
          * Form definition containing groups and fields OR widget tree
@@ -1735,36 +1733,29 @@ class AXPLayoutRendererComponent {
         //#region ----   Widget Tree Conversion   ----
         this.widgetTree = signal(null, ...(ngDevMode ? [{ debugName: "widgetTree" }] : []));
         /**
-         * Convert and evaluate data when inputs change (optimized with RxJS)
+         * Convert layout data to widget tree when inputs change
          */
         this.conversionEffect = effect(() => {
             const inputData = this.layout();
-            const ctx = this.internalContext();
-            const look = this.look();
-            const runId = ++this.evaluationRunId;
-            // Generate layout hash for change detection
-            const layoutHash = this.generateLayoutHash(inputData, look);
-            // Skip if layout hasn't changed
-            if (layoutHash === this.lastLayoutHash && this.widgetTree()) {
+            // Convert to widget tree
+            let tree;
+            if (this.isFormDefinition(inputData)) {
+                // Convert form definition to widget tree
+                tree = this.conversionService.convertFormDefinition(inputData);
+            }
+            else if (this.isWidgetNode(inputData)) {
+                // Use widget tree directly
+                tree = inputData;
+            }
+            else {
+                console.warn('AXPLayoutRendererComponent: Invalid layout input. Expected AXPDynamicFormDefinition or AXPWidgetNode.', inputData);
                 return;
             }
-            this.lastLayoutHash = layoutHash;
-            (async () => {
-                // First evaluate expressions if needed
-                const evaluated = await this.expressionEvaluator(inputData, ctx);
-                // Ignore stale results
-                if (runId !== this.evaluationRunId) {
-                    return;
-                }
-                // Convert to widget tree (this will also apply the layout look)
-                const tree = evaluated;
-                // Update widget tree
-                const prev = this.widgetTree();
-                if (!isEqual(prev, tree)) {
-                    tree.mode = this.mode();
-                    this.widgetTree.set(tree);
-                }
-            })();
+            // Update widget tree only if changed (Angular effect already prevents unnecessary runs)
+            const prev = this.widgetTree();
+            if (!isEqual(prev, tree)) {
+                this.widgetTree.set(tree);
+            }
         }, ...(ngDevMode ? [{ debugName: "conversionEffect" }] : []));
         //#endregion
         //#region ----   Outputs   ----
@@ -1807,32 +1798,6 @@ class AXPLayoutRendererComponent {
             }
         }, ...(ngDevMode ? [{ debugName: "#widgetStatusEffect" }] : []));
     }
-    async expressionEvaluator(expression, context) {
-        // Check if it's a form definition that needs conversion
-        if (this.isFormDefinition(expression)) {
-            return this.conversionService.convertFormDefinition(expression);
-        }
-        // Generate cache key using a more efficient method
-        const cacheKey = this.generateCacheKey(expression, context);
-        // Check cache first
-        if (this.expressionCache.has(cacheKey)) {
-            return this.expressionCache.get(cacheKey);
-        }
-        const scope = {
-            context: {
-                eval: (path) => get(context, path),
-            },
-        };
-        const result = await this.evaluatorService.evaluate(expression, scope);
-        // Cache result with LRU-like behavior
-        if (this.expressionCache.size > 50) {
-            // Clear half the cache when it gets too large
-            const keysToDelete = Array.from(this.expressionCache.keys()).slice(0, 25);
-            keysToDelete.forEach((key) => this.expressionCache.delete(key));
-        }
-        this.expressionCache.set(cacheKey, result);
-        return result;
-    }
     //#endregion
     //#region ----   Lifecycle Methods   ----
     ngOnInit() {
@@ -1965,55 +1930,11 @@ class AXPLayoutRendererComponent {
     isFormDefinition(data) {
         return data && typeof data === 'object' && 'groups' in data && Array.isArray(data.groups);
     }
-    //#endregion
-    //#region ----   Utility Methods   ----
-    /**
-     * Generate layout hash for change detection (short hash)
-     */
-    generateLayoutHash(layout, look) {
-        if (!layout)
-            return '';
-        // Generate short hash for large layout strings
-        const layoutStr = typeof layout === 'string' ? layout : JSON.stringify(layout);
-        const layoutHash = this.simpleHash(layoutStr);
-        return `${layoutHash}|${look}`;
-    }
-    /**
-     * Generate cache key for expression evaluation (short hash)
-     */
-    generateCacheKey(expression, context) {
-        // Use short hash for better performance
-        const exprStr = typeof expression === 'string' ? expression : JSON.stringify(expression);
-        const exprHash = this.simpleHash(exprStr);
-        const ctxHash = this.generateContextHash(context);
-        return `${exprHash}|${ctxHash}`;
-    }
     /**
-     * Generate a simple hash for context change detection
+     * Type guard to check if the input is a widget node
      */
-    generateContextHash(context) {
-        if (!context || typeof context !== 'object') {
-            return String(context);
-        }
-        // Generate short hash for context
-        const keys = Object.keys(context).sort();
-        const contextStr = keys.map((key) => `${key}:${context[key]}`).join('|');
-        return this.simpleHash(contextStr);
-    }
-    /**
-     * Simple hash function for generating short keys
-     */
-    simpleHash(str) {
-        let hash = 0;
-        if (str.length === 0)
-            return hash.toString();
-        for (let i = 0; i < str.length; i++) {
-            const char = str.charCodeAt(i);
-            hash = (hash << 5) - hash + char;
-            hash = hash & hash; // Convert to 32-bit integer
-        }
-        // Convert to positive hex string
-        return Math.abs(hash).toString(16);
+    isWidgetNode(data) {
+        return data && typeof data === 'object' && 'type' in data && typeof data.type === 'string';
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPLayoutRendererComponent, isStandalone: true, selector: "axp-layout-renderer", inputs: { layout: { classPropertyName: "layout", publicName: "layout", isSignal: true, isRequired: true, transformFunction: null }, context: { classPropertyName: "context", publicName: "context", isSignal: true, isRequired: false, transformFunction: null }, look: { classPropertyName: "look", publicName: "look", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { context: "contextChange", contextInitiated: "contextInitiated", validityChange: "validityChange" }, viewQueries: [{ propertyName: "form", first: true, predicate: AXFormComponent, descendants: true, isSignal: true }, { propertyName: "container", first: true, predicate: AXPWidgetContainerComponent, descendants: true, isSignal: true }], ngImport: i0, template: `