@siliconst/metaui 1.4.21 → 1.4.37

package/src/nz/co/siliconst/ui5/metaui/core/Engine.ts

@@ -6,7 +6,7 @@
 import { ISchema, IPropertyMetadata } from "../interfaces/ISchema";
 import { ILayoutManager } from "../interfaces/ILayoutManager";
 import { IPlugin, IPluginValidationResult } from "../interfaces/IPlugin";
-import { ConditionEngine } from "./ConditionEngine";
+
 import { PluginRegistry } from "./PluginRegistry";
 import Control from "sap/ui/core/Control";
 import VBox from "sap/m/VBox";
@@ -15,6 +15,7 @@ import { Logger } from "../utils/Logger";
 import { DefaultLayoutGenerator } from "./DefaultLayoutGenerator";
 import Core from "sap/ui/core/Core";
 import Messaging from "sap/ui/core/Messaging";
+import { GlobalPipeline } from "./PipelineManager";
 
 /**
  * The Engine is responsible for translating a normalized schema into a physical UI5 layout.
@@ -27,16 +28,21 @@ import Messaging from "sap/ui/core/Messaging";
  * @public
  */
 export class Engine {
-    /** Handles dynamic conditional logic across the active form. */
-    private conditionEngine: ConditionEngine | null = null;
+
 
     /** Array of all instantiated plugins generated during the current build. */
     private activePlugins: { plugin: IPlugin, path: string }[] = [];
 
+    /** Array of template plugins generated for table rows to prevent memory leaks during destruction. */
+    private templatePlugins: { plugin: IPlugin, path: string }[] = [];
+
     /** Deterministic scope ID injected by the host control to prevent clone collisions. */
     public engineScopeId?: string;
 
-    private activeModel?: sap.ui.model.Model;
+    private activeModel?: unknown;
+
+    /** Ledger tracking local vs cross-field errors to prevent visual race conditions. */
+    private validationLedger: Map<string, { schemaError: string | null, policyError: string | null }> = new Map();
 
     /** Reference to the GeneratorHost that instantiated this engine, for retrieving global definitions. */
     public host?: unknown;
@@ -79,26 +85,22 @@ export class Engine {
      * @param onChange Callback fired when field values change.
      * @returns The generated root UI5 Control container.
      */
-    public build(schema: ISchema, model: sap.ui.model.Model, modelName: string = "meta", onSubmit?: () => void, engineScopeId?: string, onChange?: (isValid: boolean, fieldKey?: string, errorMessage?: string, controlId?: string) => void): Control {
-        this.conditionEngine = new ConditionEngine(schema);
+    public build(schema: ISchema, model: unknown, modelName: string = "meta", onSubmit?: () => void, engineScopeId?: string, onChange?: (isValid: boolean, fieldKey?: string, errorMessage?: string, controlId?: string) => void): Control {
+
         this.activePlugins = [];
         this.activeModel = model;
         this.engineScopeId = engineScopeId;
         this.onChange = (isValid: boolean, fieldKey?: string, errorMessage?: string, controlId?: string) => {
-            if (this.conditionEngine && fieldKey) {
-                this.conditionEngine.handleEvent(fieldKey, isValid);
+            if (fieldKey) {
+                this.reportSchemaError(fieldKey, isValid ? null : errorMessage || "Invalid input");
             }
+
             if (onChange) {
                 onChange(isValid, fieldKey, errorMessage, controlId);
             }
         };
 
         try {
-            // Intercept and synthesize a default layout if the developer/backend failed to provide one
-            if (DefaultLayoutGenerator.ensureLayout(schema)) {
-                Logger.warn("[MetaUI Engine] Missing 'uiLayout' array in schema. Synthesized a default layout mapping to prevent a blank render.");
-            }
-
             const layoutStrategy = schema.layoutStrategy || (schema.type === "array" ? "table" : "form");
             const layoutManager = this.pluginRegistry.getLayout(layoutStrategy);
 
@@ -134,13 +136,13 @@ export class Engine {
 
             if (!isTemplate) {
                 this.activePlugins.push({ plugin, path: bindingPath });
+            } else {
+                this.templatePlugins.push({ plugin, path: bindingPath });
             }
             const scopeId = isTemplate ? undefined : this.engineScopeId;
             const control = plugin.render(fieldMeta, bindingPath, modelName, scopeId, this.onChange, this.activeModel);
 
-            if (this.conditionEngine) {
-                this.conditionEngine.registerPlugin(bindingPath, plugin);
-            }
+
 
             return control;
         } catch (error) {
@@ -163,6 +165,10 @@ export class Engine {
      */
     public generateLayout(schema: ISchema, modelName: string, bindingPath?: string): Control {
         try {
+            if (DefaultLayoutGenerator.ensureLayout(schema)) {
+                Logger.warn(`[MetaUI Engine] Missing 'uiLayout' array in sub-schema for ${bindingPath}. Synthesized a default layout mapping.`);
+            }
+
             const layoutStrategy = schema.layoutStrategy || (schema.type === "array" ? "table" : "form");
             const layoutManager = this.pluginRegistry.getLayout(layoutStrategy);
             return layoutManager.render(schema, modelName, this, undefined, bindingPath);
@@ -186,8 +192,8 @@ export class Engine {
         for (const item of this.activePlugins) {
             try {
                 const result = item.plugin.validate();
-                if (applyVisualState && typeof item.plugin.setVisualValidationState === "function") {
-                    item.plugin.setVisualValidationState(result.isValid, result.errorMessage);
+                if (applyVisualState) {
+                    this.reportSchemaError(item.path, result.isValid ? null : result.errorMessage || "Invalid input");
                 }
 
                 if (!result.isValid) {
@@ -201,6 +207,102 @@ export class Engine {
                 Logger.error(`[MetaUI Engine] Error validating plugin at ${item.path}`, (error as Error).message);
             }
         }
+
+        // 2. Recursively validate arrays via StateManager payload traversing for Table layout rows
+        if (this.host && typeof (this.host as any).getStateManager === "function") {
+            const stateManager = (this.host as any).getStateManager();
+            if (stateManager) {
+                const payload = stateManager.extractPayload();
+                const schema = stateManager.getSchema ? stateManager.getSchema() : (this.host as any).getParsedSchema?.();
+                if (payload && schema) {
+                    const arrayErrors = this.validatePayloadArrays(schema, payload, "");
+                    if (applyVisualState) {
+                        arrayErrors.forEach(err => {
+                            if (err.fieldKey) {
+                                this.reportSchemaError(err.fieldKey, err.isValid ? null : err.errorMessage || "Invalid input");
+                            }
+                        });
+                    }
+                    errors.push(...arrayErrors.filter(e => !e.isValid));
+                }
+            }
+        }
+
+        return errors;
+    }
+
+    public onArrayMutated(arrayPath: string): void {
+        if (this.host && typeof (this.host as any).getStateManager === "function") {
+            const stateManager = (this.host as any).getStateManager();
+            if (stateManager && typeof stateManager.clearArrayMessages === "function") {
+                stateManager.clearArrayMessages(arrayPath);
+            }
+        }
+    }
+
+    private validatePayloadArrays(schema: any, payload: any, currentPath: string): IPluginValidationResult[] {
+        const errors: IPluginValidationResult[] = [];
+        if (!schema || !payload || typeof payload !== "object") return errors;
+
+        if (schema.type === "object" && schema.properties) {
+            for (const key of Object.keys(schema.properties)) {
+                const propSchema = schema.properties[key];
+                if (payload[key] !== undefined) {
+                    const childPath = currentPath ? `${currentPath}/${key}` : key;
+                    errors.push(...this.validatePayloadArrays(propSchema, payload[key], childPath));
+                }
+            }
+        } else if (schema.type === "array" && schema.items && Array.isArray(payload)) {
+            payload.forEach((item, index) => {
+                const itemPath = currentPath ? `${currentPath}/${index}` : `${index}`;
+                if (schema.items.type === "object" && schema.items.properties) {
+                    for (const key of Object.keys(schema.items.properties)) {
+                        const propMeta = schema.items.properties[key];
+                        const propPath = `${itemPath}/${key}`;
+                        const val = item ? item[key] : undefined;
+                        
+                        const validatorsToRun: string[] = [];
+                        const argsMap: Record<string, unknown> = {};
+
+                        if (propMeta.required) validatorsToRun.push("required");
+                        if (propMeta.maxLength !== undefined) {
+                            validatorsToRun.push("maxLength");
+                            argsMap["maxLength"] = propMeta.maxLength;
+                        }
+                        if (propMeta.minLength !== undefined) {
+                            validatorsToRun.push("minLength");
+                            argsMap["minLength"] = propMeta.minLength;
+                        }
+                        if (propMeta.pattern !== undefined) {
+                            validatorsToRun.push("pattern");
+                            argsMap["pattern"] = { regex: propMeta.pattern };
+                        }
+                        if (propMeta.minimum !== undefined || propMeta.maximum !== undefined) {
+                            validatorsToRun.push("range");
+                            argsMap["range"] = { min: propMeta.minimum, max: propMeta.maximum };
+                        }
+                        const format = propMeta.ui?.format;
+                        if (format === "email" || format === "url" || format === "iban") {
+                            validatorsToRun.push(format);
+                        }
+                        
+                        if (validatorsToRun.length > 0) {
+                            const res = GlobalPipeline.executeValidation(val, validatorsToRun, argsMap);
+                            if (!res.isValid) {
+                                errors.push({
+                                    isValid: false,
+                                    errorMessage: res.errorMessage,
+                                    fieldKey: propPath,
+                                    fieldLabel: propMeta.ui?.label || key
+                                });
+                            } else {
+                                errors.push({ isValid: true, fieldKey: propPath }); // Push successful state to clear old errors
+                            }
+                        }
+                    }
+                }
+            });
+        }
         return errors;
     }
 
@@ -212,45 +314,121 @@ export class Engine {
      * @returns {IPlugin | undefined} The plugin instance, or undefined if not found.
      */
     public getPluginByPath(path: string): import("../interfaces/IPlugin").IPlugin | undefined {
-        const cleanPath = path.startsWith("/") ? path : `/${path}`;
-        const match = this.activePlugins.find(p => p.path === cleanPath || p.path === `/${cleanPath}`);
+        const cleanPath = path.replace(/^\//, "");
+        const match = this.activePlugins.find(p => p.path.replace(/^\//, "") === cleanPath);
         return match ? match.plugin : undefined;
     }
 
+    /**
+     * Reports a localized schema validation error to the coordinator ledger.
+     */
+    public reportSchemaError(fieldPath: string, errorMessage: string | null): void {
+        const cleanPath = fieldPath.replace(/^\//, "");
+        if (!this.validationLedger.has(cleanPath)) {
+            this.validationLedger.set(cleanPath, { schemaError: null, policyError: null });
+        }
+        this.validationLedger.get(cleanPath)!.schemaError = errorMessage;
+        this.resolveVisualState(cleanPath);
+    }
+
+    /**
+     * Reports a cross-field policy error to the coordinator ledger.
+     */
+    public reportPolicyError(fieldPath: string, errorMessage: string | null): void {
+        const cleanPath = fieldPath.replace(/^\//, "");
+        if (!this.validationLedger.has(cleanPath)) {
+            this.validationLedger.set(cleanPath, { schemaError: null, policyError: null });
+        }
+        this.validationLedger.get(cleanPath)!.policyError = errorMessage;
+        this.resolveVisualState(cleanPath);
+    }
+
+    /**
+     * Computes the final visual state by checking both engines and applies it to the plugin.
+     */
+    private resolveVisualState(cleanPath: string): void {
+        const plugin = this.getPluginByPath(cleanPath);
+        const ledgerEntry = this.validationLedger.get(cleanPath);
+        if (!ledgerEntry) return;
+
+        const isError = ledgerEntry.policyError !== null || ledgerEntry.schemaError !== null;
+        const errorMessage = ledgerEntry.policyError || ledgerEntry.schemaError;
+
+        if (plugin && typeof plugin.setVisualValidationState === "function") {
+            plugin.setVisualValidationState(!isError, isError ? errorMessage || undefined : undefined);
+        } else {
+            // Un-tracked template clones (Table Layout rows)
+            this.setNativeControlError(cleanPath, isError ? errorMessage || undefined : undefined);
+        }
+    }
+
+    private setNativeControlError(targetPath: string, errorMessage?: string): void {
+        if (this.host && (this.host as any).generatedContent) {
+            const rootControl = (this.host as any).generatedContent;
+            this.traverseAndSetError(rootControl, targetPath, errorMessage);
+        }
+    }
+
+    private traverseAndSetError(control: any, targetPath: string, errorMessage?: string): void {
+        if (!control) return;
+        
+        const bindingInfos = [control.getBindingInfo("value"), control.getBindingInfo("selectedKey"), control.getBindingInfo("dateValue"), control.getBindingInfo("selected")];
+        for (const info of bindingInfos) {
+            if (info && info.parts && info.parts.length > 0) {
+                const boundPath = info.parts[0].path;
+                // UI5 relative bindings drop the leading slash in the context, but retain it in the path
+                if (boundPath === targetPath || targetPath.endsWith(boundPath)) {
+                    // Ensure we match the exact row context path
+                    const context = control.getBindingContext((this.host as any).activeModelName);
+                    if (context) {
+                        const fullPath = context.getPath() + "/" + boundPath;
+                        const cleanedFullPath = fullPath.replace(/^\//, "");
+                        if (cleanedFullPath === targetPath) {
+                            if (typeof control.setValueState === "function") {
+                                control.setValueState(errorMessage ? "Error" : "None");
+                                if (typeof control.setValueStateText === "function") {
+                                    control.setValueStateText(errorMessage || "");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        if (typeof control.getAggregation === "function" && typeof control.getMetadata === "function") {
+            const aggs = control.getMetadata().getAggregations();
+            for (const aggName in aggs) {
+                const child = control.getAggregation(aggName);
+                if (Array.isArray(child)) {
+                    child.forEach(c => this.traverseAndSetError(c, targetPath, errorMessage));
+                } else if (child) {
+                    this.traverseAndSetError(child, targetPath, errorMessage);
+                }
+            }
+        }
+    }
+
     /**
      * Cleans up internal state and destroys the condition engine to prevent memory leaks.
      */
     public destroy(): void {
-        if (this.conditionEngine) {
-            this.conditionEngine.destroy();
-            this.conditionEngine = null;
-        }
 
-        // ------------------------------------------------------------------------
-        // Ghost Error Prevention
-        // Flush MessageManager for active plugins before destroying their controls
-        // ------------------------------------------------------------------------
-        const messageManager = Messaging;
-        const existingMessages = messageManager.getMessageModel().getData();
-        const messagesToRemove: unknown[] = [];
 
         for (const item of this.activePlugins) {
-            if (this.activeModel) {
-                const targetPath = `/${item.path.replace(/^\//, "")}`;
-                const matched = (existingMessages as { getTarget: () => string, getMessageProcessor: () => { getId: () => string } }[]).filter(msg =>
-                    msg.getTarget() === targetPath && msg.getMessageProcessor() && msg.getMessageProcessor().getId() === this.activeModel!.getId()
-                );
-                messagesToRemove.push(...matched);
-            }
             if (typeof item.plugin.destroy === "function") {
                 item.plugin.destroy();
             }
         }
 
-        if (messagesToRemove.length > 0) {
-            messageManager.removeMessages(messagesToRemove);
+        for (const item of this.templatePlugins) {
+            if (typeof item.plugin.destroy === "function") {
+                item.plugin.destroy();
+            }
         }
 
+        this.validationLedger.clear();
         this.activePlugins = [];
+        this.templatePlugins = [];
     }
 }

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator-dbg.js

@@ -0,0 +1,86 @@
+sap.ui.define(["./SchemaNormalizer", "../constants/MetaUIConstants"], function (___SchemaNormalizer, ___constants_MetaUIConstants) {
+  "use strict";
+
+  /**
+   * @file LayoutMutator.ts
+   * @description Intercepts the generated schema before rendering to dynamically mutate the UI layout based on inline rendering rules.
+   */
+  const SchemaNormalizer = ___SchemaNormalizer["SchemaNormalizer"];
+  const RENDER_MODE = ___constants_MetaUIConstants["RENDER_MODE"];
+  const SCHEMA_TYPE = ___constants_MetaUIConstants["SCHEMA_TYPE"];
+  class LayoutMutator {
+    /**
+     * Mutates the `uiLayout` array to expand nested inline objects into native Groups.
+     * @param schema The normalized root schema.
+     */
+    static apply(schema) {
+      if (!schema || !schema.uiLayout || !Array.isArray(schema.uiLayout)) {
+        return; // No layout to mutate
+      }
+      schema.uiLayout = this.expandElements(schema.uiLayout, schema);
+    }
+    static expandElements(elements, rootSchema) {
+      const expanded = [];
+      for (const element of elements) {
+        if (element.type === "Group") {
+          // Recursively expand group elements
+          if (element.elements) {
+            element.elements = this.expandElements(element.elements, rootSchema);
+          }
+          expanded.push(element);
+        } else if (element.type === "Control") {
+          if (!element.scope) {
+            expanded.push(element);
+            continue;
+          }
+          // Resolve the schema to see if this control points to an inline object
+          try {
+            const {
+              meta,
+              bindingPath
+            } = SchemaNormalizer.resolveScope(rootSchema, element.scope);
+            const hasExplicitWidget = !!meta?.ui?.widget;
+            const isInlineObject = meta?.type === SCHEMA_TYPE.OBJECT && meta.ui?.renderMode === RENDER_MODE.INLINE && !hasExplicitWidget;
+            if (isInlineObject && meta.properties) {
+              // Transform this Control into a Group containing its properties
+              const newGroup = {
+                ...element,
+                type: "Group",
+                label: element.label || meta.ui?.label || bindingPath.split("/").pop(),
+                elements: []
+              };
+              delete newGroup.scope;
+
+              // Add all child properties as controls
+              for (const childKey of Object.keys(meta.properties)) {
+                newGroup.elements.push({
+                  type: "Control",
+                  scope: `${element.scope}/properties/${childKey}`
+                });
+              }
+
+              // Recursively expand this new group in case it contains further inline objects
+              newGroup.elements = this.expandElements(newGroup.elements, rootSchema);
+              expanded.push(newGroup);
+            } else {
+              // Scalar control, keep as is
+              expanded.push(element);
+            }
+          } catch (e) {
+            // Scope not found, keep element to let normal error handling report it
+            expanded.push(element);
+          }
+        } else {
+          expanded.push(element);
+        }
+      }
+      return expanded;
+    }
+  }
+  var __exports = {
+    __esModule: true
+  };
+  __exports.LayoutMutator = LayoutMutator;
+  return __exports;
+});
+//# sourceMappingURL=LayoutMutator-dbg.js.map

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator-dbg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LayoutMutator-dbg.js","names":["SchemaNormalizer","___SchemaNormalizer","RENDER_MODE","___constants_MetaUIConstants","SCHEMA_TYPE","LayoutMutator","apply","schema","uiLayout","Array","isArray","expandElements","elements","rootSchema","expanded","element","type","push","scope","meta","bindingPath","resolveScope","hasExplicitWidget","ui","widget","isInlineObject","OBJECT","renderMode","INLINE","properties","newGroup","label","split","pop","childKey","Object","keys","e","__exports","__esModule"],"sources":["LayoutMutator.ts"],"sourcesContent":["/**\n * @file LayoutMutator.ts\n * @description Intercepts the generated schema before rendering to dynamically mutate the UI layout based on inline rendering rules.\n */\n\nimport { ISchema, ILayoutElement } from \"../interfaces/ISchema\";\nimport { SchemaNormalizer } from \"./SchemaNormalizer\";\nimport { RENDER_MODE, SCHEMA_TYPE } from \"../constants/MetaUIConstants\";\n\nexport class LayoutMutator {\n    /**\n     * Mutates the `uiLayout` array to expand nested inline objects into native Groups.\n     * @param schema The normalized root schema.\n     */\n    public static apply(schema: ISchema): void {\n        if (!schema || !schema.uiLayout || !Array.isArray(schema.uiLayout)) {\n            return; // No layout to mutate\n        }\n\n        schema.uiLayout = this.expandElements(schema.uiLayout, schema);\n    }\n\n    private static expandElements(elements: ILayoutElement[], rootSchema: ISchema): ILayoutElement[] {\n        const expanded: ILayoutElement[] = [];\n\n        for (const element of elements) {\n            if (element.type === \"Group\") {\n                // Recursively expand group elements\n                if (element.elements) {\n                    element.elements = this.expandElements(element.elements, rootSchema);\n                }\n                expanded.push(element);\n            } else if (element.type === \"Control\") {\n                if (!element.scope) {\n                    expanded.push(element);\n                    continue;\n                }\n                // Resolve the schema to see if this control points to an inline object\n                try {\n                    const { meta, bindingPath } = SchemaNormalizer.resolveScope(rootSchema, element.scope);\n                    \n                    const hasExplicitWidget = !!meta?.ui?.widget;\n                    const isInlineObject = meta?.type === SCHEMA_TYPE.OBJECT && meta.ui?.renderMode === RENDER_MODE.INLINE && !hasExplicitWidget;\n\n                    if (isInlineObject && meta.properties) {\n                        // Transform this Control into a Group containing its properties\n                        const newGroup: ILayoutElement = {\n                            ...element,\n                            type: \"Group\",\n                            label: element.label || meta.ui?.label || bindingPath.split(\"/\").pop(),\n                            elements: []\n                        };\n                        delete newGroup.scope;\n\n                        // Add all child properties as controls\n                        for (const childKey of Object.keys(meta.properties)) {\n                            newGroup.elements!.push({\n                                type: \"Control\",\n                                scope: `${element.scope}/properties/${childKey}`\n                            });\n                        }\n\n                        // Recursively expand this new group in case it contains further inline objects\n                        newGroup.elements = this.expandElements(newGroup.elements!, rootSchema);\n                        \n                        expanded.push(newGroup);\n                    } else {\n                        // Scalar control, keep as is\n                        expanded.push(element);\n                    }\n                } catch (e) {\n                    // Scope not found, keep element to let normal error handling report it\n                    expanded.push(element);\n                }\n            } else {\n                expanded.push(element);\n            }\n        }\n\n        return expanded;\n    }\n}\n"],"mappings":"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","ignoreList":[]}

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.d.ts

@@ -0,0 +1,16 @@
+declare module "nz/co/siliconst/ui5/metaui/core/LayoutMutator" {
+    /**
+     * @file LayoutMutator.ts
+     * @description Intercepts the generated schema before rendering to dynamically mutate the UI layout based on inline rendering rules.
+     */
+    import { ISchema } from "nz/co/siliconst/ui5/metaui/interfaces/ISchema";
+    export class LayoutMutator {
+        /**
+         * Mutates the `uiLayout` array to expand nested inline objects into native Groups.
+         * @param schema The normalized root schema.
+         */
+        static apply(schema: ISchema): void;
+        private static expandElements;
+    }
+}
+//# sourceMappingURL=LayoutMutator.d.ts.map

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LayoutMutator.d.ts","sourceRoot":"../../../../../../../..","sources":["src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,+CAA+C,CAAC;IAC/D;;;OAGG;IAEH,OAAO,EAAE,OAAO,EAAkB,MAAM,+CAA+C,CAAC;IAIxF,MAAa,aAAa;QACtB;;;WAGG;eACW,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;QAQ1C,OAAO,CAAC,MAAM,CAAC,cAAc;KA2DhC;CAEA"}

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.js

@@ -0,0 +1,2 @@
+sap.ui.define(["./SchemaNormalizer","../constants/MetaUIConstants"],function(e,t){"use strict";const s=e["SchemaNormalizer"];const o=t["RENDER_MODE"];const n=t["SCHEMA_TYPE"];class p{static apply(e){if(!e||!e.uiLayout||!Array.isArray(e.uiLayout)){return}e.uiLayout=this.expandElements(e.uiLayout,e)}static expandElements(e,t){const p=[];for(const r of e){if(r.type==="Group"){if(r.elements){r.elements=this.expandElements(r.elements,t)}p.push(r)}else if(r.type==="Control"){if(!r.scope){p.push(r);continue}try{const{meta:e,bindingPath:i}=s.resolveScope(t,r.scope);const a=!!e?.ui?.widget;const u=e?.type===n.OBJECT&&e.ui?.renderMode===o.INLINE&&!a;if(u&&e.properties){const s={...r,type:"Group",label:r.label||e.ui?.label||i.split("/").pop(),elements:[]};delete s.scope;for(const t of Object.keys(e.properties)){s.elements.push({type:"Control",scope:`${r.scope}/properties/${t}`})}s.elements=this.expandElements(s.elements,t);p.push(s)}else{p.push(r)}}catch(e){p.push(r)}}else{p.push(r)}}return p}}var r={__esModule:true};r.LayoutMutator=p;return r});
+//# sourceMappingURL=LayoutMutator.js.map

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LayoutMutator.js","names":["SchemaNormalizer","___SchemaNormalizer","RENDER_MODE","___constants_MetaUIConstants","SCHEMA_TYPE","LayoutMutator","apply","schema","uiLayout","Array","isArray","this","expandElements","elements","rootSchema","expanded","element","type","push","scope","meta","bindingPath","resolveScope","hasExplicitWidget","ui","widget","isInlineObject","OBJECT","renderMode","INLINE","properties","newGroup","label","split","pop","childKey","Object","keys","e","__exports","__esModule"],"sources":["LayoutMutator.ts"],"sourcesContent":["/**\n * @file LayoutMutator.ts\n * @description Intercepts the generated schema before rendering to dynamically mutate the UI layout based on inline rendering rules.\n */\n\nimport { ISchema, ILayoutElement } from \"../interfaces/ISchema\";\nimport { SchemaNormalizer } from \"./SchemaNormalizer\";\nimport { RENDER_MODE, SCHEMA_TYPE } from \"../constants/MetaUIConstants\";\n\nexport class LayoutMutator {\n    /**\n     * Mutates the `uiLayout` array to expand nested inline objects into native Groups.\n     * @param schema The normalized root schema.\n     */\n    public static apply(schema: ISchema): void {\n        if (!schema || !schema.uiLayout || !Array.isArray(schema.uiLayout)) {\n            return; // No layout to mutate\n        }\n\n        schema.uiLayout = this.expandElements(schema.uiLayout, schema);\n    }\n\n    private static expandElements(elements: ILayoutElement[], rootSchema: ISchema): ILayoutElement[] {\n        const expanded: ILayoutElement[] = [];\n\n        for (const element of elements) {\n            if (element.type === \"Group\") {\n                // Recursively expand group elements\n                if (element.elements) {\n                    element.elements = this.expandElements(element.elements, rootSchema);\n                }\n                expanded.push(element);\n            } else if (element.type === \"Control\") {\n                if (!element.scope) {\n                    expanded.push(element);\n                    continue;\n                }\n                // Resolve the schema to see if this control points to an inline object\n                try {\n                    const { meta, bindingPath } = SchemaNormalizer.resolveScope(rootSchema, element.scope);\n                    \n                    const hasExplicitWidget = !!meta?.ui?.widget;\n                    const isInlineObject = meta?.type === SCHEMA_TYPE.OBJECT && meta.ui?.renderMode === RENDER_MODE.INLINE && !hasExplicitWidget;\n\n                    if (isInlineObject && meta.properties) {\n                        // Transform this Control into a Group containing its properties\n                        const newGroup: ILayoutElement = {\n                            ...element,\n                            type: \"Group\",\n                            label: element.label || meta.ui?.label || bindingPath.split(\"/\").pop(),\n                            elements: []\n                        };\n                        delete newGroup.scope;\n\n                        // Add all child properties as controls\n                        for (const childKey of Object.keys(meta.properties)) {\n                            newGroup.elements!.push({\n                                type: \"Control\",\n                                scope: `${element.scope}/properties/${childKey}`\n                            });\n                        }\n\n                        // Recursively expand this new group in case it contains further inline objects\n                        newGroup.elements = this.expandElements(newGroup.elements!, rootSchema);\n                        \n                        expanded.push(newGroup);\n                    } else {\n                        // Scalar control, keep as is\n                        expanded.push(element);\n                    }\n                } catch (e) {\n                    // Scope not found, keep element to let normal error handling report it\n                    expanded.push(element);\n                }\n            } else {\n                expanded.push(element);\n            }\n        }\n\n        return expanded;\n    }\n}\n"],"mappings":"+FAAA,MAMSA,EAAgBC,EAAA,0BAChBC,EAAWC,EAAA,qBAAEC,EAAWD,EAAA,eAE1B,MAAME,EAKT,YAAcC,CAAMC,GAChB,IAAKA,IAAWA,EAAOC,WAAaC,MAAMC,QAAQH,EAAOC,UAAW,CAChE,MACJ,CAEAD,EAAOC,SAAWG,KAAKC,eAAeL,EAAOC,SAAUD,EAC3D,CAEA,qBAAeK,CAAeC,EAA4BC,GACtD,MAAMC,EAA6B,GAEnC,IAAK,MAAMC,KAAWH,EAAU,CAC5B,GAAIG,EAAQC,OAAS,QAAS,CAE1B,GAAID,EAAQH,SAAU,CAClBG,EAAQH,SAAWF,KAAKC,eAAeI,EAAQH,SAAUC,EAC7D,CACAC,EAASG,KAAKF,EAClB,MAAO,GAAIA,EAAQC,OAAS,UAAW,CACnC,IAAKD,EAAQG,MAAO,CAChBJ,EAASG,KAAKF,GACd,QACJ,CAEA,IACI,MAAMI,KAAEA,EAAIC,YAAEA,GAAgBrB,EAAiBsB,aAAaR,EAAYE,EAAQG,OAEhF,MAAMI,IAAsBH,GAAMI,IAAIC,OACtC,MAAMC,EAAiBN,GAAMH,OAASb,EAAYuB,QAAUP,EAAKI,IAAII,aAAe1B,EAAY2B,SAAWN,EAE3G,GAAIG,GAAkBN,EAAKU,WAAY,CAEnC,MAAMC,EAA2B,IAC1Bf,EACHC,KAAM,QACNe,MAAOhB,EAAQgB,OAASZ,EAAKI,IAAIQ,OAASX,EAAYY,MAAM,KAAKC,MACjErB,SAAU,WAEPkB,EAASZ,MAGhB,IAAK,MAAMgB,KAAYC,OAAOC,KAAKjB,EAAKU,YAAa,CACjDC,EAASlB,SAAUK,KAAK,CACpBD,KAAM,UACNE,MAAO,GAAGH,EAAQG,oBAAoBgB,KAE9C,CAGAJ,EAASlB,SAAWF,KAAKC,eAAemB,EAASlB,SAAWC,GAE5DC,EAASG,KAAKa,EAClB,KAAO,CAEHhB,EAASG,KAAKF,EAClB,CACJ,CAAE,MAAOsB,GAELvB,EAASG,KAAKF,EAClB,CACJ,KAAO,CACHD,EAASG,KAAKF,EAClB,CACJ,CAEA,OAAOD,CACX,EACH,IAAAwB,EAAA,CAAAC,WAAA,MAAAD,EAAAlC,gBAAA,OAAAkC,CAAA","ignoreList":[]}

package/src/nz/co/siliconst/ui5/metaui/core/LayoutMutator.ts

@@ -0,0 +1,82 @@
+/**
+ * @file LayoutMutator.ts
+ * @description Intercepts the generated schema before rendering to dynamically mutate the UI layout based on inline rendering rules.
+ */
+
+import { ISchema, ILayoutElement } from "../interfaces/ISchema";
+import { SchemaNormalizer } from "./SchemaNormalizer";
+import { RENDER_MODE, SCHEMA_TYPE } from "../constants/MetaUIConstants";
+
+export class LayoutMutator {
+    /**
+     * Mutates the `uiLayout` array to expand nested inline objects into native Groups.
+     * @param schema The normalized root schema.
+     */
+    public static apply(schema: ISchema): void {
+        if (!schema || !schema.uiLayout || !Array.isArray(schema.uiLayout)) {
+            return; // No layout to mutate
+        }
+
+        schema.uiLayout = this.expandElements(schema.uiLayout, schema);
+    }
+
+    private static expandElements(elements: ILayoutElement[], rootSchema: ISchema): ILayoutElement[] {
+        const expanded: ILayoutElement[] = [];
+
+        for (const element of elements) {
+            if (element.type === "Group") {
+                // Recursively expand group elements
+                if (element.elements) {
+                    element.elements = this.expandElements(element.elements, rootSchema);
+                }
+                expanded.push(element);
+            } else if (element.type === "Control") {
+                if (!element.scope) {
+                    expanded.push(element);
+                    continue;
+                }
+                // Resolve the schema to see if this control points to an inline object
+                try {
+                    const { meta, bindingPath } = SchemaNormalizer.resolveScope(rootSchema, element.scope);
+                    
+                    const hasExplicitWidget = !!meta?.ui?.widget;
+                    const isInlineObject = meta?.type === SCHEMA_TYPE.OBJECT && meta.ui?.renderMode === RENDER_MODE.INLINE && !hasExplicitWidget;
+
+                    if (isInlineObject && meta.properties) {
+                        // Transform this Control into a Group containing its properties
+                        const newGroup: ILayoutElement = {
+                            ...element,
+                            type: "Group",
+                            label: element.label || meta.ui?.label || bindingPath.split("/").pop(),
+                            elements: []
+                        };
+                        delete newGroup.scope;
+
+                        // Add all child properties as controls
+                        for (const childKey of Object.keys(meta.properties)) {
+                            newGroup.elements!.push({
+                                type: "Control",
+                                scope: `${element.scope}/properties/${childKey}`
+                            });
+                        }
+
+                        // Recursively expand this new group in case it contains further inline objects
+                        newGroup.elements = this.expandElements(newGroup.elements!, rootSchema);
+                        
+                        expanded.push(newGroup);
+                    } else {
+                        // Scalar control, keep as is
+                        expanded.push(element);
+                    }
+                } catch (e) {
+                    // Scope not found, keep element to let normal error handling report it
+                    expanded.push(element);
+                }
+            } else {
+                expanded.push(element);
+            }
+        }
+
+        return expanded;
+    }
+}