@salesforce/plugin-omnistudio-migration-tool 2.0.0-preview.27 → 2.0.0-preview.28

package/lib/migration/flexcard.js

@@ -237,59 +237,45 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
         };
         flexCardAssessmentInfo.migrationStatus = assessmentStatus;
         this.updateDependencies(flexCard, flexCardAssessmentInfo);
+        // Deduplicate all dependency arrays to ensure no duplicates
+        flexCardAssessmentInfo.dependenciesIP = [...new Set(flexCardAssessmentInfo.dependenciesIP)];
+        flexCardAssessmentInfo.dependenciesDR = [...new Set(flexCardAssessmentInfo.dependenciesDR)];
+        flexCardAssessmentInfo.dependenciesFC = [...new Set(flexCardAssessmentInfo.dependenciesFC)];
+        flexCardAssessmentInfo.dependenciesOS = [...new Set(flexCardAssessmentInfo.dependenciesOS)];
+        flexCardAssessmentInfo.dependenciesLWC = [...new Set(flexCardAssessmentInfo.dependenciesLWC)];
+        flexCardAssessmentInfo.dependenciesApexRemoteAction = [
+            ...new Set(flexCardAssessmentInfo.dependenciesApexRemoteAction),
+        ];
         return flexCardAssessmentInfo;
     }
     updateDependencies(flexCard, flexCardAssessmentInfo) {
         var _a, _b, _c, _d;
-        let dataSource = JSON.parse(flexCard[this.getFieldKey('Datasource__c')] || '{}');
-        // Handle both camelCase and lowercase variants
-        if (dataSource === null || dataSource === void 0 ? void 0 : dataSource.dataSource) {
-            dataSource = dataSource.dataSource;
-        }
-        else if (dataSource === null || dataSource === void 0 ? void 0 : dataSource.datasource) {
-            dataSource = dataSource.datasource;
-        }
-        // Check if it's a DataRaptor source
-        if (dataSource.type === stringContants_1.Constants.DataRaptorComponentName) {
-            const originalBundle = (_a = dataSource.value) === null || _a === void 0 ? void 0 : _a.bundle;
-            if (originalBundle) {
-                const cleanedBundle = this.cleanName(originalBundle);
-                // Push original name instead of cleaned name for assessment consistency
-                flexCardAssessmentInfo.dependenciesDR.push(originalBundle);
-                // Add warning if DataRaptor name will change
-                if (originalBundle !== cleanedBundle) {
-                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('dataRaptorNameChangeMessage', [originalBundle, cleanedBundle]));
-                    flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
-                }
-            }
-        }
-        else if (dataSource.type === stringContants_1.Constants.IntegrationProcedurePluralName) {
-            const originalIpMethod = (_b = dataSource.value) === null || _b === void 0 ? void 0 : _b.ipMethod;
-            if (originalIpMethod) {
-                const parts = originalIpMethod.split('_');
-                const cleanedParts = parts.map((p) => this.cleanName(p, true));
-                const cleanedIpMethod = cleanedParts.join('_');
-                // Push original name instead of cleaned name for assessment consistency
-                flexCardAssessmentInfo.dependenciesIP.push(originalIpMethod);
-                // Add warning if IP name will change
-                if (originalIpMethod !== cleanedIpMethod) {
-                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('integrationProcedureNameChangeMessage', [originalIpMethod, cleanedIpMethod]));
-                    flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
-                }
-                // Add warning for IP references with more than 2 parts (which potentially need manual updates)
-                if (parts.length > 2) {
-                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('integrationProcedureManualUpdateMessage', [originalIpMethod]));
-                    flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Needs manual intervention');
+        const dataSourceConfig = JSON.parse(flexCard[this.getFieldKey('Datasource__c')] || '{}');
+        // Collect all data sources - any nested object with a 'type' property is a data source
+        // This handles: dataSource, datasource, event-0_0, event-1_0, etc.
+        const dataSources = Object.values(dataSourceConfig).filter((value) => value && typeof value === 'object' && value.type);
+        for (const ds of dataSources) {
+            // Check if it's a DataRaptor source
+            if (ds.type === stringContants_1.Constants.DataRaptorComponentName) {
+                const originalBundle = (_a = ds.value) === null || _a === void 0 ? void 0 : _a.bundle;
+                if (originalBundle) {
+                    this.addDataRaptorDependency(originalBundle, flexCardAssessmentInfo);
                 }
             }
-        }
-        else if (dataSource.type === stringContants_1.Constants.ApexRemoteComponentName) {
-            const remoteClass = (_c = dataSource.value) === null || _c === void 0 ? void 0 : _c.remoteClass;
-            const remoteMethod = (_d = dataSource.value) === null || _d === void 0 ? void 0 : _d.remoteMethod;
-            logger_1.Logger.info(`Remote Action name: ${remoteClass}.${remoteMethod}`);
-            // Avoid duplicates
-            if (!flexCardAssessmentInfo.dependenciesApexRemoteAction.includes(`${remoteClass}.${remoteMethod}`)) {
-                flexCardAssessmentInfo.dependenciesApexRemoteAction.push(`${remoteClass}.${remoteMethod}`);
+            else if (ds.type === stringContants_1.Constants.IntegrationProcedurePluralName) {
+                const originalIpMethod = (_b = ds.value) === null || _b === void 0 ? void 0 : _b.ipMethod;
+                if (originalIpMethod) {
+                    this.addIntegrationProcedureDependency(originalIpMethod, flexCardAssessmentInfo);
+                }
+            }
+            else if (ds.type === stringContants_1.Constants.ApexRemoteComponentName) {
+                const remoteClass = (_c = ds.value) === null || _c === void 0 ? void 0 : _c.remoteClass;
+                const remoteMethod = (_d = ds.value) === null || _d === void 0 ? void 0 : _d.remoteMethod;
+                if (remoteClass &&
+                    remoteMethod &&
+                    !flexCardAssessmentInfo.dependenciesApexRemoteAction.includes(`${remoteClass}.${remoteMethod}`)) {
+                    flexCardAssessmentInfo.dependenciesApexRemoteAction.push(`${remoteClass}.${remoteMethod}`);
+                }
             }
         }
         // Check for Omniscript dependencies in the card's definition
@@ -300,15 +286,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                     if (state.omniscripts && Array.isArray(state.omniscripts)) {
                         for (const os of state.omniscripts) {
                             if (os.type && os.subtype) {
-                                const originalOsRef = `${os.type}_${os.subtype}_${os.language || 'English'}`;
-                                const cleanedOsRef = `${this.cleanName(os.type)}_${this.cleanName(os.subtype)}_${os.language || 'English'}`;
-                                // Push original name for consistency
-                                flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                                // Add warning if OmniScript name will change
-                                if (originalOsRef !== cleanedOsRef) {
-                                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                                    flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
-                                }
+                                this.addOmniScriptDependencyFromParts(os.type, os.subtype, os.language, flexCardAssessmentInfo);
                             }
                         }
                     }
@@ -326,14 +304,11 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             let childCards = this.readChildCardsFromDefinition(flexCard);
             // Add warnings for child card name changes
             for (const childCardName of childCards) {
-                const cleanedChildCardName = this.cleanName(childCardName);
-                // Push original child card name for consistency
-                flexCardAssessmentInfo.dependenciesFC.push(childCardName);
-                // Add warning if child card name will change
-                if (childCardName !== cleanedChildCardName) {
-                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('cardNameChangeMessage', [childCardName, cleanedChildCardName]));
-                    flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
-                }
+                this.addFlexCardDependency(childCardName, flexCardAssessmentInfo);
+            }
+            // Check for dependencies in events[] array
+            if (definition.events && Array.isArray(definition.events)) {
+                this.checkEventsForDependencies(definition.events, flexCardAssessmentInfo);
             }
         }
         catch (err) {
@@ -341,6 +316,230 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             logger_1.Logger.error(`Error parsing definition for card ${flexCard.Name}: ${err.message}`);
         }
     }
+    /**
+     * Check events array for dependencies (Assessment)
+     * Handles: events[].actionList[].stateAction references
+     */
+    checkEventsForDependencies(events, flexCardAssessmentInfo) {
+        for (const event of events) {
+            if (!event.actionList || !Array.isArray(event.actionList)) {
+                continue;
+            }
+            for (const action of event.actionList) {
+                if (!action.stateAction) {
+                    continue;
+                }
+                const stateAction = action.stateAction;
+                // 1-2. Handle message.value.bundle (DataRaptor) and message.value.ipMethod (Integration Procedure)
+                this.processStateActionMessageForDependencies(stateAction, flexCardAssessmentInfo);
+                // 3. Handle cardName (FlexCard - Flyout childCard)
+                if (stateAction.cardName) {
+                    this.addFlexCardDependency(stateAction.cardName, flexCardAssessmentInfo);
+                }
+                // 4. Handle flyoutLwc - FlexCard child cards
+                if (this.hasFlexCardFlyoutDependency(stateAction)) {
+                    this.addFlexCardDependency(stateAction.flyoutLwc, flexCardAssessmentInfo);
+                }
+                // Handle flyoutLwc - CustomLwc with potential "cf" prefix for FlexCard reference
+                else if (this.hasCustomLwcFlyoutDependency(stateAction)) {
+                    this.addCfPrefixedFlexCardDependency(stateAction.flyoutLwc, flexCardAssessmentInfo);
+                }
+                // 5. Handle osName
+                else if (this.hasOmniscriptFlyoutDependency(stateAction)) {
+                    this.addOmniScriptDependency(stateAction.osName, flexCardAssessmentInfo);
+                }
+                // 6. Handle omniType.Name (OmniScript)
+                if (stateAction.omniType && stateAction.omniType.Name) {
+                    this.addOmniScriptDependency(stateAction.omniType.Name, flexCardAssessmentInfo);
+                }
+            }
+        }
+    }
+    /**
+     * Shared helper to check if a "cf" prefixed LWC name references a FlexCard and add dependency (assessment phase)
+     * @param cfPrefixedLwcName LWC name with "cf" prefix (e.g., "cfMyFlexCard")
+     * @param flexCardAssessmentInfo Assessment info to add dependencies and warnings
+     */
+    addCfPrefixedFlexCardDependency(cfPrefixedLwcName, flexCardAssessmentInfo) {
+        if (cfPrefixedLwcName.startsWith('cf')) {
+            // Remove "cf" prefix to get the original FlexCard name
+            const originalFlexCardName = cfPrefixedLwcName.substring(2);
+            // Check if the FlexCard name will change and add warning
+            const cleanedFlexCardName = this.cleanName(originalFlexCardName);
+            this.addFlexCardDependency(originalFlexCardName, flexCardAssessmentInfo);
+            if (originalFlexCardName !== cleanedFlexCardName) {
+                flexCardAssessmentInfo.warnings.push(this.messages.getMessage('cardLWCNameChangeMessage', [originalFlexCardName, cleanedFlexCardName]));
+                flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+            }
+        }
+    }
+    /**
+     * Shared helper to update a "cf" prefixed LWC name with registry (migration phase)
+     * @param cfPrefixedLwcName LWC name with "cf" prefix (e.g., "cfMyFlexCard")
+     * @returns Updated LWC name with "cf" prefix
+     */
+    updateCfPrefixedFlexCardName(cfPrefixedLwcName) {
+        if (cfPrefixedLwcName.startsWith('cf')) {
+            // Remove "cf" prefix to get the original FlexCard name
+            const originalFlexCardName = cfPrefixedLwcName.substring(2);
+            // Look up the cleaned name from registry
+            let cleanedFlexCardName;
+            if (this.nameRegistry.hasFlexCardMapping(originalFlexCardName)) {
+                cleanedFlexCardName = this.nameRegistry.getFlexCardCleanedName(originalFlexCardName);
+            }
+            else {
+                logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['Flexcard', originalFlexCardName])}`);
+                cleanedFlexCardName = this.cleanName(originalFlexCardName);
+            }
+            return `cf${cleanedFlexCardName}`;
+        }
+        return cfPrefixedLwcName;
+    }
+    /**
+     * Shared helper to check Custom LWC component for FlexCard dependencies (assessment phase)
+     * Handles customlwcname with "cf" prefix indicating FlexCard reference
+     */
+    checkCustomLwcForDependencies(component, flexCardAssessmentInfo) {
+        if (component.element === stringContants_1.Constants.CustomLwc && component.property) {
+            if (component.property.customlwcname) {
+                const customLwcName = component.property.customlwcname;
+                logger_1.Logger.info(`Custom LWC name: ${customLwcName}`);
+                // Check if this is a FlexCard reference (starts with "cf" prefix)
+                this.addCfPrefixedFlexCardDependency(customLwcName, flexCardAssessmentInfo);
+                // Add to LWC dependencies for tracking (avoid duplicates)
+                if (!flexCardAssessmentInfo.dependenciesLWC.includes(customLwcName)) {
+                    flexCardAssessmentInfo.dependenciesLWC.push(customLwcName);
+                }
+            }
+        }
+    }
+    /**
+     * Shared helper to update Custom LWC component with registry (migration phase)
+     * Handles customlwcname with "cf" prefix indicating FlexCard reference
+     */
+    updateCustomLwcWithRegistry(component) {
+        if (component.element === stringContants_1.Constants.CustomLwc && component.property) {
+            if (component.property.customlwcname) {
+                const customLwcName = component.property.customlwcname;
+                // Check if this is a FlexCard reference (starts with "cf" prefix) and update it
+                if (customLwcName === null || customLwcName === void 0 ? void 0 : customLwcName.startsWith('cf')) {
+                    const updatedLwcName = this.updateCfPrefixedFlexCardName(customLwcName);
+                    component.property.customlwcname = updatedLwcName;
+                    if (customLwcName !== updatedLwcName) {
+                        const cleanedFlexCardName = updatedLwcName.substring(2);
+                        logger_1.Logger.logVerbose(this.messages.getMessage('customLWCFlexCardReferenceUpdated', [customLwcName, cleanedFlexCardName]));
+                    }
+                }
+                // Note: Other custom LWC names (not starting with "cf") typically don't need cleaning
+            }
+        }
+    }
+    /**
+     * Shared helper to update flyoutLwc value with registry (migration phase)
+     * Handles FlexCard child cards references
+     */
+    updateFlyoutLwcValue(stateAction) {
+        if (stateAction.flyoutLwc) {
+            if (stateAction.flyoutType === stringContants_1.Constants.ChildCard) {
+                // flyoutLwc is a direct FlexCard name reference
+                const lwcName = stateAction.flyoutLwc;
+                if (this.nameRegistry.hasFlexCardMapping(lwcName)) {
+                    stateAction.flyoutLwc = this.nameRegistry.getFlexCardCleanedName(lwcName);
+                }
+                else {
+                    logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['Flexcard', lwcName])}`);
+                    stateAction.flyoutLwc = this.cleanName(lwcName);
+                }
+            }
+            else if (stateAction.flyoutType === stringContants_1.Constants.CustomLwc) {
+                // flyoutType is customLwc - update if it's a FlexCard reference with "cf" prefix
+                stateAction.flyoutLwc = this.updateCfPrefixedFlexCardName(stateAction.flyoutLwc);
+                // Note: Non-"cf" prefixed names are returned unchanged by the helper
+            }
+        }
+    }
+    /**
+     * Shared helper to process stateAction.message JSON for dependencies
+     * Handles DataRaptor bundle and Integration Procedure ipMethod references
+     */
+    processStateActionMessageForDependencies(stateAction, flexCardAssessmentInfo) {
+        // Only parse message for DataAction or cardAction types
+        if (stateAction.message &&
+            typeof stateAction.message === 'string' &&
+            stateAction.message.trim().length > 0 &&
+            (stateAction.type === stringContants_1.Constants.DataAction || stateAction.type === stringContants_1.Constants.CardAction)) {
+            try {
+                const messageObj = JSON.parse(stateAction.message);
+                if (messageObj.value) {
+                    // DataRaptor bundle
+                    if (messageObj.value.bundle) {
+                        this.addDataRaptorDependency(messageObj.value.bundle, flexCardAssessmentInfo);
+                    }
+                    // Integration Procedure ipMethod
+                    if (messageObj.value.ipMethod) {
+                        this.addIntegrationProcedureDependency(messageObj.value.ipMethod, flexCardAssessmentInfo);
+                    }
+                }
+            }
+            catch (e) {
+                // message is not valid JSON, skip
+                logger_1.Logger.error(`Failed to parse stateAction.message as JSON: ${e.message}`);
+            }
+        }
+    }
+    /**
+     * Shared helper to process stateAction.message JSON with registry updates
+     * Handles DataRaptor bundle and Integration Procedure ipMethod references
+     */
+    processStateActionMessageWithRegistry(stateAction, invalidIpNames) {
+        // Only parse message for DataAction or cardAction types
+        if (stateAction.message &&
+            typeof stateAction.message === 'string' &&
+            stateAction.message.trim().length > 0 &&
+            (stateAction.type === stringContants_1.Constants.DataAction || stateAction.type === stringContants_1.Constants.CardAction)) {
+            try {
+                const messageObj = JSON.parse(stateAction.message);
+                let messageUpdated = false;
+                if (messageObj.value) {
+                    // DataRaptor bundle
+                    if (messageObj.value.bundle) {
+                        const originalBundle = messageObj.value.bundle;
+                        if (this.nameRegistry.hasDataMapperMapping(originalBundle)) {
+                            messageObj.value.bundle = this.nameRegistry.getDataMapperCleanedName(originalBundle);
+                        }
+                        else {
+                            logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['DataMapper', originalBundle])}`);
+                            messageObj.value.bundle = this.cleanName(originalBundle);
+                        }
+                        messageUpdated = true;
+                    }
+                    // Integration Procedure ipMethod
+                    if (messageObj.value.ipMethod) {
+                        const ipMethod = messageObj.value.ipMethod;
+                        if (this.nameRegistry.hasIntegrationProcedureMapping(ipMethod)) {
+                            messageObj.value.ipMethod = this.nameRegistry.getIntegrationProcedureCleanedName(ipMethod);
+                        }
+                        else {
+                            logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['IntegrationProcedure', ipMethod])}`);
+                            const parts = ipMethod.split('_');
+                            messageObj.value.ipMethod = parts.map((p) => this.cleanName(p, true)).join('_');
+                            if (parts.length > 2 && invalidIpNames) {
+                                invalidIpNames.set(`event.actionList.stateAction.message`, ipMethod);
+                            }
+                        }
+                        messageUpdated = true;
+                    }
+                }
+                if (messageUpdated) {
+                    stateAction.message = JSON.stringify(messageObj);
+                }
+            }
+            catch (e) {
+                // message is not valid JSON, skip
+                logger_1.Logger.error(`Failed to parse stateAction.message as JSON: ${e.message}`);
+            }
+        }
+    }
     handleAssessmentForStdDataModelOrgsWithMetadataAPIEnabled(flexCards) {
         logger_1.Logger.logVerbose(this.messages.getMessage('preparingStorageForMetadataEnabledOrg', [stringContants_1.Constants.Flexcard]));
         let storage = storageUtil_1.StorageUtil.getOmnistudioAssessmentStorage();
@@ -380,27 +579,13 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             // Process each action in the actionList
             for (const action of component.property.actionList) {
                 if (action.stateAction) {
+                    // Handle message field (contains DataRaptor/IP references as JSON string)
+                    this.processStateActionMessageForDependencies(action.stateAction, flexCardAssessmentInfo);
                     // Case 1: Direct OmniScript reference
                     if (action.stateAction.type === stringContants_1.Constants.OmniScriptComponentName && action.stateAction.omniType) {
                         const omniType = action.stateAction.omniType;
                         if (omniType.Name && typeof omniType.Name === 'string') {
-                            const originalName = omniType.Name;
-                            const parts = originalName.split('/');
-                            if (parts.length >= 2) {
-                                // Create both original and cleaned references for comparison
-                                const originalOsRef = parts.join('_');
-                                const cleanedParts = parts.length >= 3
-                                    ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                                    : parts.map((p) => this.cleanName(p));
-                                const cleanedOsRef = cleanedParts.join('_');
-                                // Push original name for consistency
-                                flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                                // Add warning only if the overall name will change
-                                if (originalOsRef !== cleanedOsRef) {
-                                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                                    flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                                }
-                            }
+                            this.addOmniScriptDependency(omniType.Name, flexCardAssessmentInfo);
                         }
                     }
                     // MISSING PATTERN FIXED: Case 1b: Direct OmniScript reference without type check (for test compatibility)
@@ -417,96 +602,35 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                         else {
                             continue; // Skip if we can't extract the name
                         }
-                        const parts = omniTypeName.split('/');
-                        if (parts.length >= 2) {
-                            const originalOsRef = parts.join('_');
-                            const cleanedParts = parts.length >= 3
-                                ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                                : parts.map((p) => this.cleanName(p));
-                            const cleanedOsRef = cleanedParts.join('_');
-                            flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                            if (originalOsRef !== cleanedOsRef) {
-                                flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                                flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                            }
-                        }
+                        this.addOmniScriptDependency(omniTypeName, flexCardAssessmentInfo);
                     }
                     // Case 2: Flyout OmniScript reference
-                    else if (action.stateAction.type === 'Flyout' &&
-                        action.stateAction.flyoutType === stringContants_1.Constants.OmniScriptPluralName &&
-                        action.stateAction.osName) {
+                    else if (this.hasOmniscriptFlyoutDependency(action.stateAction)) {
                         const osName = action.stateAction.osName;
                         if (typeof osName === 'string') {
-                            // osName is typically in format "Omniscript/Testing/English"
-                            const originalName = osName;
-                            const parts = originalName.split('/');
-                            if (parts.length >= 2) {
-                                // Create both original and cleaned references for comparison
-                                const originalOsRef = parts.join('_');
-                                const cleanedParts = parts.length >= 3
-                                    ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                                    : parts.map((p) => this.cleanName(p));
-                                const cleanedOsRef = cleanedParts.join('_');
-                                // Push original name for consistency
-                                flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                                // Add warning only if the overall name will change
-                                if (originalOsRef !== cleanedOsRef) {
-                                    flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                                    flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                                }
-                            }
+                            this.addOmniScriptDependency(osName, flexCardAssessmentInfo);
                         }
                     }
-                }
-            }
-        }
-        // Check for Custom LWC component
-        if (component.element === 'customLwc' && component.property) {
-            // Check customlwcname property first
-            if (component.property.customlwcname) {
-                const customLwcName = component.property.customlwcname;
-                logger_1.Logger.info(`Custom LWC name: ${customLwcName}`);
-                // Check if this is a FlexCard reference (starts with "cf" prefix)
-                if (customLwcName.startsWith('cf')) {
-                    // Remove "cf" prefix to get the original FlexCard name
-                    const originalFlexCardName = customLwcName.substring(2);
-                    // Check if the FlexCard name will change and add warning
-                    const cleanedFlexCardName = this.cleanName(originalFlexCardName);
-                    if (originalFlexCardName !== cleanedFlexCardName) {
-                        flexCardAssessmentInfo.warnings.push(this.messages.getMessage('cardLWCNameChangeMessage', [originalFlexCardName, cleanedFlexCardName]));
-                        flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+                    // Case 3: Flyout childCard reference - flyoutLwc is a direct FlexCard name
+                    else if (this.hasFlexCardFlyoutDependency(action.stateAction)) {
+                        this.addFlexCardDependency(action.stateAction.flyoutLwc, flexCardAssessmentInfo);
+                    }
+                    // Case 4: Flyout CustomLwc reference - check for FlexCard reference with "cf" prefix
+                    else if (this.hasCustomLwcFlyoutDependency(action.stateAction)) {
+                        this.addCfPrefixedFlexCardDependency(action.stateAction.flyoutLwc, flexCardAssessmentInfo);
                     }
-                }
-                // Regular custom LWC (and FlexCard reference)
-                // Avoid duplicates
-                if (!flexCardAssessmentInfo.dependenciesLWC.includes(customLwcName)) {
-                    flexCardAssessmentInfo.dependenciesLWC.push(customLwcName);
                 }
             }
         }
+        // Check for Custom LWC component
+        this.checkCustomLwcForDependencies(component, flexCardAssessmentInfo);
         // Check standard component actions if they exist
         if (component.actions && Array.isArray(component.actions)) {
             for (const action of component.actions) {
                 if (action.stateAction && action.stateAction.omniType) {
                     const omniType = action.stateAction.omniType;
                     if (omniType.Name && typeof omniType.Name === 'string') {
-                        const originalName = omniType.Name;
-                        const parts = originalName.split('/');
-                        if (parts.length >= 2) {
-                            // Create both original and cleaned references for comparison
-                            const originalOsRef = parts.join('_');
-                            const cleanedParts = parts.length >= 3
-                                ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                                : parts.map((p) => this.cleanName(p));
-                            const cleanedOsRef = cleanedParts.join('_');
-                            // Push original name for consistency
-                            flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                            // Add warning if OmniScript name will change
-                            if (originalOsRef !== cleanedOsRef) {
-                                flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                                flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                            }
-                        }
+                        this.addOmniScriptDependency(omniType.Name, flexCardAssessmentInfo);
                     }
                 }
             }
@@ -517,65 +641,38 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             if (component.property.stateAction.omniType) {
                 const omniType = component.property.stateAction.omniType;
                 if (omniType.Name && typeof omniType.Name === 'string') {
-                    const originalName = omniType.Name;
-                    const parts = originalName.split('/');
-                    if (parts.length >= 2) {
-                        const originalOsRef = parts.join('_');
-                        const cleanedParts = parts.length >= 3
-                            ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                            : parts.map((p) => this.cleanName(p));
-                        const cleanedOsRef = cleanedParts.join('_');
-                        flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                        if (originalOsRef !== cleanedOsRef) {
-                            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                            flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                        }
-                    }
+                    this.addOmniScriptDependency(omniType.Name, flexCardAssessmentInfo);
                 }
             }
             // Case 2: Flyout OmniScript reference on component property
-            if (component.property.stateAction.type === 'Flyout' &&
-                component.property.stateAction.flyoutType === 'OmniScripts' &&
-                component.property.stateAction.osName) {
+            if (this.hasOmniscriptFlyoutDependency(component.property.stateAction)) {
                 const osName = component.property.stateAction.osName;
                 if (typeof osName === 'string') {
-                    const parts = osName.split('/');
-                    if (parts.length >= 2) {
-                        const originalOsRef = parts.join('_');
-                        const cleanedParts = parts.length >= 3
-                            ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                            : parts.map((p) => this.cleanName(p));
-                        const cleanedOsRef = cleanedParts.join('_');
-                        flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                        if (originalOsRef !== cleanedOsRef) {
-                            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                            flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                        }
-                    }
+                    this.addOmniScriptDependency(osName, flexCardAssessmentInfo);
                 }
             }
+            // Case 3: Flyout childCard reference on component property - flyoutLwc is a direct FlexCard name
+            if (this.hasFlexCardFlyoutDependency(component.property.stateAction)) {
+                this.addFlexCardDependency(component.property.stateAction.flyoutLwc, flexCardAssessmentInfo);
+            }
+            // Case 4: Flyout CustomLwc reference on component property - check for FlexCard reference with "cf" prefix
+            if (this.hasCustomLwcFlyoutDependency(component.property.stateAction)) {
+                this.addCfPrefixedFlexCardDependency(component.property.stateAction.flyoutLwc, flexCardAssessmentInfo);
+            }
         }
         // MISSING PATTERN FIXED: Handle omni-flyout elements (from tests)
-        if (component.element === 'omni-flyout' && component.property && component.property.flyoutOmniScript) {
+        if (component.element === stringContants_1.Constants.OmniFlyout && component.property && component.property.flyoutOmniScript) {
             if (component.property.flyoutOmniScript.osName) {
                 const osName = component.property.flyoutOmniScript.osName;
                 if (typeof osName === 'string') {
-                    const parts = osName.split('/');
-                    if (parts.length >= 2) {
-                        const originalOsRef = parts.join('_');
-                        const cleanedParts = parts.length >= 3
-                            ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
-                            : parts.map((p) => this.cleanName(p));
-                        const cleanedOsRef = cleanedParts.join('_');
-                        flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
-                        if (originalOsRef !== cleanedOsRef) {
-                            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
-                            flexCardAssessmentInfo.migrationStatus = 'Warnings';
-                        }
-                    }
+                    this.addOmniScriptDependency(osName, flexCardAssessmentInfo);
                 }
             }
         }
+        // MISSING PATTERN FIXED: Handle childCardPreview elements with cardName property
+        if (component.element === stringContants_1.Constants.ChildCardPreview && component.property && component.property.cardName) {
+            this.addFlexCardDependency(component.property.cardName, flexCardAssessmentInfo);
+        }
         // Check child components recursively
         if (component.children && Array.isArray(component.children)) {
             for (const child of component.children) {
@@ -906,6 +1003,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
     }
     // Maps an indivitdual VlocityCard__c record to an OmniUiCard record.
     mapVlocityCardRecord(cardRecord, cardsUploadInfo, invalidIpNames) {
+        var _a, _b;
         // Transformed object
         let mappedObject = {};
         if (!this.IS_STANDARD_DATA_MODEL) {
@@ -951,24 +1049,36 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                         '.0';
             }
         }
-        // Update the datasource
+        // Update the datasource - process any nested object with a 'type' property
         const datasource = JSON.parse(mappedObject[VlocityCard_1.default.Datasource__c] || '{}');
-        if (datasource.dataSource) {
-            const type = datasource.dataSource.type;
-            if (type === stringContants_1.Constants.DataRaptorComponentName) {
-                datasource.dataSource.value.bundle = this.cleanName(datasource.dataSource.value.bundle);
-            }
-            else if (type === stringContants_1.Constants.IntegrationProcedurePluralName) {
-                const ipMethod = datasource.dataSource.value.ipMethod || '';
-                const parts = ipMethod.split('_');
-                const newKey = parts.map((p) => this.cleanName(p, true)).join('_');
-                datasource.dataSource.value.ipMethod = newKey;
-                if (parts.length > 2) {
-                    invalidIpNames.set('DataSource', ipMethod);
+        let updated = false;
+        // Process all keys that have objects with type property
+        for (const key of Object.keys(datasource)) {
+            const ds = datasource[key];
+            if (!ds || typeof ds !== 'object' || !ds.type)
+                continue;
+            if (ds.type === stringContants_1.Constants.DataRaptorComponentName && ((_a = ds.value) === null || _a === void 0 ? void 0 : _a.bundle)) {
+                ds.value.bundle = this.nameRegistry.hasDataMapperMapping(ds.value.bundle)
+                    ? this.nameRegistry.getDataMapperCleanedName(ds.value.bundle)
+                    : this.cleanName(ds.value.bundle);
+                updated = true;
+            }
+            else if (ds.type === stringContants_1.Constants.IntegrationProcedurePluralName && ((_b = ds.value) === null || _b === void 0 ? void 0 : _b.ipMethod)) {
+                const ipMethod = ds.value.ipMethod;
+                if (this.nameRegistry.hasIntegrationProcedureMapping(ipMethod)) {
+                    ds.value.ipMethod = this.nameRegistry.getIntegrationProcedureCleanedName(ipMethod);
                 }
+                else {
+                    const parts = ipMethod.split('_');
+                    ds.value.ipMethod = parts.map((p) => this.cleanName(p, true)).join('_');
+                    if (parts.length > 2)
+                        invalidIpNames.set(key, ipMethod);
+                }
+                updated = true;
             }
-            mappedObject[VlocityCard_1.default.Datasource__c] = JSON.stringify(datasource);
         }
+        if (updated)
+            mappedObject[VlocityCard_1.default.Datasource__c] = JSON.stringify(datasource);
         const isCardActive = cardRecord[this.getFieldKey('Active__c')];
         this.ensureCommunityTargets(mappedObject, isCardActive);
         // Update all dependencies comprehensively
@@ -983,19 +1093,17 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
      * Comprehensive dependency update using NameMappingRegistry - mirrors assessment logic
      */
     updateAllDependenciesWithRegistry(mappedObject, invalidIpNames) {
-        // 1. Handle propertySet (Definition) datasource
+        // Handle propertySet (Definition) - update all dependency references
         const propertySet = JSON.parse(mappedObject[VlocityCard_1.default.Definition__c] || '{}');
         if (propertySet) {
-            // Use NameMappingRegistry to update all dependency references first
-            const updatedPropertySet = this.nameRegistry.updateDependencyReferences(propertySet);
             // Handle dataSource in propertySet
-            if (updatedPropertySet.dataSource) {
-                this.updateDataSourceWithRegistry(updatedPropertySet.dataSource, invalidIpNames, 'PropertySet');
+            if (propertySet.dataSource) {
+                this.updateDataSourceWithRegistry(propertySet.dataSource, invalidIpNames, 'PropertySet');
             }
             // Handle states comprehensively
-            if (updatedPropertySet.states && Array.isArray(updatedPropertySet.states)) {
-                for (let i = 0; i < updatedPropertySet.states.length; i++) {
-                    const state = updatedPropertySet.states[i];
+            if (propertySet.states && Array.isArray(propertySet.states)) {
+                for (let i = 0; i < propertySet.states.length; i++) {
+                    const state = propertySet.states[i];
                     // Handle child cards using registry
                     if (state.childCards && Array.isArray(state.childCards)) {
                         state.childCards = state.childCards.map((c) => {
@@ -1025,7 +1133,50 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                     }
                 }
             }
-            mappedObject[VlocityCard_1.default.Definition__c] = JSON.stringify(updatedPropertySet);
+            // Handle events[] array references (Migration)
+            if (propertySet.events && Array.isArray(propertySet.events)) {
+                this.updateEventsWithRegistry(propertySet.events, invalidIpNames);
+            }
+            mappedObject[VlocityCard_1.default.Definition__c] = JSON.stringify(propertySet);
+        }
+    }
+    /**
+     * Update events array references (Migration)
+     * Handles: events[].actionList[].stateAction references
+     */
+    updateEventsWithRegistry(events, invalidIpNames) {
+        for (const event of events) {
+            if (!event.actionList || !Array.isArray(event.actionList)) {
+                continue;
+            }
+            for (const action of event.actionList) {
+                if (!action.stateAction) {
+                    continue;
+                }
+                const stateAction = action.stateAction;
+                // 1-2. Handle message.value.bundle (DataRaptor) and message.value.ipMethod (Integration Procedure)
+                this.processStateActionMessageWithRegistry(stateAction, invalidIpNames);
+                // 3. Handle cardName (FlexCard - Flyout childCard)
+                if (stateAction.cardName) {
+                    const originalCardName = stateAction.cardName;
+                    if (this.nameRegistry.hasFlexCardMapping(originalCardName)) {
+                        stateAction.cardName = this.nameRegistry.getFlexCardCleanedName(originalCardName);
+                    }
+                    else {
+                        logger_1.Logger.logVerbose(`\n${this.messages.getMessage('componentMappingNotFound', ['Flexcard', originalCardName])}`);
+                        stateAction.cardName = this.cleanName(originalCardName);
+                    }
+                }
+                // 4. Handle flyoutLwc (FlexCard child card and custom LWC references)
+                this.updateFlyoutLwcValue(stateAction);
+                if (this.hasOmniscriptFlyoutDependency(stateAction)) {
+                    this.updateOsNameWithRegistry(stateAction, 'osName');
+                }
+                // 6. Handle omniType.Name (OmniScript)
+                if (stateAction.omniType && stateAction.omniType.Name) {
+                    this.updateOmniTypeNameWithRegistry(stateAction.omniType);
+                }
+            }
         }
     }
     /**
@@ -1034,7 +1185,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
     updateDataSourceWithRegistry(dataSource, invalidIpNames, context) {
         var _a, _b;
         const type = dataSource.type;
-        if (type === stringContants_1.Constants.DataRaptorComponentName || type === 'DataRaptor') {
+        if (type === stringContants_1.Constants.DataRaptorComponentName) {
             // Handle DataRaptor using registry
             const originalBundle = ((_a = dataSource.value) === null || _a === void 0 ? void 0 : _a.bundle) || '';
             if (originalBundle && this.nameRegistry.hasDataMapperMapping(originalBundle)) {
@@ -1045,7 +1196,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                 dataSource.value.bundle = this.cleanName(originalBundle);
             }
         }
-        else if (type === stringContants_1.Constants.IntegrationProcedurePluralName || type === 'IntegrationProcedures') {
+        else if (type === stringContants_1.Constants.IntegrationProcedurePluralName) {
             // Handle Integration Procedures using registry
             const ipMethod = ((_b = dataSource.value) === null || _b === void 0 ? void 0 : _b.ipMethod) || '';
             const hasRegistryMapping = this.nameRegistry.hasIntegrationProcedureMapping(ipMethod);
@@ -1101,36 +1252,25 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
         if (component.element === 'action' && component.property && component.property.actionList) {
             for (const action of component.property.actionList) {
                 if (action.stateAction) {
+                    // Handle message field (contains DataRaptor/IP references as JSON string)
+                    this.processStateActionMessageWithRegistry(action.stateAction);
                     // Case 1: Direct OmniScript reference
                     if (action.stateAction.type === stringContants_1.Constants.OmniScriptComponentName && action.stateAction.omniType) {
                         this.updateOmniTypeNameWithRegistry(action.stateAction.omniType);
                     }
                     // Case 2: Flyout OmniScript reference
-                    else if (action.stateAction.type === 'Flyout' &&
-                        action.stateAction.flyoutType === stringContants_1.Constants.OmniScriptPluralName &&
-                        action.stateAction.osName) {
+                    else if (this.hasOmniscriptFlyoutDependency(action.stateAction)) {
                         this.updateOsNameWithRegistry(action.stateAction, 'osName');
                     }
+                    // Case 3: Flyout with flyoutLwc (ChildCard or CustomLwc)
+                    else if (this.hasFlyoutLwc(action.stateAction)) {
+                        this.updateFlyoutLwcValue(action.stateAction);
+                    }
                 }
             }
         }
         // Handle Custom LWC components - special case for FlexCard references
-        if (component.element === 'customLwc' && component.property) {
-            if (component.property.customlwcname) {
-                const customLwcName = component.property.customlwcname;
-                // Check if this is a FlexCard reference (starts with "cf" prefix)
-                if (customLwcName === null || customLwcName === void 0 ? void 0 : customLwcName.startsWith('cf')) {
-                    // Remove "cf" prefix to get the original FlexCard name
-                    const originalFlexCardName = customLwcName.substring(2);
-                    // Look up the cleaned name from registry
-                    const cleanedFlexCardName = this.nameRegistry.getFlexCardCleanedName(originalFlexCardName);
-                    // Update the customlwcname with the cleaned FlexCard name
-                    component.property.customlwcname = `cf${cleanedFlexCardName}`;
-                    logger_1.Logger.logVerbose(this.messages.getMessage('customLWCFlexCardReferenceUpdated', [customLwcName, cleanedFlexCardName]));
-                }
-                // Note: Other custom LWC names (not starting with "cf") typically don't need cleaning
-            }
-        }
+        this.updateCustomLwcWithRegistry(component);
         // Handle standard component actions (like assessment)
         if (component.actions && Array.isArray(component.actions)) {
             for (const action of component.actions) {
@@ -1144,14 +1284,16 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             if (component.property.stateAction.omniType) {
                 this.updateOmniTypeNameWithRegistry(component.property.stateAction.omniType);
             }
-            if (component.property.stateAction.type === 'Flyout' &&
-                component.property.stateAction.flyoutType === 'OmniScripts' &&
-                component.property.stateAction.osName) {
+            if (this.hasOmniscriptFlyoutDependency(component.property.stateAction)) {
                 this.updateOsNameWithRegistry(component.property.stateAction, 'osName');
             }
+            // Handle Flyout with flyoutLwc (ChildCard or CustomLwc)
+            if (this.hasFlyoutLwc(component.property.stateAction)) {
+                this.updateFlyoutLwcValue(component.property.stateAction);
+            }
         }
         // Handle childCardPreview elements (from old fixChildren method)
-        if (component.element === 'childCardPreview' && component.property) {
+        if (component.element === stringContants_1.Constants.ChildCardPreview && component.property) {
             if (component.property.cardName) {
                 const originalCardName = component.property.cardName;
                 if (this.nameRegistry.hasFlexCardMapping(originalCardName)) {
@@ -1164,7 +1306,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             }
         }
         // Handle omni-flyout elements (missing from migration logic)
-        if (component.element === 'omni-flyout' && component.property && component.property.flyoutOmniScript) {
+        if (component.element === stringContants_1.Constants.OmniFlyout && component.property && component.property.flyoutOmniScript) {
             if (component.property.flyoutOmniScript.osName) {
                 const osName = component.property.flyoutOmniScript.osName;
                 if (typeof osName === 'string') {
@@ -1261,6 +1403,121 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
             stateAction[fieldName] = parts.map((p) => this.cleanName(p)).join('/');
         }
     }
+    // ==================== Assessment Helper Methods ====================
+    /**
+     * Helper method to add OmniScript dependency and warnings during assessment
+     * Handles osName in format "Type/SubType/Language" or "Type/SubType"
+     * @param osName - OmniScript name in format "Type/SubType" or "Type/SubType/Language"
+     * @param flexCardAssessmentInfo - Assessment info to update
+     */
+    addOmniScriptDependency(osName, flexCardAssessmentInfo) {
+        if (!osName || typeof osName !== 'string') {
+            return;
+        }
+        const parts = osName.split('/');
+        if (parts.length < 2) {
+            return;
+        }
+        const originalOsRef = parts.join('_');
+        // Skip if already processed
+        if (flexCardAssessmentInfo.dependenciesOS.includes(originalOsRef)) {
+            return;
+        }
+        // Clean parts - preserve language (3rd part) as-is
+        const cleanedParts = parts.length >= 3
+            ? [this.cleanName(parts[0]), this.cleanName(parts[1]), parts[2]]
+            : parts.map((p) => this.cleanName(p));
+        const cleanedOsRef = cleanedParts.join('_');
+        // Add to dependencies
+        flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
+        // Add warning if name will change
+        if (originalOsRef !== cleanedOsRef) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+        }
+    }
+    /**
+     * Helper method to add OmniScript dependency from type/subtype/language fields
+     * @param type - OmniScript type
+     * @param subtype - OmniScript subtype
+     * @param language - OmniScript language (defaults to 'English')
+     * @param flexCardAssessmentInfo - Assessment info to update
+     */
+    addOmniScriptDependencyFromParts(type, subtype, language, flexCardAssessmentInfo) {
+        if (!type || !subtype) {
+            return;
+        }
+        const lang = language || 'English';
+        const originalOsRef = `${type}_${subtype}_${lang}`;
+        // Skip if already processed
+        if (flexCardAssessmentInfo.dependenciesOS.includes(originalOsRef)) {
+            return;
+        }
+        const cleanedOsRef = `${this.cleanName(type)}_${this.cleanName(subtype)}_${lang}`;
+        // Add to dependencies
+        flexCardAssessmentInfo.dependenciesOS.push(originalOsRef);
+        // Add warning if name will change
+        if (originalOsRef !== cleanedOsRef) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('omniScriptNameChangeMessage', [originalOsRef, cleanedOsRef]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+        }
+    }
+    /**
+     * Helper method to add DataRaptor dependency and warnings during assessment
+     * @param bundle - DataRaptor bundle name
+     * @param flexCardAssessmentInfo - Assessment info to update
+     */
+    addDataRaptorDependency(bundle, flexCardAssessmentInfo) {
+        if (!bundle || flexCardAssessmentInfo.dependenciesDR.includes(bundle)) {
+            return;
+        }
+        const cleanedBundle = this.cleanName(bundle);
+        flexCardAssessmentInfo.dependenciesDR.push(bundle);
+        if (bundle !== cleanedBundle) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('dataRaptorNameChangeMessage', [bundle, cleanedBundle]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+        }
+    }
+    /**
+     * Helper method to add Integration Procedure dependency and warnings during assessment
+     * @param ipMethod - Integration Procedure method name (Type_SubType format)
+     * @param flexCardAssessmentInfo - Assessment info to update
+     */
+    addIntegrationProcedureDependency(ipMethod, flexCardAssessmentInfo) {
+        if (!ipMethod || flexCardAssessmentInfo.dependenciesIP.includes(ipMethod)) {
+            return;
+        }
+        const parts = ipMethod.split('_');
+        const cleanedParts = parts.map((p) => this.cleanName(p, true));
+        const cleanedIpMethod = cleanedParts.join('_');
+        flexCardAssessmentInfo.dependenciesIP.push(ipMethod);
+        if (ipMethod !== cleanedIpMethod) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('integrationProcedureNameChangeMessage', [ipMethod, cleanedIpMethod]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+        }
+        // Add manual intervention warning if IP has more than 2 parts
+        if (parts.length > 2) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('integrationProcedureManualUpdateMessage', [ipMethod]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Needs manual intervention');
+        }
+    }
+    /**
+     * Helper method to add FlexCard dependency and warnings during assessment
+     * @param cardName - FlexCard name
+     * @param flexCardAssessmentInfo - Assessment info to update
+     */
+    addFlexCardDependency(cardName, flexCardAssessmentInfo) {
+        if (!cardName || flexCardAssessmentInfo.dependenciesFC.includes(cardName)) {
+            return;
+        }
+        const cleanedCardName = this.cleanName(cardName);
+        flexCardAssessmentInfo.dependenciesFC.push(cardName);
+        if (cardName !== cleanedCardName) {
+            flexCardAssessmentInfo.warnings.push(this.messages.getMessage('cardNameChangeMessage', [cardName, cleanedCardName]));
+            flexCardAssessmentInfo.migrationStatus = (0, stringUtils_1.getUpdatedAssessmentStatus)(flexCardAssessmentInfo.migrationStatus, 'Warnings');
+        }
+    }
+    // ==================== End Assessment Helper Methods ====================
     getCardFields() {
         return this.IS_STANDARD_DATA_MODEL
             ? Object.values(VlocityCard_1.default).filter((value) => value !== '')
@@ -1307,12 +1564,60 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                     }
                 }
             }
+            // Check OmniScript references in events[] array
+            if (definition && definition.events && Array.isArray(definition.events)) {
+                if (this.eventsHaveAngularOmniScriptDependency(definition.events)) {
+                    return true;
+                }
+            }
         }
         catch (err) {
             logger_1.Logger.error(`Error checking Angular dependencies for card ${card['Name']}: ${err.message}`);
         }
         return false;
     }
+    /**
+     * Check if events array has Angular OmniScript dependencies
+     */
+    eventsHaveAngularOmniScriptDependency(events) {
+        for (const event of events) {
+            if (!event.actionList || !Array.isArray(event.actionList)) {
+                continue;
+            }
+            for (const action of event.actionList) {
+                if (!action.stateAction) {
+                    continue;
+                }
+                const stateAction = action.stateAction;
+                // Check omniType.Name
+                if (stateAction.omniType) {
+                    if (this.checkOmniTypeForAngular(stateAction.omniType)) {
+                        return true;
+                    }
+                }
+                if (this.hasOmniscriptFlyoutDependency(stateAction)) {
+                    if (this.checkOsNameForAngular(stateAction.osName)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+    hasOmniscriptFlyoutDependency(stateAction) {
+        return (stateAction.type === stringContants_1.Constants.Flyout &&
+            stateAction.flyoutType === stringContants_1.Constants.OmniScriptPluralName &&
+            stateAction.osName);
+    }
+    hasFlexCardFlyoutDependency(stateAction) {
+        return (stateAction.type === stringContants_1.Constants.Flyout && stateAction.flyoutType === stringContants_1.Constants.ChildCard && stateAction.flyoutLwc);
+    }
+    hasCustomLwcFlyoutDependency(stateAction) {
+        return (stateAction.type === stringContants_1.Constants.Flyout && stateAction.flyoutType === stringContants_1.Constants.CustomLwc && stateAction.flyoutLwc);
+    }
+    hasFlyoutLwc(stateAction) {
+        return stateAction.type === stringContants_1.Constants.Flyout && stateAction.flyoutLwc;
+    }
     /**
      * Recursively check if a component has Angular Omniscript dependencies
      */
@@ -1334,9 +1639,7 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                         }
                     }
                     // Case 2: Flyout OmniScript reference
-                    else if (action.stateAction.type === 'Flyout' &&
-                        action.stateAction.flyoutType === stringContants_1.Constants.OmniScriptPluralName &&
-                        action.stateAction.osName) {
+                    else if (this.hasOmniscriptFlyoutDependency(action.stateAction)) {
                         if (this.checkOsNameForAngular(action.stateAction.osName)) {
                             return true;
                         }
@@ -1361,16 +1664,14 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
                     return true;
                 }
             }
-            if (component.property.stateAction.type === 'Flyout' &&
-                component.property.stateAction.flyoutType === 'OmniScripts' &&
-                component.property.stateAction.osName) {
+            if (this.hasOmniscriptFlyoutDependency(component.property.stateAction)) {
                 if (this.checkOsNameForAngular(component.property.stateAction.osName)) {
                     return true;
                 }
             }
         }
         // Pattern 4: Handle omni-flyout elements (for test compatibility)
-        if (component.element === 'omni-flyout' && component.property && component.property.flyoutOmniScript) {
+        if (component.element === stringContants_1.Constants.OmniFlyout && component.property && component.property.flyoutOmniScript) {
             if (component.property.flyoutOmniScript.osName) {
                 if (this.checkOsNameForAngular(component.property.flyoutOmniScript.osName)) {
                     return true;
@@ -1395,6 +1696,10 @@ class CardMigrationTool extends base_1.BaseMigrationTool {
         if (!omniType) {
             return false;
         }
+        // Check if IsWebCompEnabled is explicitly false (Angular OmniScript)
+        if (typeof omniType === 'object' && omniType.IsWebCompEnabled === false) {
+            return true;
+        }
         let omniTypeName;
         // Handle both string omniType and object with Name property
         if (typeof omniType === 'string') {