Moved to a workspace architecture (#247)

* Moved to a workspace architecture
boa-dev · Feb 14, 2020 · 5f6e4c2 · 5f6e4c2
1 parent cb850fc
commit 5f6e4c2
Show file tree

Hide file tree

Showing 51 changed files with 541 additions and 452 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,61 +1,28 @@
-[package]
-name = "Boa"
-version = "0.5.1"
-authors = ["Jason Williams <jase.williams@gmail.com>"]
-description = "Boa is a Javascript lexer, parser and Just-in-Time compiler written in Rust. Currently, it has support for some of the language."
-homepage = "https://github.com/jasonwilliams/boa"
-repository = "https://github.com/jasonwilliams/boa"
-keywords = ["javascript", "compiler", "lexer", "parser", "js"]
-license = "Unlicense/MIT"
-exclude = [".vscode/*", "Dockerfile", "Makefile", ".editorConfig"]
-edition = "2018"
-default-run = "boa"
-
-[features]
-default = ["wasm-bindgen"]
-
-[dependencies]
-gc = "^0.3.3"
-gc_derive = "^0.3.2"
-serde_json = "^1.0.40"
-rand = "^0.7.0"
-regex = "^1.3.0"
-structopt = "0.3.2"
-
-# Optional Dependencies
-wasm-bindgen = { version = "^0.2.50", optional = true }
-
-[dev-dependencies]
-criterion = "^0.3.0"
-
-[lib]
-crate-type = ["cdylib", "lib"]
-name = "boa"
-path = "src/lib/lib.rs"
-bench = false
-
-[[bench]]
-name = "string"
-harness = false
-
-[[bench]]
-name = "fib"
-harness = false
-
-[[bench]]
-name = "exec"
-harness = false
-
-[[bench]]
-name = "parser"
-harness = false
-
-[[bin]]
-name = "boa"
-path = "src/bin/bin.rs"
-bench = false
-
-[[bin]]
-name = "boashell"
-path = "src/bin/shell.rs"
-bench = false
+[workspace]
+members = [
+    "boa",
+    "boa_cli",
+]
+
+# The release profile, used for `cargo build`.
+[profile.dev]
+incremental = true
+opt-level = 0
+debug = true
+rpath = false
+lto = false
+debug-assertions = true
+overflow-checks = true
+panic = 'unwind'
+
+# The release profile, used for `cargo build --release`.
+[profile.release]
+incremental = false
+opt-level = 3
+debug = false
+rpath = false
+codegen-units = 1
+lto = true
+debug-assertions = false
+overflow-checks = false
+panic = 'unwind'
diff --git a/boa/Cargo.toml b/boa/Cargo.toml
@@ -0,0 +1,48 @@
+[package]
+name = "Boa"
+version = "0.5.1"
+authors = ["Jason Williams <jase.williams@gmail.com>"]
+description = "Boa is a Javascript lexer, parser and Just-in-Time compiler written in Rust. Currently, it has support for some of the language."
+repository = "https://github.com/jasonwilliams/boa"
+keywords = ["javascript", "compiler", "lexer", "parser", "js"]
+categories = ["parser-implementations", "wasm"]
+license = "Unlicense/MIT"
+exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
+edition = "2018"
+
+[features]
+default = ["wasm-bindgen"]
+
+[dependencies]
+gc = "0.3.3"
+gc_derive = "0.3.2"
+serde_json = "1.0.46"
+rand = "0.7.3"
+regex = "1.3.4"
+
+# Optional Dependencies
+wasm-bindgen = { version = "0.2.58", optional = true }
+
+[dev-dependencies]
+criterion = "0.3.1"
+
+[lib]
+crate-type = ["cdylib", "lib"]
+name = "boa"
+bench = false
+
+[[bench]]
+name = "string"
+harness = false
+
+[[bench]]
+name = "fib"
+harness = false
+
+[[bench]]
+name = "exec"
+harness = false
+
+[[bench]]
+name = "parser"
+harness = false
diff --git a/benches/exec.rs → boa/benches/exec.rs b/benches/exec.rs → boa/benches/exec.rs
diff --git a/benches/fib.rs → boa/benches/fib.rs b/benches/fib.rs → boa/benches/fib.rs
diff --git a/benches/parser.rs → boa/benches/parser.rs b/benches/parser.rs → boa/benches/parser.rs
diff --git a/benches/string.rs → boa/benches/string.rs b/benches/string.rs → boa/benches/string.rs
diff --git a/src/lib/builtins/array.rs → boa/src/builtins/array.rs b/src/lib/builtins/array.rs → boa/src/builtins/array.rs
diff --git a/src/lib/builtins/boolean.rs → boa/src/builtins/boolean.rs b/src/lib/builtins/boolean.rs → boa/src/builtins/boolean.rs
diff --git a/src/lib/builtins/console.rs → boa/src/builtins/console.rs b/src/lib/builtins/console.rs → boa/src/builtins/console.rs
diff --git a/src/lib/builtins/error.rs → boa/src/builtins/error.rs b/src/lib/builtins/error.rs → boa/src/builtins/error.rs
diff --git a/src/lib/builtins/function.rs → boa/src/builtins/function.rs b/src/lib/builtins/function.rs → boa/src/builtins/function.rs
diff --git a/src/lib/builtins/json.rs → boa/src/builtins/json.rs b/src/lib/builtins/json.rs → boa/src/builtins/json.rs
diff --git a/src/lib/builtins/math.rs → boa/src/builtins/math.rs b/src/lib/builtins/math.rs → boa/src/builtins/math.rs
diff --git a/src/lib/builtins/mod.rs → boa/src/builtins/mod.rs b/src/lib/builtins/mod.rs → boa/src/builtins/mod.rs
diff --git a/src/lib/builtins/number.rs → boa/src/builtins/number.rs b/src/lib/builtins/number.rs → boa/src/builtins/number.rs
diff --git a/src/lib/builtins/object.rs → boa/src/builtins/object.rs b/src/lib/builtins/object.rs → boa/src/builtins/object.rs
diff --git a/src/lib/builtins/object/internal_state.rs → boa/src/builtins/object/internal_state.rs b/src/lib/builtins/object/internal_state.rs → boa/src/builtins/object/internal_state.rs
diff --git a/src/lib/builtins/property.rs → boa/src/builtins/property.rs b/src/lib/builtins/property.rs → boa/src/builtins/property.rs
diff --git a/src/lib/builtins/regexp.rs → boa/src/builtins/regexp.rs b/src/lib/builtins/regexp.rs → boa/src/builtins/regexp.rs
diff --git a/src/lib/builtins/string.rs → boa/src/builtins/string.rs b/src/lib/builtins/string.rs → boa/src/builtins/string.rs
diff --git a/src/lib/builtins/symbol.rs → boa/src/builtins/symbol.rs b/src/lib/builtins/symbol.rs → boa/src/builtins/symbol.rs
diff --git a/src/lib/builtins/value.rs → boa/src/builtins/value.rs b/src/lib/builtins/value.rs → boa/src/builtins/value.rs
diff --git a/...ronment/declarative_environment_record.rs → ...ronment/declarative_environment_record.rs b/...ronment/declarative_environment_record.rs → ...ronment/declarative_environment_record.rs
diff --git a/...b/environment/environment_record_trait.rs → ...c/environment/environment_record_trait.rs b/...b/environment/environment_record_trait.rs → ...c/environment/environment_record_trait.rs
diff --git a/...nvironment/function_environment_record.rs → ...nvironment/function_environment_record.rs b/...nvironment/function_environment_record.rs → ...nvironment/function_environment_record.rs
diff --git a/.../environment/global_environment_record.rs → .../environment/global_environment_record.rs b/.../environment/global_environment_record.rs → .../environment/global_environment_record.rs
diff --git a/src/lib/environment/lexical_environment.rs → boa/src/environment/lexical_environment.rs b/src/lib/environment/lexical_environment.rs → boa/src/environment/lexical_environment.rs
diff --git a/src/lib/environment/mod.rs → boa/src/environment/mod.rs b/src/lib/environment/mod.rs → boa/src/environment/mod.rs
diff --git a/.../environment/object_environment_record.rs → .../environment/object_environment_record.rs b/.../environment/object_environment_record.rs → .../environment/object_environment_record.rs
diff --git a/src/lib/exec.rs → boa/src/exec.rs b/src/lib/exec.rs → boa/src/exec.rs
diff --git a/src/lib/lib.rs → boa/src/lib.rs b/src/lib/lib.rs → boa/src/lib.rs
diff --git a/src/lib/realm.rs → boa/src/realm.rs b/src/lib/realm.rs → boa/src/realm.rs
diff --git a/src/lib/syntax/ast/constant.rs → boa/src/syntax/ast/constant.rs b/src/lib/syntax/ast/constant.rs → boa/src/syntax/ast/constant.rs
diff --git a/src/lib/syntax/ast/expr.rs → boa/src/syntax/ast/expr.rs b/src/lib/syntax/ast/expr.rs → boa/src/syntax/ast/expr.rs
diff --git a/src/lib/syntax/ast/keyword.rs → boa/src/syntax/ast/keyword.rs b/src/lib/syntax/ast/keyword.rs → boa/src/syntax/ast/keyword.rs
diff --git a/src/lib/syntax/ast/mod.rs → boa/src/syntax/ast/mod.rs b/src/lib/syntax/ast/mod.rs → boa/src/syntax/ast/mod.rs
diff --git a/src/lib/syntax/ast/op.rs → boa/src/syntax/ast/op.rs b/src/lib/syntax/ast/op.rs → boa/src/syntax/ast/op.rs
diff --git a/src/lib/syntax/ast/pos.rs → boa/src/syntax/ast/pos.rs b/src/lib/syntax/ast/pos.rs → boa/src/syntax/ast/pos.rs
diff --git a/src/lib/syntax/ast/punc.rs → boa/src/syntax/ast/punc.rs b/src/lib/syntax/ast/punc.rs → boa/src/syntax/ast/punc.rs
diff --git a/src/lib/syntax/ast/token.rs → boa/src/syntax/ast/token.rs b/src/lib/syntax/ast/token.rs → boa/src/syntax/ast/token.rs
diff --git a/src/lib/syntax/lexer.rs → boa/src/syntax/lexer.rs b/src/lib/syntax/lexer.rs → boa/src/syntax/lexer.rs
diff --git a/src/lib/syntax/mod.rs → boa/src/syntax/mod.rs b/src/lib/syntax/mod.rs → boa/src/syntax/mod.rs
diff --git a/src/lib/syntax/parser.rs → boa/src/syntax/parser.rs b/src/lib/syntax/parser.rs → boa/src/syntax/parser.rs
diff --git a/src/lib/wasm.rs → boa/src/wasm.rs b/src/lib/wasm.rs → boa/src/wasm.rs
diff --git a/boa_cli/Cargo.toml b/boa_cli/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "boa_cli"
+version = "0.1.0"
+authors = ["razican <iban.eguia@cern.ch>"]
+description = "Boa is a Javascript lexer, parser and Just-in-Time compiler written in Rust. Currently, it has support for some of the language."
+repository = "https://github.com/jasonwilliams/boa"
+keywords = ["javascript", "compiler", "lexer", "parser", "js", "cli"]
+categories = ["command-line-utilities"]
+license = "Unlicense/MIT"
+exclude = ["../.vscode/*", "../Dockerfile", "../Makefile", "../.editorConfig"]
+edition = "2018"
+
+[dependencies]
+Boa = { path = "../boa" }
+structopt = "0.3.9"
diff --git a/boa_cli/src/main.rs b/boa_cli/src/main.rs
@@ -0,0 +1,39 @@
+#![deny(unused_qualifications, clippy::correctness, clippy::style)]
+#![warn(clippy::perf)]
+#![allow(clippy::cognitive_complexity)]
+
+use boa::{exec, exec::Executor, forward_val, realm::Realm};
+use std::{fs::read_to_string, path::PathBuf};
+use structopt::StructOpt;
+
+/// CLI configuration for Boa.
+#[derive(Debug, StructOpt)]
+#[structopt(author, about)]
+struct Opt {
+    /// The javascript file to be evaluated.
+    #[structopt(name = "FILE", parse(from_os_str), default_value = "tests/js/test.js")]
+    file: PathBuf,
+    /// Open a boa shell (WIP).
+    #[structopt(short, long)]
+    shell: bool,
+}
+
+pub fn main() -> Result<(), std::io::Error> {
+    let args = Opt::from_args();
+
+    let buffer = read_to_string(args.file)?;
+
+    if args.shell {
+        let realm = Realm::create();
+        let mut engine = Executor::new(realm);
+
+        match forward_val(&mut engine, &buffer) {
+            Ok(v) => print!("{}", v.to_string()),
+            Err(v) => eprint!("{}", v.to_string()),
+        }
+    } else {
+        dbg!(exec(&buffer));
+    }
+
+    Ok(())
+}
diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 // Note that a dynamic `import` statement here is required due to
 // webpack/webpack#6615, but in theory `import { greet } from './pkg/hello_world';`
 // will work here one day as well!
-const rust = import("./pkg");
+const rust = import("./boa/pkg");
 import * as monaco from "monaco-editor";
 // const image = import("./assets/01_rust_loves_js.png");
 
@@ -14,8 +14,7 @@ greet('World')
 `;
 
 const editor = monaco.editor.create(
-  document.getElementsByClassName("textbox")[0],
-  {
+  document.getElementsByClassName("textbox")[0], {
     value: initialCode,
     language: "javascript",
     theme: "vs",
@@ -42,4 +41,4 @@ function inputHandler(evt) {
   let p = document.querySelector("p.output");
   let result = window.evaluate(text);
   p.textContent = `> ${result}`;
-}
+}
diff --git a/src/bin/bin.rs b/src/bin/bin.rs
diff --git a/src/bin/shell.rs b/src/bin/shell.rs
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,6 +1,8 @@
 const path = require("path");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
-const { CleanWebpackPlugin } = require("clean-webpack-plugin");
+const {
+  CleanWebpackPlugin
+} = require("clean-webpack-plugin");
 const CopyWebpackPlugin = require("copy-webpack-plugin");
 const webpack = require("webpack");
 const WasmPackPlugin = require("@wasm-tool/wasm-pack-plugin");
@@ -18,10 +20,13 @@ module.exports = {
       template: "index.html"
     }),
     new WasmPackPlugin({
-      crateDirectory: path.resolve(__dirname, ".")
+      crateDirectory: path.resolve(__dirname, "./boa/"),
+      outDir: path.resolve(__dirname, "./boa/pkg/")
     }),
-    new CopyWebpackPlugin([
-      { from: "./assets/*", to: "." },
+    new CopyWebpackPlugin([{
+        from: "./assets/*",
+        to: "."
+      },
       {
         from: "./node_modules/bootstrap/dist/css/bootstrap.min.css",
         to: "./assets"
@@ -38,8 +43,7 @@ module.exports = {
     })
   ],
   module: {
-    rules: [
-      {
+    rules: [{
         test: /\.css$/,
         use: ["style-loader", "css-loader"]
       },
@@ -50,4 +54,4 @@ module.exports = {
     ]
   },
   mode: "development"
-};
+};