Mac build script

2 years ago · b42ab4c6de
parent ce8e691a57
commit b42ab4c6de
28 changed files with 171 additions and 92 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -470,7 +470,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
 [[package]]
 name = "cozo"
-version = "0.1.7"
+version = "0.2.0"
 dependencies = [
 "approx",
 "base64",
@ -519,7 +519,7 @@ dependencies = [
 [[package]]
 name = "cozo-lib-wasm"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
 "console_error_panic_hook",
 "cozo",
@ -530,7 +530,7 @@ dependencies = [
 [[package]]
 name = "cozo-node"
-version = "0.1.6"
+version = "0.2.0"
 dependencies = [
 "cozo",
 "lazy_static",
@ -539,7 +539,7 @@ dependencies = [
 [[package]]
 name = "cozo-swift"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
 "cozo",
 "swift-bridge",
@ -548,7 +548,7 @@ dependencies = [
 [[package]]
 name = "cozo_c"
-version = "0.1.3"
+version = "0.2.0"
 dependencies = [
 "cbindgen",
 "cozo",
@ -557,7 +557,7 @@ dependencies = [
 [[package]]
 name = "cozo_java"
-version = "0.1.3"
+version = "0.2.0"
 dependencies = [
 "cozo",
 "jni",
@ -566,7 +566,7 @@ dependencies = [
 [[package]]
 name = "cozo_py_module"
-version = "0.1.7"
+version = "0.2.0"
 dependencies = [
 "cozo",
 "pyo3",
@ -589,7 +589,7 @@ dependencies = [
 [[package]]
 name = "cozoserver"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
 "chrono",
 "clap",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,3 @@
 #[profile.release]
 #lto = true
 [workspace]
 members = [
    "cozo-core",
--- a/1
+++ b/1
@ -0,0 +1 @@
 0.2.0
--- a/build-release-mac.sh
+++ b/build-release-mac.sh
@ -2,20 +2,35 @@
 set -e
-VERSION=$(cat ./Cargo.toml | grep -E "^version" | grep -Eo '[0-9.]+')
+VERSION=$(cat ./VERSION)
 ARCH=$(uname -m)
-rm -fr release
+#rm -fr release
-mkdir release
+mkdir -p release
-cargo build --release
+for TARGET in x86_64-apple-darwin aarch64-apple-darwin; do
-cargo build --release --manifest-path=cozo-lib-c/Cargo.toml
+  # standalone, c, java, nodejs
-cargo build --release --manifest-path=cozo-lib-java/Cargo.toml
+  CARGO_PROFILE_RELEASE_LTO=fat cargo build --release -p cozoserver -p cozo_c -p cozo_java -p cozo-node -F compact -F storage-rocksdb --target $TARGET
  cp target/$TARGET/release/cozoserver release/cozoserver-$VERSION-$TARGET # standalone
  cp target/$TARGET/release/libcozo_c.a release/libcozo_c-$VERSION-$TARGET.a # c static
  cp target/$TARGET/release/libcozo_c.dylib release/libcozo_c-$VERSION-$TARGET.dylib # c dynamic
  cp target/$TARGET/release/libcozo_java.dylib release/libcozo_java-$VERSION-$TARGET.dylib # java
  cp target/$TARGET/release/libcozo_node.dylib release/libcozo_node-$VERSION-$TARGET.dylib # nodejs
-cp target/release/cozoserver release/cozoserver-${VERSION}-mac-${ARCH}
+  # python
-cp target/release/libcozo_c.a release/libcozo_c-${VERSION}-mac-${ARCH}.a
+  cd cozo-lib-python
-cp target/release/libcozo_c.dylib release/libcozo_c-${VERSION}-mac-${ARCH}.dylib
+  CARGO_PROFILE_RELEASE_LTO=fat PYO3_NO_PYTHON=1 maturin build -F compact -F storage-rocksdb --release --strip --target $TARGET
-cp target/release/libcozo_java.dylib release/libcozo_java-${VERSION}-mac-${ARCH}.dylib
+  cd ..
-strip release/cozoserver-${VERSION}-mac-${ARCH}
+done
-gzip release/*
+# copy python
 cp target/wheels/*.whl release/
 # swift
 cd cozo-lib-swift
 CARGO_PROFILE_RELEASE_LTO=fat ./build-rust.sh
 cd ..
 # WASM
 cd cozo-lib-wasm
 CARGO_PROFILE_RELEASE_LTO=fat ./build.sh
 cd ..
--- a/cozo-core/Cargo.toml
+++ b/cozo-core/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cozo"
-version = "0.1.7"
+version = "0.2.0"
 edition = "2021"
 description = "A general-purpose, transactional, relational database that uses Datalog and focuses on graph data and algorithms"
 authors = ["Ziyang Hu"]
@ -9,12 +9,9 @@ homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 exclude = [
    "docs/*",
    "tests/*",
 ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
 #! # Features
--- a/cozo-lib-c/Cargo.toml
+++ b/cozo-lib-c/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cozo_c"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
@ -42,7 +42,7 @@ nothread = ["cozo/nothread"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-cozo = { version = "0.1.2", path = "../cozo-core", default_features = false }
+cozo = { version = "0.2.0", path = "../cozo-core", default_features = false }
 lazy_static = "1.4.0"
 [build-dependencies]
--- a/cozo-lib-java/Cargo.toml
+++ b/cozo-lib-java/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "cozo_java"
-version = "0.1.3"
+version = "0.2.0"
 edition = "2021"
 license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
@ -21,5 +21,5 @@ io-uring = ["cozo/io-uring"]
 [dependencies]
 jni = "0.20.0"
 # , features = ["compact"]
-cozo = { version = "0.1.3", path = "../cozo-core", default_features = false, features = ["compact"] }
+cozo = { version = "0.2.0", path = "../cozo-core", default_features = false, features = ["compact"] }
 lazy_static = "1.4.0"
--- a/cozo-lib-nodejs/Cargo.toml
+++ b/cozo-lib-nodejs/Cargo.toml
@ -1,9 +1,12 @@
 [package]
 name = "cozo-node"
-version = "0.1.6"
+version = "0.2.0"
 description = "Cozo database for NodeJS"
 authors = ["Ziyang Hu"]
-license = "MIT/Apache-2.0/BSD-3-Clause"
+license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 edition = "2021"
 exclude = ["index.node"]
@ -41,7 +44,7 @@ nothread = ["cozo/nothread"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-cozo = { version = "0.1.7", path = "../cozo-core", default-features = false }
+cozo = { version = "0.2.0", path = "../cozo-core", default-features = false }
 lazy_static = "1.4.0"
 [dependencies.neon]
--- a/cozo-lib-nodejs/LICENSE.txt
+++ b/cozo-lib-nodejs/LICENSE.txt
@ -1,21 +0,0 @@
 MIT License
 Copyright (c) 2022 Ziyang Hu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/cozo-lib-nodejs/index.js
+++ b/cozo-lib-nodejs/index.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 const binary = require('@mapbox/node-pre-gyp');
 const path = require('path');
 const binding_path = binary.find(path.resolve(path.join(__dirname, './package.json')));
--- a/cozo-lib-nodejs/src/lib.rs
+++ b/cozo-lib-nodejs/src/lib.rs
@ -1,5 +1,9 @@
 /*
- * Copyright 2022, The Cozo Project Authors. Licensed under MIT/Apache-2.0/BSD-3-Clause.
+ * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 use std::collections::BTreeMap;
 use std::sync::atomic::{AtomicU32, Ordering};
--- a/cozo-lib-python/Cargo.toml
+++ b/cozo-lib-python/Cargo.toml
@ -1,7 +1,13 @@
 [package]
 name = "cozo_py_module"
-version = "0.1.7"
+version = "0.2.0"
 edition = "2021"
 description = "Cozo database for python"
 authors = ["Ziyang Hu"]
 license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -39,5 +45,5 @@ nothread = ["cozo/nothread"]
 [dependencies]
 cozo = { version = "0.2.0", path = "../cozo-core", default-features = false }
 pyo3 = { version = "0.17.1", features = ["extension-module", "abi3", "abi3-py37"] }
 cozo = { version = "0.1.7", path = "../cozo-core", default-features = false }
--- a/cozo-lib-python/LICENSE.txt
+++ b/cozo-lib-python/LICENSE.txt
@ -1,21 +0,0 @@
 MIT License
 Copyright (c) 2022 Ziyang Hu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/cozo-lib-python/src/lib.rs
+++ b/cozo-lib-python/src/lib.rs
@ -1,5 +1,9 @@
 /*
- * Copyright 2022, The Cozo Project Authors. Licensed under MIT/Apache-2.0/BSD-3-Clause.
+ * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 use pyo3::exceptions::PyException;
--- a/cozo-lib-swift/Cargo.toml
+++ b/cozo-lib-swift/Cargo.toml
@ -1,7 +1,13 @@
 [package]
 name = "cozo-swift"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "Cozo database for Swift"
 authors = ["Ziyang Hu"]
 license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 [lib]
 crate-type = ["staticlib"]
@ -17,5 +23,5 @@ io-uring = ["cozo/io-uring"]
 swift-bridge-build = "0.1.41"
 [dependencies]
 cozo = { version = "0.2.0", path = "../cozo-core", default-features = false, features = ["compact"] }
 swift-bridge = "0.1.41"
 cozo = { version = "0.1.7", path = "../cozo-core", default-features = false, features = ["compact"] }
--- a/cozo-lib-swift/build-rust.sh
+++ b/cozo-lib-swift/build-rust.sh
@ -6,8 +6,8 @@ cd $THISDIR
 export SWIFT_BRIDGE_OUT_DIR="$(pwd)/generated"
 # Build the project for the desired platforms:
-cargo build -p cozo-swift --target x86_64-apple-darwin --release
+cargo build -p cozo-swift -F storage-rocksdb --target x86_64-apple-darwin --release
-cargo build -p cozo-swift --target aarch64-apple-darwin --release
+cargo build -p cozo-swift -F storage-rocksdb --target aarch64-apple-darwin --release
 mkdir -p ../target/universal-macos/release
 lipo \
@ -16,9 +16,9 @@ lipo \
    ../target/universal-macos/release/libcozo_swift.a
 cargo build -p cozo-swift --target aarch64-apple-ios --release
 cargo build -p cozo-swift --target x86_64-apple-ios --release
 cargo build -p cozo-swift --target aarch64-apple-ios-sim --release
 mkdir -p ../target/universal-ios/release
 lipo \
--- a/cozo-lib-swift/src/lib.rs
+++ b/cozo-lib-swift/src/lib.rs
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 use cozo::*;
 #[swift_bridge::bridge]
--- a/cozo-lib-wasm/Cargo.toml
+++ b/cozo-lib-wasm/Cargo.toml
@ -1,9 +1,13 @@
 [package]
 name = "cozo-lib-wasm"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Ziyang Hu <hu.ziyang@cantab.net>"]
 edition = "2021"
 description = "Cozo database for WASM"
 authors = ["Ziyang Hu"]
 license = "MPL-2.0"
 homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 [lib]
 crate-type = ["cdylib", "rlib"]
@ -13,7 +17,7 @@ default = ["console_error_panic_hook"]
 [dependencies]
 wasm-bindgen = "0.2.63"
-cozo = { version = "0.1.7", path = "../cozo-core", default-features = false, features = ["wasm", "graph-algo", "nothread"] }
+cozo = { version = "0.2.0", path = "../cozo-core", default-features = false, features = ["wasm", "graph-algo", "nothread"] }
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
--- a/cozo-lib-wasm/wasm-react-demo/public/index.html
+++ b/cozo-lib-wasm/wasm-react-demo/public/index.html
@ -1,3 +1,11 @@
 <!--
  ~ Copyright 2022, The Cozo Project Authors.
  ~
  ~ This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
  ~ If a copy of the MPL was not distributed with this file,
  ~ You can obtain one at https://mozilla.org/MPL/2.0/.
  -->
 <!DOCTYPE html>
 <html lang="en">
  <head>
--- a/cozo-lib-wasm/wasm-react-demo/src/App.css
+++ b/cozo-lib-wasm/wasm-react-demo/src/App.css
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
@import "~normalize.css";
@import "~@blueprintjs/core/lib/css/blueprint.css";
--- a/cozo-lib-wasm/wasm-react-demo/src/App.js
+++ b/cozo-lib-wasm/wasm-react-demo/src/App.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 import './App.css';
 import {Button, Intent, Tag, TextArea} from "@blueprintjs/core";
 import {Cell, Column, Table2} from "@blueprintjs/table";
--- a/cozo-lib-wasm/wasm-react-demo/src/App.test.js
+++ b/cozo-lib-wasm/wasm-react-demo/src/App.test.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 import { render, screen } from '@testing-library/react';
 import App from './App';
--- a/cozo-lib-wasm/wasm-react-demo/src/index.css
+++ b/cozo-lib-wasm/wasm-react-demo/src/index.css
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 body {
  margin: 0;
  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
--- a/cozo-lib-wasm/wasm-react-demo/src/index.js
+++ b/cozo-lib-wasm/wasm-react-demo/src/index.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
--- a/cozo-lib-wasm/wasm-react-demo/src/logo.svg
+++ b/cozo-lib-wasm/wasm-react-demo/src/logo.svg
@ -1 +0,0 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>
--- a/cozo-lib-wasm/wasm-react-demo/src/reportWebVitals.js
+++ b/cozo-lib-wasm/wasm-react-demo/src/reportWebVitals.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 const reportWebVitals = onPerfEntry => {
  if (onPerfEntry && onPerfEntry instanceof Function) {
    import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
--- a/cozo-lib-wasm/wasm-react-demo/src/setupTests.js
+++ b/cozo-lib-wasm/wasm-react-demo/src/setupTests.js
@ -1,3 +1,11 @@
 /*
 * Copyright 2022, The Cozo Project Authors.
 *
 * This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
 * If a copy of the MPL was not distributed with this file,
 * You can obtain one at https://mozilla.org/MPL/2.0/.
 */
 // jest-dom adds custom jest matchers for asserting on DOM nodes.
 // allows you to do things like:
 // expect(element).toHaveTextContent(/react/i)
--- a/cozoserver/Cargo.toml
+++ b/cozoserver/Cargo.toml
@ -1,8 +1,13 @@
 [package]
 name = "cozoserver"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "MPL-2.0"
 description = "Standalone Cozo database"
 authors = ["Ziyang Hu"]
 homepage = "https://github.com/cozodb/cozo"
 repository = "https://github.com/cozodb/cozo"
 documentation = "https://cozodb.github.io/current/manual"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -37,7 +42,7 @@ nothread = ["cozo/nothread"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-cozo = { version = "0.1.7", path = "../cozo-core", default-features = false }
+cozo = { version = "0.2.0", path = "../cozo-core", default-features = false }
 clap = { version = "3.2.8", features = ["derive"] }
 rouille = "3.5.0"
 env_logger = "0.9.3"
		`@ -1 +0,0 @@`
			<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>