Simplify lib

Author: kddnewton

.gitignore

@@ -1,10 +1,9 @@
 /docs/index.js*
 /head-wasm32-unknown-wasi-full-js/
-/lib/lib/
+/lib/
 /node_modules/
 /ruby.wasm
 /src/app.wasm
 /vendor/
 /wasi-vfs
-/wasmtime
 /yarn-error.log

Rakefile

@@ -14,11 +14,6 @@ file "wasi-vfs" do
   rm filename
 end
 
-file "wasmtime" do
-  `curl https://wasmtime.dev/install.sh -sSf | bash`
-  cp "#{ENV["HOME"]}/.wasmtime/bin/wasmtime", "wasmtime"
-end
-
 file "head-wasm32-unknown-wasi-full-js" do
   require "json"
   version = JSON.parse(File.read("package.json"))["dependencies"]["ruby-head-wasm-wasi"][1..]
@@ -30,15 +25,15 @@ file "head-wasm32-unknown-wasi-full-js" do
 end
 
 file "ruby.wasm" => ["head-wasm32-unknown-wasi-full-js"] do
-  mv "head-wasm32-unknown-wasi-full-js/usr/local/bin/ruby", "ruby.wasm"
+  cp "head-wasm32-unknown-wasi-full-js/usr/local/bin/ruby", "ruby.wasm"
 end
 
-file "src/app.wasm" => ["wasi-vfs", "wasmtime", "ruby.wasm", "lib/app.rb"] do
+file "src/app.wasm" => ["Gemfile.lock", "wasi-vfs", "ruby.wasm"] do
   require "bundler/setup"
-  cp_r $:.find { _1.include?("syntax_tree") }, "lib/lib"
+  cp_r $:.find { _1.include?("syntax_tree") }, "lib"
 
   `./wasi-vfs pack ruby.wasm --mapdir /lib::./lib --mapdir /usr::./head-wasm32-unknown-wasi-full-js/usr -o src/app.wasm`
-  rm_rf "lib/lib"
+  rm_rf "lib"
 end
 
 task default: ["src/app.wasm"]

lib/app.rb

@@ -65,7 +65,12 @@ export default async function createRuby() {
   // Once our virtual machine is booted, we're going to require the necessary
   // files to make it work. I'm not sure why I need to explicitly require
   // did_you_mean here, but it doesn't work without it.
-  ruby.eval(`require "did_you_mean"; require "json"; require_relative "/lib/app"`);
+  ruby.eval(`
+    require "did_you_mean"
+    require "json"
+    $:.unshift("/lib")
+    require_relative "/lib/syntax_tree"
+  `);
 
   return {
     // A function that calls through to PP to get the pretty-printed version of

src/createRuby.ts

@@ -19,7 +19,7 @@ const initialState: State = {
 
 type Action = (
   | { type: "changeSource", source: string }
-  | { type: "createRuby", ruby: Ruby }
+  | { type: "createRuby", ruby: Ruby, output: string }
   | { type: "evaluateSource", output: string }
   | { type: "syntaxErrorSource" }
 );
@@ -29,7 +29,7 @@ function reducer(state: State, action: Action): State {
     case "changeSource":
       return { ...state, state: "evaluating", source: action.source };
     case "createRuby":
-      return { ...state, state: "ready", ruby: action.ruby };
+      return { ...state, state: "ready", ruby: action.ruby, output: action.output };
     case "evaluateSource":
       return { ...state, state: "ready", output: action.output };
     case "syntaxErrorSource":
@@ -48,7 +48,7 @@ const App: React.FC = () => {
     switch (state.state) {
       case "initializing":
         createRuby().then((ruby) => {
-          dispatch({ type: "createRuby", ruby });
+          dispatch({ type: "createRuby", ruby, output: ruby.prettyPrint(state.source) });
         });
         return;
       case "evaluating":