fix(core): fixes #592882 ng generate @angular/core:signal-queries-migration (#60688)

aparzi · thePunderWoman · commit 006ac7f22f47 · 2025-04-02T15:14:43.000Z
fixes #592882 - retain accessibility modifier if it's already present for signal migrations PR Close #60688
diff --git a/packages/core/schematics/migrations/signal-queries-migration/convert_query_property.ts b/packages/core/schematics/migrations/signal-queries-migration/convert_query_property.ts
@@ -150,8 +150,17 @@ export function computeReplacementsToMigrateQuery(
     resolvedReadType === null && type !== undefined ? [type] : undefined,
     args,
   );
+
+  const accessibilityModifier = getAccessibilityModifier(node);
+  let modifiers: (ts.ModifierLike | ts.ModifierToken<ts.SyntaxKind.ReadonlyKeyword>)[] = [
+    ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
+  ];
+  if (accessibilityModifier) {
+    modifiers = [accessibilityModifier, ...modifiers];
+  }
+
   const updated = ts.factory.createPropertyDeclaration(
-    [ts.factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
+    modifiers,
     node.name,
     undefined,
     undefined,
@@ -169,3 +178,12 @@ export function computeReplacementsToMigrateQuery(
     ),
   ];
 }
+
+function getAccessibilityModifier(node: ts.PropertyDeclaration): ts.ModifierLike | undefined {
+  return node.modifiers?.find(
+    (mod) =>
+      mod.kind === ts.SyntaxKind.PublicKeyword ||
+      mod.kind === ts.SyntaxKind.PrivateKeyword ||
+      mod.kind === ts.SyntaxKind.ProtectedKeyword,
+  );
+}
diff --git a/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts b/packages/core/schematics/migrations/signal-queries-migration/migration.spec.ts
@@ -55,6 +55,11 @@ const declarationTestCases: TestCase[] = [
     before: `@ViewChild('myBtn', {read: ElementRef}) buttonEl!: ElementRef;`,
     after: `readonly buttonEl = viewChild.required('myBtn', { read: ElementRef });`,
   },
+  {
+    id: 'viewChild retain accessibility modifier',
+    before: `@ViewChild('sidenav') public sidenav: HTMLElement;`,
+    after: `public readonly sidenav = viewChild<HTMLElement>('sidenav');`,
+  },
   // Content Child
   {
     id: 'contentChild with string locator and nullable',
@@ -137,6 +142,11 @@ const declarationTestCases: TestCase[] = [
     before: `@ViewChildren('myBtn', {descendants: true}) buttonEl = new QueryList<ElementRef>()`,
     after: `readonly buttonEl = viewChildren<ElementRef>('myBtn');`,
   },
+  {
+    id: 'viewChildren retain accessibility modifier',
+    before: `@ViewChildren('sidenav') public sidenav: HTMLElement;`,
+    after: `public readonly sidenav = viewChildren('sidenav');`,
+  },
   // ContentChildren
   {
     id: 'contentChildren with string locator and nullable',
