build: update to TypeScript 4.8 RC

Updates to the TypeScript 4.8 RC and adds some code to account for a breaking change where the decorators and modifiers of an AST node have been combined into a single array.

Author: crisbeto

package.json

@@ -65,22 +65,22 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular/animations": "14.1.2",
+    "@angular/animations": "14.2.0-rc.0",
     "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#08f0188fccf98139207fbd5e683533950e9068e2",
-    "@angular/cdk": "14.1.2",
-    "@angular/common": "14.1.2",
-    "@angular/compiler": "14.1.2",
-    "@angular/compiler-cli": "14.1.2",
-    "@angular/core": "14.1.2",
-    "@angular/forms": "14.1.2",
-    "@angular/localize": "14.1.2",
-    "@angular/material": "14.1.2",
+    "@angular/cdk": "14.2.0-next.2",
+    "@angular/common": "14.2.0-rc.0",
+    "@angular/compiler": "14.2.0-rc.0",
+    "@angular/compiler-cli": "14.2.0-rc.0",
+    "@angular/core": "14.2.0-rc.0",
+    "@angular/forms": "14.2.0-rc.0",
+    "@angular/localize": "14.2.0-rc.0",
+    "@angular/material": "14.2.0-next.2",
     "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#a9d380df54092930c4eabbab114c29ac125759f4",
-    "@angular/platform-browser": "14.1.2",
-    "@angular/platform-browser-dynamic": "14.1.2",
-    "@angular/platform-server": "14.1.2",
-    "@angular/router": "14.1.2",
-    "@angular/service-worker": "14.1.2",
+    "@angular/platform-browser": "14.2.0-rc.0",
+    "@angular/platform-browser-dynamic": "14.2.0-rc.0",
+    "@angular/platform-server": "14.2.0-rc.0",
+    "@angular/router": "14.2.0-rc.0",
+    "@angular/service-worker": "14.2.0-rc.0",
     "@babel/core": "7.18.10",
     "@babel/generator": "7.18.12",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -214,7 +214,7 @@
     "tree-kill": "1.2.2",
     "ts-node": "^10.0.0",
     "tslib": "2.4.0",
-    "typescript": "~4.7.2",
+    "typescript": "4.8.1-rc",
     "verdaccio": "5.14.0",
     "verdaccio-auth-memory": "^10.0.0",
     "webpack": "5.74.0",

packages/angular_devkit/build_angular/package.json

@@ -80,7 +80,7 @@
     "ng-packagr": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": ">=4.6.2 <4.8"
+    "typescript": ">=4.6.2 <4.9"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

packages/angular_devkit/core/src/json/schema/registry.ts

@@ -649,7 +649,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       }
 
       let value = source(schema);
-      if (isObservable(value)) {
+      if (isObservable<{}>(value)) {
         value = await value.toPromise();
       }
 

packages/ngtools/webpack/package.json

@@ -23,14 +23,14 @@
   "dependencies": {},
   "peerDependencies": {
     "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
-    "typescript": ">=4.6.2 <4.8",
+    "typescript": ">=4.6.2 <4.9",
     "webpack": "^5.54.0"
   },
   "devDependencies": {
     "@angular-devkit/core": "0.0.0-PLACEHOLDER",
     "@angular/compiler": "14.1.2",
     "@angular/compiler-cli": "14.1.2",
-    "typescript": "~4.7.2",
+    "typescript": "4.8.1-rc",
     "webpack": "5.74.0"
   }
 }

packages/ngtools/webpack/src/transformers/elide_imports_spec.ts

@@ -773,7 +773,7 @@ describe('@ngtools/webpack transformers', () => {
         ): ts.Transformer<ts.SourceFile> => {
           const visit: ts.Visitor = (node) => {
             if (ts.isShorthandPropertyAssignment(node)) {
-              return ts.createPropertyAssignment(node.name, node.name);
+              return ts.factory.createPropertyAssignment(node.name, node.name);
             }
 
             return ts.visitEachChild(node, (child) => visit(child), context);

packages/ngtools/webpack/src/transformers/replace_resources.ts

@@ -11,6 +11,9 @@ import { InlineAngularResourceLoaderPath } from '../loaders/inline-resource';
 
 export const NG_COMPONENT_RESOURCE_QUERY = 'ngResource';
 
+/** Whether the current version of TypeScript is after 4.8. */
+const IS_TS_48 = isAfterVersion(4, 8);
+
 export function replaceResources(
   shouldTransform: (fileName: string) => boolean,
   getTypeChecker: () => ts.TypeChecker,
@@ -24,27 +27,13 @@ export function replaceResources(
 
     const visitNode: ts.Visitor = (node: ts.Node) => {
       if (ts.isClassDeclaration(node)) {
-        const decorators = ts.visitNodes(node.decorators, (node) =>
-          ts.isDecorator(node)
-            ? visitDecorator(
-                nodeFactory,
-                node,
-                typeChecker,
-                resourceImportDeclarations,
-                moduleKind,
-                inlineStyleFileExtension,
-              )
-            : node,
-        );
-
-        return nodeFactory.updateClassDeclaration(
+        return visitClassDeclaration(
+          nodeFactory,
+          typeChecker,
           node,
-          decorators,
-          node.modifiers,
-          node.name,
-          node.typeParameters,
-          node.heritageClauses,
-          node.members,
+          resourceImportDeclarations,
+          moduleKind,
+          inlineStyleFileExtension,
         );
       }
 
@@ -76,6 +65,75 @@ export function replaceResources(
   };
 }
 
+/**
+ * Replaces the resources inside of a `ClassDeclaration`. This is a backwards-compatibility layer
+ * to support TypeScript versions older than 4.8 where the decorators of a node were in a separate
+ * array, rather than being part of its `modifiers` array.
+ *
+ * TODO: remove this function and use the `NodeFactory` directly once support for TypeScript
+ * 4.6 and 4.7 has been dropped.
+ */
+function visitClassDeclaration(
+  nodeFactory: ts.NodeFactory,
+  typeChecker: ts.TypeChecker,
+  node: ts.ClassDeclaration,
+  resourceImportDeclarations: ts.ImportDeclaration[],
+  moduleKind: ts.ModuleKind | undefined,
+  inlineStyleFileExtension: string | undefined,
+): ts.ClassDeclaration {
+  let decorators: ts.Decorator[] | undefined;
+  let modifiers: ts.Modifier[] | undefined;
+
+  if (IS_TS_48) {
+    node.modifiers?.forEach((modifier) => {
+      if (ts.isDecorator(modifier)) {
+        decorators ??= [];
+        decorators.push(modifier);
+      } else {
+        modifiers = modifiers ??= [];
+        modifiers.push(modifier);
+      }
+    });
+  } else {
+    decorators = node.decorators as unknown as ts.Decorator[];
+    modifiers = node.modifiers as unknown as ts.Modifier[];
+  }
+
+  if (!decorators || decorators.length === 0) {
+    return node;
+  }
+
+  decorators = decorators.map((current) =>
+    visitDecorator(
+      nodeFactory,
+      current,
+      typeChecker,
+      resourceImportDeclarations,
+      moduleKind,
+      inlineStyleFileExtension,
+    ),
+  );
+
+  return IS_TS_48
+    ? nodeFactory.updateClassDeclaration(
+        node,
+        [...decorators, ...(modifiers ?? [])],
+        node.name,
+        node.typeParameters,
+        node.heritageClauses,
+        node.members,
+      )
+    : nodeFactory.updateClassDeclaration(
+        node,
+        decorators,
+        modifiers,
+        node.name,
+        node.typeParameters,
+        node.heritageClauses,
+        node.members,
+      );
+}
+
 function visitDecorator(
   nodeFactory: ts.NodeFactory,
   node: ts.Decorator,
@@ -327,3 +385,16 @@ function getDecoratorOrigin(
 
   return null;
 }
+
+/** Checks if the current version of TypeScript is after the specified major/minor versions. */
+function isAfterVersion(targetMajor: number, targetMinor: number): boolean {
+  const [major, minor] = ts.versionMajorMinor.split('.').map((part) => parseInt(part));
+
+  if (major < targetMajor) {
+    return false;
+  } else if (major > targetMajor) {
+    return true;
+  } else {
+    return minor >= targetMinor;
+  }
+}

packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel

@@ -1,11 +1,11 @@
 load("//tools:defaults.bzl", "ts_library")
 
-# files fetched on 2022-05-25 from
-# https://github.com/microsoft/TypeScript/releases/tag/v4.7.2
+# files fetched on 2022-08-18 from
+# https://github.com/microsoft/TypeScript/releases/tag/v4.8-rc
 
 # Commands to download:
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
-# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.7.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8-rc/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
+# curl https://raw.githubusercontent.com/microsoft/TypeScript/v4.8-rc/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
 
 licenses(["notice"])  # Apache 2.0