Check for class expressions in inspectDeclarator and inspectClassMethod

schmod · Nov 20, 2019 · b366314 · b366314
1 parent 70152ff
commit b366314
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/nginject.js b/nginject.js
@@ -227,7 +227,7 @@ function inspectAssignment(path, ctx){
 
 function inspectDeclarator(path, ctx){
   const node = path.node;
-  if(!isFunctionExpressionOrArrow(node.init)){
+  if(!isFunctionExpressionOrArrow(node.init) && !t.isClassExpression(node.init)){
     return;
   }
 
@@ -270,7 +270,14 @@ function inspectClassMethod(path, ctx){
   const ancestry = path.getAncestry();
   for(var i=0; i < ancestry.length; i++){
     let ancestor = ancestry[i];
-    if(ancestor.isClassDeclaration()){
+
+	// Adds the variable declaration of 'MyClass' to the suspects in the case of
+	// let MyClass = class MyClass {
+	//    /* @ngInject */
+	//    constructor() {
+	//    }
+	// }
+    if(ancestor.isClassDeclaration() || ancestor.isClassExpression()){
       addSuspect(ancestor, ctx, !annotation);
       return;
     }