cognitive-complexity-ts 0.6.2 → 0.6.4

package/README.md

@@ -14,13 +14,13 @@ npm install cognitive-complexity-ts
 
 ```bash
 # UI output (any of the following)
+npx ccts [file path]
+npx cognitive-complexity-ts [file path]
 npx cognitive-complexity-ts-ui [file path]
 npx ccts-ui [file path]
 
 # JSON output (any of the following)
-npx cognitive-complexity-ts [file path]
 npx cognitive-complexity-ts-json [file path]
-npx ccts [file path]
 npx ccts-json [file path]
 
 ```

package/build/shared/types.d.ts

@@ -13,10 +13,10 @@ export interface FileOutput {
     score: number;
     inner: ContainerOutput[];
 }
-export declare type FolderOutput = {
+export type FolderOutput = {
     [name: string]: FileOutput | FolderOutput;
 };
-export declare type ProgramOutput = FolderOutput;
+export type ProgramOutput = FolderOutput;
 export interface ScoreAndInner {
     score: number;
     inner: ContainerOutput[];

package/build/src/api.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -27,7 +27,7 @@ class Scope {
     scopeToAdd(node, variableBeingDefined) {
         const local = [];
         const object = [];
-        const introducedLocal = node_naming_1.getIntroducedLocalName(node);
+        const introducedLocal = (0, node_naming_1.getIntroducedLocalName)(node);
         if (introducedLocal !== undefined) {
             local.push(introducedLocal);
         }
@@ -40,7 +40,7 @@ class Scope {
                 object.push(variableBeingDefined + "." + name);
             }
         }
-        const maybeExpression = node_naming_1.getExpressionToAccessObjectMember(node);
+        const maybeExpression = (0, node_naming_1.getExpressionToAccessObjectMember)(node);
         if (maybeExpression !== undefined) {
             object.push(maybeExpression);
             if (variableBeingDefined) {

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -40,10 +44,10 @@ function aggregateCostOfChildren(children, childDepth, topLevel, scope, variable
         const childCost = nodeCost(child, topLevel, childDepth, scope, variableBeingDefined);
         score += childCost.score;
         // a function/class/namespace/type is part of the inner scope we want to output
-        const name = node_naming_1.chooseContainerName(child, variableBeingDefined);
+        const name = (0, node_naming_1.chooseContainerName)(child, variableBeingDefined);
         if (name !== undefined) {
             inner.push({
-                ...node_inspection_1.getColumnAndLine(child),
+                ...(0, node_inspection_1.getColumnAndLine)(child),
                 ...childCost,
                 name,
             });
@@ -87,7 +91,7 @@ function costOfDepth(node, depth) {
 }
 function inherentCost(node, scope) {
     // certain language features carry and inherent cost
-    if (node_inspection_1.isSequenceOfDifferentBooleanOperations(node)
+    if ((0, node_inspection_1.isSequenceOfDifferentBooleanOperations)(node)
         || ts.isCatchClause(node)
         || ts.isConditionalExpression(node)
         || ts.isConditionalTypeNode(node)
@@ -98,10 +102,10 @@ function inherentCost(node, scope) {
         || ts.isMappedTypeNode(node)
         || ts.isSwitchStatement(node)
         || ts.isWhileStatement(node)
-        || node_inspection_1.isBreakOrContinueToLabel(node)) {
+        || (0, node_inspection_1.isBreakOrContinueToLabel)(node)) {
         return 1;
     }
-    const calledName = node_naming_1.getNameIfCalledNode(node);
+    const calledName = (0, node_naming_1.getNameIfCalledNode)(node);
     if (calledName !== undefined) {
         return scope.includes(calledName) ? 1 : 0;
     }
@@ -122,7 +126,7 @@ function inherentCost(node, scope) {
         }
         return score;
     }
-    if (node_inspection_1.isBinaryTypeOperator(node)) {
+    if ((0, node_inspection_1.isBinaryTypeOperator)(node)) {
         // This node naturally represents a sequence of binary type operators.
         // (unlike normal binary operators)
         let score = 1;
@@ -132,7 +136,7 @@ function inherentCost(node, scope) {
         // Binary sub-expressions at either end of the syntax list
         // do not break this sequence of operators in the code; they merely bookend it.
         const syntaxList = node.getChildren()[0];
-        const numOfSequenceInterrupts = util_1.countNotAtTheEnds(syntaxList.getChildren(), node_inspection_1.isBinaryTypeOperator);
+        const numOfSequenceInterrupts = (0, util_1.countNotAtTheEnds)(syntaxList.getChildren(), node_inspection_1.isBinaryTypeOperator);
         score += numOfSequenceInterrupts;
         return score;
     }
@@ -150,7 +154,7 @@ function nodeCost(node, topLevel, depth = 0, scope = new Scope_1.Scope([], []),
     // get the ancestors container names from the perspective of this node's children
     const namedAncestorsOfChildren = scope
         .maybeAdd(node, variableBeingDefined);
-    const { same, below } = depth_1.whereAreChildren(node);
+    const { same, below } = (0, depth_1.whereAreChildren)(node);
     /**
      * The name being introduced (if there is one)
      * for a variable whose declaration this scope is directly inside of.
@@ -160,15 +164,15 @@ function nodeCost(node, topLevel, depth = 0, scope = new Scope_1.Scope([], []),
      * let a = f( $undefined$ () => {} );
      * let a =                      () => { $undefined$ };
      */
-    let newVariableBeingDefined = node_naming_1.getNameOfAssignment(node);
+    let newVariableBeingDefined = (0, node_naming_1.getNameOfAssignment)(node);
     if (newVariableBeingDefined === undefined
-        && node_inspection_1.passThroughNameBeingAssigned(node)) {
+        && (0, node_inspection_1.passThroughNameBeingAssigned)(node)) {
         newVariableBeingDefined = variableBeingDefined;
     }
     const costOfSameDepthChildren = aggregateCostOfChildren(same, depth, topLevel, namedAncestorsOfChildren, newVariableBeingDefined);
     // The nodes below this node have the same depth number,
     // iff this node is top level and it is a container.
-    const container = node_inspection_1.isContainer(node);
+    const container = (0, node_inspection_1.isContainer)(node);
     const depthOfBelow = depth + (topLevel && container ? 0 : 1);
     const costOfBelowChildren = aggregateCostOfChildren(below, depthOfBelow, false, namedAncestorsOfChildren, newVariableBeingDefined);
     score += costOfSameDepthChildren.score;

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logNode = exports.testLog = void 0;
 const util_1 = require("util");
-exports.testLog = util_1.debuglog("test");
+exports.testLog = (0, util_1.debuglog)("test");
 function logNode(child) {
-    exports.testLog(child.getFullText());
+    (0, exports.testLog)(child.getFullText());
 }
 exports.logNode = logNode;
 //# sourceMappingURL=debug.js.map

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

@@ -4,7 +4,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -47,7 +51,7 @@ function whereAreChildren(node) {
     else if (ts.isDoStatement(node)) {
         return doStatement(node);
     }
-    else if (node_inspection_1.isForLikeStatement(node)) {
+    else if ((0, node_inspection_1.isForLikeStatement)(node)) {
         return forLikeStatement(node);
     }
     else if (ts.isFunctionDeclaration(node)) {

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

@@ -1,7 +1,7 @@
 import * as ts from "typescript";
 import { ColumnAndLine } from "../../shared/types";
-export declare type ForLikeStatement = ts.ForStatement | ts.ForInOrOfStatement;
-export declare type FunctionNode = ts.AccessorDeclaration | ts.ArrowFunction | ts.FunctionDeclaration | ts.FunctionExpression | ts.MethodDeclaration;
+export type ForLikeStatement = ts.ForStatement | ts.ForInOrOfStatement;
+export type FunctionNode = ts.AccessorDeclaration | ts.ArrowFunction | ts.FunctionDeclaration | ts.FunctionExpression | ts.MethodDeclaration;
 export declare function getColumnAndLine(node: ts.Node): ColumnAndLine;
 export declare function getIdentifier(node: ts.Node): string | undefined;
 export declare function getFirstNonParenthesizedAncestor(node: ts.Node): ts.Node;

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -33,7 +37,7 @@ function getColumnAndLine(node) {
 exports.getColumnAndLine = getColumnAndLine;
 function getIdentifier(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifierOrPrivateIdentifier(child) || ts.isComputedPropertyName(child)) {
+        if (ts.isMemberName(child) || ts.isComputedPropertyName(child)) {
             return child.getText();
         }
     }
@@ -65,7 +69,7 @@ exports.isBinaryTypeOperator = isBinaryTypeOperator;
 function isBreakOrContinueToLabel(node) {
     if (ts.isBreakOrContinueStatement(node)) {
         for (const child of node.getChildren()) {
-            if (ts.isIdentifierOrPrivateIdentifier(child)) {
+            if (ts.isMemberName(child)) {
                 return true;
             }
         }
@@ -131,7 +135,7 @@ function passThroughNameBeingAssigned(node) {
 }
 exports.passThroughNameBeingAssigned = passThroughNameBeingAssigned;
 function report(node, depth = 0) {
-    const toLog = [util_1.repeat("\t", depth), ts.SyntaxKind[node.kind], node.kind];
+    const toLog = [(0, util_1.repeat)("\t", depth), ts.SyntaxKind[node.kind], node.kind];
     console.error(...toLog);
     for (const child of node.getChildren()) {
         report(child, depth + 1);

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25,7 +29,7 @@ const node_util_1 = require("../util/node-util");
 const node_inspection_1 = require("./node-inspection");
 function chooseContainerName(node, variableBeingDefined) {
     var _a, _b;
-    if (node_inspection_1.isFunctionNode(node)) {
+    if ((0, node_inspection_1.isFunctionNode)(node)) {
         return (_b = (_a = getFunctionNodeName(node)) !== null && _a !== void 0 ? _a : variableBeingDefined) !== null && _b !== void 0 ? _b : "";
     }
     if (ts.isClassDeclaration(node)) {
@@ -51,7 +55,7 @@ function chooseContainerName(node, variableBeingDefined) {
 exports.chooseContainerName = chooseContainerName;
 function getIntroducedLocalName(node) {
     if (ts.isVariableDeclaration(node)) {
-        return node_inspection_1.getIdentifier(node);
+        return (0, node_inspection_1.getIdentifier)(node);
     }
     if (ts.isClassDeclaration(node)) {
         return getClassDeclarationName(node);
@@ -105,7 +109,7 @@ function getNameOfAssignment(node) {
         || ts.isEnumDeclaration(node)
         || ts.isEnumMember(node)
         || ts.isCallSignatureDeclaration(node)) {
-        return node_inspection_1.getIdentifier(node);
+        return (0, node_inspection_1.getIdentifier)(node);
     }
     if (ts.isTypeAliasDeclaration(node)) {
         return getTypeAliasName(node);
@@ -140,7 +144,7 @@ exports.getExpressionToAccessObjectMember = getExpressionToAccessObjectMember;
  */
 function getAccessorIdentifierName(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifierOrPrivateIdentifier(child)) {
+        if (ts.isMemberName(child)) {
             return [child.getText(), true];
         }
         if (ts.isComputedPropertyName(child)) {
@@ -150,7 +154,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.isIdentifierOrPrivateIdentifier(node) || ts.isElementAccessExpression(node)) {
+    if (ts.isMemberName(node) || ts.isElementAccessExpression(node)) {
         return node.getText();
     }
     if (ts.isParenthesizedExpression(node)) {
@@ -165,7 +169,7 @@ function getCalledFunctionName(node) {
     return name !== null && name !== void 0 ? name : "";
 }
 function getClassDeclarationName(node) {
-    const name = node_inspection_1.getIdentifier(node);
+    const name = (0, node_inspection_1.getIdentifier)(node);
     return name !== null && name !== void 0 ? name : ""; // anonymous class
 }
 function getClassExpressionName(node, variableBeingDefined = undefined) {
@@ -188,7 +192,7 @@ function getFunctionNodeName(func) {
     }
     if (ts.isFunctionExpression(func)) {
         const maybeIdentifier = func.getChildren()[1];
-        if (ts.isIdentifierOrPrivateIdentifier(maybeIdentifier)) {
+        if (ts.isMemberName(maybeIdentifier)) {
             return maybeIdentifier.getText();
         }
         else {
@@ -219,7 +223,7 @@ function getModuleDeclarationName(node) {
  */
 function getMethodDeclarationName(node) {
     for (const child of node.getChildren()) {
-        if (ts.isIdentifierOrPrivateIdentifier(child)) {
+        if (ts.isMemberName(child)) {
             return [child.getText(), true];
         }
         if (ts.isComputedPropertyName(child)) {
@@ -229,14 +233,14 @@ function getMethodDeclarationName(node) {
     throw new node_util_1.UnreachableNodeState(node, "Method has no identifier.");
 }
 function getNewedConstructorName(node) {
-    return node_inspection_1.getTextWithoutBrackets(node.getChildAt(1));
+    return (0, node_inspection_1.getTextWithoutBrackets)(node.getChildAt(1));
 }
 function getTypeAliasName(node) {
     return node.getChildAt(1).getText();
 }
 function maybeGetFirstIdentifierName(node) {
     const name = node.getChildren()
-        .find(child => ts.isIdentifierOrPrivateIdentifier(child));
+        .find(child => ts.isMemberName(child));
     return name === null || name === void 0 ? void 0 : name.getText();
 }
 //# sourceMappingURL=node-naming.js.map

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

@@ -4,7 +4,11 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -51,13 +55,13 @@ exports.getFileOutput = getFileOutput;
 // API
 function getSourceOutput(sourceCode, fileName = "") {
     const parsedFile = ts.createSourceFile(fileName, sourceCode, ts.ScriptTarget.Latest, true);
-    return cognitive_complexity_1.fileCost(parsedFile);
+    return (0, cognitive_complexity_1.fileCost)(parsedFile);
 }
 exports.getSourceOutput = getSourceOutput;
 // API
 async function getFolderOutput(folderPath) {
     const folderContents = await fs_1.promises.readdir(folderPath, { withFileTypes: true });
-    return util_1.createObjectOfPromisedValues(folderContents, entry => entry.name, (entry) => {
+    return (0, util_1.createObjectOfPromisedValues)(folderContents, entry => entry.name, (entry) => {
         if (entry.isDirectory()) {
             return getFolderOutput(folderPath + "/" + entry.name);
         }

package/build/src/json.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -38,7 +42,7 @@ async function main() {
 }
 async function printCognitiveComplexityJson(fullPath) {
     const relativePath = path.relative(process.cwd(), fullPath);
-    const programOutputStr = await output_1.programOutput(relativePath);
-    console.log(js_beautify_1.js_beautify(programOutputStr));
+    const programOutputStr = await (0, output_1.programOutput)(relativePath);
+    console.log((0, js_beautify_1.js_beautify)(programOutputStr));
 }
 //# sourceMappingURL=json.js.map

package/build/src/ui-server/ui-server.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -49,7 +53,7 @@ function cached(res) {
 }
 async function doesFileExistInFolder(filePath, folderPath) {
     return isPathInsideDir(filePath, folderPath)
-        && await util_1.doesNotThrow(fs_1.promises.access(filePath))
+        && await (0, util_1.doesNotThrow)(fs_1.promises.access(filePath))
         && (await fs_1.promises.stat(filePath)).isFile();
 }
 function endWith404(res) {

package/build/src/ui.js

@@ -11,13 +11,13 @@ const ui_server_1 = require("./ui-server/ui-server");
 const helpText = "Arguments: [-h | --help] [--port <NUMBER>] [FILE]...";
 main();
 async function main() {
-    const args = minimist_1.default(process.argv.slice(2));
+    const args = (0, minimist_1.default)(process.argv.slice(2));
     if (args["h"] || args["help"]) {
         console.log(helpText);
         return;
     }
     const givenPort = parseInt(args["port"]);
-    const port = util_1.nonNaN(givenPort, 5678);
+    const port = (0, util_1.nonNaN)(givenPort, 5678);
     const url = `http://localhost:${port}`;
     const inputFiles = args["_"];
     if (inputFiles.length === 0) {
@@ -26,14 +26,14 @@ async function main() {
         return;
     }
     const combinedOutputsJson = await generateComplexityJson(inputFiles);
-    const server = ui_server_1.createUiServer(combinedOutputsJson);
+    const server = (0, ui_server_1.createUiServer)(combinedOutputsJson);
     server.listen(port, () => {
         console.log(`Server started at ${url}`);
-        open_1.default(url);
+        (0, open_1.default)(url);
     });
 }
 async function generateComplexityJson(inputFiles) {
-    const combinedOutputs = await util_1.keysToAsyncValues(inputFiles, file => output_1.getFileOrFolderOutput(file));
+    const combinedOutputs = await (0, util_1.keysToAsyncValues)(inputFiles, file => (0, output_1.getFileOrFolderOutput)(file));
     return JSON.stringify(combinedOutputs);
 }
 //# sourceMappingURL=ui.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cognitive-complexity-ts",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "",
   "keywords": [
     "typescript",
@@ -49,7 +49,7 @@
     "minimist": "^1.2.5",
     "open": "^7.1.0",
     "source-map-support": "^0.5.19",
-    "typescript": "^4.1.5"
+    "typescript": "^5.2.2"
   },
   "devDependencies": {
     "@types/deep-diff": "^1.0.0",