cognitive-complexity-ts 0.5.0 → 0.6.0

package/build/src/cognitive-complexity/Scope.js

@@ -40,12 +40,12 @@ class Scope {
                 object.push(variableBeingDefined + "." + name);
             }
         }
-        const maybeName = node_naming_1.getNameIfObjectMember(node);
-        if (maybeName !== undefined) {
-            object.push("this." + maybeName);
+        const maybeExpression = node_naming_1.getExpressionToAccessObjectMember(node);
+        if (maybeExpression !== undefined) {
+            object.push(maybeExpression);
             if (variableBeingDefined) {
-                object.push(variableBeingDefined + "." + maybeName);
-                local.push(variableBeingDefined + "." + maybeName);
+                object.push(variableBeingDefined + "." + maybeExpression);
+                local.push(variableBeingDefined + "." + maybeExpression);
             }
         }
         return {

package/build/src/cognitive-complexity/node-inspection.js

@@ -33,7 +33,7 @@ function getColumnAndLine(node) {
 exports.getColumnAndLine = getColumnAndLine;
 function getIdentifier(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifier(child)) {
+        if (ts.isIdentifier(child) || ts.isComputedPropertyName(child)) {
             return child.getText();
         }
     }

package/build/src/cognitive-complexity/node-naming.d.ts

@@ -3,4 +3,4 @@ export declare function chooseContainerName(node: ts.Node, variableBeingDefined:
 export declare function getIntroducedLocalName(node: ts.Node): string | undefined;
 export declare function getNameIfCalledNode(node: ts.Node): string | undefined;
 export declare function getNameOfAssignment(node: ts.Node): string | undefined;
-export declare function getNameIfObjectMember(node: ts.Node): string | undefined;
+export declare function getExpressionToAccessObjectMember(node: ts.Node): string | undefined;

package/build/src/cognitive-complexity/node-naming.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNameIfObjectMember = exports.getNameOfAssignment = exports.getNameIfCalledNode = exports.getIntroducedLocalName = exports.chooseContainerName = void 0;
+exports.getExpressionToAccessObjectMember = exports.getNameOfAssignment = exports.getNameIfCalledNode = exports.getIntroducedLocalName = exports.chooseContainerName = void 0;
 const ts = __importStar(require("typescript"));
 const node_util_1 = require("../util/node-util");
 const node_inspection_1 = require("./node-inspection");
@@ -113,18 +113,44 @@ function getNameOfAssignment(node) {
     return undefined;
 }
 exports.getNameOfAssignment = getNameOfAssignment;
-function getNameIfObjectMember(node) {
+function getExpressionToAccessObjectMember(node) {
     if (ts.isMethodDeclaration(node)) {
-        return getMethodDeclarationName(node);
+        const [name, requiresDot] = getMethodDeclarationName(node);
+        if (requiresDot) {
+            return "this." + name;
+        }
+        else {
+            return "this" + name;
+        }
     }
     if (ts.isAccessor(node)) {
-        return getFirstIdentifierName(node);
+        const [name, requiresDot] = getAccessorIdentifierName(node);
+        if (requiresDot) {
+            return "this." + name;
+        }
+        else {
+            return "this" + name;
+        }
     }
     return undefined;
 }
-exports.getNameIfObjectMember = getNameIfObjectMember;
+exports.getExpressionToAccessObjectMember = getExpressionToAccessObjectMember;
+/**
+ * @return [name, requires dot syntax]
+ */
+function getAccessorIdentifierName(node) {
+    for (const child of node.getChildren()) {
+        if (ts.isIdentifier(child)) {
+            return [child.getText(), true];
+        }
+        if (ts.isComputedPropertyName(child)) {
+            return [child.getText(), false];
+        }
+    }
+    throw new node_util_1.UnreachableNodeState(node, "The accessor was expected to have an identifier or computed property name.");
+}
 function getIdentifierDespiteBrackets(node) {
-    if (ts.isIdentifier(node)) {
+    if (ts.isIdentifier(node) || ts.isElementAccessExpression(node)) {
         return node.getText();
     }
     if (ts.isParenthesizedExpression(node)) {
@@ -148,7 +174,8 @@ function getClassExpressionName(node, variableBeingDefined = undefined) {
 }
 function getFunctionNodeName(func) {
     if (ts.isAccessor(func)) {
-        return getFirstIdentifierName(func);
+        const [name] = getAccessorIdentifierName(func);
+        return name;
     }
     if (ts.isArrowFunction(func)) {
         return undefined;
@@ -168,8 +195,8 @@ function getFunctionNodeName(func) {
             return undefined;
         }
     }
-    const name = getMethodDeclarationName(func);
-    if (name !== undefined) {
+    if (ts.isMethodDeclaration(func)) {
+        const [name] = getMethodDeclarationName(func);
         return name;
     }
     throw new node_util_1.UnreachableNodeState(func, "FunctionNode is not of a recognised type.");
@@ -177,14 +204,6 @@ function getFunctionNodeName(func) {
 function getInterfaceDeclarationName(node) {
     return node.getChildAt(1).getText();
 }
-function getFirstIdentifierName(node) {
-    const name = node.getChildren()
-        .find(child => ts.isIdentifier(child));
-    if (name === undefined) {
-        throw new node_util_1.UnreachableNodeState(node, "Node was expected to have an identifier.");
-    }
-    return name.getText();
-}
 function getModuleDeclarationName(node) {
     const moduleKeywordIndex = node.getChildren()
         .findIndex(node => node.kind === ts.SyntaxKind.NamespaceKeyword
@@ -195,10 +214,17 @@ function getModuleDeclarationName(node) {
     const moduleIdentifier = node.getChildAt(moduleKeywordIndex + 1);
     return moduleIdentifier.getText();
 }
+/**
+ * @return [name, requires dot syntax]
+ */
 function getMethodDeclarationName(node) {
-    const name = node_inspection_1.getIdentifier(node);
-    if (name !== undefined) {
-        return name;
+    for (const child of node.getChildren()) {
+        if (ts.isIdentifier(child)) {
+            return [child.getText(), true];
+        }
+        if (ts.isComputedPropertyName(child)) {
+            return [child.getText(), false];
+        }
     }
     throw new node_util_1.UnreachableNodeState(node, "Method has no identifier.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cognitive-complexity-ts",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "",
   "keywords": [
     "typescript",