Simplify type string generation (#44)

Author: max-leuthaeuser

package.json

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

src/Defaults.ts

@@ -95,5 +95,7 @@ export const DEFAULT_TSC_OPTIONS: tsc.CompilerOptions = {
 export const DEFAULT_TSC_TYPE_OPTIONS: number = tsc.TypeFormatFlags.NoTruncation | tsc.TypeFormatFlags.InTypeAlias
 
 export const ANY: string = "any"
+export const UNKNOWN: string = "unknown"
 
-export const DEFAULT_IGNORED_TYPES: string[] = ["any", "unknown", "any[]", "unknown[]"]
+export const STRING_REGEX: RegExp = /^["'`].*["'`]$/
+export const ARRAY_REGEX: RegExp = /.+\[]$/

src/TscUtils.ts

@@ -1,5 +1,4 @@
 import * as Defaults from "./Defaults";
-import {DEFAULT_IGNORED_TYPES} from "./Defaults";
 
 import tsc from "typescript";
 
@@ -17,9 +16,10 @@ function forEachNode(ast: tsc.Node, callback: (node: tsc.Node) => void): void {
 function safeTypeToString(node: tsc.Type, typeChecker: tsc.TypeChecker): string {
     try {
         const tpe: string = typeChecker.typeToString(node, undefined, Defaults.DEFAULT_TSC_TYPE_OPTIONS);
-        if (/^["'`].*["'`]$/.test(tpe)) {
-            return "string";
-        }
+        if (tpe.length === 0) return Defaults.ANY
+        if (tpe == Defaults.UNKNOWN) return Defaults.ANY
+        if (Defaults.STRING_REGEX.test(tpe)) return "string";
+        if (Defaults.ARRAY_REGEX.test(tpe)) return "__ecma.Array";
         return tpe;
     } catch (err) {
         return Defaults.ANY;
@@ -51,7 +51,7 @@ export function typeMapForFile(file: string): TypeMap {
         } else {
             typeStr = safeTypeToString(typeChecker.getTypeAtLocation(node), typeChecker);
         }
-        if (!DEFAULT_IGNORED_TYPES.includes(typeStr)) {
+        if (typeStr !== Defaults.ANY) {
             const pos = `${node.getStart()}:${node.getEnd()}`;
             seenTypes.set(pos, typeStr);
         }