From 732ac39e0630aac978e4cf3c00342527fb559e0d Mon Sep 17 00:00:00 2001 From: Pooya Paridel Date: Mon, 10 Apr 2017 14:00:02 -0700 Subject: [PATCH 1/4] Convert it to ES5 Convert it to make it compatible with older version of Node.js --- index.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 1c464f1..d88fb6c 100644 --- a/index.js +++ b/index.js @@ -1,7 +1,19 @@ -const ts = require('typescript'); -const { version, name } = require('./package.json'); -const { join, dirname } = require('path'); -const { access, constants, readFileSync } = require('fs'); +var ts = require('typescript'); + +var _require = require('./package.json'), + version = _require.version, + name = _require.name; + +var _require2 = require('path'), + join = _require2.join, + dirname = _require2.dirname; + +var _require3 = require('fs'), + access = _require3.access, + constants = _require3.constants, + readFileSync = _require3.readFileSync; + +var debug = require('debug')(name); const debug = require('debug')(name); From 9ddc1d8094063091e7c01039875f40eebe452a62 Mon Sep 17 00:00:00 2001 From: Pooya Paridel Date: Thu, 4 May 2017 11:58:02 -0700 Subject: [PATCH 2/4] rewrite the restructuring Object destructuring assignment like "const { version, name } = require('./package.json');" is not supported in Node.js 4 so this change makes it compatible with older Node. --- index.js | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/index.js b/index.js index d88fb6c..b67bfee 100644 --- a/index.js +++ b/index.js @@ -1,19 +1,17 @@ -var ts = require('typescript'); +const ts = require('typescript'); -var _require = require('./package.json'), - version = _require.version, - name = _require.name; +const package = require('./package.json'); +const version = package.version; +const name = package.name; -var _require2 = require('path'), - join = _require2.join, - dirname = _require2.dirname; +const path = require('path'); +const join = path.join; +const dirname = path.dirname; -var _require3 = require('fs'), - access = _require3.access, - constants = _require3.constants, - readFileSync = _require3.readFileSync; - -var debug = require('debug')(name); +const fs = require('fs'); +const access = fs.access; +const constants = fs.constants; +const readFileSync = fs.readFileSync; const debug = require('debug')(name); @@ -33,11 +31,14 @@ function tsify(content, fileName) { compilerOptions.inlineSourceMap = true; debug('transpileModule', { fileName }); - const { outputText, diagnostics } = ts.transpileModule(content, { + const transpileModule = ts.transpileModule(content, { fileName, compilerOptions, reportDiagnostics: true, }); + const outputText = transpileModule.outputText; + const diagnostics = transpileModule.diagnostics + debug({ diagnostics }); return outputText; @@ -54,17 +55,20 @@ function getCompilerOptionsViaCache(configFileName) { } function getCompilerOptions(configFileName) { - const { config, error } = ts.readConfigFile(configFileName, ts.sys.readFile); + const readConfigFile = ts.readConfigFile(configFileName, ts.sys.readFile); + const config = readConfigFile.config; + const error = readConfigFile.readConfigFile; + if (error) { throw new Error(`TS config error in ${configFileName}: ${error.messageText}`); } - const { options } = ts.parseJsonConfigFileContent( + const options = ts.parseJsonConfigFileContent( config, ts.sys, ts.getDirectoryPath(configFileName), {}, - configFileName); + configFileName).options; debug('getCompilerOptions', { configFileName, options }); return options; } From 20ac776ce89e8fa988effa52dfc2977e61a9b650 Mon Sep 17 00:00:00 2001 From: Pooya Paridel Date: Thu, 4 May 2017 11:59:51 -0700 Subject: [PATCH 3/4] Minor bug fix. --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index b67bfee..a9c4236 100644 --- a/index.js +++ b/index.js @@ -57,7 +57,7 @@ function getCompilerOptionsViaCache(configFileName) { function getCompilerOptions(configFileName) { const readConfigFile = ts.readConfigFile(configFileName, ts.sys.readFile); const config = readConfigFile.config; - const error = readConfigFile.readConfigFile; + const error = readConfigFile.error; if (error) { throw new Error(`TS config error in ${configFileName}: ${error.messageText}`); From 17aaea84aec0f264f70b2c26e8ecebd72a2ea6f9 Mon Sep 17 00:00:00 2001 From: Pooya Paridel Date: Tue, 27 Jun 2017 14:58:57 -0700 Subject: [PATCH 4/4] Some cleanups. --- index.js | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/index.js b/index.js index a9c4236..7660924 100644 --- a/index.js +++ b/index.js @@ -1,22 +1,10 @@ const ts = require('typescript'); const package = require('./package.json'); -const version = package.version; -const name = package.name; - -const path = require('path'); -const join = path.join; -const dirname = path.dirname; - -const fs = require('fs'); -const access = fs.access; -const constants = fs.constants; -const readFileSync = fs.readFileSync; - -const debug = require('debug')(name); +const debug = require('debug')(package.name); debug('versions', { - [name]: version, + [name]: package.version, typescript: ts.version, }); @@ -56,15 +44,13 @@ function getCompilerOptionsViaCache(configFileName) { function getCompilerOptions(configFileName) { const readConfigFile = ts.readConfigFile(configFileName, ts.sys.readFile); - const config = readConfigFile.config; - const error = readConfigFile.error; - if (error) { + if (readConfigFile.error) { throw new Error(`TS config error in ${configFileName}: ${error.messageText}`); } const options = ts.parseJsonConfigFileContent( - config, + readConfigFile.config, ts.sys, ts.getDirectoryPath(configFileName), {},