From 24d9a86501b3bc62d6a1873c350f492842f45ccd Mon Sep 17 00:00:00 2001
From: Chau Tran <nartc7789@gmail.com>
Date: Thu, 4 Jan 2024 19:17:40 -0600
Subject: [PATCH] feat(vite-plugin-angular): support let with getters (#838)

---
 apps/ng-app/src/app/another-one.ng            |  18 +++
 apps/ng-app/src/app/app.component.ng          |   4 +-
 apps/ng-app/src/app/hello.ts                  |  15 +++
 .../authoring/__snapshots__/ng.spec.ts.snap   |  11 +-
 .../src/lib/authoring/ng.spec.ts              |   7 +
 .../src/lib/authoring/ng.ts                   | 120 ++++++++++++------
 6 files changed, 134 insertions(+), 41 deletions(-)
 create mode 100644 apps/ng-app/src/app/hello.ts

diff --git a/apps/ng-app/src/app/another-one.ng b/apps/ng-app/src/app/another-one.ng
index 4a20b183c..9f0c5d28b 100644
--- a/apps/ng-app/src/app/another-one.ng
+++ b/apps/ng-app/src/app/another-one.ng
@@ -1,6 +1,17 @@
 <script lang="ts">
+  import { ChangeDetectorRef, inject } from '@angular/core';
+
+  const cdr = inject(ChangeDetectorRef);
+
+  let lateVariable: string;
+
   onInit(() => {
     console.log('anotherOne init');
+    setTimeout(() => {
+      lateVariable = 'anotherOne';
+      cdr.detectChanges();
+      console.log(this);
+    }, 2000);
   });
 
   onDestroy(() => {
@@ -10,10 +21,17 @@
 
 <template>
   <h1>DJ KHALED!!!</h1>
+  @if (lateVariable) {
+  <h2>Late Variable here: {{ lateVariable }}</h2>
+  }
 </template>
 
 <style>
   h1 {
     color: green;
   }
+
+  h2 {
+    color: tomato;
+  }
 </style>
diff --git a/apps/ng-app/src/app/app.component.ng b/apps/ng-app/src/app/app.component.ng
index d2dc45f61..583af9160 100644
--- a/apps/ng-app/src/app/app.component.ng
+++ b/apps/ng-app/src/app/app.component.ng
@@ -6,10 +6,11 @@
   import { JsonPipe } from '@angular/common';
   import { delay } from 'rxjs';
   import Highlight from './highlight.ng';
+  import { HelloOriginal } from './hello';
 
   defineMetadata({
     selector: 'app-root',
-    imports: [JsonPipe],
+    imports: [JsonPipe, HelloOriginal],
     exposes: [Math],
   });
 
@@ -49,6 +50,7 @@
   @if (counter() > 5) {
   <Hello />
   <AnotherOne />
+  <app-hello-original />
   }
 
   <p>Counter: {{ counter() }}</p>
diff --git a/apps/ng-app/src/app/hello.ts b/apps/ng-app/src/app/hello.ts
new file mode 100644
index 000000000..2d0b8e5ce
--- /dev/null
+++ b/apps/ng-app/src/app/hello.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import Hello from './hello.ng';
+
+@Component({
+  selector: 'app-hello-original',
+  standalone: true,
+  template: `
+    <p>I'm a boring hello</p>
+    <p>Below me is a cool hello though</p>
+    <Hello />
+  `,
+  imports: [Hello],
+})
+// eslint-disable-next-line @angular-eslint/component-class-suffix
+export class HelloOriginal {}
diff --git a/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/ng.spec.ts.snap b/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/ng.spec.ts.snap
index c0046e821..78e8d549f 100644
--- a/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/ng.spec.ts.snap
+++ b/packages/vite-plugin-angular/src/lib/authoring/__snapshots__/ng.spec.ts.snap
@@ -13,17 +13,26 @@ import { signal } from "@angular/core";
   <p>{{ counter() }}</p>
   <p>{ a }</p>
   <p>{ b }</p>
-  <p>{ c }</p>\`,
+  <p>{ c }</p>
+  <p>{{ test }}</p>\`,
     imports: []
 })
 export default class AnalogNgEntity {
     constructor() {
+        let test: string;
+        setTimeout(() => {
+            test = 'test';
+        }, 1000)
         const counter = signal(0);
         this.counter = counter;
         const [a, b, , c = 4] = [1, 2, 3];
         this.a = a;
         this.b = b;
         this.c = c;
+
+        Object.defineProperties(this, {
+            test: { get() { return test; } },
+        });
     }
 
     protected Math = Math;
diff --git a/packages/vite-plugin-angular/src/lib/authoring/ng.spec.ts b/packages/vite-plugin-angular/src/lib/authoring/ng.spec.ts
index d9b107250..de4aa4472 100644
--- a/packages/vite-plugin-angular/src/lib/authoring/ng.spec.ts
+++ b/packages/vite-plugin-angular/src/lib/authoring/ng.spec.ts
@@ -8,6 +8,12 @@ defineMetadata({
   exposes: [Math]
 });
 
+let test: string;
+
+setTimeout(() => {
+  test = 'test';
+}, 1000)
+
 const counter = signal(0);
 const [a, b, , c = 4] = [1, 2, 3];
 </script>
@@ -18,6 +24,7 @@ const [a, b, , c = 4] = [1, 2, 3];
   <p>{ a }</p>
   <p>{ b }</p>
   <p>{ c }</p>
+  <p>{{ test }}</p>
 </template>
 
 <style>
diff --git a/packages/vite-plugin-angular/src/lib/authoring/ng.ts b/packages/vite-plugin-angular/src/lib/authoring/ng.ts
index 8af0fcd19..4fdb66550 100644
--- a/packages/vite-plugin-angular/src/lib/authoring/ng.ts
+++ b/packages/vite-plugin-angular/src/lib/authoring/ng.ts
@@ -9,6 +9,7 @@ import {
   Scope,
   StructureKind,
   SyntaxKind,
+  VariableDeclarationKind,
 } from 'ts-morph';
 
 const SCRIPT_TAG_REGEX = /<script lang="ts">([\s\S]*?)<\/script>/i;
@@ -130,6 +131,7 @@ function processNgScript(
   }
 
   const declarations: string[] = [];
+  const getters: Array<{ propertyName: string; isFunction: boolean }> = [];
 
   ngSourceFile.forEachChild((node) => {
     // for ImportDeclaration (e.g: import ... from ...)
@@ -144,14 +146,21 @@ function processNgScript(
       targetSourceFile.addImportDeclaration(node.getStructure());
     }
 
-    // for VariableStatement (e.g: const ... = ...)
+    // for VariableStatement (e.g: const ... = ..., let ... = ...)
     if (Node.isVariableStatement(node)) {
       // NOTE: we do not support multiple declarations (i.e: const a, b, c)
       const declarations = node.getDeclarations();
       const declaration = declarations[0];
+      const isLet = node.getDeclarationKind() === VariableDeclarationKind.Let;
       const initializer = declaration.getInitializer();
 
-      if (initializer) {
+      if (!initializer && isLet) {
+        targetConstructor.addStatements(node.getText());
+        getters.push({
+          propertyName: declaration.getName(),
+          isFunction: false,
+        });
+      } else if (initializer) {
         const declarationNameNode = declaration.getNameNode();
 
         // destructures
@@ -161,20 +170,28 @@ function processNgScript(
         ) {
           targetConstructor.addStatements(node.getText());
 
-          const bindingElements = declarationNameNode.getDescendantsOfKind(
-            SyntaxKind.BindingElement
-          );
+          const bindingElements = declarationNameNode
+            .getDescendantsOfKind(SyntaxKind.BindingElement)
+            .map((bindingElement) => bindingElement.getName());
 
-          for (const bindingElement of bindingElements) {
-            const bindingElementName = bindingElement.getName();
-            targetClass.addProperty({
-              name: bindingElementName,
-              kind: StructureKind.Property,
-              scope: Scope.Protected,
-            });
-            targetConstructor.addStatements(
-              `this.${bindingElementName} = ${bindingElementName};`
+          if (isLet) {
+            getters.push(
+              ...bindingElements.map((bindingElement) => ({
+                propertyName: bindingElement,
+                isFunction: false,
+              }))
             );
+          } else {
+            for (const bindingElement of bindingElements) {
+              targetClass.addProperty({
+                name: bindingElement,
+                kind: StructureKind.Property,
+                scope: Scope.Protected,
+              });
+              targetConstructor.addStatements(
+                `this.${bindingElement} = ${bindingElement};`
+              );
+            }
           }
         } else {
           addPropertyToClass(
@@ -182,8 +199,12 @@ function processNgScript(
             targetConstructor,
             declaration.getName(),
             initializer,
-            () => {
+            isLet,
+            (isFunction, propertyName) => {
               targetConstructor.addStatements(node.getText());
+              if (isLet) {
+                getters.push({ propertyName, isFunction });
+              }
             }
           );
         }
@@ -196,13 +217,14 @@ function processNgScript(
         targetConstructor,
         node.getName() || '',
         node,
-        (propertyName, propertyInitializer) => {
+        false,
+        (_, propertyName) => {
           targetConstructor.addFunction({
             name: propertyName,
-            parameters: propertyInitializer
+            parameters: node
               .getParameters()
               .map((parameter) => parameter.getStructure()),
-            statements: propertyInitializer
+            statements: node
               .getStatements()
               .map((statement) => statement.getText()),
           });
@@ -227,10 +249,11 @@ function processNgScript(
               targetConstructor,
               functionName,
               initFunction,
-              (propertyName, propertyInitializer) => {
+              false,
+              (_isFunction, propertyName) => {
                 targetConstructor.addFunction({
                   name: propertyName,
-                  statements: propertyInitializer
+                  statements: initFunction
                     .getStatements()
                     .map((statement) => statement.getText()),
                 });
@@ -264,6 +287,20 @@ function processNgScript(
     }
   }
 
+  if (getters.length > 0) {
+    targetConstructor.addStatements(`
+Object.defineProperties(this, {
+${getters
+  .map(
+    ({ isFunction, propertyName }) =>
+      `${propertyName}:{get(){return ${
+        !isFunction ? `${propertyName}` : `${propertyName}.bind(this)`
+      };}},`
+  )
+  .join('\n')}
+});`);
+  }
+
   if (!isProd) {
     // PROD probably does not need this
     targetSourceFile.formatText({ ensureNewLineAtEndOfFile: true });
@@ -323,26 +360,31 @@ function addPropertyToClass<
   targetConstructor: ConstructorDeclaration,
   propertyName: string,
   propertyInitializer: TInitializer,
-  constructorUpdater: (
-    propertyName: string,
-    propertyInitializer: TInitializer
-  ) => void
+  isLet: boolean,
+  constructorUpdater: (isFunction: boolean, propertyName: string) => void
 ) {
-  // add the empty property the class (e.g: protected propertyName;)
-  targetClass.addProperty({
-    name: propertyName,
-    kind: StructureKind.Property,
-    scope: Scope.Protected,
-  });
-
-  // update the constructor
-  constructorUpdater(propertyName, propertyInitializer);
+  if (!isLet) {
+    // add the empty property the class (e.g: protected propertyName;)
+    targetClass.addProperty({
+      name: propertyName,
+      kind: StructureKind.Property,
+      scope: Scope.Protected,
+    });
+  }
 
-  // assign the variable to the property
-  targetConstructor.addStatements(
+  const isFunction =
     Node.isArrowFunction(propertyInitializer) ||
-      Node.isFunctionDeclaration(propertyInitializer)
-      ? `this.${propertyName} = ${propertyName}.bind(this);`
-      : `this.${propertyName} = ${propertyName};`
-  );
+    Node.isFunctionDeclaration(propertyInitializer);
+
+  // update the constructor
+  constructorUpdater(isFunction, propertyName);
+
+  if (!isLet) {
+    // assign the variable to the property
+    targetConstructor.addStatements(
+      isFunction
+        ? `this.${propertyName} = ${propertyName}.bind(this);`
+        : `this.${propertyName} = ${propertyName};`
+    );
+  }
 }