From 7b5b25be317a797b3f9df172bf53394d6d8813b2 Mon Sep 17 00:00:00 2001
From: Elon Volo <elonvolo@gmail.com>
Date: Mon, 11 Oct 2021 18:24:15 -0400
Subject: [PATCH] Fix for TypeScript params with access modifiers and default
 values

---
 ...ams-access-modifier-default-param.input.ts |  9 +++++++++
 ...ms-access-modifier-default-param.output.ts | 20 +++++++++++++++++++
 __tests__/transform-test.js                   |  1 +
 utils.js                                      | 20 +++++++++++++++++--
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 __testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts
 create mode 100644 __testfixtures__/method-constructor-logparams-access-modifier-default-param.output.ts

diff --git a/__testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts b/__testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts
new file mode 100644
index 0000000..a4ef57b
--- /dev/null
+++ b/__testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts
@@ -0,0 +1,9 @@
+export class HttpHandler {
+
+    constructor(
+      protected routes = 5,
+    ) {
+      let q = 5;
+    }
+  }
+  
\ No newline at end of file
diff --git a/__testfixtures__/method-constructor-logparams-access-modifier-default-param.output.ts b/__testfixtures__/method-constructor-logparams-access-modifier-default-param.output.ts
new file mode 100644
index 0000000..832948c
--- /dev/null
+++ b/__testfixtures__/method-constructor-logparams-access-modifier-default-param.output.ts
@@ -0,0 +1,20 @@
+// @ts-ignore
+function decycle(u){var f=[],c=[];return function p(o,i){var t,e,n,r=o&&o.toJSON instanceof Function?o.toJSON():o;if(typeof r=="object"&&r!==null){for(t=0;t<f.length;t+=1)if(f[t]===r)return{$ref:c[t]};if(f.push(r),c.push(i),Object.prototype.toString.apply(r)==="[object Array]")for(n=[],t=0;t<r.length;t+=1)n[t]=p(r[t],i+"["+t+"]");else{n={};for(e in r)Object.prototype.hasOwnProperty.call(r,e)&&(n[e]=p(r[e],i+"["+JSON.stringify(e)+"]"))}return n}return r}(u,"$")}
+
+export class HttpHandler {
+
+    constructor(
+      protected routes = 5,
+    ) {
+      console.log(
+        '[logitall]  __testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts:5:constructor()'
+      );
+
+      console.log(
+        `[logitall]  	__testfixtures__/method-constructor-logparams-access-modifier-default-param.input.ts:5::param routes value: 
+                    ${JSON.stringify(decycle(routes))}`
+      );
+
+      let q = 5;
+    }
+  }
diff --git a/__tests__/transform-test.js b/__tests__/transform-test.js
index 8f78c04..29ffeda 100644
--- a/__tests__/transform-test.js
+++ b/__tests__/transform-test.js
@@ -20,6 +20,7 @@ defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', '--fa
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', '--fail-on-error' : true}, 'method-constructor', { 'parser': 'ts' });
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', 'params': true, '--fail-on-error' : true }, 'method-constructor-logparams', { 'parser': 'ts' });
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', 'params': true, '--fail-on-error' : true}, 'method-constructor-logparams-access-modifier', { 'parser': 'ts' });
+defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', 'params': true, '--fail-on-error' : true}, 'method-constructor-logparams-access-modifier-default-param', { 'parser': 'ts' });
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', '--fail-on-error' : true}, 'method-instance', { 'parser': 'ts' });
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', 'params' : true, '--fail-on-error' : true}, 'method-instance-logparams', { 'parser': 'ts' });
 defineTest(__dirname + '../', 'transform', {'relpath': '__testfixtures__', '--fail-on-error' : true }, 'method-static', { 'parser': 'ts' });
diff --git a/utils.js b/utils.js
index 8401915..c75fa22 100644
--- a/utils.js
+++ b/utils.js
@@ -145,8 +145,24 @@ const buildParamLoggingList = (paramNodes, relPathToFile, linenum, functionName)
     // Babel parses the function parameter node into a TSParameterProperty node
     // So in that case we need to dig one level deeper to get the name of the parameter.
     if (!currentNodeName && currentNode.type === 'TSParameterProperty') {
-      // The solution is to get TSParameterProperty.paramter.name
-      currentNodeName = currentNode.parameter.name;
+      // The solution is to get TSParameterProperty.paramter.name or some variation of that
+
+      // Check to see if this is TypeScript with an assigment, e.g.
+      // export class HttpHandler {
+
+      //   constructor(
+      //     protected routes = 5,
+      //   ) {
+      //     let q = 5;
+      //   }
+      // }
+      // 
+      // If so, then go get routes we need to do theTypeScriptNode.parameter.left.name;
+      if (currentNode.parameter.type == 'AssignmentPattern') {
+        currentNodeName = currentNode.parameter.left.name;
+      } else {
+        currentNodeName = currentNode.parameter.name;
+      }
     }
 
     if (currentNode.type == 'ObjectPattern') {