cognitive-complexity-ts 0.4.4 → 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/build/src/cognitive-complexity/output.d.ts

@@ -7,6 +7,7 @@ import { FileOutput, FolderOutput } from "../../shared/types";
  */
 export declare function getFileOrFolderOutput(entryPath: string): Promise<FileOutput | FolderOutput>;
 export declare function getFileOutput(filePath: string): Promise<FileOutput>;
+export declare function getSourceOutput(sourceCode: string, fileName?: string): FileOutput;
 export declare function getFolderOutput(folderPath: string): Promise<FolderOutput>;
 /**
  * @param entryPath Relative to cwd

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

@@ -22,7 +22,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.programOutput = exports.getFolderOutput = exports.getFileOutput = exports.getFileOrFolderOutput = void 0;
+exports.programOutput = exports.getFolderOutput = exports.getSourceOutput = exports.getFileOutput = exports.getFileOrFolderOutput = void 0;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const ts = __importStar(require("typescript"));
@@ -45,11 +45,16 @@ exports.getFileOrFolderOutput = getFileOrFolderOutput;
 // API
 async function getFileOutput(filePath) {
     const fileContent = (await fs_1.promises.readFile(filePath)).toString();
-    const parsedFile = ts.createSourceFile(path.basename(filePath), fileContent, ts.ScriptTarget.Latest, true);
-    return cognitive_complexity_1.fileCost(parsedFile);
+    return getSourceOutput(fileContent, path.basename(filePath));
 }
 exports.getFileOutput = getFileOutput;
 // API
+function getSourceOutput(sourceCode, fileName = "") {
+    const parsedFile = ts.createSourceFile(fileName, sourceCode, ts.ScriptTarget.Latest, true);
+    return 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) => {

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

@@ -24,6 +24,7 @@ const fs_1 = require("fs");
 const http = __importStar(require("http"));
 const path = __importStar(require("path"));
 const util_1 = require("../util/util");
+const DEV_MODE = !!process.env["DEV"];
 const sourcePath = __dirname + "/../../..";
 const cssPath = path.normalize(sourcePath + "/ui/ts");
 const indexFilePath = path.normalize(sourcePath + "/ui/html/index.html");
@@ -91,7 +92,7 @@ async function handleRequest(req, res, combinedOutputsJson) {
         res.write(await fs_1.promises.readFile(targetFile));
         return;
     }
-    if (url.endsWith(".js.map")) {
+    if (DEV_MODE && url.endsWith(".js.map")) {
         const targetFile = jsPath + "/" + url;
         if (!doesFileExistInFolder(targetFile, jsPath)) {
             return endWith404(res);
@@ -101,7 +102,7 @@ async function handleRequest(req, res, combinedOutputsJson) {
         res.write(await fs_1.promises.readFile(targetFile));
         return;
     }
-    if (url.endsWith(".ts")) {
+    if (DEV_MODE && url.endsWith(".ts")) {
         const targetFile = tsPath + "/" + url;
         if (!doesFileExistInFolder(targetFile, tsPath)) {
             return endWith404(res);

package/build/src/ui.js

@@ -8,17 +8,23 @@ const open_1 = __importDefault(require("open"));
 const util_1 = require("./util/util");
 const output_1 = require("./cognitive-complexity/output");
 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));
     if (args["h"] || args["help"]) {
-        printHelp();
+        console.log(helpText);
         return;
     }
     const givenPort = parseInt(args["port"]);
     const port = util_1.nonNaN(givenPort, 5678);
     const url = `http://localhost:${port}`;
     const inputFiles = args["_"];
+    if (inputFiles.length === 0) {
+        console.error("No files given.");
+        console.error(helpText);
+        return;
+    }
     const combinedOutputsJson = await generateComplexityJson(inputFiles);
     const server = ui_server_1.createUiServer(combinedOutputsJson);
     server.listen(port, () => {
@@ -30,7 +36,4 @@ async function generateComplexityJson(inputFiles) {
     const combinedOutputs = await util_1.keysToAsyncValues(inputFiles, file => output_1.getFileOrFolderOutput(file));
     return JSON.stringify(combinedOutputs);
 }
-function printHelp() {
-    console.log("Arguments: [-h | --help] [--port <NUMBER>] [FILE]...");
-}
 //# sourceMappingURL=ui.js.map

package/build/ui/ts/complexity-tree/ComplexityController.js

@@ -30,7 +30,6 @@ export class ComplexityController {
         this.view.expandAll();
     }
     sort() {
-        console.log("sort");
         if (this.sortMethod === Sort.inOrder) {
             if (this.include === Include.containers) {
                 sortProgramByName(this.complexity);
@@ -49,7 +48,6 @@ export class ComplexityController {
         this.model.overwriteComplexity(this.complexity);
     }
     filter() {
-        console.log("filter");
         this.complexity = cloneSortedOutput(this.initialComplexity);
         const removeWhat = this.include === Include.folders
             ? () => false

package/build/ui/ts/component/tree/Tree.js

@@ -25,9 +25,6 @@ export class Tree {
         if (this.containerMap.has(containerOutput.id)) {
             return this.containerMap.get(containerOutput.id);
         }
-        else {
-            console.log("container");
-        }
         const container = new Container(containerOutput, containerOutput.inner.map(inner => this.makeContainer(inner)));
         this.containerMap.set(containerOutput.id, container);
         return container;
@@ -36,9 +33,6 @@ export class Tree {
         if (this.fileMap.has(fileOutput.id)) {
             return this.fileMap.get(fileOutput.id);
         }
-        else {
-            console.log("file");
-        }
         const children = [];
         for (const containerOutput of fileOutput.inner) {
             children.push(this.makeContainer(containerOutput));
@@ -51,9 +45,6 @@ export class Tree {
         if (this.folderContentsMap.has(folderOutput.id)) {
             return this.folderContentsMap.get(folderOutput.id);
         }
-        else {
-            console.log("folder contents");
-        }
         const folderContents = new FolderContents(folderOutput.inner.map((folderEntry) => {
             const folderEntryComponent = isSortedContainerOutput(folderEntry)
                 ? this.makeContainer(folderEntry)
@@ -69,9 +60,6 @@ export class Tree {
         if (this.folderMap.has(folderOutput.id)) {
             return this.folderMap.get(folderOutput.id);
         }
-        else {
-            console.log("folder");
-        }
         const folder = new Folder(folderOutput, this.makeFolderContents(folderOutput));
         this.folderMap.set(folderOutput.id, folder);
         return folder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cognitive-complexity-ts",
-  "version": "0.4.4",
+  "version": "0.6.0",
   "description": "",
   "keywords": [
     "typescript",
@@ -15,7 +15,7 @@
     "build-tools": "tsc -i -p ./tools",
     "build-ui": "npm run build && tsc -i -p ./ui",
     "json": "npm run build && node -r source-map-support/register ./build/src/json",
-    "ui": "npm run build && npm run build-ui && node -r source-map-support/register ./build/src/ui",
+    "ui": "npm run build && npm run build-ui && DEV=true node -r source-map-support/register ./build/src/ui",
     "test": "npm run build && node -r source-map-support/register ./build/test/main",
     "what": "npm run build-tools && node -r source-map-support/register ./build/tools/what-is-it",
     "prepublishOnly": "rm -rf ./build && npm run build && npm run build-ui && npm run test"