fix(*): several bug fixes

package.json

@@ -50,11 +50,11 @@
     "commander": "^5.1.0",
     "cosmiconfig": "^6.0.0",
     "deasync": "^0.1.20",
-    "execa": "^4.0.2",
+    "execa": "^4.0.3",
     "https-proxy-agent": "^5.0.0",
     "ignore": "^5.1.8",
     "js-yaml": "^3.14.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
     "mkdirp": "^1.0.4",
     "node-fetch": "^2.6.0",
     "openapi-types": "^1.3.5",

src/index.ts

@@ -24,7 +24,15 @@ const DEFAULT_OUTPUT_DIR = 'build';
 const DEFAULT_STORAGE = 'table';
 const DEFAULT_HTTP_CLIENT = 'axios';
 const SERVERLESS_YML = 'serverless.yml';
-export const EXTENSIONS = ['.js', '.mjs', '.jsx', '.ts'];
+export const EXTENSIONS = [
+  '.js',
+  '.mjs',
+  '.jsx',
+  '.ts',
+  '.d.ts',
+  'tsx',
+  '.node',
+];
 
 export class Escapin {
   public id: string;
@@ -121,9 +129,10 @@ export class Escapin {
     moduleName: string,
     location: 'dependencies' | 'devDependencies' = 'dependencies',
   ): void {
-    this.packageJson[location][moduleName] = `^${u.getLatestVersion(
-      moduleName,
-    )}`;
+    const deps = this.packageJson[location];
+    if (deps !== undefined) {
+      deps[moduleName] = `^${u.getLatestVersion(moduleName)}`;
+    }
   }
 
   public savePackageJson(): void {

src/state.ts

@@ -4,12 +4,10 @@ import fs from 'fs';
 import module from 'module';
 import { OpenAPIV2 } from 'openapi-types';
 import Path from 'path';
-import { Escapin } from '.';
+import { Escapin, EXTENSIONS } from '.';
 import { OneOrMore, PathInfo } from './types';
 import * as u from './util';
 
-export const EXTENSIONS = ['.js', '.mjs', '.jsx'];
-
 export class BaseState {
   public escapin!: Escapin;
   public replacements!: Array<{
@@ -114,6 +112,7 @@ export class BaseState {
     return (
       moduleName in
       Object.assign(
+        new Object(),
         dependencies,
         devDependencies,
         peerDependencies,

src/types.ts

@@ -23,8 +23,8 @@ export interface Credential {
 export interface PackageJson {
   main?: string;
   scripts?: { [script: string]: string };
-  dependencies: { [moduleName: string]: string };
-  devDependencies: { [moduleName: string]: string };
+  dependencies?: { [moduleName: string]: string };
+  devDependencies?: { [moduleName: string]: string };
   peerDependencies?: { [moduleName: string]: string };
   optionalDependencies?: { [moduleName: string]: string };
   bundledDependencies?: string[];

src/visitors/functionTypes/index.ts

@@ -27,7 +27,8 @@ const visitor: Visitor<BaseState> = {
 
     escapin.save();
 
-    const { dependencies, devDependencies } = escapin.packageJson;
+    const dependencies = escapin.packageJson.dependencies || new Object();
+    const devDependencies = escapin.packageJson.devDependencies || new Object();
     const modules = [
       ...Object.keys(dependencies),
       ...Object.keys(devDependencies),

src/visitors/functionTypes/visit.ts

@@ -47,6 +47,12 @@ export function newVisit(
       return false;
     }
     const firstParam = paramTypeNode.parameters[0];
+    if (firstParam === undefined) {
+      if (process.env.NODE_ENV === 'test') {
+        console.log('firstParam is undefined');
+      }
+      return false;
+    }
     const firstParamSymbol = checker.getSymbolAtLocation(firstParam.name);
     if (firstParamSymbol === undefined) {
       if (process.env.NODE_ENV === 'test') {

src/visitors/openApiV2/load.ts

@@ -22,29 +22,17 @@ export function loadOpenApiV2(
       cleanupNeeded = true;
     } else {
       resolved = state.resolvePath(uri);
-      if (resolved === undefined) {
-        throw new Error(`${uri} not found.`);
-      } else if (!fs.existsSync(resolved)) {
-        throw new Error(`${resolved} not found.`);
+      if (resolved === undefined || !fs.existsSync(resolved)) {
+        return null;
       }
     }
     spec = deasyncPromise(dereference(resolved));
     if (cleanupNeeded) {
       rimraf(resolved);
     }
   } catch (err) {
-    if (state.hasDependency(uri)) {
-      console.log(`${uri} is a module.`);
-    }
-    const index = uri.lastIndexOf('/');
-    const actualUri = index > 0 ? uri.substring(0, uri.lastIndexOf('/')) : uri;
-    if (state.hasDependency(actualUri)) {
-      console.log(`${actualUri} is a module.`);
-    } else if (fs.existsSync(actualUri)) {
-      console.log(`${actualUri} is a local module.`);
-    } else {
-      throw err;
-    }
+    console.error(err);
+    return null;
   }
   return spec;
 }

src/visitors/uncallbackify.ts

@@ -30,15 +30,19 @@ const visitor: Visitor<BaseState> = {
     for (const stmtPath of blockPath) {
       if (stmtPath.isIfStatement() && u.includes(stmtPath, errorParam.node)) {
         const stmt = stmtPath.node;
-        const result = u.evalSnippet(stmt.test, {
-          [errorParam.node.name]: new Error(),
-        });
-        if (result) {
-          alternate.push(...u.toStatements(stmt.consequent));
-          if (stmt.alternate !== null) {
-            consequent.push(...u.toStatements(stmt.alternate));
+        try {
+          const result = u.evalSnippet(stmt.test, {
+            [errorParam.node.name]: new Error(),
+          });
+          if (result) {
+            alternate.push(...u.toStatements(stmt.consequent));
+            if (stmt.alternate !== null) {
+              consequent.push(...u.toStatements(stmt.alternate));
+            }
+          } else {
+            throw new Error('result is undefined');
           }
-        } else {
+        } catch (err) {
           consequent.push(...u.toStatements(stmt.consequent));
           if (stmt.alternate !== null) {
             alternate.push(...u.toStatements(stmt.alternate));