Several performance improvements

* ignore *.d.ts files
* clear seen types map after writing a *.typemap file as we do type generation per file only anyway

Author: max-leuthaeuser

index.js

@@ -26,7 +26,7 @@ const IGNORE_DIRS = [
   "build",
 ];
 
-const IGNORE_FILE_PATTERN = new RegExp("(conf|test|spec)\\.(js|ts)$", "i");
+const IGNORE_FILE_PATTERN = new RegExp("(conf|test|spec|\\.d)\\.(js|ts)$", "i");
 
 const getAllFiles = (dir, extn, files, result, regex) => {
   files = files || fs.readdirSync(dir);
@@ -137,7 +137,6 @@ const toVueAst = (file) => {
   );
 };
 
-
 function createTsc(srcFiles) {
   try {
     const program = tsc.createProgram(srcFiles, {
@@ -158,7 +157,7 @@ function createTsc(srcFiles) {
       }
     }
 
-    function safeTypeToString(node, context) {
+    function safeTypeWithContextToString(node, context) {
       try {
         return typeChecker.typeToString(node, context,
           tsc.TypeFormatFlags.NoTruncation | tsc.TypeFormatFlags.InTypeAlias
@@ -185,10 +184,10 @@ function createTsc(srcFiles) {
         if (funcSignature) {
           typeStr = safeTypeToString(funcSignature.getReturnType());
         } else {
-          typeStr = safeTypeToString(typeChecker.getTypeAtLocation(node), node);
+          typeStr = safeTypeWithContextToString(typeChecker.getTypeAtLocation(node), node);
         }
       } else {
-        typeStr = safeTypeToString(typeChecker.getTypeAtLocation(node), node);
+        typeStr = safeTypeWithContextToString(typeChecker.getTypeAtLocation(node), node);
       }
       seenTypes.set(node.getStart(), typeStr);
       tsc.forEachChild(node, addType);
@@ -206,7 +205,6 @@ function createTsc(srcFiles) {
   }
 }
 
-
 /**
  * Generate AST for JavaScript or TypeScript
  */
@@ -231,6 +229,7 @@ const createJSAst = async (options) => {
           const tsAst = ts.program.getSourceFile(file);
           tsc.forEachChild(tsAst, ts.addType);
           writeTypesFile(file, ts.seenTypes, options);
+          ts.seenTypes.clear();
         } catch (err) {
           console.warn("Retrieving types", file, ":", err.message);
         }
@@ -258,7 +257,6 @@ const createVueAst = async (options) => {
   }
 };
 
-
 /**
  * Deal with cyclic reference in json
  */
@@ -313,7 +311,6 @@ const writeTypesFile = (file, seenTypes, options) => {
   console.log("Converted types for", relativePath, "to", outTypeFile);
 };
 
-
 const createXAst = async (options) => {
   const src_dir = options.src;
   try {
@@ -328,7 +325,7 @@ const createXAst = async (options) => {
   ) {
     return await createJSAst(options);
   }
-  console.error(src_dir, "unkown project type");
+  console.error(src_dir, "unknown project type");
   process.exit(1);
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@joernio/astgen",
-  "version": "2.19.0",
+  "version": "2.20.0",
   "description": "Generate JS/TS AST in json format with Babel",
   "exports": "./index.js",
   "keywords": [