cognitive-complexity-ts 0.6.0 → 0.6.2

package/README.md

@@ -110,7 +110,6 @@ npm i
 # All builds are incremental.
 # These scripts also build dependencies incrementally.
 npm run build       # The main complexity analysis program and UI back-end server.
-npm run build-test
 npm run build-tools
 npm run build-ui    # The in-browser UI code only.
 ```

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

@@ -24,6 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whereAreChildren = void 0;
 const ts = __importStar(require("typescript"));
+const node_util_1 = require("../util/node-util");
 const node_inspection_1 = require("./node-inspection");
 ;
 /**
@@ -85,11 +86,13 @@ function arrowFunction(node) {
 }
 function catchClause(node) {
     const children = node.getChildren();
-    const variableDefinition = children[2];
-    const catchCode = children[4];
+    const variableDeclaration = children.find(child => ts.isVariableDeclaration(child));
+    const block = children.find(child => ts.isBlock(child));
+    if (block === undefined)
+        throw new node_util_1.UnreachableNodeState(node, "catch clause has no block");
     return {
-        same: [variableDefinition],
-        below: [catchCode]
+        same: variableDeclaration ? [variableDeclaration] : [],
+        below: [block],
     };
 }
 function conditionalExpression(node) {

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) || ts.isComputedPropertyName(child)) {
+        if (ts.isIdentifierOrPrivateIdentifier(child) || ts.isComputedPropertyName(child)) {
             return child.getText();
         }
     }
@@ -65,7 +65,7 @@ exports.isBinaryTypeOperator = isBinaryTypeOperator;
 function isBreakOrContinueToLabel(node) {
     if (ts.isBreakOrContinueStatement(node)) {
         for (const child of node.getChildren()) {
-            if (ts.isIdentifier(child)) {
+            if (ts.isIdentifierOrPrivateIdentifier(child)) {
                 return true;
             }
         }

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

@@ -140,7 +140,7 @@ exports.getExpressionToAccessObjectMember = getExpressionToAccessObjectMember;
  */
 function getAccessorIdentifierName(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifier(child)) {
+        if (ts.isIdentifierOrPrivateIdentifier(child)) {
             return [child.getText(), true];
         }
         if (ts.isComputedPropertyName(child)) {
@@ -150,7 +150,7 @@ function getAccessorIdentifierName(node) {
     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) || ts.isElementAccessExpression(node)) {
+    if (ts.isIdentifierOrPrivateIdentifier(node) || ts.isElementAccessExpression(node)) {
         return node.getText();
     }
     if (ts.isParenthesizedExpression(node)) {
@@ -188,7 +188,7 @@ function getFunctionNodeName(func) {
     }
     if (ts.isFunctionExpression(func)) {
         const maybeIdentifier = func.getChildren()[1];
-        if (ts.isIdentifier(maybeIdentifier)) {
+        if (ts.isIdentifierOrPrivateIdentifier(maybeIdentifier)) {
             return maybeIdentifier.getText();
         }
         else {
@@ -219,7 +219,7 @@ function getModuleDeclarationName(node) {
  */
 function getMethodDeclarationName(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifier(child)) {
+        if (ts.isIdentifierOrPrivateIdentifier(child)) {
             return [child.getText(), true];
         }
         if (ts.isComputedPropertyName(child)) {
@@ -236,7 +236,7 @@ function getTypeAliasName(node) {
 }
 function maybeGetFirstIdentifierName(node) {
     const name = node.getChildren()
-        .find(child => ts.isIdentifier(child));
+        .find(child => ts.isIdentifierOrPrivateIdentifier(child));
     return name === null || name === void 0 ? void 0 : name.getText();
 }
 //# sourceMappingURL=node-naming.js.map

package/package.json

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