From 2409e7071a4c1e035a6f212249e96ba36d7aeb4f Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Mon, 18 Sep 2023 08:47:58 +0200
Subject: [PATCH] fix(cdk/schematics): account for single string in styles and
 new styleUrl (#27798)

Updates the `ComponentResourceCollector` to account for the new changes in v17 where `@Component.styles` can be a single string and there's a new `@Component.styleUrl` property.
---
 .../component-resource-collector.ts           | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/cdk/schematics/update-tool/component-resource-collector.ts b/src/cdk/schematics/update-tool/component-resource-collector.ts
index 8568b17c64a3..cf353d51e050 100644
--- a/src/cdk/schematics/update-tool/component-resource-collector.ts
+++ b/src/cdk/schematics/update-tool/component-resource-collector.ts
@@ -45,7 +45,10 @@ export class ComponentResourceCollector {
   resolvedTemplates: ResolvedResource[] = [];
   resolvedStylesheets: ResolvedResource[] = [];
 
-  constructor(public typeChecker: ts.TypeChecker, private _fileSystem: FileSystem) {}
+  constructor(
+    public typeChecker: ts.TypeChecker,
+    private _fileSystem: FileSystem,
+  ) {}
 
   visitNode(node: ts.Node) {
     if (node.kind === ts.SyntaxKind.ClassDeclaration) {
@@ -95,8 +98,12 @@ export class ComponentResourceCollector {
 
       const propertyName = getPropertyNameText(property.name);
 
-      if (propertyName === 'styles' && ts.isArrayLiteralExpression(property.initializer)) {
-        property.initializer.elements.forEach(el => {
+      if (propertyName === 'styles') {
+        const elements = ts.isArrayLiteralExpression(property.initializer)
+          ? property.initializer.elements
+          : [property.initializer];
+
+        elements.forEach(el => {
           if (ts.isStringLiteralLike(el)) {
             // Need to add an offset of one to the start because the template quotes are
             // not part of the template content.
@@ -135,16 +142,15 @@ export class ComponentResourceCollector {
       if (propertyName === 'styleUrls' && ts.isArrayLiteralExpression(property.initializer)) {
         property.initializer.elements.forEach(el => {
           if (ts.isStringLiteralLike(el)) {
-            const stylesheetPath = this._fileSystem.resolve(sourceFileDirPath, el.text);
-            const stylesheet = this.resolveExternalStylesheet(stylesheetPath, node);
-
-            if (stylesheet) {
-              this.resolvedStylesheets.push(stylesheet);
-            }
+            this._trackExternalStylesheet(sourceFileDirPath, el, node);
           }
         });
       }
 
+      if (propertyName === 'styleUrl' && ts.isStringLiteralLike(property.initializer)) {
+        this._trackExternalStylesheet(sourceFileDirPath, property.initializer, node);
+      }
+
       if (propertyName === 'templateUrl' && ts.isStringLiteralLike(property.initializer)) {
         const templateUrl = property.initializer.text;
         const templatePath = this._fileSystem.resolve(sourceFileDirPath, templateUrl);
@@ -197,6 +203,19 @@ export class ComponentResourceCollector {
       getCharacterAndLineOfPosition: pos => getLineAndCharacterFromPosition(lineStartsMap, pos),
     };
   }
+
+  private _trackExternalStylesheet(
+    sourceFileDirPath: string,
+    node: ts.StringLiteralLike,
+    container: ts.ClassDeclaration,
+  ) {
+    const stylesheetPath = this._fileSystem.resolve(sourceFileDirPath, node.text);
+    const stylesheet = this.resolveExternalStylesheet(stylesheetPath, container);
+
+    if (stylesheet) {
+      this.resolvedStylesheets.push(stylesheet);
+    }
+  }
 }
 
 /** Strips the BOM from a string. */