@syncfusion/ej2-react-form-renderer 0.1.1-beta → 0.1.2-beta

package/src/json-converter.js

@@ -72,7 +72,7 @@ export function makeUniqueFieldKey(baseKey, existingKeys, originalId) {
 // ============================================================================
 // UI TYPE TO SEMANTIC TYPE MAPPING
 // ============================================================================
-const UI_TYPE_TO_SEMANTIC_TYPE = {
+export const UI_TYPE_TO_SEMANTIC_TYPE = {
     // String types
     'textbox': { type: 'string' },
     'textarea': { type: 'string' },
@@ -264,6 +264,34 @@ export function splitSchema(heartSchema) {
                     hasValidConditions = true;
                 }
             }
+            if (component.conditions?.choiceBasedField) {
+                const rule = component.conditions.choiceBasedField;
+                // Validate that primary field exists
+                if (rule.primaryFieldId && validFieldIds.has(rule.primaryFieldId)) {
+                    cleanedConditions.choiceBasedField = rule;
+                    hasValidConditions = true;
+                }
+            }
+            if (component.conditions.conditionalData && Array.isArray(component.conditions.conditionalData)) {
+                const cleanedDataRules = component.conditions.conditionalData
+                    .map((rule) => {
+                    const cleaned = cleanConditionRules(rule.condition, validFieldIds);
+                    if (cleaned && rule.dataSource) {
+                        return {
+                            condition: cleaned,
+                            dataSource: rule.dataSource,
+                            columns: rule.columns,
+                            includeColumns: rule.includeColumns
+                        };
+                    }
+                    return null;
+                })
+                    .filter((rule) => rule !== null && rule !== undefined);
+                if (cleanedDataRules.length > 0) {
+                    cleanedConditions.conditionalData = cleanedDataRules;
+                    hasValidConditions = true;
+                }
+            }
             // Update component conditions (or remove if empty)
             component.conditions = hasValidConditions ? cleanedConditions : undefined;
         }
@@ -386,15 +414,23 @@ export function splitSchema(heartSchema) {
         // Add property reference to layout (use fieldKey instead of component ID)
         layoutParent.push({ type: 'field', propertyId: fieldKey });
     }
+    // ✅ Merge data and UI fields into unified properties
+    const unifiedProperties = {};
+    Object.keys(dataFields).forEach(fieldKey => {
+        const dataField = dataFields[fieldKey];
+        const uiField = uiFields[fieldKey];
+        unifiedProperties[fieldKey] = {
+            ...dataField,
+            ...uiField,
+            // Ensure widget is always set
+            widget: uiField?.widget || inferWidgetFromType(dataField.type, dataField.format, dataField.options !== undefined)
+        };
+    });
     return {
-        dataSchema: {
-            version: heartSchema.version,
-            properties: dataFields
-        },
-        uiSchema: {
-            properties: stripConfiguredFlag(uiFields),
-            layout
-        }
+        version: heartSchema.version,
+        properties: stripConfiguredFlag(unifiedProperties),
+        layout,
+        ...(heartSchema.settings ? { settings: heartSchema.settings } : {})
     };
 }
 function extractDataField(component, semanticType) {
@@ -412,6 +448,8 @@ function extractDataField(component, semanticType) {
         dataField.label = component.label;
     if (component.defaultValue !== undefined)
         dataField.defaultValue = component.defaultValue;
+    if (component.expressionValue !== undefined)
+        dataField.expressionValue = component.expressionValue;
     if (component.content !== undefined)
         dataField.content = component.content;
     if (component.buttonType !== undefined)
@@ -458,7 +496,7 @@ function extractUIField(component) {
     };
     // Copy all properties EXCEPT those in data schema allowed list
     const dataSchemaProps = new Set([
-        'id', 'type', 'label', 'format', 'defaultValue', 'required', 'options', 'name',
+        'id', 'type', 'label', 'format', 'defaultValue', 'required', 'options', 'name', 'expressionValue',
         'minLength', 'maxLength', 'minimum', 'maximum', 'minValue', 'maxValue',
         'minDate', 'maxDate', 'minTime', 'maxTime', 'regex', 'pattern', 'content', 'buttonType', 'textboxType'
     ]);
@@ -494,30 +532,15 @@ function extractUIField(component) {
 // MERGE ALGORITHM
 // ============================================================================
 /**
- * Merge split schemas back into heart schema
- * Supports both simple merge and fuzzy matching for re-import scenarios
+ * Merge unified schema back into heart schema
+ * Reconstructs FormComponent array from unified properties and layout
  */
-export function mergeSchema(split, existingUISchema) {
-    // Create lookup map for O(1) access to data fields
-    const dataFieldMap = new Map();
-    Object.entries(split.dataSchema.properties).forEach(([id, field]) => {
-        dataFieldMap.set(id, field);
-    });
-    // Use existing UI schema if provided (for re-import), otherwise use split UI schema
-    let uiSchema = existingUISchema || split.uiSchema;
-    // ✅ Ensure all UI properties have _configured flag (add if missing from imported JSON)
-    const enhancedUIProperties = {};
-    Object.entries(uiSchema.properties).forEach(([key, uiField]) => {
-        enhancedUIProperties[key] = {
-            ...uiField,
-            _configured: uiField._configured !== undefined ? uiField._configured : true
-        };
+export function mergeSchema(unified) {
+    // Create lookup map for O(1) access to unified properties
+    const propertyMap = new Map();
+    Object.entries(unified.properties).forEach(([id, field]) => {
+        propertyMap.set(id, field);
     });
-    // Use enhanced UI schema with _configured flags
-    uiSchema = {
-        ...uiSchema,
-        properties: enhancedUIProperties
-    };
     // Track processed field IDs to prevent duplicates
     const processedFieldIds = new Set();
     // Recursive function to process layout nodes
@@ -528,25 +551,24 @@ export function mergeSchema(split, existingUISchema) {
                 const fieldNode = node;
                 // ✅ DEDUPLICATION: Skip if we've already processed this field
                 if (processedFieldIds.has(fieldNode.propertyId)) {
-                    //console.log(`⚠️ [mergeSchema] Skipping duplicate field: ${fieldNode.propertyId}`);
                     continue;
                 }
                 processedFieldIds.add(fieldNode.propertyId);
-                const dataField = dataFieldMap.get(fieldNode.propertyId);
-                const uiField = uiSchema.properties[fieldNode.propertyId];
-                if (!dataField) {
-                    console.warn(`Field ${fieldNode.propertyId} in layout not found in data schema`);
-                    // Generate fallback data field
-                    const fallbackDataField = {
+                const unifiedField = propertyMap.get(fieldNode.propertyId);
+                if (!unifiedField) {
+                    console.warn(`Field ${fieldNode.propertyId} in layout not found in unified schema`);
+                    // Generate fallback component
+                    const fallbackComponent = {
                         id: fieldNode.propertyId,
-                        name: generateName(uiField?.widget || ''),
-                        type: 'any',
-                        label: uiField?.widget || 'Unknown Field'
+                        name: generateName(''),
+                        type: 'textbox',
+                        label: 'Unknown Field',
+                        _configured: true
                     };
-                    components.push(mergeField(fallbackDataField, uiField));
+                    components.push(fallbackComponent);
                 }
                 else {
-                    components.push(mergeField(dataField, uiField));
+                    components.push(mergeUnifiedField(unifiedField));
                 }
             }
             else if (node.type === 'table') {
@@ -569,7 +591,6 @@ export function mergeSchema(split, existingUISchema) {
                 tableNode.cells.forEach((row) => {
                     const cellRow = [];
                     row.forEach((cell) => {
-                        // Recursively process children in each cell
                         const cellComponents = processLayoutNodes(cell.children);
                         cellRow.push(cellComponents);
                     });
@@ -610,7 +631,7 @@ export function mergeSchema(split, existingUISchema) {
                 tabsNode.tabs.forEach((tab) => {
                     tabsComponent.tabItems.push({
                         header: tab.header,
-                        content: processLayoutNodes(tab.children) // Recursively process tab content
+                        content: processLayoutNodes(tab.children)
                     });
                 });
                 components.push(tabsComponent);
@@ -646,73 +667,76 @@ export function mergeSchema(split, existingUISchema) {
     };
     // Process root layout nodes
     let components;
-    if (!uiSchema.layout || uiSchema.layout.length === 0) {
-        // If layout is undefined or empty, generate a flat layout from data schema
-        //console.log('⚠️ UI Schema layout is undefined or empty, generating from data schema');
-        components = Object.entries(split.dataSchema.properties).map(([fieldKey, dataField]) => {
-            const uiField = uiSchema.properties[fieldKey];
-            return mergeField(dataField, uiField);
+    if (!unified.layout || unified.layout.length === 0) {
+        // If layout is undefined or empty, generate a flat layout from properties
+        components = Object.entries(unified.properties).map(([, unifiedField]) => {
+            return mergeUnifiedField(unifiedField);
         });
     }
     else {
-        components = processLayoutNodes(uiSchema.layout);
+        components = processLayoutNodes(unified.layout);
     }
     return {
-        version: split.dataSchema.version,
-        components
+        version: unified.version,
+        components,
+        ...(unified.settings ? { settings: unified.settings } : {})
     };
 }
 /**
- * Merge a single field from data and UI schemas
+ * Merge a single unified field into FormComponent
  */
-function mergeField(dataField, uiField) {
-    // Check if options are present in the data field
-    const hasOptions = dataField.options !== undefined && dataField.options.length > 0;
+function mergeUnifiedField(unifiedField) {
+    const hasOptions = unifiedField.options !== undefined && unifiedField.options.length > 0;
     const component = {
-        id: dataField.id,
-        name: dataField.name,
-        type: (uiField?.widget || inferWidgetFromType(dataField.type, dataField.format, hasOptions)),
-        label: dataField.label || dataField.id,
+        id: unifiedField.id,
+        name: unifiedField.name,
+        type: (unifiedField.widget || inferWidgetFromType(unifiedField.type, unifiedField.format, hasOptions)),
+        label: unifiedField.label || unifiedField.id,
     };
-    // Copy data properties
-    if (dataField.defaultValue !== undefined)
-        component.defaultValue = dataField.defaultValue;
-    if (dataField.required !== undefined)
-        component.required = dataField.required;
-    if (dataField.content !== undefined)
-        component.content = dataField.content;
-    if (dataField.buttonType !== undefined)
-        component.buttonType = dataField.buttonType;
-    if (dataField.textboxType !== undefined)
-        component.textboxType = dataField.textboxType;
-    if (dataField.options !== undefined)
-        component.options = dataField.options;
-    if (dataField.minLength !== undefined)
-        component.minLength = dataField.minLength;
-    if (dataField.maxLength !== undefined)
-        component.maxLength = dataField.maxLength;
-    if (dataField.minValue !== undefined)
-        component.minValue = dataField.minValue;
-    if (dataField.maxValue !== undefined)
-        component.maxValue = dataField.maxValue;
-    if (dataField.minDate !== undefined)
-        component.minDate = dataField.minDate;
-    if (dataField.maxDate !== undefined)
-        component.maxDate = dataField.maxDate;
-    if (dataField.minTime !== undefined)
-        component.minTime = dataField.minTime;
-    if (dataField.maxTime !== undefined)
-        component.maxTime = dataField.maxTime;
-    if (dataField.pattern !== undefined)
-        component.regex = dataField.pattern;
-    // Copy UI properties (including _configured flag)
-    if (uiField) {
-        Object.keys(uiField).forEach(key => {
-            if (key !== 'widget' && component[key] === undefined) {
-                component[key] = uiField[key];
-            }
-        });
-    }
+    // Copy all data and UI properties from unified field
+    const dataSchemaProps = new Set([
+        'id', 'type', 'name', 'label', 'format', 'widget', 'defaultValue', 'required', 'options', 'expressionValue',
+        'minLength', 'maxLength', 'minimum', 'maximum', 'minValue', 'maxValue',
+        'minDate', 'maxDate', 'minTime', 'maxTime', 'regex', 'pattern', 'content', 'buttonType', 'textboxType'
+    ]);
+    Object.keys(unifiedField).forEach(key => {
+        if (!dataSchemaProps.has(key) && key !== 'id' && key !== 'name' && key !== 'type' && key !== 'label') {
+            component[key] = unifiedField[key];
+        }
+    });
+    // Copy specific data properties
+    if (unifiedField.defaultValue !== undefined)
+        component.defaultValue = unifiedField.defaultValue;
+    if (unifiedField.expressionValue !== undefined)
+        component.expressionValue = unifiedField.expressionValue;
+    if (unifiedField.required !== undefined)
+        component.required = unifiedField.required;
+    if (unifiedField.content !== undefined)
+        component.content = unifiedField.content;
+    if (unifiedField.buttonType !== undefined)
+        component.buttonType = unifiedField.buttonType;
+    if (unifiedField.textboxType !== undefined)
+        component.textboxType = unifiedField.textboxType;
+    if (unifiedField.options !== undefined)
+        component.options = unifiedField.options;
+    if (unifiedField.minLength !== undefined)
+        component.minLength = unifiedField.minLength;
+    if (unifiedField.maxLength !== undefined)
+        component.maxLength = unifiedField.maxLength;
+    if (unifiedField.minValue !== undefined)
+        component.minValue = unifiedField.minValue;
+    if (unifiedField.maxValue !== undefined)
+        component.maxValue = unifiedField.maxValue;
+    if (unifiedField.minDate !== undefined)
+        component.minDate = unifiedField.minDate;
+    if (unifiedField.maxDate !== undefined)
+        component.maxDate = unifiedField.maxDate;
+    if (unifiedField.minTime !== undefined)
+        component.minTime = unifiedField.minTime;
+    if (unifiedField.maxTime !== undefined)
+        component.maxTime = unifiedField.maxTime;
+    if (unifiedField.pattern !== undefined)
+        component.regex = unifiedField.pattern;
     return component;
 }
 /**
@@ -988,21 +1012,23 @@ export function mergeWithIDRemapping(newDataSchema, existingUISchema) {
             //console.log(`📐 Layout rebuilt: new fields added at end`);
         }
     }
-    // Merge with remapped data
+    // Merge to FormSchema using unified schema
+    const unifiedProperties = {};
+    Object.keys(remappedDataFields).forEach(fieldKey => {
+        const dataField = remappedDataFields[fieldKey];
+        const uiField = enhancedUIProperties[fieldKey];
+        unifiedProperties[fieldKey] = {
+            ...dataField,
+            ...uiField,
+            widget: uiField?.widget || inferWidgetFromType(dataField.type, dataField.format, dataField.options !== undefined)
+        };
+    });
     const mergedSchema = mergeSchema({
-        dataSchema: {
-            version: newDataSchema.version,
-            properties: remappedDataFields
-        },
-        uiSchema: {
-            properties: enhancedUIProperties,
-            layout: remappedLayout
-        }
+        version: newDataSchema.version,
+        properties: unifiedProperties,
+        layout: remappedLayout,
+        ...(newDataSchema.settings ? { settings: newDataSchema.settings } : {})
     });
-    // Log summary
-    //const remappedCount = matchResults.filter(m => m.newDataId !== m.existingId).length;
-    //const newFieldsCount = matchResults.filter(m => m.method === 'new').length;
-    //console.log(`Merge complete: ${matchResults.length} fields, ${remappedCount} remapped, ${newFieldsCount} new`);
     return mergedSchema;
 }
 /**
@@ -1055,9 +1081,6 @@ function remapLayoutIds(layout, idMap) {
         return node;
     });
 }
-// ============================================================================
-// UTILITY FUNCTIONS
-// ============================================================================
 /**
  * Extract all field IDs from layout tree
  */
@@ -1084,14 +1107,6 @@ export function extractFieldIdsFromLayout(layout) {
     }
     return fieldIds;
 }
-/**
- * Find unmatched fields (in data schema but not in layout)
- */
-export function findUnmatchedFields(dataSchema, layout) {
-    const layoutFieldIds = extractFieldIdsFromLayout(layout);
-    const dataFieldIds = Object.keys(dataSchema.properties);
-    return dataFieldIds.filter(id => !layoutFieldIds.has(id));
-}
 // ============================================================================
 // PARSER OUTPUT CONVERSION
 // ============================================================================
@@ -1192,138 +1207,3 @@ export function convertComponentsToDataSchema(components) {
         properties
     };
 }
-/**
- * Convert parser output to a simple linear layout
- * Used when no existing UI schema is present
- */
-export function convertComponentsToUISchema(components) {
-    const properties = {};
-    const layout = [];
-    // Helper to recursively process components and build layout
-    function processComponent(comp) {
-        // Extract UI field
-        const uiField = extractUIField(comp);
-        properties[comp.id] = uiField;
-        // Handle different component types
-        if (comp.type === 'table' && comp.tableCells) {
-            const tableCells = comp.tableCells.map((row, rowIndex) => row.map((cellComponents, colIndex) => ({
-                row: rowIndex,
-                col: colIndex,
-                // cellComponents is FormComponent[], so map over it directly
-                children: cellComponents.map(processComponent)
-            })));
-            return {
-                type: 'table',
-                id: comp.id,
-                name: comp.name,
-                label: comp.label,
-                cssClass: comp.cssClass,
-                hideBorders: comp.hideBorders,
-                rows: comp.tableCells.length,
-                cols: comp.tableCells[0]?.length || 0,
-                cells: tableCells,
-                columnWidths: comp.columnWidths
-            };
-        }
-        if (comp.type === 'panel' && comp.children) {
-            return {
-                type: 'panel',
-                id: comp.id,
-                name: comp.name,
-                label: comp.label,
-                cssClass: comp.cssClass,
-                hideBorders: comp.hideBorders,
-                hideLabel: comp.hideLabel,
-                children: comp.children.map(processComponent)
-            };
-        }
-        if (comp.type === 'tabs' && comp.tabItems) {
-            // tabs is an array of { header, children }
-            const tabs = comp.tabItems.map((tab) => ({
-                header: tab.header,
-                children: tab.content?.map(processComponent) || []
-            }));
-            return {
-                type: 'tabs',
-                id: comp.id,
-                name: comp.name,
-                cssClass: comp.cssClass,
-                tabs
-            };
-        }
-        if (comp.type === 'card' && comp.children) {
-            return {
-                type: 'card',
-                id: comp.id,
-                name: comp.name,
-                label: comp.label,
-                cssClass: comp.cssClass,
-                hideLabel: comp.hideLabel,
-                cardTitle: comp.cardTitle,
-                cardSubtitle: comp.cardSubtitle,
-                enableAction: comp.enableAction,
-                actionButtonLabel: comp.actionButtonLabel,
-                actionButtonType: comp.actionButtonType,
-                children: comp.children.map(processComponent)
-            };
-        }
-        // Regular field
-        return {
-            type: 'field',
-            propertyId: comp.id
-        };
-    }
-    // Process all root components
-    for (const comp of components) {
-        layout.push(processComponent(comp));
-    }
-    return {
-        properties,
-        layout
-    };
-}
-// ============================================================================
-// RENDERER HELPER FUNCTIONS
-// ============================================================================
-/**
- * Generate default UI properties for each data field
- * Used by renderers when only data schema is provided
- */
-export function generateUIPropertiesFromData(dataSchema) {
-    const properties = {};
-    Object.entries(dataSchema.properties).forEach(([fieldId, dataField]) => {
-        const hasOptions = dataField.options !== undefined && dataField.options.length > 0;
-        const widget = inferWidgetFromType(dataField.type, dataField.format, hasOptions);
-        properties[fieldId] = { widget };
-    });
-    return properties;
-}
-/**
- * Generate sequential layout from data schema
- * Used by renderers when only data schema is provided
- */
-export function generateLayoutFromData(dataSchema) {
-    return Object.keys(dataSchema.properties).map(fieldId => ({
-        type: 'field',
-        propertyId: fieldId
-    }));
-}
-/**
- * Generate minimal data schema from UI schema
- * Used by renderers when only UI schema is provided
- */
-export function generateDataSchemaFromUI(uiSchema) {
-    const dataProperties = {};
-    Object.entries(uiSchema.properties).forEach(([fieldId, uiField]) => {
-        dataProperties[fieldId] = {
-            id: fieldId,
-            type: 'string',
-            name: generateName(uiField.label),
-            label: uiField.label || fieldId
-        };
-    });
-    return {
-        version: '0.1.0',
-        properties: dataProperties
-    };
-}

package/src/parser.js

@@ -394,6 +394,7 @@ export class UniversalJsonParser {
             type: type,
             label: element.title || element.label || this.humanizeFieldName(element.name),
             defaultValue: element.defaultValue,
+            expressionValue: element.expressionValue,
             ...Object.keys(validation).length > 0 ? validation : undefined
         };
         if (type === 'dropdown' || type === 'multiselect' || type === 'radio' || type === 'splitButton') {
@@ -437,7 +438,8 @@ export class UniversalJsonParser {
                 id: this.generateComponentId(typeInference.type),
                 type: typeInference.type,
                 label: this.humanizeFieldName(key),
-                defaultValue: value
+                defaultValue: value,
+                expressionValue: undefined
             };
             if (typeInference.textboxType) {
                 component.textboxType = typeInference.textboxType;
@@ -491,6 +493,7 @@ export class UniversalJsonParser {
             type: typeInfo.type,
             label: propDef.title || propDef.label || this.humanizeFieldName(fieldName),
             defaultValue: propDef.default || propDef.defaultValue || undefined,
+            expressionValue: propDef.expressionValue || undefined,
             content: propDef.content,
             buttonType: propDef.buttonType,
             textboxType: propDef.textboxType,

package/src/renderFormField.d.ts

@@ -8,6 +8,7 @@ export interface RenderFormFieldProps {
     component: FormComponent;
     value?: any;
     onChange: (value: any) => void;
+    formState?: any;
     onBlur?: () => void;
     onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
     ref?: any;
@@ -17,4 +18,4 @@ export interface RenderFormFieldProps {
 /**
  * Renders a single form field component
  */
-export declare const renderFormField: ({ component, value, onChange, onBlur, ref, hasError, onClick, locale }: RenderFormFieldProps) => React.ReactNode;
+export declare const RenderFormField: ({ component, value, onChange, onBlur, ref, hasError, onClick, locale, formState }: RenderFormFieldProps) => React.ReactNode;