From 137949e8ff17ca34eebd6d6f68a1610ba95cf7a5 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Fri, 3 Mar 2023 12:53:07 -0500
Subject: [PATCH] refactor(@angular/cli): use non-experimental decorators for
 internal memoize

With standard decorator support now available for use, the memoize decorator
has been updated to be a standard decorator instead of a TypeScript experimental
decorator. This change also removes the only usage of decorators within the
Angular CLI code itself. This change does not affect application code.
---
 packages/angular/cli/src/utilities/memoize.ts | 47 ++++++++-----------
 tsconfig.json                                 |  1 -
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/packages/angular/cli/src/utilities/memoize.ts b/packages/angular/cli/src/utilities/memoize.ts
index 1d0929c1fd..2ae55e4b38 100644
--- a/packages/angular/cli/src/utilities/memoize.ts
+++ b/packages/angular/cli/src/utilities/memoize.ts
@@ -13,41 +13,34 @@
  *
  * @see https://en.wikipedia.org/wiki/Memoization
  */
-export function memoize<T>(
-  target: Object,
-  propertyKey: string | symbol,
-  descriptor: TypedPropertyDescriptor<T>,
-): TypedPropertyDescriptor<T> {
-  const descriptorPropertyName = descriptor.get ? 'get' : 'value';
-  const originalMethod: unknown = descriptor[descriptorPropertyName];
-
-  if (typeof originalMethod !== 'function') {
+export function memoize<This, Args extends unknown[], Return>(
+  target: (this: This, ...args: Args) => Return,
+  context: ClassMemberDecoratorContext,
+) {
+  if (context.kind !== 'method' && context.kind !== 'getter') {
     throw new Error('Memoize decorator can only be used on methods or get accessors.');
   }
 
-  const cache = new Map<string, unknown>();
+  const cache = new Map<string, Return>();
 
-  return {
-    ...descriptor,
-    [descriptorPropertyName]: function (this: unknown, ...args: unknown[]) {
-      for (const arg of args) {
-        if (!isJSONSerializable(arg)) {
-          throw new Error(
-            `Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`,
-          );
-        }
+  return function (this: This, ...args: Args): Return {
+    for (const arg of args) {
+      if (!isJSONSerializable(arg)) {
+        throw new Error(
+          `Argument ${isNonPrimitive(arg) ? arg.toString() : arg} is JSON serializable.`,
+        );
       }
+    }
 
-      const key = JSON.stringify(args);
-      if (cache.has(key)) {
-        return cache.get(key);
-      }
+    const key = JSON.stringify(args);
+    if (cache.has(key)) {
+      return cache.get(key) as Return;
+    }
 
-      const result = originalMethod.apply(this, args);
-      cache.set(key, result);
+    const result = target.apply(this, args);
+    cache.set(key, result);
 
-      return result;
-    },
+    return result;
   };
 }
 
diff --git a/tsconfig.json b/tsconfig.json
index 045ed0acdf..fe9e0e782e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,7 +5,6 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
-    "experimentalDecorators": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,
     "isolatedModules": true,