Fix expression-file by using require and path.resolve

baselines/requireJquery.d.ts

@@ -0,0 +1,5 @@
+declare namespace requireJquery {
+    function jqeury(w: any): any;
+
+}
+

baselines/simple.d.ts

@@ -0,0 +1,4 @@
+declare const simple: {
+    test: number;
+};
+

lib/run.ts

@@ -83,8 +83,7 @@ try {
         const filename = args['expression-file'];
         name = path.basename(filename, path.extname(filename)).replace(/[^A-Za-z0-9]/g, '_');
         (module as any).paths.unshift(process.cwd() + '/node_modules');
-        const fileContent = fs.readFileSync(filename, "utf-8");
-        result = guess.generateIdentifierDeclarationFile(name, eval(fileContent));
+        result = guess.generateIdentifierDeclarationFile(name, require(path.resolve(filename)));
     } else if (args.identifier) {
         if (args.name) throw new ArgsError('Cannot use --name with --identifier');
         if (args.module || args.expression) throw new ArgsError('Cannot specify more than one input');

package.json

@@ -22,6 +22,7 @@
     "lodash": "latest",
     "mocha": "^3.0.2",
     "react": "latest",
+    "shx": "^0.3.3",
     "tslint": "^5.1.0",
     "webpack": "^1.13.1"
   },
@@ -30,7 +31,7 @@
   ],
   "preferGlobal": true,
   "scripts": {
-    "test": "mocha bin/tests/test.js",
+    "test": "shx cp -r ./tests/fixtures/ ./bin/tests && mocha bin/tests/test.js",
     "build": "tsc",
     "build-browser": "tsc -p browser && webpack",
     "lint": "tslint --project tsconfig.json --format stylish"

tests/fixtures/require-jquery.js

@@ -0,0 +1,3 @@
+const jqeury = require("jquery")
+
+exports.jqeury = jqeury;

tests/fixtures/simple.js

@@ -0,0 +1 @@
+exports.test = 1

tests/test.ts

@@ -44,6 +44,11 @@ const expressions: { [s: string]: any } = {
     overriddenToString,
 };
 
+const expressionFiles: { [s: string]: any } = {
+    simple: path.join(__dirname, "fixtures", "simple.js"),
+    requireJquery: path.join(__dirname, "fixtures", "require-jquery.js"),
+};
+
 function checkDeclarationBaseline(name: string, content: string) {
     const filename = path.join(__dirname, `../../baselines/${name}`);
     const existing = fs.existsSync(filename) ? fs.readFileSync(filename, 'utf-8') : '<none>';
@@ -70,3 +75,12 @@ describe("Expression tests", () => {
         });
     }
 });
+
+describe("Expression file test", () => {
+    for (const key of Object.keys(expressionFiles)) {
+        it(`Generates the same declaration for ${key}`, () => {
+            const result = tsg.generateIdentifierDeclarationFile(key!, require(expressionFiles[key!]));
+            checkDeclarationBaseline(`${key}.d.ts`, result);
+        });
+    }
+});