@ethlete/core 5.0.0-next.53 → 5.0.0-next.54

package/generators/migrate-to-v5/router-state-service.js

@@ -67,6 +67,8 @@ function findRouterStateServiceVariables(sourceFile) {
 function findClassForRouterStateService(sourceFile, routerStateServiceVar) {
     let classNode = null;
     function visit(node) {
+        if (classNode)
+            return;
         if (ts.isClassDeclaration(node)) {
             const hasRouterStateService = node.members.some((member) => {
                 if (ts.isPropertyDeclaration(member) && ts.isIdentifier(member.name)) {
@@ -750,9 +752,10 @@ function addImportsToPackage(sourceFile, content, imports, packageName) {
         }
     });
     if (existingImport?.importClause?.namedBindings && ts.isNamedImports(existingImport.importClause.namedBindings)) {
-        // Add to existing import
-        const existingImports = existingImport.importClause.namedBindings.elements.map((el) => el.name.text);
-        const newImports = importsList.filter((imp) => !existingImports.includes(imp));
+        const existingElements = existingImport.importClause.namedBindings.elements;
+        const existingImportedNames = existingElements.map((el) => el.propertyName?.text ?? el.name.text);
+        const existingImports = existingElements.map((el) => el.getText(sourceFile));
+        const newImports = importsList.filter((imp) => !existingImportedNames.includes(imp));
         if (newImports.length === 0)
             return content;
         const allImports = [...existingImports, ...newImports].sort();
@@ -782,7 +785,16 @@ function removeRouterStateServiceInjection(sourceFile, content, routerStateServi
             node.members.forEach((member) => {
                 if (ts.isPropertyDeclaration(member) && ts.isIdentifier(member.name)) {
                     const memberName = member.name.text;
-                    if (routerStateServiceVars.includes(memberName)) {
+                    const injectsRouterState = member.initializer &&
+                        ts.isCallExpression(member.initializer) &&
+                        ts.isIdentifier(member.initializer.expression) &&
+                        member.initializer.expression.text === 'inject' &&
+                        member.initializer.arguments.some((argument) => ts.isIdentifier(argument) && argument.text === 'RouterStateService');
+                    const hasRouterStateType = member.type &&
+                        ts.isTypeReferenceNode(member.type) &&
+                        ts.isIdentifier(member.type.typeName) &&
+                        member.type.typeName.text === 'RouterStateService';
+                    if (routerStateServiceVars.includes(memberName) && (injectsRouterState || hasRouterStateType)) {
                         const memberStart = member.getStart(sourceFile, true);
                         const memberEnd = member.getEnd();
                         let lineStart = memberStart;
@@ -807,7 +819,11 @@ function removeRouterStateServiceInjection(sourceFile, content, routerStateServi
                     member.parameters.forEach((param) => {
                         if (ts.isIdentifier(param.name)) {
                             const paramName = param.name.text;
-                            if (routerStateServiceVars.includes(paramName)) {
+                            const hasRouterStateType = param.type &&
+                                ts.isTypeReferenceNode(param.type) &&
+                                ts.isIdentifier(param.type.typeName) &&
+                                param.type.typeName.text === 'RouterStateService';
+                            if (routerStateServiceVars.includes(paramName) && hasRouterStateType) {
                                 return;
                             }
                         }
@@ -951,11 +967,13 @@ export default async function migrateRouterStateService(tree) {
         for (const child of children) {
             const path = dir === '.' ? child : `${dir}/${child}`;
             if (tree.isFile(path)) {
-                if (path.endsWith('.ts') && !path.includes('node_modules') && !path.includes('.spec.ts')) {
+                if (path.endsWith('.ts') && !path.includes('node_modules')) {
                     tsFiles.push(path);
                 }
             }
             else {
+                if (child === 'node_modules')
+                    continue;
                 findFiles(path);
             }
         }
@@ -971,6 +989,14 @@ export default async function migrateRouterStateService(tree) {
             continue;
         console.log(`Processing: ${filePath}`);
         const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+        const hasEthleteImport = sourceFile.statements.some((statement) => ts.isImportDeclaration(statement) &&
+            ts.isStringLiteral(statement.moduleSpecifier) &&
+            statement.moduleSpecifier.text.startsWith('@ethlete/') &&
+            !!statement.importClause?.namedBindings &&
+            ts.isNamedImports(statement.importClause.namedBindings) &&
+            statement.importClause.namedBindings.elements.some((element) => (element.propertyName?.text ?? element.name.text) === 'RouterStateService'));
+        if (!hasEthleteImport)
+            continue;
         const inlineResult = handleInlineInjectPatterns(sourceFile, content);
         let updatedContent = inlineResult.content;
         const updatedSourceFile = updatedContent !== content
@@ -1005,7 +1031,7 @@ export default async function migrateRouterStateService(tree) {
                     allImportsNeeded['@angular/core/rxjs-interop'].add('toObservable');
                 }
             });
-            for (const [original, replacement] of context.replacements) {
+            for (const [original, replacement] of [...context.replacements].sort((a, b) => b[0].length - a[0].length)) {
                 if (replacement.includes('toObservable(')) {
                     allImportsNeeded['@angular/core/rxjs-interop'].add('toObservable');
                 }
@@ -1061,4 +1087,3 @@ export default async function migrateRouterStateService(tree) {
         console.log('\nℹ️  No RouterStateService usage found\n');
     }
 }
-//# sourceMappingURL=router-state-service.js.map

package/generators/migrate-to-v5/viewport-service.js

@@ -11,7 +11,7 @@ export default async function migrateViewportService(tree) {
         for (const child of children) {
             const path = dir === '.' ? child : `${dir}/${child}`;
             if (tree.isFile(path)) {
-                if (path.endsWith('.ts') && !path.includes('node_modules') && !path.includes('.spec.ts')) {
+                if (path.endsWith('.ts') && !path.includes('node_modules')) {
                     tsFiles.push(path);
                 }
                 else if (path.endsWith('.css') ||
@@ -22,6 +22,8 @@ export default async function migrateViewportService(tree) {
                 }
             }
             else {
+                if (child === 'node_modules')
+                    continue;
                 findFiles(path);
             }
         }
@@ -44,6 +46,9 @@ export default async function migrateViewportService(tree) {
             continue;
         logger.log(`Processing: ${filePath}`);
         const sourceFile = ts.createSourceFile(filePath, content, ts.ScriptTarget.Latest, true);
+        const viewportPackage = getViewportServicePackage(sourceFile);
+        if (viewportPackage !== '@ethlete/core' && !viewportPackage?.startsWith('@fifa-gg/uikit'))
+            continue;
         // Check if this is a component with a template
         const templatePath = findTemplateForComponent(tree, filePath, sourceFile);
         // Track signal properties for template migration
@@ -93,7 +98,7 @@ export default async function migrateViewportService(tree) {
                 }
             });
             // Check if any replacements use toObservable or toSignal
-            for (const [original, replacement] of context.replacements) {
+            for (const [original, replacement] of [...context.replacements].sort((a, b) => b[0].length - a[0].length)) {
                 if (replacement.includes('toObservable(')) {
                     allImportsNeeded['@angular/core/rxjs-interop'].add('toObservable');
                 }
@@ -174,6 +179,7 @@ export default async function migrateViewportService(tree) {
             componentTemplateMigrations.set(filePath, templateMigrationInfo);
         }
         const updatedSourceFileForInline = ts.createSourceFile(filePath, updatedContent, ts.ScriptTarget.Latest, true);
+        const inlineTemplateEdits = [];
         updatedSourceFileForInline.forEachChild((node) => {
             if (ts.isClassDeclaration(node)) {
                 const decorators = 
@@ -192,25 +198,25 @@ export default async function migrateViewportService(tree) {
                                 let templateText = prop.initializer.getText();
                                 // Remove the surrounding quotes/backticks
                                 templateText = templateText.slice(1, -1);
-                                // For each signal property, replace usages with ()
-                                for (const propName of templateMigrationInfo.signalProperties) {
-                                    const regex = new RegExp(`\\b${propName}(?!\\s*\\()\\b`, 'g');
-                                    templateText = templateText.replace(regex, `${propName}()`);
-                                }
+                                templateText = migrateTemplateText(templateText, templateMigrationInfo.signalProperties);
                                 // Re-wrap with original quotes/backticks
                                 const quote = prop.initializer.getText()[0];
                                 const newInitializer = quote + templateText + quote;
-                                // Replace in the file content
-                                updatedContent =
-                                    updatedContent.slice(0, prop.initializer.getStart(updatedSourceFileForInline)) +
-                                        newInitializer +
-                                        updatedContent.slice(prop.initializer.getEnd());
+                                inlineTemplateEdits.push({
+                                    start: prop.initializer.getStart(updatedSourceFileForInline),
+                                    end: prop.initializer.getEnd(),
+                                    replacement: newInitializer,
+                                });
                             }
                         });
                     }
                 });
             }
         });
+        inlineTemplateEdits.sort((a, b) => b.start - a.start);
+        for (const edit of inlineTemplateEdits) {
+            updatedContent = updatedContent.slice(0, edit.start) + edit.replacement + updatedContent.slice(edit.end);
+        }
         // Write the updated content if changes were made
         if (updatedContent !== content) {
             tree.write(filePath, updatedContent);
@@ -275,28 +281,24 @@ function detectCssVariableUsage(tree, styleFiles) {
     }
     return { hasViewportVariables, hasScrollbarVariables };
 }
+const migrateTemplateExpression = (expression, signalProperties) => {
+    let migrated = expression;
+    for (const propName of signalProperties) {
+        const regex = new RegExp(`\\b${escapeRegExp(propName)}(?!\\s*\\()\\b`, 'g');
+        migrated = migrated.replace(regex, `${propName}()`);
+    }
+    return migrated;
+};
+const migrateTemplateText = (template, signalProperties) => template
+    .replace(/{{([\s\S]*?)}}/g, (_, expression) => `{{${migrateTemplateExpression(expression, signalProperties)}}}`)
+    .replace(/((?:\[[^\]]+\]|\([^)]+\)|\*[\w.-]+)\s*=\s*)(["'])([\s\S]*?)\2/g, (_, prefix, quote, expression) => `${prefix}${quote}${migrateTemplateExpression(expression, signalProperties)}${quote}`)
+    .replace(/@(if|for|switch|case|defer)\s*\(([^\n{}]*)\)/g, (_, block, expression) => `@${block} (${migrateTemplateExpression(expression, signalProperties)})`);
 function migrateTemplateFile(tree, htmlFilePath, migrationInfo) {
     const content = tree.read(htmlFilePath, 'utf-8');
     if (!content)
         return false;
-    let updatedContent = content;
-    let hasChanges = false;
-    // For each signal property, replace usages with () calls
-    for (const propName of migrationInfo.signalProperties) {
-        // Match property usage in various Angular contexts:
-        // 1. Interpolation: {{ propName }}
-        // 2. Property binding: [prop]="propName"
-        // 3. Event binding: (event)="propName === value"
-        // 4. Structural directives: *ngIf="propName"
-        // But NOT if already called: propName()
-        // Create a regex that matches the property but not if followed by (
-        const regex = new RegExp(`\\b${escapeRegExp(propName)}(?!\\s*\\()\\b`, 'g');
-        const newContent = updatedContent.replace(regex, `${propName}()`);
-        if (newContent !== updatedContent) {
-            updatedContent = newContent;
-            hasChanges = true;
-        }
-    }
+    const updatedContent = migrateTemplateText(content, migrationInfo.signalProperties);
+    const hasChanges = updatedContent !== content;
     if (hasChanges) {
         tree.write(htmlFilePath, updatedContent);
     }
@@ -339,7 +341,7 @@ function getViewportServicePackage(sourceFile) {
     sourceFile.forEachChild((node) => {
         if (ts.isImportDeclaration(node) && node.importClause?.namedBindings) {
             if (ts.isNamedImports(node.importClause.namedBindings)) {
-                const hasViewportService = node.importClause.namedBindings.elements.some((el) => el.name.text === 'ViewportService');
+                const hasViewportService = node.importClause.namedBindings.elements.some((el) => (el.propertyName?.text ?? el.name.text) === 'ViewportService');
                 if (hasViewportService && ts.isStringLiteral(node.moduleSpecifier)) {
                     packageName = node.moduleSpecifier.text;
                 }
@@ -358,7 +360,7 @@ function getPropertyMaps(packageName) {
         isLg: isEthleteCore ? 'injectIsLg' : 'injectIsXl',
         isXl: isEthleteCore ? 'injectIsXl' : 'injectIs2Xl',
         is2Xl: 'injectIs2Xl',
-        isBase: isEthleteCore ? 'injectIsBase' : 'injectIsLg',
+        isBase: 'injectIsLg',
         viewportSize: 'injectViewportDimensions',
         scrollbarSize: 'injectScrollbarDimensions',
         currentViewport: 'injectCurrentBreakpoint',
@@ -1092,7 +1094,7 @@ function findClassForViewportService(sourceFile, viewportServiceVar) {
 function findAvailableMemberName(baseName, existingMembers) {
     // baseName already has $ suffix for observables at this point
     // Try variations: name, _name, #name
-    const candidates = [baseName, `_${baseName}`, `#${baseName}`];
+    const candidates = [baseName, `_${baseName}`];
     for (const candidate of candidates) {
         if (!existingMembers.has(candidate)) {
             return candidate;
@@ -1160,29 +1162,8 @@ function migrateMonitorViewport(sourceFile, content, viewportServiceVars, cssVar
         return { content, imports };
     }
     // Determine what to add to constructor
-    const constructorStatements = [];
-    if (cssVariablesUsed.hasViewportVariables) {
-        constructorStatements.push('writeViewportSizeToCssVariables();');
-        imports.push('writeViewportSizeToCssVariables');
-    }
-    if (cssVariablesUsed.hasScrollbarVariables) {
-        constructorStatements.push('writeScrollbarSizeToCssVariables();');
-        imports.push('writeScrollbarSizeToCssVariables');
-    }
-    if (constructorStatements.length === 0) {
-        // Just remove monitorViewport calls
-        const modifications = monitorViewportCalls.map((call) => ({
-            start: call.start,
-            end: call.end,
-            replacement: '',
-        }));
-        // Apply modifications from end to start
-        modifications.sort((a, b) => b.start - a.start);
-        for (const mod of modifications) {
-            updatedContent = updatedContent.slice(0, mod.start) + mod.replacement + updatedContent.slice(mod.end);
-        }
-        return { content: updatedContent, imports };
-    }
+    const constructorStatements = ['writeViewportSizeToCssVariables();', 'writeScrollbarSizeToCssVariables();'];
+    imports.push('writeViewportSizeToCssVariables', 'writeScrollbarSizeToCssVariables');
     // Group calls by class
     const callsByClass = new Map();
     for (const call of monitorViewportCalls) {
@@ -1277,8 +1258,10 @@ function addImportsToPackage(sourceFile, content, neededImports, packageName) {
         statement.moduleSpecifier.text === packageName);
     const importsToAdd = Array.from(neededImports).sort();
     if (existingImport?.importClause?.namedBindings && ts.isNamedImports(existingImport.importClause.namedBindings)) {
-        const existingImportNames = existingImport.importClause.namedBindings.elements.map((el) => el.name.text);
-        const newImports = importsToAdd.filter((imp) => !existingImportNames.includes(imp));
+        const existingElements = existingImport.importClause.namedBindings.elements;
+        const existingImportedNames = existingElements.map((el) => el.propertyName?.text ?? el.name.text);
+        const existingImportNames = existingElements.map((el) => el.getText(sourceFile));
+        const newImports = importsToAdd.filter((imp) => !existingImportedNames.includes(imp));
         if (newImports.length > 0) {
             const allImports = [...existingImportNames, ...newImports].sort();
             const importText = existingImport.getText(sourceFile);
@@ -1674,4 +1657,3 @@ function checkIfPropertyIsUsedElsewhere(sourceFile, classNode, propertyName, pro
     });
     return isUsed;
 }
-//# sourceMappingURL=viewport-service.js.map

package/generators/tailwind-4-color-theme/generator.js

@@ -62,6 +62,10 @@ export default async function generate(tree, schema) {
     // Step 6: Generate Tailwind CSS
     logger.log('\n🎨 Generating Tailwind theme CSS...');
     const css = generateTailwindThemeCss(themes, prefix, runtimePrefix, schema);
+    const typesOutputPath = schema.typesOutputPath ?? outputPath.replace(/\.css$/, '.d.ts');
+    if (typesOutputPath === outputPath) {
+        throw new Error('A custom outputPath must end in .css or be paired with a distinct typesOutputPath.');
+    }
     // Step 7: Write the generated CSS file
     const outputDir = outputPath.substring(0, outputPath.lastIndexOf('/'));
     if (outputDir && !tree.exists(outputDir)) {
@@ -72,7 +76,6 @@ export default async function generate(tree, schema) {
     // Step 8: Generate the `EthleteColorThemeNameRegistry` augmentation, so `etProvideColor`
     // (and anything else that accepts a `RegisteredColorThemeName`) is checked/autocompleted
     // against this app's actual theme names, instead of a plain `string`.
-    const typesOutputPath = schema.typesOutputPath || outputPath.replace(/\.css$/, '.d.ts');
     const typesDts = generateColorThemeNameTypes(themes, schema);
     tree.write(typesOutputPath, typesDts);
     logger.log(`✅ Generated color theme name types at: ${typesOutputPath}`);
@@ -131,35 +134,37 @@ function extractThemesFromContent(content, filePath) {
     // Get the array elements (these are references to the theme const declarations)
     const elements = initializer.getElements();
     for (const element of elements) {
-        // Resolve the identifier to its declaration
+        let themeObj;
+        let name = '<inline>';
         if (element.isKind(SyntaxKind.Identifier)) {
-            const name = element.getText();
+            name = element.getText();
             const themeDecl = exportedDeclarations.find((decl) => decl.getName() === name);
             if (!themeDecl) {
                 logger.warn(`⚠️  Could not find declaration for theme: ${name}`);
                 continue;
             }
-            let themeObj = themeDecl.getInitializer();
+            themeObj = themeDecl.getInitializer();
             if (!themeObj) {
                 logger.warn(`⚠️  Theme ${name} has no initializer`);
                 continue;
             }
-            // Handle 'as const' and 'satisfies X' wrappers on individual theme objects, in
-            // either order (e.g. `{...} satisfies Theme`, `{...} as const`, or both combined).
-            while (themeObj.isKind(SyntaxKind.AsExpression) || themeObj.isKind(SyntaxKind.SatisfiesExpression)) {
-                themeObj = themeObj.getExpression();
-            }
-            if (!themeObj.isKind(SyntaxKind.ObjectLiteralExpression)) {
-                logger.warn(`⚠️  Theme ${name} is not an object literal`);
-                continue;
-            }
-            try {
-                const theme = parseThemeObject(themeObj, sourceFile);
-                themes.push(theme);
-            }
-            catch (error) {
-                logger.warn(`⚠️  Failed to parse theme ${name}: ${error instanceof Error ? error.message : String(error)}`);
-            }
+        }
+        else {
+            themeObj = element;
+        }
+        while (themeObj.isKind(SyntaxKind.AsExpression) || themeObj.isKind(SyntaxKind.SatisfiesExpression)) {
+            themeObj = themeObj.getExpression();
+        }
+        if (!themeObj.isKind(SyntaxKind.ObjectLiteralExpression)) {
+            logger.warn(`⚠️  Theme ${name} is not an object literal`);
+            continue;
+        }
+        try {
+            const theme = parseThemeObject(themeObj, sourceFile);
+            themes.push(theme);
+        }
+        catch (error) {
+            logger.warn(`⚠️  Failed to parse theme ${name}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
     if (themes.length === 0) {
@@ -282,6 +287,11 @@ function parseThemeSwatch(obj, sourceFile) {
 const COLOR_MAP_KEYS = ['default', 'hover', 'focus', 'active', 'disabled'];
 const isColorMapKey = (name) => COLOR_MAP_KEYS.some((key) => key === name);
 function parseColorMap(initializer, sourceFile) {
+    if (initializer.isKind(SyntaxKind.Identifier)) {
+        const declaration = sourceFile.getVariableDeclarations().find((decl) => decl.getName() === initializer.getText());
+        const referencedInitializer = declaration?.getInitializer();
+        return referencedInitializer ? parseColorMap(referencedInitializer, sourceFile) : null;
+    }
     // Handle spread expressions by resolving references
     if (initializer.isKind(SyntaxKind.ObjectLiteralExpression)) {
         const colorMap = {};
@@ -596,4 +606,3 @@ function findMainStylesFile(tree) {
     return potentialFiles;
 }
 //#endregion
-//# sourceMappingURL=generator.js.map

package/generators/tailwind-4-surface-theme/generator.js

@@ -61,12 +61,15 @@ export default async function generate(tree, schema) {
     }
     logger.log('\n🎨 Generating Tailwind surface theme CSS...');
     const css = generateSurfaceThemeCss(themes, prefix, runtimePrefix, schema);
+    const typesOutputPath = schema.typesOutputPath ?? outputPath.replace(/\.css$/, '.d.ts');
+    if (typesOutputPath === outputPath) {
+        throw new Error('A custom outputPath must end in .css or be paired with a distinct typesOutputPath.');
+    }
     tree.write(outputPath, css);
     logger.log(`✅ Generated Tailwind surface themes at: ${outputPath}`);
     // Generate the `EthleteSurfaceThemeNameRegistry` augmentation, so `etProvideSurface` (and
     // anything else that accepts a `RegisteredSurfaceThemeName`) is checked/autocompleted
     // against this app's actual surface theme names, instead of a plain `string`.
-    const typesOutputPath = schema.typesOutputPath || outputPath.replace(/\.css$/, '.d.ts');
     const typesDts = generateSurfaceThemeNameTypes(themes, schema);
     tree.write(typesOutputPath, typesDts);
     logger.log(`✅ Generated surface theme name types at: ${typesOutputPath}`);
@@ -119,34 +122,37 @@ function extractSurfaceThemesFromContent(content, filePath) {
     }
     const elements = initializer.getElements();
     for (const element of elements) {
+        let themeObj;
+        let name = '<inline>';
         if (element.isKind(SyntaxKind.Identifier)) {
-            const name = element.getText();
+            name = element.getText();
             const themeDecl = exportedDeclarations.find((decl) => decl.getName() === name);
             if (!themeDecl) {
                 logger.warn(`⚠️  Could not find declaration for surface theme: ${name}`);
                 continue;
             }
-            let themeObj = themeDecl.getInitializer();
+            themeObj = themeDecl.getInitializer();
             if (!themeObj) {
                 logger.warn(`⚠️  Surface theme ${name} has no initializer`);
                 continue;
             }
-            // Handle 'as const' and 'satisfies X' wrappers on individual theme objects, in
-            // either order (e.g. `{...} satisfies SurfaceTheme`, `{...} as const`, or both).
-            while (themeObj.isKind(SyntaxKind.AsExpression) || themeObj.isKind(SyntaxKind.SatisfiesExpression)) {
-                themeObj = themeObj.getExpression();
-            }
-            if (!themeObj.isKind(SyntaxKind.ObjectLiteralExpression)) {
-                logger.warn(`⚠️  Surface theme ${name} is not an object literal`);
-                continue;
-            }
-            try {
-                const theme = parseSurfaceThemeObject(themeObj);
-                themes.push(theme);
-            }
-            catch (error) {
-                logger.warn(`⚠️  Failed to parse surface theme ${name}: ${error instanceof Error ? error.message : String(error)}`);
-            }
+        }
+        else {
+            themeObj = element;
+        }
+        while (themeObj.isKind(SyntaxKind.AsExpression) || themeObj.isKind(SyntaxKind.SatisfiesExpression)) {
+            themeObj = themeObj.getExpression();
+        }
+        if (!themeObj.isKind(SyntaxKind.ObjectLiteralExpression)) {
+            logger.warn(`⚠️  Surface theme ${name} is not an object literal`);
+            continue;
+        }
+        try {
+            const theme = parseSurfaceThemeObject(themeObj, sourceFile);
+            themes.push(theme);
+        }
+        catch (error) {
+            logger.warn(`⚠️  Failed to parse surface theme ${name}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
     if (themes.length === 0) {
@@ -160,6 +166,20 @@ const INTERACTION_KEYS = ['default', 'hover', 'focus', 'active', 'disabled'];
 const isInteractionKey = (name) => INTERACTION_KEYS.some((key) => key === name);
 const SWATCH_KEYS = ['color', 'onColor', 'inkColor'];
 const isSwatchKey = (name) => SWATCH_KEYS.some((key) => key === name);
+const resolveObjectLiteral = (expression, sourceFile) => {
+    let resolved = expression;
+    while (resolved.isKind(SyntaxKind.AsExpression) || resolved.isKind(SyntaxKind.SatisfiesExpression)) {
+        resolved = resolved.getExpression();
+    }
+    if (resolved.isKind(SyntaxKind.Identifier)) {
+        const declaration = sourceFile
+            .getVariableDeclarations()
+            .find((candidate) => candidate.getName() === resolved.getText());
+        const initializer = declaration?.getInitializer();
+        return initializer ? resolveObjectLiteral(initializer, sourceFile) : null;
+    }
+    return resolved.isKind(SyntaxKind.ObjectLiteralExpression) ? resolved : null;
+};
 function parseInteractionColorMap(obj) {
     const map = {};
     for (const prop of obj.getProperties()) {
@@ -173,7 +193,7 @@ function parseInteractionColorMap(obj) {
     }
     return map;
 }
-function parseInteractionColor(obj, themeName) {
+function parseInteractionColor(obj, themeName, sourceFile) {
     const swatch = {};
     for (const prop of obj.getProperties()) {
         if (!prop.isKind(SyntaxKind.PropertyAssignment))
@@ -185,22 +205,30 @@ function parseInteractionColor(obj, themeName) {
                 `{ color: { default, hover, focus, active, disabled }, onColor?, inkColor? }. ` +
                 `Run \`nx g @ethlete/core:migrate-surface-interaction-swatch\` to convert your themes.`);
         }
-        if (!initializer?.isKind(SyntaxKind.ObjectLiteralExpression) || !isSwatchKey(name))
+        if (!initializer || !isSwatchKey(name))
             continue;
-        const map = parseInteractionColorMap(initializer);
+        const mapObject = resolveObjectLiteral(initializer, sourceFile);
+        if (!mapObject) {
+            throw new Error(`Surface theme "${themeName}" has an interactionColor.${name} value that cannot be resolved.`);
+        }
+        const map = parseInteractionColorMap(mapObject);
         if (name === 'color') {
-            if (map.default && map.hover && map.focus && map.active && map.disabled) {
-                swatch.color = map;
+            if (!map.default || !map.hover || !map.focus || !map.active || !map.disabled) {
+                throw new Error(`Surface theme "${themeName}" must define default, hover, focus, active and disabled interaction colors.`);
             }
+            swatch.color = map;
             continue;
         }
         if (map.default) {
             swatch[name] = map;
         }
     }
-    return swatch.color ? swatch : undefined;
+    if (!swatch.color) {
+        throw new Error(`Surface theme "${themeName}" interactionColor must define a color swatch.`);
+    }
+    return swatch;
 }
-function parseSurfaceThemeObject(obj) {
+function parseSurfaceThemeObject(obj, sourceFile) {
     const properties = obj.getProperties();
     const theme = {};
     let interactionColorObj = null;
@@ -219,8 +247,11 @@ function parseSurfaceThemeObject(obj) {
             }
             continue;
         }
-        if (propName === 'interactionColor' && initializer.isKind(SyntaxKind.ObjectLiteralExpression)) {
-            interactionColorObj = initializer;
+        if (propName === 'interactionColor') {
+            interactionColorObj = resolveObjectLiteral(initializer, sourceFile);
+            if (!interactionColorObj) {
+                throw new Error('Surface theme interactionColor must be an inline or same-file object literal.');
+            }
             continue;
         }
         if (propName === 'elevation') {
@@ -254,7 +285,7 @@ function parseSurfaceThemeObject(obj) {
         throw new Error('SurfaceTheme must have name, type, elevation, background, color, colorMuted, colorSubtle, and border properties');
     }
     if (interactionColorObj) {
-        theme.interactionColor = parseInteractionColor(interactionColorObj, theme.name);
+        theme.interactionColor = parseInteractionColor(interactionColorObj, theme.name, sourceFile);
     }
     return theme;
 }
@@ -566,4 +597,3 @@ function findMainStylesFile(tree) {
     return potentialFiles;
 }
 //#endregion
-//# sourceMappingURL=generator.js.map

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@ethlete/core",
-  "version": "5.0.0-next.53",
+  "version": "5.0.0-next.54",
   "license": "MIT",
   "sideEffects": false,
   "peerDependencies": {
-    "@analogjs/vite-plugin-angular": "2.6.3",
     "@angular/common": "22.0.7",
     "@angular/core": "22.0.7",
     "@angular/forms": "22.0.7",
@@ -15,13 +14,9 @@
     "@nx/devkit": "23.1.0",
     "rxjs": "7.8.2",
     "ts-morph": "21.0.1",
-    "typescript": "6.0.3",
-    "vite": "8.1.5"
+    "typescript": "6.0.3"
   },
   "peerDependenciesMeta": {
-    "@analogjs/vite-plugin-angular": {
-      "optional": true
-    },
     "@nx/devkit": {
       "optional": true
     },
@@ -30,9 +25,6 @@
     },
     "typescript": {
       "optional": true
-    },
-    "vite": {
-      "optional": true
     }
   },
   "generators": "./generators/generators.json",