update for new version (doesn't really matter though)

Cargo.toml

@@ -1,8 +1,11 @@
 [package]
-name = "bitsy-merge"
+name = "mixsy"
-version = "0.71.0"
+description = "combine Bitsy games"
+version = "0.710.0"
 authors = ["Max Bradbury <max@tinybird.info>"]
 edition = "2018"
+license = "MIT"
+repository = "https://tinybird.dev/max/mixsy"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -10,6 +13,6 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-"bitsy-parser" = "^0.72.0"
+"bitsy-parser" = "^0.710.0"
 "lazy_static"  = "^1.4.0"
-"wasm-bindgen" = "^0.2.64"
+"wasm-bindgen" = "^0.2.78"

build.sh

@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
+cargo build
 pug index.pug
-set -ex
 wasm-pack build --target web

deploy.sh

@@ -1,6 +1,4 @@
 #!/bin/sh
 
-./build.sh
-
 zip -r mixsy.zip README.md index.html merge.png pkg
 butler push mixsy.zip ruin/mixsy:html

index.js

@@ -8,12 +8,24 @@ async function run() {
     const output       = document.getElementById('c');
     const merge_button = document.getElementById('merge');
 
+    function handleResult(inputElement, message) {
+        console.log(message);
+        let messageBox = inputElement.nextSibling;
+        messageBox.innerText = message;
+        messageBox.style.display = "block"
+        setTimeout(() => {messageBox.style.display = "none"}, 4000);
+    }
+
     main.addEventListener('change', () => {
-        console.debug(load_main(main.value));
+        if (main.value) {
+            handleResult(main, load_main(main.value));
+        }
     });
 
     additional.addEventListener('change', () => {
-        console.debug(load_additional(additional.value));
+        if (additional.value) {
+            handleResult(additional, load_additional(additional.value));
+        }
     });
 
     function mix() {

index.pug

@@ -3,6 +3,8 @@ html(lang="en-gb")
     head
         meta(content="text/html;charset=utf-8" http-equiv="Content-Type")
         title mixsy
+        //- no favicon!! taken from: https://k1ss.org/blog/20191004a
+        <link href=data:, rel=icon>
         style
             include style.css
     body
@@ -13,9 +15,11 @@ html(lang="en-gb")
                 #main.square.left
                     h2 main
                     textarea#a(placeholder="Paste your main game data here...")
+                    p.result
                 #additional.square.left
                     h2 additional
                     textarea#b(placeholder="Paste additional game data here...")
+                    p.result
             .row.middle
                 img.centre(src="merge.png" alt="")
                 button#merge.centre mix!
@@ -23,6 +27,5 @@ html(lang="en-gb")
                 .square.centre
                     h2 output
                     textarea#c
-        //- Note the usage of `type=module` here as this is an ES6 module -->
         script(type="module")
             include index.js

src/lib.rs

@@ -16,10 +16,11 @@ lazy_static! {
 
 #[wasm_bindgen]
 pub fn load_main(game_data: String) -> String {
-    let game = Game::from(game_data);
+    let result = Game::from(game_data);
 
-    if game.is_ok() {
+    if result.is_ok() {
-        STATE.lock().unwrap().main = Some(game.unwrap());
+        let (game, _errors) = result.unwrap();
+        STATE.lock().unwrap().main = Some(game);
         "OK!"
     } else {
         "Could not parse game data"
@@ -28,10 +29,11 @@ pub fn load_main(game_data: String) -> String {
 
 #[wasm_bindgen]
 pub fn load_additional(game_data: String) -> String {
-    let game = Game::from(game_data);
+    let result = Game::from(game_data);
 
-    if game.is_ok() {
+    if result.is_ok() {
-        STATE.lock().unwrap().additional = Some(game.unwrap());
+        let (game, _errors) = result.unwrap();
+        STATE.lock().unwrap().additional = Some(game);
         "OK!"
     } else {
         "Could not parse game data"
@@ -41,8 +43,14 @@ pub fn load_additional(game_data: String) -> String {
 #[wasm_bindgen]
 pub fn merge() -> String {
     let state = STATE.lock().unwrap();
+
+    if state.main.is_none() || state.additional.is_none() {
+        return "".to_string();
+    }
+
     let mut main = state.main.clone().unwrap();
-    let additional = state.additional.clone().unwrap();
+    let additional = state.additional.as_ref().unwrap();
+
     main.merge(additional);
     main.dedupe_tiles();
     main.to_string()

style.css

@@ -72,6 +72,12 @@ textarea {
     float: left;
 }
 
+.result {
+    position: relative;
+    background: var(--bg);
+    color: var(--inverse);
+}
+
 .row {
     width: 100%;
     height: calc(82vmin / 3);
@@ -81,4 +87,4 @@ textarea {
     width: 50vmin;
     height: 100%;
     padding: 0.5em;
-}
+}