cleanup

Author: whyboris

README.md

@@ -16,7 +16,7 @@ Inside any directory, run:
 tcg
 ```
 
-It will remind you how to use the CLI: you need to provide specific files, or globs:
+It will remind you how to use the CLI: you need to provide specific files, or globs (wildcard paths):
 
 ```sh
 tcg myFile.ts folder/*.ts anotherFolder/**/*.ts

bin/extract.js

@@ -23,9 +23,8 @@ function extractFunctionCalls(node, sourceFile, indentLevel) {
     if (ts.isFunctionDeclaration(node)) {
         node.forEachChild(function (child) {
             if (ts.isIdentifier(child)) {
-                var functionName = child.getText(sourceFile);
-                currentFunction = functionName;
-                allFunctions.push(functionName);
+                var declaredFunction = child.getText(sourceFile);
+                updateDeclaredFunctions(declaredFunction);
             }
         });
     }
@@ -38,13 +37,29 @@ function extractFunctionCalls(node, sourceFile, indentLevel) {
             updateCalledFunctions(calledFunction);
         }
     }
-    // Optional logging:
-    // const indentation = "-".repeat(indentLevel);
-    // const syntaxKind = ts.SyntaxKind[node.kind];
-    // const nodeText = node.getText(sourceFile).split('\n')[0];
-    // console.log(`${indentation}${syntaxKind}: ${nodeText}`);
+    logThings(node, sourceFile, indentLevel);
     node.forEachChild(function (child) { return extractFunctionCalls(child, sourceFile, indentLevel + 1); });
 }
+/**
+ * Log stuff if needed
+ * @param node
+ * @param sourceFile
+ * @param indentLevel
+ */
+function logThings(node, sourceFile, indentLevel) {
+    var indentation = "-".repeat(indentLevel);
+    var syntaxKind = ts.SyntaxKind[node.kind];
+    var nodeText = node.getText(sourceFile).split('\n')[0];
+    console.log("" + indentation + syntaxKind + ": " + nodeText);
+}
+/**
+ * Update `allFunctions` and `currentFunction`
+ * @param declaredFunction
+ */
+function updateDeclaredFunctions(declaredFunction) {
+    currentFunction = declaredFunction;
+    allFunctions.push(declaredFunction);
+}
 /**
  * Update `calledFunctions` map with current called function name
  * @param calledFunction - name of the function getting called

bin/index.js

@@ -38,6 +38,5 @@ function showHelpMessage() {
     console.log('or any combination of the above, like `' + green('myFile.ts myFolder/*.ts') + '`');
 }
 function proceed() {
-    console.log('do some stuff');
     extract_1.processFiles(myArgs);
 }

extract.ts

@@ -26,9 +26,8 @@ function extractFunctionCalls(node: ts.Node, sourceFile: ts.SourceFile, indentLe
   if (ts.isFunctionDeclaration(node)) {
     node.forEachChild(child => {
       if (ts.isIdentifier(child)) {
-        const functionName: string = child.getText(sourceFile);
-        currentFunction = functionName;
-        allFunctions.push(functionName);
+        const declaredFunction: string = child.getText(sourceFile);
+        updateDeclaredFunctions(declaredFunction);
       }
     });
   }
@@ -43,15 +42,34 @@ function extractFunctionCalls(node: ts.Node, sourceFile: ts.SourceFile, indentLe
     }
   }
 
-  // Optional logging:
-  // const indentation = "-".repeat(indentLevel);
-  // const syntaxKind = ts.SyntaxKind[node.kind];
-  // const nodeText = node.getText(sourceFile).split('\n')[0];
-  // console.log(`${indentation}${syntaxKind}: ${nodeText}`);
+  // logThings(node, sourceFile, indentLevel);
 
   node.forEachChild(child => extractFunctionCalls(child, sourceFile, indentLevel + 1));
 }
 
+/**
+ * Log stuff if needed
+ * @param node
+ * @param sourceFile
+ * @param indentLevel
+ */
+function logThings(node: ts.Node, sourceFile: ts.SourceFile, indentLevel: number) {
+  const indentation = "-".repeat(indentLevel);
+  const syntaxKind = ts.SyntaxKind[node.kind];
+  const nodeText = node.getText(sourceFile).split('\n')[0];
+  console.log(`${indentation}${syntaxKind}: ${nodeText}`);
+}
+
+
+/**
+ * Update `allFunctions` and `currentFunction`
+ * @param declaredFunction
+ */
+function updateDeclaredFunctions(declaredFunction: string): void {
+  currentFunction = declaredFunction;
+  allFunctions.push(declaredFunction);
+}
+
 /**
  * Update `calledFunctions` map with current called function name
  * @param calledFunction - name of the function getting called

index.ts

@@ -46,6 +46,5 @@ function showHelpMessage(): void {
 }
 
 function proceed(): void {
-  console.log('do some stuff');
   processFiles(myArgs);
 }

package.json

@@ -9,12 +9,16 @@
   "author": "Boris Yakubchik",
   "homepage": "https://yboris.dev",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/whyboris/TypeScript-Call-Graph"
+  },
   "main": "bin/index.js",
   "bin": {
     "tcg": "./bin/index.js"
   },
   "scripts": {
-    "start": "tsc && mv index.js bin/index.js && mv extract.js bin/extract.js && node bin/index.js",
+    "start": "tsc && mv index.js bin/index.js && mv extract.js bin/extract.js && node bin/index.js *.ts",
     "test": "node bin/index.js *.ts",
     "global": "npm install -g ."
   },