fix(deno-lint): add tsx: true when path endsWith .tsx

napi-rs · Aug 31, 2020 · b1e5502 · b1e5502
1 parent 9a714a3
commit b1e5502
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/packages/deno-lint/Cargo.toml b/packages/deno-lint/Cargo.toml
@@ -14,6 +14,7 @@ napi = { version = "0.4" }
 napi-derive = { version = "0.4" }
 serde = "1"
 serde_json = "1"
+swc_ecmascript = { version = "=0.6.3", features = ["parser", "transforms", "utils", "visit"] }
 termcolor = "1.1"
 
 [target.'cfg(all(unix, not(target_env = "musl")))'.dependencies]

diff --git a/packages/deno-lint/bin.js b/packages/deno-lint/bin.js
@@ -2,7 +2,9 @@
 
 const { binding } = require('@node-rs/deno-lint')
 
-const enableAllRules = process.argv.includes('--all') || process.argv.includes('-a')
+const { argv } = process
+
+const enableAllRules = argv.includes('--all') || argv.includes('-a')
 
 const hasError = binding.denolint(__dirname, enableAllRules)
 

diff --git a/packages/deno-lint/src/lib.rs b/packages/deno-lint/src/lib.rs
@@ -16,6 +16,8 @@ use deno_lint::swc_util::get_default_ts_config;
 use ignore::types::TypesBuilder;
 use ignore::WalkBuilder;
 use napi::{CallContext, Error, JsBoolean, JsBuffer, JsObject, JsString, Module, Result, Status};
+use swc_ecmascript::parser::Syntax;
+use swc_ecmascript::parser::TsConfig;
 use termcolor::Color::{Ansi256, Red};
 use termcolor::{Ansi, ColorSpec, WriteColor};
 
@@ -224,6 +226,12 @@ fn lint_command(ctx: CallContext) -> Result<JsBoolean> {
         if !p.is_dir() {
           let file_content = fs::read_to_string(&p)
             .map_err(|e| Error::from_reason(format!("Read file {:?} failed: {}", p, e)))?;
+
+          let mut ts_config = TsConfig::default();
+          ts_config.dynamic_import = true;
+          ts_config.decorators = true;
+          ts_config.tsx = p.ends_with(".tsx");
+          Syntax::Typescript(ts_config);
           let mut linter = LinterBuilder::default()
             .rules(if enable_all_rules {
               get_all_rules()

diff --git a/tsconfig.json b/tsconfig.json
@@ -19,7 +19,7 @@
     "suppressImplicitAnyIndexErrors": true,
     "suppressExcessPropertyErrors": true,
     "forceConsistentCasingInFileNames": true,
-    "target": "ES5",
+    "target": "ES2018",
     "inlineSourceMap": true,
     "esModuleInterop": true,
     "stripInternal": true,