Wasm version of JS Transformer

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
-members = ["packages/transformers/js", "packages/utils/fs-search"]
-
-[profile.release]
-opt-level = 3
-# lto = true
+members = [
+  "packages/transformers/js/core",
+  "packages/transformers/js/napi",
+  "packages/transformers/js/wasm",
+  "packages/utils/fs-search",
+]

packages/transformers/js/Cargo.toml → packages/transformers/js/core/Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 authors = ["Devon Govett <devongovett@gmail.com>"]
-name = "parcel-js-swc"
+name = "parcel-js-swc-core"
 version = "0.1.0"
+edition = "2018"
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["rlib"]
 
 [dependencies]
-napi = { version = "1", features = ["serde-json"] }
-napi-derive = "1"
 swc_ecmascript = { version = "0.36.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils"] }
 swc_ecma_preset_env = "0.20.1"
 swc_common = { version = "0.10.19", features = ["tty-emitter", "sourcemap"] }
@@ -20,12 +19,3 @@ Inflector = "0.11.4"
 data-encoding = "2.3.2"
 sha-1 = "0.9.4"
 dunce = "1.0.1"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-jemallocator = { version = "0.3.2", features = ["disable_initial_exec_tls"] }
-
-[target.'cfg(windows)'.dependencies]
-mimalloc = { version = "0.1.25", default-features = false }
-
-[build-dependencies]
-napi-build = { version = "1" }

packages/transformers/js/src/dependency_collector.rs → packages/transformers/js/core/src/dependency_collector.rs

@@ -7,7 +7,7 @@ use swc_common::{SourceMap, SyntaxContext, DUMMY_SP};
 use swc_ecmascript::ast;
 use swc_ecmascript::visit::{Fold, FoldWith};
 
-use utils::*;
+use crate::utils::*;
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub enum DependencyKind {

packages/transformers/js/src/env_replacer.rs → packages/transformers/js/core/src/env_replacer.rs

@@ -5,7 +5,7 @@ use swc_common::{SyntaxContext, DUMMY_SP};
 use swc_ecmascript::ast;
 use swc_ecmascript::visit::Fold;
 
-use utils::*;
+use crate::utils::*;
 
 pub struct EnvReplacer<'a> {
   pub replace_env: bool,

packages/transformers/js/src/fs.rs → packages/transformers/js/core/src/fs.rs

@@ -1,7 +1,7 @@
+use crate::dependency_collector::{DependencyDescriptor, DependencyKind};
 use crate::hoist::{Collect, Import};
 use crate::utils::SourceLocation;
 use data_encoding::{BASE64, HEXLOWER};
-use dependency_collector::{DependencyDescriptor, DependencyKind};
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 use swc_atoms::JsWord;

packages/transformers/js/src/global_replacer.rs → packages/transformers/js/core/src/global_replacer.rs

@@ -6,8 +6,8 @@ use swc_common::{SourceMap, SyntaxContext, DUMMY_SP};
 use swc_ecmascript::ast;
 use swc_ecmascript::visit::{Fold, FoldWith};
 
-use dependency_collector::{DependencyDescriptor, DependencyKind};
-use utils::{create_require, SourceLocation};
+use crate::dependency_collector::{DependencyDescriptor, DependencyKind};
+use crate::utils::{create_require, SourceLocation};
 
 pub struct GlobalReplacer<'a> {
   pub source_map: &'a SourceMap,

packages/transformers/js/src/lib.rs → packages/transformers/js/core/src/lib.rs

@@ -1,6 +1,3 @@
-extern crate napi;
-#[macro_use]
-extern crate napi_derive;
 extern crate swc_common;
 extern crate swc_ecma_preset_env;
 extern crate swc_ecmascript;
@@ -13,14 +10,6 @@ extern crate serde;
 extern crate serde_bytes;
 extern crate sha1;
 
-#[cfg(target_os = "macos")]
-#[global_allocator]
-static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
-
-#[cfg(windows)]
-#[global_allocator]
-static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
-
 mod decl_collector;
 mod dependency_collector;
 mod env_replacer;
@@ -30,7 +19,6 @@ mod hoist;
 mod modules;
 mod utils;
 
-use napi::{CallContext, JsObject, JsUnknown, Result};
 use std::collections::{HashMap, HashSet};
 use std::str::FromStr;
 
@@ -39,7 +27,6 @@ use swc_common::comments::SingleThreadedComments;
 use swc_common::errors::{DiagnosticBuilder, Emitter, Handler};
 use swc_common::{chain, sync::Lrc, FileName, Globals, Mark, SourceMap};
 use swc_ecma_preset_env::{preset_env, Mode::Entry, Targets, Version, Versions};
-use swc_ecmascript::ast;
 use swc_ecmascript::ast::Module;
 use swc_ecmascript::codegen::text_writer::JsWriter;
 use swc_ecmascript::parser::lexer::Lexer;
@@ -62,7 +49,7 @@ use modules::esm2cjs;
 use utils::{CodeHighlight, Diagnostic, SourceLocation};
 
 #[derive(Serialize, Debug, Deserialize)]
-struct Config {
+pub struct Config {
   filename: String,
   #[serde(with = "serde_bytes")]
   code: Vec<u8>,
@@ -85,9 +72,9 @@ struct Config {
 }
 
 #[derive(Serialize, Debug, Deserialize, Default)]
-struct TransformResult<'a> {
+pub struct TransformResult {
   #[serde(with = "serde_bytes")]
-  code: &'a [u8],
+  code: Vec<u8>,
   map: Option<String>,
   shebang: Option<String>,
   dependencies: Vec<DependencyDescriptor>,
@@ -136,12 +123,8 @@ impl Emitter for ErrorBuffer {
   }
 }
 
-#[js_function(1)]
-fn transform(ctx: CallContext) -> Result<JsUnknown> {
-  let opts = ctx.get::<JsObject>(0)?;
-  let config: Config = ctx.env.from_js_value(opts)?;
+pub fn transform(config: Config) -> Result<TransformResult, std::io::Error> {
   let mut result = TransformResult::default();
-  let mut code_buf = vec![];
   let mut map_buf = vec![];
 
   let code = unsafe { std::str::from_utf8_unchecked(&config.code) };
@@ -197,7 +180,7 @@ fn transform(ctx: CallContext) -> Result<JsUnknown> {
         .collect();
 
       result.diagnostics = Some(diagnostics);
-      ctx.env.to_js_value(&result)
+      Ok(result)
     }
     Ok((module, comments)) => {
       let mut module = module;
@@ -333,7 +316,7 @@ fn transform(ctx: CallContext) -> Result<JsUnknown> {
                 }
                 Err(diagnostics) => {
                   result.diagnostics = Some(diagnostics);
-                  return ctx.env.to_js_value(&result);
+                  return Ok(result);
                 }
               }
             } else {
@@ -360,9 +343,8 @@ fn transform(ctx: CallContext) -> Result<JsUnknown> {
                 result.map = Some(String::from_utf8(map_buf).unwrap());
               }
             }
-            code_buf = buf;
-            result.code = &code_buf;
-            ctx.env.to_js_value(&result)
+            result.code = buf;
+            Ok(result)
           },
         )
       })
@@ -413,7 +395,7 @@ fn emit(
   comments: SingleThreadedComments,
   program: &Module,
   source_maps: bool,
-) -> Result<(Vec<u8>, Vec<(swc_common::BytePos, swc_common::LineCol)>)> {
+) -> Result<(Vec<u8>, Vec<(swc_common::BytePos, swc_common::LineCol)>), std::io::Error> {
   let mut src_map_buf = vec![];
   let mut buf = vec![];
   {
@@ -440,10 +422,3 @@ fn emit(
 
   return Ok((buf, src_map_buf));
 }
-
-#[module_exports]
-fn init(mut exports: JsObject) -> Result<()> {
-  exports.create_named_method("transform", transform)?;
-
-  Ok(())
-}

packages/transformers/js/napi/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+authors = ["Devon Govett <devongovett@gmail.com>"]
+name = "parcel-js-swc-napi"
+version = "0.1.0"
+edition = "2018"
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+napi = { version = "1", features = ["serde-json"] }
+napi-derive = "1"
+parcel-js-swc-core = { path = "../core" }
+
+[target.'cfg(target_os = "macos")'.dependencies]
+jemallocator = { version = "0.3.2", features = ["disable_initial_exec_tls"] }
+
+[target.'cfg(windows)'.dependencies]
+mimalloc = { version = "0.1.25", default-features = false }
+
+[build-dependencies]
+napi-build = { version = "1" }

packages/transformers/js/napi/src/lib.rs

@@ -0,0 +1,30 @@
+extern crate napi;
+#[macro_use]
+extern crate napi_derive;
+extern crate parcel_js_swc_core;
+
+use napi::{CallContext, JsObject, JsUnknown, Result};
+
+#[cfg(target_os = "macos")]
+#[global_allocator]
+static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;
+
+#[cfg(windows)]
+#[global_allocator]
+static ALLOC: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
+#[js_function(1)]
+fn transform(ctx: CallContext) -> Result<JsUnknown> {
+  let opts = ctx.get::<JsObject>(0)?;
+  let config: parcel_js_swc_core::Config = ctx.env.from_js_value(opts)?;
+
+  let result = parcel_js_swc_core::transform(config)?;
+  ctx.env.to_js_value(&result)
+}
+
+#[module_exports]
+fn init(mut exports: JsObject) -> Result<()> {
+  exports.create_named_method("transform", transform)?;
+
+  Ok(())
+}

packages/transformers/js/native-browser.js

@@ -0,0 +1,37 @@
+import initFn, {transform} from './wasm/dist-web/parcel_js_swc_wasm.js';
+
+export const init = initFn();
+
+function transformWrapper(config) {
+  let result = transform(config);
+  return {
+    ...result,
+    // Hydrate Uint8Array into Buffer
+    code: Buffer.from(result.code.buffer),
+    // https://github.com/cloudflare/serde-wasm-bindgen/issues/10
+    dependencies: result.dependencies?.map(d => ({
+      ...d,
+      attributes:
+        d.attributes != null
+          ? Object.fromEntries([...d.attributes])
+          : undefined,
+    })),
+    hoist_result:
+      result.hoist_result != null
+        ? {
+            ...result.hoist_result,
+            imported_symbols: Object.fromEntries([
+              ...result.hoist_result.imported_symbols,
+            ]),
+            exported_symbols: Object.fromEntries([
+              ...result.hoist_result.exported_symbols,
+            ]),
+            dynamic_imports: Object.fromEntries([
+              ...result.hoist_result.dynamic_imports,
+            ]),
+          }
+        : undefined,
+  };
+}
+
+export {transformWrapper as transform};