fix(compiler-cli): handle conditional expressions when extracting dependencies (#59637)

clydin · AndrewKushnir · commit 39690969af14 · 2025-01-21T10:47:43.000-08:00
Updates the HMR dependencies extraction logic to handle conditional expressions. For example, `providers: [condition ? providersA : providersB]`. PR Close #59637
diff --git a/packages/compiler-cli/src/ngtsc/hmr/src/extract_dependencies.ts b/packages/compiler-cli/src/ngtsc/hmr/src/extract_dependencies.ts
@@ -310,6 +310,10 @@ class PotentialTopLevelReadsVisitor extends o.RecursiveAstVisitor {
       return (parent.propertyName || parent.name) === node;
     }
 
+    if (ts.isConditionalExpression(parent)) {
+      return parent.condition === node || parent.whenFalse === node || parent.whenTrue === node;
+    }
+
     // Otherwise it's not top-level.
     return false;
   }
diff --git a/packages/compiler-cli/test/ngtsc/hmr_spec.ts b/packages/compiler-cli/test/ngtsc/hmr_spec.ts
@@ -549,6 +549,38 @@ runInEachFileSystem(() => {
       );
     });
 
+    it('should capture conditional expression dependencies', () => {
+      enableHmr();
+      env.write(
+        'test.ts',
+        `
+          import {Component, InjectionToken} from '@angular/core';
+
+          const providersA: any[] = [];
+          const providersB: any[] = [];
+          const condition = true;
+
+          @Component({
+            template: '',
+            providers: [condition ? providersA : providersB]
+          })
+          export class Cmp {}
+        `,
+      );
+
+      env.driveMain();
+
+      const jsContents = env.getContents('test.js');
+      const hmrContents = env.driveHmr('test.ts', 'Cmp');
+
+      expect(jsContents).toContain(
+        'ɵɵreplaceMetadata(Cmp, m.default, [i0], [condition, providersA, providersB, Component]));',
+      );
+      expect(hmrContents).toContain(
+        'export default function Cmp_UpdateMetadata(Cmp, ɵɵnamespaces, condition, providersA, providersB, Component) {',
+      );
+    });
+
     it('should capture parenthesized dependencies', () => {
       enableHmr();
       env.write(

Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,10 @@ class PotentialTopLevelReadsVisitor extends o.RecursiveAstVisitor {`
`310`	`310`	`return (parent.propertyName \|\| parent.name) === node;`
`311`	`311`	`}`
`312`	`312`
	`313`	`+ if (ts.isConditionalExpression(parent)) {`
	`314`	`+ return parent.condition === node \|\| parent.whenFalse === node \|\| parent.whenTrue === node;`
	`315`	`+ }`
	`316`	`+`
`313`	`317`	`// Otherwise it's not top-level.`
`314`	`318`	`return false;`
`315`	`319`	`}`