upgrade: swc crates (#16)

* update swc dependencies

* add parser type for TsTupleElement

* try

* Need to check TsTupleElement's type now for allowing inline multi-line behaviour.

* 0.19.4

* Temp fix for compiling a wasm build.

* Remove --locked for now.

Co-authored-by: David Sherret <[email protected]>

Author: bartlomieju

.github/workflows/ci.yml

@@ -43,16 +43,21 @@ jobs:
     - name: Build debug
       if: matrix.config.kind == 'test_debug'
       run: cargo build --verbose
-    - name: Build release
-      if: matrix.config.kind == 'test_release'
-      run: cargo build --target wasm32-unknown-unknown --release --locked --verbose
-
     - name: Test debug
       if: matrix.config.kind == 'test_debug'
       run: cargo test --verbose
+
+    - name: Patch for WASM build
+      if: matrix.config.kind == 'test_release'
+      run: |
+        chmod +x setup-wasm.sh
+        ./setup-wasm.sh
+    - name: Build release
+      if: matrix.config.kind == 'test_release'
+      run: cargo build --target wasm32-unknown-unknown --release --verbose # --locked # add back after removing wasm patch
     - name: Test release
       if: matrix.config.kind == 'test_release'
-      run: cargo test --release --locked --verbose
+      run: cargo test --release --verbose # --locked # add back after removing wasm patch
 
     - name: Get tag version
       if: matrix.config.kind == 'test_release' && startsWith(github.ref, 'refs/tags/')

.gitignore

@@ -1,2 +1,3 @@
 /target
 **/*.rs.bk
+sourcemap

Cargo.lock

@@ -2,7 +2,7 @@
 name = "dprint-plugin-typescript"
 description = "TypeScript code formatting plugin for Dprint."
 keywords = ["formatting", "formatter", "typescript"]
-version = "0.19.3"
+version = "0.19.4"
 authors = ["David Sherret <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -14,9 +14,9 @@ crate-type = ["lib", "cdylib"]
 
 [dependencies]
 dprint-core = "0.22.0"
-swc_common = "=0.5.12"
-swc_ecma_ast = "=0.20.0"
-swc_ecma_parser = "=0.24.5"
+swc_common = "=0.6.0"
+swc_ecma_ast = "=0.22.0"
+swc_ecma_parser = "=0.26.0"
 serde = { version = "1.0.88", features = ["derive"] }
 serde_json = "1.0"
 

Cargo.toml

@@ -0,0 +1,12 @@
+--- Cargo.toml	2020-06-30 10:59:56.075476800 -0400
++++ Cargo_new.toml	2020-06-30 10:59:49.756000200 -0400
+@@ -20,6 +20,9 @@
+ serde = { version = "1.0.88", features = ["derive"] }
+ serde_json = "1.0"
+ 
++[patch.crates-io]
++sourcemap = { path = "sourcemap" }
++
+ [dev-dependencies]
+ dprint-development = "0.2.2"
+ debug-here = "0.2"

patches/cargo.patch

@@ -0,0 +1,10 @@
+--- detector.rs	2020-06-15 10:40:49.000000000 -0400
++++ detector_new.rs"	2020-06-30 10:56:31.931406500 -0400
+@@ -46,6 +46,7 @@
+     /// Resolves the reference against a local file path
+     ///
+     /// This is similar to `resolve` but operates on file paths.
++    #[cfg(any(unix, windows, target_os = "redox"))]
+     pub fn resolve_path(&self, minified_path: &Path) -> Option<PathBuf> {
+         let url = self.get_url();
+         if url.starts_with("data:") {

patches/sourcemap_detector.patch

@@ -0,0 +1,8 @@
+#!/bin/bash
+# to create patches use $ diff -u file1.rs file1.new.rs > file1.patch
+
+# temporary in order to allow targeting wasm32-unknown-unknown
+curl -L https://crates.io/api/v1/crates/sourcemap/6.0.0/download | tar xzf -
+mv sourcemap-6.0.0 sourcemap
+patch sourcemap/src/detector.rs patches/sourcemap_detector.patch
+patch Cargo.toml patches/cargo.patch

setup-wasm.sh

@@ -271,6 +271,7 @@ fn parse_node_with_inner_parse<'a>(node: Node<'a>, context: &mut Context<'a>, in
             Node::TsTypeQuery(node) => parse_type_query(node, context),
             Node::TsTypeRef(node) => parse_type_reference(node, context),
             Node::TsUnionType(node) => parse_union_type(node, context),
+            Node::TsTupleElement(node) => parse_node((&node.ty).into(), context),
             /* unknown */
             _ => parse_raw_string(node.text(context).into()),
         }
@@ -6428,6 +6429,7 @@ fn allows_inline_multi_line(node: &Node, has_siblings: bool) -> bool {
         Node::AssignPat(node) => allows_inline_multi_line(&(&node.left).into(), has_siblings)
             || allows_inline_multi_line(&(&node.right).into(), has_siblings),
         Node::TsTypeAnn(type_ann) => allows_inline_multi_line(&(&type_ann.type_ann).into(), has_siblings),
+        Node::TsTupleElement(tuple_element) => allows_inline_multi_line(&(&tuple_element.ty).into(), has_siblings),
         _ => false,
     };
 

src/parsing/parser.rs

@@ -533,6 +533,7 @@ generate_node! [
     TsTypeQuery,
     TsTypeRef,
     TsUnionType,
+    TsTupleElement,
     /* unknown */
     Span
 ];