diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8519ac5e..edc5680b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,10 +2,10 @@ name: CI on: push: branches: - - main + - main pull_request: branches: - - main + - main jobs: fmt: runs-on: ubuntu-latest @@ -14,7 +14,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.67.0 + toolchain: 1.64.0 default: true components: rustfmt - uses: Swatinem/rust-cache@v1 @@ -28,7 +28,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.67.0 + toolchain: 1.64.0 default: true components: clippy - uses: Swatinem/rust-cache@v1 @@ -42,7 +42,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.67.0 + toolchain: 1.64.0 default: true - uses: Swatinem/rust-cache@v1 - name: Build rust docs @@ -77,28 +77,6 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: run tests run: ./scripts/ci/wasm_tests - deno_tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: denoland/setup-deno@v1 - with: - deno-version: v1.x - - name: Install wasm-bindgen-cli - run: cargo install wasm-bindgen-cli wasm-opt - - name: Install wasm32 target - run: rustup target add wasm32-unknown-unknown - - name: run tests - run: ./scripts/ci/deno_tests - - js_fmt: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: install - run: yarn global add prettier - - name: format - run: prettier -c javascript/.prettierrc javascript js_tests: runs-on: ubuntu-latest @@ -118,7 +96,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: nightly-2023-01-26 + toolchain: 1.64.0 default: true - uses: Swatinem/rust-cache@v1 - name: Install CMocka @@ -127,8 +105,6 @@ jobs: uses: jwlawson/actions-setup-cmake@v1.12 with: cmake-version: latest - - name: Install rust-src - run: rustup component add rust-src - name: Build and test C bindings run: ./scripts/ci/cmake-build Release Static shell: bash @@ -138,7 +114,9 @@ jobs: strategy: matrix: toolchain: - - 1.67.0 + - 1.60.0 + - nightly + continue-on-error: ${{ matrix.toolchain == 'nightly' }} steps: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 @@ -157,7 +135,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.67.0 + toolchain: 1.64.0 default: true - uses: Swatinem/rust-cache@v1 - run: ./scripts/ci/build-test @@ -170,7 +148,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.67.0 + toolchain: 1.64.0 default: true - uses: Swatinem/rust-cache@v1 - run: ./scripts/ci/build-test diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index 762671ff..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,214 +0,0 @@ -name: Release -on: - push: - branches: - - main - -jobs: - check_if_wasm_version_upgraded: - name: Check if WASM version has been upgraded - runs-on: ubuntu-latest - outputs: - wasm_version: ${{ steps.version-updated.outputs.current-package-version }} - wasm_has_updated: ${{ steps.version-updated.outputs.has-updated }} - steps: - - uses: JiPaix/package-json-updated-action@v1.0.5 - id: version-updated - with: - path: rust/automerge-wasm/package.json - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - publish-wasm: - name: Publish WASM package - runs-on: ubuntu-latest - needs: - - check_if_wasm_version_upgraded - # We create release only if the version in the package.json has been upgraded - if: needs.check_if_wasm_version_upgraded.outputs.wasm_has_updated == 'true' - steps: - - uses: actions/setup-node@v3 - with: - node-version: '16.x' - registry-url: 'https://registry.npmjs.org' - - uses: denoland/setup-deno@v1 - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.ref }} - - name: Get rid of local github workflows - run: rm -r .github/workflows - - name: Remove tmp_branch if it exists - run: git push origin :tmp_branch || true - - run: git checkout -b tmp_branch - - name: Install wasm-bindgen-cli - run: cargo install wasm-bindgen-cli wasm-opt - - name: Install wasm32 target - run: rustup target add wasm32-unknown-unknown - - name: run wasm js tests - id: wasm_js_tests - run: ./scripts/ci/wasm_tests - - name: run wasm deno tests - id: wasm_deno_tests - run: ./scripts/ci/deno_tests - - name: build release - id: build_release - run: | - npm --prefix $GITHUB_WORKSPACE/rust/automerge-wasm run release - - name: Collate deno release files - if: steps.wasm_js_tests.outcome == 'success' && steps.wasm_deno_tests.outcome == 'success' - run: | - mkdir $GITHUB_WORKSPACE/deno_wasm_dist - cp $GITHUB_WORKSPACE/rust/automerge-wasm/deno/* $GITHUB_WORKSPACE/deno_wasm_dist - cp $GITHUB_WORKSPACE/rust/automerge-wasm/index.d.ts $GITHUB_WORKSPACE/deno_wasm_dist - cp $GITHUB_WORKSPACE/rust/automerge-wasm/README.md $GITHUB_WORKSPACE/deno_wasm_dist - cp $GITHUB_WORKSPACE/rust/automerge-wasm/LICENSE $GITHUB_WORKSPACE/deno_wasm_dist - sed -i '1i /// ' $GITHUB_WORKSPACE/deno_wasm_dist/automerge_wasm.js - - name: Create npm release - if: steps.wasm_js_tests.outcome == 'success' && steps.wasm_deno_tests.outcome == 'success' - run: | - if [ "$(npm --prefix $GITHUB_WORKSPACE/rust/automerge-wasm show . version)" = "$VERSION" ]; then - echo "This version is already published" - exit 0 - fi - EXTRA_ARGS="--access public" - if [[ $VERSION == *"alpha."* ]] || [[ $VERSION == *"beta."* ]] || [[ $VERSION == *"rc."* ]]; then - echo "Is pre-release version" - EXTRA_ARGS="$EXTRA_ARGS --tag next" - fi - if [ "$NODE_AUTH_TOKEN" = "" ]; then - echo "Can't publish on NPM, You need a NPM_TOKEN secret." - false - fi - npm publish $GITHUB_WORKSPACE/rust/automerge-wasm $EXTRA_ARGS - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - VERSION: ${{ needs.check_if_wasm_version_upgraded.outputs.wasm_version }} - - name: Commit wasm deno release files - run: | - git config --global user.name "actions" - git config --global user.email actions@github.com - git add $GITHUB_WORKSPACE/deno_wasm_dist - git commit -am "Add deno release files" - git push origin tmp_branch - - name: Tag wasm release - if: steps.wasm_js_tests.outcome == 'success' && steps.wasm_deno_tests.outcome == 'success' - uses: softprops/action-gh-release@v1 - with: - name: Automerge Wasm v${{ needs.check_if_wasm_version_upgraded.outputs.wasm_version }} - tag_name: js/automerge-wasm-${{ needs.check_if_wasm_version_upgraded.outputs.wasm_version }} - target_commitish: tmp_branch - generate_release_notes: false - draft: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Remove tmp_branch - run: git push origin :tmp_branch - check_if_js_version_upgraded: - name: Check if JS version has been upgraded - runs-on: ubuntu-latest - outputs: - js_version: ${{ steps.version-updated.outputs.current-package-version }} - js_has_updated: ${{ steps.version-updated.outputs.has-updated }} - steps: - - uses: JiPaix/package-json-updated-action@v1.0.5 - id: version-updated - with: - path: javascript/package.json - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - publish-js: - name: Publish JS package - runs-on: ubuntu-latest - needs: - - check_if_js_version_upgraded - - check_if_wasm_version_upgraded - - publish-wasm - # We create release only if the version in the package.json has been upgraded and after the WASM release - if: | - (always() && ! cancelled()) && - (needs.publish-wasm.result == 'success' || needs.publish-wasm.result == 'skipped') && - needs.check_if_js_version_upgraded.outputs.js_has_updated == 'true' - steps: - - uses: actions/setup-node@v3 - with: - node-version: '16.x' - registry-url: 'https://registry.npmjs.org' - - uses: denoland/setup-deno@v1 - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - ref: ${{ github.ref }} - - name: Get rid of local github workflows - run: rm -r .github/workflows - - name: Remove js_tmp_branch if it exists - run: git push origin :js_tmp_branch || true - - run: git checkout -b js_tmp_branch - - name: check js formatting - run: | - yarn global add prettier - prettier -c javascript/.prettierrc javascript - - name: run js tests - id: js_tests - run: | - cargo install wasm-bindgen-cli wasm-opt - rustup target add wasm32-unknown-unknown - ./scripts/ci/js_tests - - name: build js release - id: build_release - run: | - npm --prefix $GITHUB_WORKSPACE/javascript run build - - name: build js deno release - id: build_deno_release - run: | - VERSION=$WASM_VERSION npm --prefix $GITHUB_WORKSPACE/javascript run deno:build - env: - WASM_VERSION: ${{ needs.check_if_wasm_version_upgraded.outputs.wasm_version }} - - name: run deno tests - id: deno_tests - run: | - npm --prefix $GITHUB_WORKSPACE/javascript run deno:test - - name: Collate deno release files - if: steps.js_tests.outcome == 'success' && steps.deno_tests.outcome == 'success' - run: | - mkdir $GITHUB_WORKSPACE/deno_js_dist - cp $GITHUB_WORKSPACE/javascript/deno_dist/* $GITHUB_WORKSPACE/deno_js_dist - - name: Create npm release - if: steps.js_tests.outcome == 'success' && steps.deno_tests.outcome == 'success' - run: | - if [ "$(npm --prefix $GITHUB_WORKSPACE/javascript show . version)" = "$VERSION" ]; then - echo "This version is already published" - exit 0 - fi - EXTRA_ARGS="--access public" - if [[ $VERSION == *"alpha."* ]] || [[ $VERSION == *"beta."* ]] || [[ $VERSION == *"rc."* ]]; then - echo "Is pre-release version" - EXTRA_ARGS="$EXTRA_ARGS --tag next" - fi - if [ "$NODE_AUTH_TOKEN" = "" ]; then - echo "Can't publish on NPM, You need a NPM_TOKEN secret." - false - fi - npm publish $GITHUB_WORKSPACE/javascript $EXTRA_ARGS - env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} - VERSION: ${{ needs.check_if_js_version_upgraded.outputs.js_version }} - - name: Commit js deno release files - run: | - git config --global user.name "actions" - git config --global user.email actions@github.com - git add $GITHUB_WORKSPACE/deno_js_dist - git commit -am "Add deno js release files" - git push origin js_tmp_branch - - name: Tag JS release - if: steps.js_tests.outcome == 'success' && steps.deno_tests.outcome == 'success' - uses: softprops/action-gh-release@v1 - with: - name: Automerge v${{ needs.check_if_js_version_upgraded.outputs.js_version }} - tag_name: js/automerge-${{ needs.check_if_js_version_upgraded.outputs.js_version }} - target_commitish: js_tmp_branch - generate_release_notes: false - draft: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Remove js_tmp_branch - run: git push origin :js_tmp_branch diff --git a/README.md b/README.md index ad174da4..449da11d 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If you're familiar with CRDTs and interested in the design of Automerge in particular take a look at https://automerge.org/docs/how-it-works/backend/ Finally, if you want to talk to us about this project please [join the -Slack](https://join.slack.com/t/automerge/shared_invite/zt-e4p3760n-kKh7r3KRH1YwwNfiZM8ktw) +Slack](https://join.slack.com/t/automerge/shared_invite/zt-1ho1ieas2-DnWZcRR82BRu65vCD4t3Xw) ## Status @@ -40,12 +40,11 @@ in that time. In general we try and respect semver. -### JavaScript +### JavaScript -A stable release of the javascript package is currently available as -`@automerge/automerge@2.0.0` where. pre-release verisions of the `2.0.1` are -available as `2.0.1-alpha.n`. `2.0.1*` packages are also available for Deno at -https://deno.land/x/automerge +An alpha release of the javascript package is currently available as +`@automerge/automerge@2.0.0-alpha.n` where `n` is an integer. We are gathering +feedback on the API and looking to release a `2.0.0` in the next few weeks. ### Rust @@ -53,90 +52,34 @@ The rust codebase is currently oriented around producing a performant backend for the Javascript wrapper and as such the API for Rust code is low level and not well documented. We will be returning to this over the next few months but for now you will need to be comfortable reading the tests and asking questions -to figure out how to use it. If you are looking to build rust applications which -use automerge you may want to look into -[autosurgeon](https://github.com/alexjg/autosurgeon) +to figure out how to use it. + ## Repository Organisation -- `./rust` - the rust rust implementation and also the Rust components of +* `./rust` - the rust rust implementation and also the Rust components of platform specific wrappers (e.g. `automerge-wasm` for the WASM API or `automerge-c` for the C FFI bindings) -- `./javascript` - The javascript library which uses `automerge-wasm` +* `./javascript` - The javascript library which uses `automerge-wasm` internally but presents a more idiomatic javascript interface -- `./scripts` - scripts which are useful to maintenance of the repository. +* `./scripts` - scripts which are useful to maintenance of the repository. This includes the scripts which are run in CI. -- `./img` - static assets for use in `.md` files +* `./img` - static assets for use in `.md` files ## Building To build this codebase you will need: - `rust` +- `wasm-bindgen-cli` +- `wasm-opt` - `node` - `yarn` - `cmake` -- `cmocka` - -You will also need to install the following with `cargo install` - -- `wasm-bindgen-cli` -- `wasm-opt` -- `cargo-deny` - -And ensure you have added the `wasm32-unknown-unknown` target for rust cross-compilation. The various subprojects (the rust code, the wrapper projects) have their own build instructions, but to run the tests that will be run in CI you can run -`./scripts/ci/run`. - -### For macOS - -These instructions worked to build locally on macOS 13.1 (arm64) as of -Nov 29th 2022. - -```bash -# clone the repo -git clone https://github.com/automerge/automerge-rs -cd automerge-rs - -# install rustup -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh - -# install homebrew -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - -# install cmake, node, cmocka -brew install cmake node cmocka - -# install yarn -npm install --global yarn - -# install javascript dependencies -yarn --cwd ./javascript - -# install rust dependencies -cargo install wasm-bindgen-cli wasm-opt cargo-deny - -# get nightly rust to produce optimized automerge-c builds -rustup toolchain install nightly -rustup component add rust-src --toolchain nightly - -# add wasm target in addition to current architecture -rustup target add wasm32-unknown-unknown - -# Run ci script -./scripts/ci/run -``` - -If your build fails to find `cmocka.h` you may need to teach it about homebrew's -installation location: - -``` -export CPATH=/opt/homebrew/include -export LIBRARY_PATH=/opt/homebrew/lib -./scripts/ci/run -``` +`./scripts/ci/run`. ## Contributing diff --git a/flake.lock b/flake.lock index a052776b..b2070c2d 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1642700792, + "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { @@ -32,11 +32,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669542132, - "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=", + "lastModified": 1643805626, + "narHash": "sha256-AXLDVMG+UaAGsGSpOtQHPIKB+IZ0KSd9WS77aanGzgc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a115bb9bd56831941be3776c8a94005867f316a7", + "rev": "554d2d8aa25b6e583575459c297ec23750adb6cb", "type": "github" }, "original": { @@ -48,11 +48,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665296151, - "narHash": "sha256-uOB0oxqxN9K7XGF1hcnY+PQnlQJ+3bP2vCn/+Ru/bbc=", + "lastModified": 1637453606, + "narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "14ccaaedd95a488dd7ae142757884d8e125b3363", + "rev": "8afc4e543663ca0a6a4f496262cd05233737e732", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669775522, - "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", + "lastModified": 1643941258, + "narHash": "sha256-uHyEuICSu8qQp6adPTqV33ajiwoF0sCh+Iazaz5r7fo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", + "rev": "674156c4c2f46dd6a6846466cb8f9fee84c211ca", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 37835738..938225b7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,67 +3,63 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; + flake-utils = { + url = "github:numtide/flake-utils"; + inputs.nixpkgs.follows = "nixpkgs"; + }; rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { - self, - nixpkgs, - flake-utils, - rust-overlay, - }: + outputs = { self, nixpkgs, flake-utils, rust-overlay }: flake-utils.lib.eachDefaultSystem - (system: let - pkgs = import nixpkgs { - overlays = [rust-overlay.overlays.default]; - inherit system; - }; - rust = pkgs.rust-bin.stable.latest.default; - in { - formatter = pkgs.alejandra; + (system: + let + pkgs = import nixpkgs { + overlays = [ rust-overlay.overlay ]; + inherit system; + }; + lib = pkgs.lib; + rust = pkgs.rust-bin.stable.latest.default; + cargoNix = pkgs.callPackage ./Cargo.nix { + inherit pkgs; + release = true; + }; + debugCargoNix = pkgs.callPackage ./Cargo.nix { + inherit pkgs; + release = false; + }; + in + { + devShell = pkgs.mkShell { + buildInputs = with pkgs; + [ + (rust.override { + extensions = [ "rust-src" ]; + targets = [ "wasm32-unknown-unknown" ]; + }) + cargo-edit + cargo-watch + cargo-criterion + cargo-fuzz + cargo-flamegraph + cargo-deny + crate2nix + wasm-pack + pkgconfig + openssl + gnuplot - packages = { - deadnix = pkgs.runCommand "deadnix" {} '' - ${pkgs.deadnix}/bin/deadnix --fail ${./.} - mkdir $out - ''; - }; + nodejs + yarn - checks = { - inherit (self.packages.${system}) deadnix; - }; + # c deps + cmake + cmocka + doxygen - devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - (rust.override { - extensions = ["rust-src"]; - targets = ["wasm32-unknown-unknown"]; - }) - cargo-edit - cargo-watch - cargo-criterion - cargo-fuzz - cargo-flamegraph - cargo-deny - crate2nix - wasm-pack - pkgconfig - openssl - gnuplot - - nodejs - yarn - deno - - # c deps - cmake - cmocka - doxygen - - rnix-lsp - nixpkgs-fmt - ]; - }; - }); + rnix-lsp + nixpkgs-fmt + ]; + }; + }); } diff --git a/javascript/.denoifyrc.json b/javascript/.denoifyrc.json deleted file mode 100644 index 9453a31f..00000000 --- a/javascript/.denoifyrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "replacer": "scripts/denoify-replacer.mjs" -} diff --git a/javascript/.eslintrc.cjs b/javascript/.eslintrc.cjs index 88776271..80e08d55 100644 --- a/javascript/.eslintrc.cjs +++ b/javascript/.eslintrc.cjs @@ -1,15 +1,11 @@ module.exports = { root: true, - parser: "@typescript-eslint/parser", - plugins: ["@typescript-eslint"], - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"], - rules: { - "@typescript-eslint/no-unused-vars": [ - "error", - { - argsIgnorePattern: "^_", - varsIgnorePattern: "^_", - }, - ], - }, -} + parser: '@typescript-eslint/parser', + plugins: [ + '@typescript-eslint', + ], + extends: [ + 'eslint:recommended', + 'plugin:@typescript-eslint/recommended', + ], +}; diff --git a/javascript/.gitignore b/javascript/.gitignore index f98d9db2..bf2aad08 100644 --- a/javascript/.gitignore +++ b/javascript/.gitignore @@ -2,5 +2,3 @@ /yarn.lock dist docs/ -.vim -deno_dist/ diff --git a/javascript/.prettierignore b/javascript/.prettierignore deleted file mode 100644 index 6ab2f796..00000000 --- a/javascript/.prettierignore +++ /dev/null @@ -1,4 +0,0 @@ -e2e/verdacciodb -dist -docs -deno_dist diff --git a/javascript/.prettierrc b/javascript/.prettierrc deleted file mode 100644 index 18b9c97f..00000000 --- a/javascript/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "semi": false, - "arrowParens": "avoid" -} diff --git a/javascript/HACKING.md b/javascript/HACKING.md index b7e92eef..c3203775 100644 --- a/javascript/HACKING.md +++ b/javascript/HACKING.md @@ -8,7 +8,7 @@ Rust codebase and can be found in `~/automerge-wasm`). I.e. the responsibility of this codebase is - To map from the javascript data model to the underlying `set`, `make`, - `insert`, and `delete` operations of Automerge. + `insert`, and `delete` operations of Automerge. - To expose a more convenient interface to functions in `automerge-wasm` which generate messages to send over the network or compressed file formats to store on disk @@ -37,3 +37,4 @@ yarn test If you make changes to the `automerge-wasm` package you will need to re-run `yarn e2e buildjs` + diff --git a/javascript/README.md b/javascript/README.md index af8306ac..ffd2b38e 100644 --- a/javascript/README.md +++ b/javascript/README.md @@ -19,6 +19,7 @@ data](#make-some-data). If you're in a browser you need a bundler ### Bundler setup + `@automerge/automerge` is a wrapper around a core library which is written in rust, compiled to WebAssembly and distributed as a separate package called `@automerge/automerge-wasm`. Browsers don't currently support WebAssembly @@ -53,28 +54,28 @@ import * as automerge from "@automerge/automerge" import * as assert from "assert" let doc1 = automerge.from({ - tasks: [ - { description: "feed fish", done: false }, - { description: "water plants", done: false }, - ], + tasks: [ + {description: "feed fish", done: false}, + {description: "water plants", done: false}, + ] }) -// Create a new thread of execution +// Create a new thread of execution let doc2 = automerge.clone(doc1) // Now we concurrently make changes to doc1 and doc2 // Complete a task in doc2 doc2 = automerge.change(doc2, d => { - d.tasks[0].done = true + d.tasks[0].done = true }) // Add a task in doc1 doc1 = automerge.change(doc1, d => { - d.tasks.push({ - description: "water fish", - done: false, - }) + d.tasks.push({ + description: "water fish", + done: false + }) }) // Merge changes from both docs @@ -83,19 +84,19 @@ doc2 = automerge.merge(doc2, doc1) // Both docs are merged and identical assert.deepEqual(doc1, { - tasks: [ - { description: "feed fish", done: true }, - { description: "water plants", done: false }, - { description: "water fish", done: false }, - ], + tasks: [ + {description: "feed fish", done: true}, + {description: "water plants", done: false}, + {description: "water fish", done: false}, + ] }) assert.deepEqual(doc2, { - tasks: [ - { description: "feed fish", done: true }, - { description: "water plants", done: false }, - { description: "water fish", done: false }, - ], + tasks: [ + {description: "feed fish", done: true}, + {description: "water plants", done: false}, + {description: "water fish", done: false}, + ] }) ``` diff --git a/javascript/config/cjs.json b/javascript/config/cjs.json index 0b135067..d7f8c63f 100644 --- a/javascript/config/cjs.json +++ b/javascript/config/cjs.json @@ -1,12 +1,6 @@ { - "extends": "../tsconfig.json", - "exclude": [ - "../dist/**/*", - "../node_modules", - "../test/**/*", - "../src/**/*.deno.ts" - ], - "compilerOptions": { - "outDir": "../dist/cjs" - } + "extends": "../tsconfig.json", + "compilerOptions": { + "outDir": "../dist/cjs" + } } diff --git a/javascript/config/declonly.json b/javascript/config/declonly.json deleted file mode 100644 index 7c1df687..00000000 --- a/javascript/config/declonly.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../tsconfig.json", - "exclude": [ - "../dist/**/*", - "../node_modules", - "../test/**/*", - "../src/**/*.deno.ts" - ], - "emitDeclarationOnly": true, - "compilerOptions": { - "outDir": "../dist" - } -} diff --git a/javascript/config/mjs.json b/javascript/config/mjs.json index ecf3ce36..8f964400 100644 --- a/javascript/config/mjs.json +++ b/javascript/config/mjs.json @@ -1,14 +1,8 @@ { - "extends": "../tsconfig.json", - "exclude": [ - "../dist/**/*", - "../node_modules", - "../test/**/*", - "../src/**/*.deno.ts" - ], - "compilerOptions": { - "target": "es6", - "module": "es6", - "outDir": "../dist/mjs" - } + "extends": "../tsconfig.json", + "compilerOptions": { + "target": "es6", + "module": "es6", + "outDir": "../dist/mjs" + } } diff --git a/javascript/deno-tests/deno.ts b/javascript/deno-tests/deno.ts deleted file mode 100644 index fc0a4dad..00000000 --- a/javascript/deno-tests/deno.ts +++ /dev/null @@ -1,10 +0,0 @@ -import * as Automerge from "../deno_dist/index.ts" - -Deno.test("It should create, clone and free", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.clone(doc1) - - // this is only needed if weakrefs are not supported - Automerge.free(doc1) - Automerge.free(doc2) -}) diff --git a/javascript/e2e/README.md b/javascript/e2e/README.md index 9dcee471..ff87bd60 100644 --- a/javascript/e2e/README.md +++ b/javascript/e2e/README.md @@ -54,7 +54,7 @@ yarn e2e buildexamples -e webpack If you're experimenting with a project which is not in the `examples` folder you'll need a running registry. `run-registry` builds and publishes `automerge-js` and `automerge-wasm` and then runs the registry at -`localhost:4873`. +`localhost:4873`. ``` yarn e2e run-registry @@ -63,6 +63,7 @@ yarn e2e run-registry You can now run `yarn install --registry http://localhost:4873` to experiment with the built packages. + ## Using the `dev` build of `automerge-wasm` All the commands above take a `-p` flag which can be either `release` or diff --git a/javascript/e2e/index.ts b/javascript/e2e/index.ts index fb0b1599..828c0635 100644 --- a/javascript/e2e/index.ts +++ b/javascript/e2e/index.ts @@ -1,25 +1,15 @@ -import { once } from "events" -import { setTimeout } from "timers/promises" -import { spawn, ChildProcess } from "child_process" +import {once} from "events" +import {setTimeout} from "timers/promises" +import {spawn, ChildProcess} from "child_process" import * as child_process from "child_process" -import { - command, - subcommands, - run, - array, - multioption, - option, - Type, -} from "cmd-ts" +import {command, subcommands, run, array, multioption, option, Type} from "cmd-ts" import * as path from "path" import * as fsPromises from "fs/promises" import fetch from "node-fetch" const VERDACCIO_DB_PATH = path.normalize(`${__dirname}/verdacciodb`) const VERDACCIO_CONFIG_PATH = path.normalize(`${__dirname}/verdaccio.yaml`) -const AUTOMERGE_WASM_PATH = path.normalize( - `${__dirname}/../../rust/automerge-wasm` -) +const AUTOMERGE_WASM_PATH = path.normalize(`${__dirname}/../../rust/automerge-wasm`) const AUTOMERGE_JS_PATH = path.normalize(`${__dirname}/..`) const EXAMPLES_DIR = path.normalize(path.join(__dirname, "../", "examples")) @@ -28,286 +18,217 @@ type Example = "webpack" | "vite" | "create-react-app" // Type to parse strings to `Example` so the types line up for the `buildExamples` commmand const ReadExample: Type = { - async from(str) { - if (str === "webpack") { - return "webpack" - } else if (str === "vite") { - return "vite" - } else if (str === "create-react-app") { - return "create-react-app" - } else { - throw new Error(`Unknown example type ${str}`) + async from(str) { + if (str === "webpack") { + return "webpack" + } else if (str === "vite") { + return "vite" + } else if (str === "create-react-app") { + return "create-react-app" + } else { + throw new Error(`Unknown example type ${str}`) + } } - }, } type Profile = "dev" | "release" const ReadProfile: Type = { - async from(str) { - if (str === "dev") { - return "dev" - } else if (str === "release") { - return "release" - } else { - throw new Error(`Unknown profile ${str}`) + async from(str) { + if (str === "dev") { + return "dev" + } else if (str === "release") { + return "release" + } else { + throw new Error(`Unknown profile ${str}`) + } } - }, } const buildjs = command({ - name: "buildjs", - args: { - profile: option({ - type: ReadProfile, - long: "profile", - short: "p", - defaultValue: () => "dev" as Profile, - }), - }, - handler: ({ profile }) => { - console.log("building js") - withPublishedWasm(profile, async (registryUrl: string) => { - await buildAndPublishAutomergeJs(registryUrl) - }) - }, + name: "buildjs", + args: { + profile: option({ + type: ReadProfile, + long: "profile", + short: "p", + defaultValue: () => "dev" as Profile + }) + }, + handler: ({profile}) => { + console.log("building js") + withPublishedWasm(profile, async (registryUrl: string) => { + await buildAndPublishAutomergeJs(registryUrl) + }) + } }) const buildWasm = command({ - name: "buildwasm", - args: { - profile: option({ - type: ReadProfile, - long: "profile", - short: "p", - defaultValue: () => "dev" as Profile, - }), - }, - handler: ({ profile }) => { - console.log("building automerge-wasm") - withRegistry(buildAutomergeWasm(profile)) - }, + name: "buildwasm", + args: { + profile: option({ + type: ReadProfile, + long: "profile", + short: "p", + defaultValue: () => "dev" as Profile + }) + }, + handler: ({profile}) => { + console.log("building automerge-wasm") + withRegistry( + buildAutomergeWasm(profile), + ) + } }) const buildexamples = command({ - name: "buildexamples", - args: { - examples: multioption({ - long: "example", - short: "e", - type: array(ReadExample), - }), - profile: option({ - type: ReadProfile, - long: "profile", - short: "p", - defaultValue: () => "dev" as Profile, - }), - }, - handler: ({ examples, profile }) => { - if (examples.length === 0) { - examples = ["webpack", "vite", "create-react-app"] + name: "buildexamples", + args: { + examples: multioption({ + long: "example", + short: "e", + type: array(ReadExample), + }), + profile: option({ + type: ReadProfile, + long: "profile", + short: "p", + defaultValue: () => "dev" as Profile + }) + }, + handler: ({examples, profile}) => { + if (examples.length === 0) { + examples = ["webpack", "vite", "create-react-app"] + } + buildExamples(examples, profile) } - buildExamples(examples, profile) - }, }) + const runRegistry = command({ - name: "run-registry", - args: { - profile: option({ - type: ReadProfile, - long: "profile", - short: "p", - defaultValue: () => "dev" as Profile, - }), - }, - handler: ({ profile }) => { - withPublishedWasm(profile, async (registryUrl: string) => { - await buildAndPublishAutomergeJs(registryUrl) - console.log("\n************************") - console.log(` Verdaccio NPM registry is running at ${registryUrl}`) - console.log(" press CTRL-C to exit ") - console.log("************************") - await once(process, "SIGINT") - }).catch(e => { - console.error(`Failed: ${e}`) - }) - }, + name: "run-registry", + args: { + profile: option({ + type: ReadProfile, + long: "profile", + short: "p", + defaultValue: () => "dev" as Profile + }) + }, + handler: ({profile}) => { + withPublishedWasm(profile, async (registryUrl: string) => { + await buildAndPublishAutomergeJs(registryUrl) + console.log("\n************************") + console.log(` Verdaccio NPM registry is running at ${registryUrl}`) + console.log(" press CTRL-C to exit ") + console.log("************************") + await once(process, "SIGINT") + }).catch(e => { + console.error(`Failed: ${e}`) + }) + } }) + const app = subcommands({ - name: "e2e", - cmds: { - buildjs, - buildexamples, - buildwasm: buildWasm, - "run-registry": runRegistry, - }, + name: "e2e", + cmds: {buildjs, buildexamples, buildwasm: buildWasm, "run-registry": runRegistry} }) run(app, process.argv.slice(2)) async function buildExamples(examples: Array, profile: Profile) { - await withPublishedWasm(profile, async registryUrl => { - printHeader("building and publishing automerge") - await buildAndPublishAutomergeJs(registryUrl) - for (const example of examples) { - printHeader(`building ${example} example`) - if (example === "webpack") { - const projectPath = path.join(EXAMPLES_DIR, example) - await removeExistingAutomerge(projectPath) - await fsPromises.rm(path.join(projectPath, "yarn.lock"), { - force: true, - }) - await spawnAndWait( - "yarn", - [ - "--cwd", - projectPath, - "install", - "--registry", - registryUrl, - "--check-files", - ], - { stdio: "inherit" } - ) - await spawnAndWait("yarn", ["--cwd", projectPath, "build"], { - stdio: "inherit", - }) - } else if (example === "vite") { - const projectPath = path.join(EXAMPLES_DIR, example) - await removeExistingAutomerge(projectPath) - await fsPromises.rm(path.join(projectPath, "yarn.lock"), { - force: true, - }) - await spawnAndWait( - "yarn", - [ - "--cwd", - projectPath, - "install", - "--registry", - registryUrl, - "--check-files", - ], - { stdio: "inherit" } - ) - await spawnAndWait("yarn", ["--cwd", projectPath, "build"], { - stdio: "inherit", - }) - } else if (example === "create-react-app") { - const projectPath = path.join(EXAMPLES_DIR, example) - await removeExistingAutomerge(projectPath) - await fsPromises.rm(path.join(projectPath, "yarn.lock"), { - force: true, - }) - await spawnAndWait( - "yarn", - [ - "--cwd", - projectPath, - "install", - "--registry", - registryUrl, - "--check-files", - ], - { stdio: "inherit" } - ) - await spawnAndWait("yarn", ["--cwd", projectPath, "build"], { - stdio: "inherit", - }) - } - } - }) + await withPublishedWasm(profile, async (registryUrl) => { + printHeader("building and publishing automerge") + await buildAndPublishAutomergeJs(registryUrl) + for (const example of examples) { + printHeader(`building ${example} example`) + if (example === "webpack") { + const projectPath = path.join(EXAMPLES_DIR, example) + await removeExistingAutomerge(projectPath) + await fsPromises.rm(path.join(projectPath, "yarn.lock"), {force: true}) + await spawnAndWait("yarn", ["--cwd", projectPath, "install", "--registry", registryUrl, "--check-files"], {stdio: "inherit"}) + await spawnAndWait("yarn", ["--cwd", projectPath, "build"], {stdio: "inherit"}) + } else if (example === "vite") { + const projectPath = path.join(EXAMPLES_DIR, example) + await removeExistingAutomerge(projectPath) + await fsPromises.rm(path.join(projectPath, "yarn.lock"), {force: true}) + await spawnAndWait("yarn", ["--cwd", projectPath, "install", "--registry", registryUrl, "--check-files"], {stdio: "inherit"}) + await spawnAndWait("yarn", ["--cwd", projectPath, "build"], {stdio: "inherit"}) + } else if (example === "create-react-app") { + const projectPath = path.join(EXAMPLES_DIR, example) + await removeExistingAutomerge(projectPath) + await fsPromises.rm(path.join(projectPath, "yarn.lock"), {force: true}) + await spawnAndWait("yarn", ["--cwd", projectPath, "install", "--registry", registryUrl, "--check-files"], {stdio: "inherit"}) + await spawnAndWait("yarn", ["--cwd", projectPath, "build"], {stdio: "inherit"}) + } + } + }) } type WithRegistryAction = (registryUrl: string) => Promise -async function withRegistry( - action: WithRegistryAction, - ...actions: Array -) { - // First, start verdaccio - printHeader("Starting verdaccio NPM server") - const verd = await VerdaccioProcess.start() - actions.unshift(action) +async function withRegistry(action: WithRegistryAction, ...actions: Array) { + // First, start verdaccio + printHeader("Starting verdaccio NPM server") + const verd = await VerdaccioProcess.start() + actions.unshift(action) - for (const action of actions) { - try { - type Step = "verd-died" | "action-completed" - const verdDied: () => Promise = async () => { - await verd.died() - return "verd-died" - } - const actionComplete: () => Promise = async () => { - await action("http://localhost:4873") - return "action-completed" - } - const result = await Promise.race([verdDied(), actionComplete()]) - if (result === "verd-died") { - throw new Error("verdaccio unexpectedly exited") - } - } catch (e) { - await verd.kill() - throw e + for (const action of actions) { + try { + type Step = "verd-died" | "action-completed" + const verdDied: () => Promise = async () => { + await verd.died() + return "verd-died" + } + const actionComplete: () => Promise = async () => { + await action("http://localhost:4873") + return "action-completed" + } + const result = await Promise.race([verdDied(), actionComplete()]) + if (result === "verd-died") { + throw new Error("verdaccio unexpectedly exited") + } + } catch(e) { + await verd.kill() + throw e + } } - } - await verd.kill() + await verd.kill() } async function withPublishedWasm(profile: Profile, action: WithRegistryAction) { - await withRegistry(buildAutomergeWasm(profile), publishAutomergeWasm, action) + await withRegistry( + buildAutomergeWasm(profile), + publishAutomergeWasm, + action + ) } function buildAutomergeWasm(profile: Profile): WithRegistryAction { - return async (registryUrl: string) => { - printHeader("building automerge-wasm") - await spawnAndWait( - "yarn", - ["--cwd", AUTOMERGE_WASM_PATH, "--registry", registryUrl, "install"], - { stdio: "inherit" } - ) - const cmd = profile === "release" ? "release" : "debug" - await spawnAndWait("yarn", ["--cwd", AUTOMERGE_WASM_PATH, cmd], { - stdio: "inherit", - }) - } + return async (registryUrl: string) => { + printHeader("building automerge-wasm") + await spawnAndWait("yarn", ["--cwd", AUTOMERGE_WASM_PATH, "--registry", registryUrl, "install"], {stdio: "inherit"}) + const cmd = profile === "release" ? "release" : "debug" + await spawnAndWait("yarn", ["--cwd", AUTOMERGE_WASM_PATH, cmd], {stdio: "inherit"}) + } } async function publishAutomergeWasm(registryUrl: string) { - printHeader("Publishing automerge-wasm to verdaccio") - await fsPromises.rm( - path.join(VERDACCIO_DB_PATH, "@automerge/automerge-wasm"), - { recursive: true, force: true } - ) - await yarnPublish(registryUrl, AUTOMERGE_WASM_PATH) + printHeader("Publishing automerge-wasm to verdaccio") + await fsPromises.rm(path.join(VERDACCIO_DB_PATH, "@automerge/automerge-wasm"), { recursive: true, force: true} ) + await yarnPublish(registryUrl, AUTOMERGE_WASM_PATH) } async function buildAndPublishAutomergeJs(registryUrl: string) { - // Build the js package - printHeader("Building automerge") - await removeExistingAutomerge(AUTOMERGE_JS_PATH) - await removeFromVerdaccio("@automerge/automerge") - await fsPromises.rm(path.join(AUTOMERGE_JS_PATH, "yarn.lock"), { - force: true, - }) - await spawnAndWait( - "yarn", - [ - "--cwd", - AUTOMERGE_JS_PATH, - "install", - "--registry", - registryUrl, - "--check-files", - ], - { stdio: "inherit" } - ) - await spawnAndWait("yarn", ["--cwd", AUTOMERGE_JS_PATH, "build"], { - stdio: "inherit", - }) - await yarnPublish(registryUrl, AUTOMERGE_JS_PATH) + // Build the js package + printHeader("Building automerge") + await removeExistingAutomerge(AUTOMERGE_JS_PATH) + await removeFromVerdaccio("@automerge/automerge") + await fsPromises.rm(path.join(AUTOMERGE_JS_PATH, "yarn.lock"), {force: true}) + await spawnAndWait("yarn", ["--cwd", AUTOMERGE_JS_PATH, "install", "--registry", registryUrl, "--check-files"], {stdio: "inherit"}) + await spawnAndWait("yarn", ["--cwd", AUTOMERGE_JS_PATH, "build"], {stdio: "inherit"}) + await yarnPublish(registryUrl, AUTOMERGE_JS_PATH) } /** @@ -315,110 +236,104 @@ async function buildAndPublishAutomergeJs(registryUrl: string) { * */ class VerdaccioProcess { - child: ChildProcess - stdout: Array - stderr: Array + child: ChildProcess + stdout: Array + stderr: Array - constructor(child: ChildProcess) { - this.child = child + constructor(child: ChildProcess) { + this.child = child - // Collect stdout/stderr otherwise the subprocess gets blocked writing - this.stdout = [] - this.stderr = [] - this.child.stdout && - this.child.stdout.on("data", data => this.stdout.push(data)) - this.child.stderr && - this.child.stderr.on("data", data => this.stderr.push(data)) + // Collect stdout/stderr otherwise the subprocess gets blocked writing + this.stdout = [] + this.stderr = [] + this.child.stdout && this.child.stdout.on("data", (data) => this.stdout.push(data)) + this.child.stderr && this.child.stderr.on("data", (data) => this.stderr.push(data)) - const errCallback = (e: any) => { - console.error("!!!!!!!!!ERROR IN VERDACCIO PROCESS!!!!!!!!!") - console.error(" ", e) - if (this.stdout.length > 0) { - console.log("\n**Verdaccio stdout**") - const stdout = Buffer.concat(this.stdout) - process.stdout.write(stdout) - } + const errCallback = (e: any) => { + console.error("!!!!!!!!!ERROR IN VERDACCIO PROCESS!!!!!!!!!") + console.error(" ", e) + if (this.stdout.length > 0) { + console.log("\n**Verdaccio stdout**") + const stdout = Buffer.concat(this.stdout) + process.stdout.write(stdout) + } - if (this.stderr.length > 0) { - console.log("\n**Verdaccio stderr**") - const stdout = Buffer.concat(this.stderr) - process.stdout.write(stdout) - } - process.exit(-1) - } - this.child.on("error", errCallback) - } - - /** - * Spawn a verdaccio process and wait for it to respond succesfully to http requests - * - * The returned `VerdaccioProcess` can be used to control the subprocess - */ - static async start() { - const child = spawn( - "yarn", - ["verdaccio", "--config", VERDACCIO_CONFIG_PATH], - { env: { ...process.env, FORCE_COLOR: "true" } } - ) - - // Forward stdout and stderr whilst waiting for startup to complete - const stdoutCallback = (data: Buffer) => process.stdout.write(data) - const stderrCallback = (data: Buffer) => process.stderr.write(data) - child.stdout && child.stdout.on("data", stdoutCallback) - child.stderr && child.stderr.on("data", stderrCallback) - - const healthCheck = async () => { - while (true) { - try { - const resp = await fetch("http://localhost:4873") - if (resp.status === 200) { - return - } else { - console.log(`Healthcheck failed: bad status ${resp.status}`) - } - } catch (e) { - console.error(`Healthcheck failed: ${e}`) + if (this.stderr.length > 0) { + console.log("\n**Verdaccio stderr**") + const stdout = Buffer.concat(this.stderr) + process.stdout.write(stdout) + } + process.exit(-1) } - await setTimeout(500) - } + this.child.on("error", errCallback) } - await withTimeout(healthCheck(), 10000) - // Stop forwarding stdout/stderr - child.stdout && child.stdout.off("data", stdoutCallback) - child.stderr && child.stderr.off("data", stderrCallback) - return new VerdaccioProcess(child) - } + /** + * Spawn a verdaccio process and wait for it to respond succesfully to http requests + * + * The returned `VerdaccioProcess` can be used to control the subprocess + */ + static async start() { + const child = spawn("yarn", ["verdaccio", "--config", VERDACCIO_CONFIG_PATH], {env: { ...process.env, FORCE_COLOR: "true"}}) - /** - * Send a SIGKILL to the process and wait for it to stop - */ - async kill() { - this.child.stdout && this.child.stdout.destroy() - this.child.stderr && this.child.stderr.destroy() - this.child.kill() - try { - await withTimeout(once(this.child, "close"), 500) - } catch (e) { - console.error("unable to kill verdaccio subprocess, trying -9") - this.child.kill(9) - await withTimeout(once(this.child, "close"), 500) + // Forward stdout and stderr whilst waiting for startup to complete + const stdoutCallback = (data: Buffer) => process.stdout.write(data) + const stderrCallback = (data: Buffer) => process.stderr.write(data) + child.stdout && child.stdout.on("data", stdoutCallback) + child.stderr && child.stderr.on("data", stderrCallback) + + const healthCheck = async () => { + while (true) { + try { + const resp = await fetch("http://localhost:4873") + if (resp.status === 200) { + return + } else { + console.log(`Healthcheck failed: bad status ${resp.status}`) + } + } catch (e) { + console.error(`Healthcheck failed: ${e}`) + } + await setTimeout(500) + } + } + await withTimeout(healthCheck(), 10000) + + // Stop forwarding stdout/stderr + child.stdout && child.stdout.off("data", stdoutCallback) + child.stderr && child.stderr.off("data", stderrCallback) + return new VerdaccioProcess(child) } - } - /** - * A promise which resolves if the subprocess exits for some reason - */ - async died(): Promise { - const [exit, _signal] = await once(this.child, "exit") - return exit - } + /** + * Send a SIGKILL to the process and wait for it to stop + */ + async kill() { + this.child.stdout && this.child.stdout.destroy() + this.child.stderr && this.child.stderr.destroy() + this.child.kill(); + try { + await withTimeout(once(this.child, "close"), 500) + } catch (e) { + console.error("unable to kill verdaccio subprocess, trying -9") + this.child.kill(9) + await withTimeout(once(this.child, "close"), 500) + } + } + + /** + * A promise which resolves if the subprocess exits for some reason + */ + async died(): Promise { + const [exit, _signal] = await once(this.child, "exit") + return exit + } } function printHeader(header: string) { - console.log("\n===============================") - console.log(` ${header}`) - console.log("===============================") + console.log("\n===============================") + console.log(` ${header}`) + console.log("===============================") } /** @@ -432,46 +347,36 @@ function printHeader(header: string) { * @param packageDir - The directory containing the package.json of the target project */ async function removeExistingAutomerge(packageDir: string) { - await fsPromises.rm(path.join(packageDir, "node_modules", "@automerge"), { - recursive: true, - force: true, - }) - await fsPromises.rm(path.join(packageDir, "node_modules", "automerge"), { - recursive: true, - force: true, - }) + await fsPromises.rm(path.join(packageDir, "node_modules", "@automerge"), {recursive: true, force: true}) + await fsPromises.rm(path.join(packageDir, "node_modules", "automerge"), {recursive: true, force: true}) } type SpawnResult = { - stdout?: Buffer - stderr?: Buffer + stdout?: Buffer, + stderr?: Buffer, } -async function spawnAndWait( - cmd: string, - args: Array, - options: child_process.SpawnOptions -): Promise { - const child = spawn(cmd, args, options) - let stdout = null - let stderr = null - if (child.stdout) { - stdout = [] - child.stdout.on("data", data => stdout.push(data)) - } - if (child.stderr) { - stderr = [] - child.stderr.on("data", data => stderr.push(data)) - } +async function spawnAndWait(cmd: string, args: Array, options: child_process.SpawnOptions): Promise { + const child = spawn(cmd, args, options) + let stdout = null + let stderr = null + if (child.stdout) { + stdout = [] + child.stdout.on("data", data => stdout.push(data)) + } + if (child.stderr) { + stderr = [] + child.stderr.on("data", data => stderr.push(data)) + } - const [exit, _signal] = await once(child, "exit") - if (exit && exit !== 0) { - throw new Error("nonzero exit code") - } - return { - stderr: stderr ? Buffer.concat(stderr) : null, - stdout: stdout ? Buffer.concat(stdout) : null, - } + const [exit, _signal] = await once(child, "exit") + if (exit && exit !== 0) { + throw new Error("nonzero exit code") + } + return { + stderr: stderr? Buffer.concat(stderr) : null, + stdout: stdout ? Buffer.concat(stdout) : null + } } /** @@ -482,27 +387,29 @@ async function spawnAndWait( * okay I Promise. */ async function removeFromVerdaccio(packageName: string) { - await fsPromises.rm(path.join(VERDACCIO_DB_PATH, packageName), { - force: true, - recursive: true, - }) + await fsPromises.rm(path.join(VERDACCIO_DB_PATH, packageName), {force: true, recursive: true}) } async function yarnPublish(registryUrl: string, cwd: string) { - await spawnAndWait( - "yarn", - ["--registry", registryUrl, "--cwd", cwd, "publish", "--non-interactive"], - { - stdio: "inherit", - env: { - ...process.env, - FORCE_COLOR: "true", - // This is a fake token, it just has to be the right format - npm_config__auth: - "//localhost:4873/:_authToken=Gp2Mgxm4faa/7wp0dMSuRA==", - }, - } - ) + await spawnAndWait( + "yarn", + [ + "--registry", + registryUrl, + "--cwd", + cwd, + "publish", + "--non-interactive", + ], + { + stdio: "inherit", + env: { + ...process.env, + FORCE_COLOR: "true", + // This is a fake token, it just has to be the right format + npm_config__auth: "//localhost:4873/:_authToken=Gp2Mgxm4faa/7wp0dMSuRA==" + } + }) } /** @@ -512,23 +419,20 @@ async function yarnPublish(registryUrl: string, cwd: string) { * @param promise - the promise to wait for @param timeout - the delay in * milliseconds to wait before throwing */ -async function withTimeout( - promise: Promise, - timeout: number -): Promise { - type Step = "timed-out" | { result: T } - const timedOut: () => Promise = async () => { - await setTimeout(timeout) - return "timed-out" - } - const succeeded: () => Promise = async () => { - const result = await promise - return { result } - } - const result = await Promise.race([timedOut(), succeeded()]) - if (result === "timed-out") { - throw new Error("timed out") - } else { - return result.result - } +async function withTimeout(promise: Promise, timeout: number): Promise { + type Step = "timed-out" | {result: T} + const timedOut: () => Promise = async () => { + await setTimeout(timeout) + return "timed-out" + } + const succeeded: () => Promise = async () => { + const result = await promise + return {result} + } + const result = await Promise.race([timedOut(), succeeded()]) + if (result === "timed-out") { + throw new Error("timed out") + } else { + return result.result + } } diff --git a/javascript/e2e/tsconfig.json b/javascript/e2e/tsconfig.json index a2109873..9f0e2e76 100644 --- a/javascript/e2e/tsconfig.json +++ b/javascript/e2e/tsconfig.json @@ -1,6 +1,6 @@ { - "compilerOptions": { - "types": ["node"] - }, - "module": "nodenext" + "compilerOptions": { + "types": ["node"] + }, + "module": "nodenext" } diff --git a/javascript/e2e/verdaccio.yaml b/javascript/e2e/verdaccio.yaml index 865f5f05..45920a16 100644 --- a/javascript/e2e/verdaccio.yaml +++ b/javascript/e2e/verdaccio.yaml @@ -4,22 +4,22 @@ auth: file: ./htpasswd publish: allow_offline: true -logs: { type: stdout, format: pretty, level: info } -packages: +logs: {type: stdout, format: pretty, level: info} +packages: "@automerge/automerge-wasm": - access: "$all" - publish: "$all" + access: "$all" + publish: "$all" "@automerge/automerge": - access: "$all" - publish: "$all" + access: "$all" + publish: "$all" "*": - access: "$all" - publish: "$all" - proxy: npmjs + access: "$all" + publish: "$all" + proxy: npmjs "@*/*": - access: "$all" - publish: "$all" - proxy: npmjs + access: "$all" + publish: "$all" + proxy: npmjs uplinks: npmjs: url: https://registry.npmjs.org/ diff --git a/javascript/examples/create-react-app/README.md b/javascript/examples/create-react-app/README.md index baa135ac..dc894080 100644 --- a/javascript/examples/create-react-app/README.md +++ b/javascript/examples/create-react-app/README.md @@ -54,6 +54,6 @@ In the root of the project add the following contents to `craco.config.js` const cracoWasm = require("craco-wasm") module.exports = { - plugins: [cracoWasm()], + plugins: [cracoWasm()] } ``` diff --git a/javascript/examples/create-react-app/craco.config.js b/javascript/examples/create-react-app/craco.config.js index 489dad8f..ad806e67 100644 --- a/javascript/examples/create-react-app/craco.config.js +++ b/javascript/examples/create-react-app/craco.config.js @@ -1,5 +1,5 @@ const cracoWasm = require("craco-wasm") module.exports = { - plugins: [cracoWasm()], + plugins: [cracoWasm()] } diff --git a/javascript/examples/create-react-app/src/App.js b/javascript/examples/create-react-app/src/App.js index 7cfe997b..fc4805b4 100644 --- a/javascript/examples/create-react-app/src/App.js +++ b/javascript/examples/create-react-app/src/App.js @@ -1,11 +1,12 @@ import * as Automerge from "@automerge/automerge" -import logo from "./logo.svg" -import "./App.css" +import logo from './logo.svg'; +import './App.css'; let doc = Automerge.init() -doc = Automerge.change(doc, d => (d.hello = "from automerge")) +doc = Automerge.change(doc, (d) => d.hello = "from automerge") const result = JSON.stringify(doc) + function App() { return (
@@ -14,7 +15,7 @@ function App() {

{result}

- ) + ); } -export default App +export default App; diff --git a/javascript/examples/create-react-app/src/App.test.js b/javascript/examples/create-react-app/src/App.test.js index ea796120..1f03afee 100644 --- a/javascript/examples/create-react-app/src/App.test.js +++ b/javascript/examples/create-react-app/src/App.test.js @@ -1,8 +1,8 @@ -import { render, screen } from "@testing-library/react" -import App from "./App" +import { render, screen } from '@testing-library/react'; +import App from './App'; -test("renders learn react link", () => { - render() - const linkElement = screen.getByText(/learn react/i) - expect(linkElement).toBeInTheDocument() -}) +test('renders learn react link', () => { + render(); + const linkElement = screen.getByText(/learn react/i); + expect(linkElement).toBeInTheDocument(); +}); diff --git a/javascript/examples/create-react-app/src/index.css b/javascript/examples/create-react-app/src/index.css index 4a1df4db..ec2585e8 100644 --- a/javascript/examples/create-react-app/src/index.css +++ b/javascript/examples/create-react-app/src/index.css @@ -1,13 +1,13 @@ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", - "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } code { - font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; } diff --git a/javascript/examples/create-react-app/src/index.js b/javascript/examples/create-react-app/src/index.js index 58c21edc..d563c0fb 100644 --- a/javascript/examples/create-react-app/src/index.js +++ b/javascript/examples/create-react-app/src/index.js @@ -1,17 +1,17 @@ -import React from "react" -import ReactDOM from "react-dom/client" -import "./index.css" -import App from "./App" -import reportWebVitals from "./reportWebVitals" +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import './index.css'; +import App from './App'; +import reportWebVitals from './reportWebVitals'; -const root = ReactDOM.createRoot(document.getElementById("root")) +const root = ReactDOM.createRoot(document.getElementById('root')); root.render( -) +); // If you want to start measuring performance in your app, pass a function // to log results (for example: reportWebVitals(console.log)) // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals -reportWebVitals() +reportWebVitals(); diff --git a/javascript/examples/create-react-app/src/reportWebVitals.js b/javascript/examples/create-react-app/src/reportWebVitals.js index eee308db..5253d3ad 100644 --- a/javascript/examples/create-react-app/src/reportWebVitals.js +++ b/javascript/examples/create-react-app/src/reportWebVitals.js @@ -1,13 +1,13 @@ const reportWebVitals = onPerfEntry => { if (onPerfEntry && onPerfEntry instanceof Function) { - import("web-vitals").then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { - getCLS(onPerfEntry) - getFID(onPerfEntry) - getFCP(onPerfEntry) - getLCP(onPerfEntry) - getTTFB(onPerfEntry) - }) + import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => { + getCLS(onPerfEntry); + getFID(onPerfEntry); + getFCP(onPerfEntry); + getLCP(onPerfEntry); + getTTFB(onPerfEntry); + }); } -} +}; -export default reportWebVitals +export default reportWebVitals; diff --git a/javascript/examples/create-react-app/src/setupTests.js b/javascript/examples/create-react-app/src/setupTests.js index 6a0fd123..8f2609b7 100644 --- a/javascript/examples/create-react-app/src/setupTests.js +++ b/javascript/examples/create-react-app/src/setupTests.js @@ -2,4 +2,4 @@ // allows you to do things like: // expect(element).toHaveTextContent(/react/i) // learn more: https://github.com/testing-library/jest-dom -import "@testing-library/jest-dom" +import '@testing-library/jest-dom'; diff --git a/javascript/examples/create-react-app/yarn.lock b/javascript/examples/create-react-app/yarn.lock index ec83af3b..90a1592b 100644 --- a/javascript/examples/create-react-app/yarn.lock +++ b/javascript/examples/create-react-app/yarn.lock @@ -24,17 +24,17 @@ jsonpointer "^5.0.0" leven "^3.1.0" -"@automerge/automerge-wasm@0.1.12": - version "0.1.12" - resolved "https://registry.yarnpkg.com/@automerge/automerge-wasm/-/automerge-wasm-0.1.12.tgz#8ce25255d95d4ed6fb387de6858f7b7b7e2ed4a9" - integrity sha512-/xjX1217QYJ+QaoT6iHQw4hGNUIoc3xc65c9eCnfX5v9J9BkTOl05p2Cnr51O2rPc/M6TqZLmlvpvNVdcH9JpA== +"@automerge/automerge-wasm@0.1.9": + version "0.1.9" + resolved "http://localhost:4873/@automerge%2fautomerge-wasm/-/automerge-wasm-0.1.9.tgz#b2def5e8b643f1802bc696843b7755dc444dc2eb" + integrity sha512-S+sjJUJ3aPn2F37vKYAzKxz8CDgbHpOOGVjKSgkLjkAqe1pQ+wp4BpiELXafX73w8DVIrGx1zzru4w3t+Eo8gw== -"@automerge/automerge@2.0.0-alpha.7": - version "2.0.0-alpha.7" - resolved "https://registry.yarnpkg.com/@automerge/automerge/-/automerge-2.0.0-alpha.7.tgz#2ee220d51bcd796074a18af74eeabb5f177e1f36" - integrity sha512-Wd2/GNeqtBybUtXclEE7bWBmmEkhv3q2ITQmLh18V0VvMPbqMBpcOKYzQFnKCyiPyRe5XcYeQAyGyunhE5V0ug== +"@automerge/automerge@2.0.0-alpha.4": + version "2.0.0-alpha.4" + resolved "http://localhost:4873/@automerge%2fautomerge/-/automerge-2.0.0-alpha.4.tgz#df406f5364960a4d21040044da55ebd47406ea3a" + integrity sha512-PVRD1dmLy0U4GttyMvlWr99wyr6xvskJbOkxJDHnp+W2VAFfcqa4QKouaFbJ4W3iIsYX8DfQJ+uhRxa6UnvkHg== dependencies: - "@automerge/automerge-wasm" "0.1.12" + "@automerge/automerge-wasm" "0.1.9" uuid "^8.3" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.8.3": @@ -2827,7 +2827,7 @@ bfj@^7.0.2: big.js@^5.2.2: version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" + resolved "http://localhost:4873/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== binary-extensions@^2.0.0: @@ -3817,7 +3817,7 @@ emoji-regex@^9.2.2: emojis-list@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" + resolved "http://localhost:4873/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== encodeurl@~1.0.2: @@ -5845,9 +5845,9 @@ json-stable-stringify-without-jsonify@^1.0.1: integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593" - integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA== + version "1.0.1" + resolved "http://localhost:4873/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" @@ -5942,9 +5942,9 @@ loader-runner@^4.2.0: integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== loader-utils@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" - integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== + version "2.0.2" + resolved "http://localhost:4873/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129" + integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" @@ -6165,9 +6165,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + version "1.2.6" + resolved "http://localhost:4873/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== mkdirp@~0.5.1: version "0.5.6" diff --git a/javascript/examples/vite/README.md b/javascript/examples/vite/README.md index c84594f5..efe44479 100644 --- a/javascript/examples/vite/README.md +++ b/javascript/examples/vite/README.md @@ -7,7 +7,6 @@ There are three things you need to do to get WASM packaging working with vite: 3. Exclude `automerge-wasm` from the optimizer First, install the packages we need: - ```bash yarn add vite-plugin-top-level-await yarn add vite-plugin-wasm @@ -21,22 +20,22 @@ import wasm from "vite-plugin-wasm" import topLevelAwait from "vite-plugin-top-level-await" export default defineConfig({ - plugins: [topLevelAwait(), wasm()], - - // This is only necessary if you are using `SharedWorker` or `WebWorker`, as - // documented in https://vitejs.dev/guide/features.html#import-with-constructors - worker: { - format: "es", plugins: [topLevelAwait(), wasm()], - }, + + // This is only necessary if you are using `SharedWorker` or `WebWorker`, as + // documented in https://vitejs.dev/guide/features.html#import-with-constructors + worker: { + format: "es", + plugins: [topLevelAwait(), wasm()] + }, - optimizeDeps: { - // This is necessary because otherwise `vite dev` includes two separate - // versions of the JS wrapper. This causes problems because the JS - // wrapper has a module level variable to track JS side heap - // allocations, initializing this twice causes horrible breakage - exclude: ["@automerge/automerge-wasm"], - }, + optimizeDeps: { + // This is necessary because otherwise `vite dev` includes two separate + // versions of the JS wrapper. This causes problems because the JS + // wrapper has a module level variable to track JS side heap + // allocations, initializing this twice causes horrible breakage + exclude: ["@automerge/automerge-wasm"] + } }) ``` @@ -52,3 +51,4 @@ yarn vite yarn install yarn dev ``` + diff --git a/javascript/examples/vite/main.ts b/javascript/examples/vite/main.ts index 0ba18f48..157c8e48 100644 --- a/javascript/examples/vite/main.ts +++ b/javascript/examples/vite/main.ts @@ -1,15 +1,15 @@ -import * as Automerge from "/node_modules/.vite/deps/automerge-js.js?v=6e973f28" -console.log(Automerge) -let doc = Automerge.init() -doc = Automerge.change(doc, d => (d.hello = "from automerge-js")) -console.log(doc) -const result = JSON.stringify(doc) +import * as Automerge from "/node_modules/.vite/deps/automerge-js.js?v=6e973f28"; +console.log(Automerge); +let doc = Automerge.init(); +doc = Automerge.change(doc, (d) => d.hello = "from automerge-js"); +console.log(doc); +const result = JSON.stringify(doc); if (typeof document !== "undefined") { - const element = document.createElement("div") - element.innerHTML = JSON.stringify(result) - document.body.appendChild(element) + const element = document.createElement("div"); + element.innerHTML = JSON.stringify(result); + document.body.appendChild(element); } else { - console.log("node:", result) + console.log("node:", result); } -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL2FsZXgvUHJvamVjdHMvYXV0b21lcmdlL2F1dG9tZXJnZS1ycy9hdXRvbWVyZ2UtanMvZXhhbXBsZXMvdml0ZS9zcmMvbWFpbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBBdXRvbWVyZ2UgZnJvbSBcImF1dG9tZXJnZS1qc1wiXG5cbi8vIGhlbGxvIHdvcmxkIGNvZGUgdGhhdCB3aWxsIHJ1biBjb3JyZWN0bHkgb24gd2ViIG9yIG5vZGVcblxuY29uc29sZS5sb2coQXV0b21lcmdlKVxubGV0IGRvYyA9IEF1dG9tZXJnZS5pbml0KClcbmRvYyA9IEF1dG9tZXJnZS5jaGFuZ2UoZG9jLCAoZDogYW55KSA9PiBkLmhlbGxvID0gXCJmcm9tIGF1dG9tZXJnZS1qc1wiKVxuY29uc29sZS5sb2coZG9jKVxuY29uc3QgcmVzdWx0ID0gSlNPTi5zdHJpbmdpZnkoZG9jKVxuXG5pZiAodHlwZW9mIGRvY3VtZW50ICE9PSAndW5kZWZpbmVkJykge1xuICAgIC8vIGJyb3dzZXJcbiAgICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7XG4gICAgZWxlbWVudC5pbm5lckhUTUwgPSBKU09OLnN0cmluZ2lmeShyZXN1bHQpXG4gICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChlbGVtZW50KTtcbn0gZWxzZSB7XG4gICAgLy8gc2VydmVyXG4gICAgY29uc29sZS5sb2coXCJub2RlOlwiLCByZXN1bHQpXG59XG5cbiJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxlQUFlO0FBSTNCLFFBQVEsSUFBSSxTQUFTO0FBQ3JCLElBQUksTUFBTSxVQUFVLEtBQUs7QUFDekIsTUFBTSxVQUFVLE9BQU8sS0FBSyxDQUFDLE1BQVcsRUFBRSxRQUFRLG1CQUFtQjtBQUNyRSxRQUFRLElBQUksR0FBRztBQUNmLE1BQU0sU0FBUyxLQUFLLFVBQVUsR0FBRztBQUVqQyxJQUFJLE9BQU8sYUFBYSxhQUFhO0FBRWpDLFFBQU0sVUFBVSxTQUFTLGNBQWMsS0FBSztBQUM1QyxVQUFRLFlBQVksS0FBSyxVQUFVLE1BQU07QUFDekMsV0FBUyxLQUFLLFlBQVksT0FBTztBQUNyQyxPQUFPO0FBRUgsVUFBUSxJQUFJLFNBQVMsTUFBTTtBQUMvQjsiLCJuYW1lcyI6W119 +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi9ob21lL2FsZXgvUHJvamVjdHMvYXV0b21lcmdlL2F1dG9tZXJnZS1ycy9hdXRvbWVyZ2UtanMvZXhhbXBsZXMvdml0ZS9zcmMvbWFpbi50cyJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBBdXRvbWVyZ2UgZnJvbSBcImF1dG9tZXJnZS1qc1wiXG5cbi8vIGhlbGxvIHdvcmxkIGNvZGUgdGhhdCB3aWxsIHJ1biBjb3JyZWN0bHkgb24gd2ViIG9yIG5vZGVcblxuY29uc29sZS5sb2coQXV0b21lcmdlKVxubGV0IGRvYyA9IEF1dG9tZXJnZS5pbml0KClcbmRvYyA9IEF1dG9tZXJnZS5jaGFuZ2UoZG9jLCAoZDogYW55KSA9PiBkLmhlbGxvID0gXCJmcm9tIGF1dG9tZXJnZS1qc1wiKVxuY29uc29sZS5sb2coZG9jKVxuY29uc3QgcmVzdWx0ID0gSlNPTi5zdHJpbmdpZnkoZG9jKVxuXG5pZiAodHlwZW9mIGRvY3VtZW50ICE9PSAndW5kZWZpbmVkJykge1xuICAgIC8vIGJyb3dzZXJcbiAgICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7XG4gICAgZWxlbWVudC5pbm5lckhUTUwgPSBKU09OLnN0cmluZ2lmeShyZXN1bHQpXG4gICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChlbGVtZW50KTtcbn0gZWxzZSB7XG4gICAgLy8gc2VydmVyXG4gICAgY29uc29sZS5sb2coXCJub2RlOlwiLCByZXN1bHQpXG59XG5cbiJdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWSxlQUFlO0FBSTNCLFFBQVEsSUFBSSxTQUFTO0FBQ3JCLElBQUksTUFBTSxVQUFVLEtBQUs7QUFDekIsTUFBTSxVQUFVLE9BQU8sS0FBSyxDQUFDLE1BQVcsRUFBRSxRQUFRLG1CQUFtQjtBQUNyRSxRQUFRLElBQUksR0FBRztBQUNmLE1BQU0sU0FBUyxLQUFLLFVBQVUsR0FBRztBQUVqQyxJQUFJLE9BQU8sYUFBYSxhQUFhO0FBRWpDLFFBQU0sVUFBVSxTQUFTLGNBQWMsS0FBSztBQUM1QyxVQUFRLFlBQVksS0FBSyxVQUFVLE1BQU07QUFDekMsV0FBUyxLQUFLLFlBQVksT0FBTztBQUNyQyxPQUFPO0FBRUgsVUFBUSxJQUFJLFNBQVMsTUFBTTtBQUMvQjsiLCJuYW1lcyI6W119 \ No newline at end of file diff --git a/javascript/examples/vite/src/counter.ts b/javascript/examples/vite/src/counter.ts index 3e516b6d..a3529e1f 100644 --- a/javascript/examples/vite/src/counter.ts +++ b/javascript/examples/vite/src/counter.ts @@ -4,6 +4,6 @@ export function setupCounter(element: HTMLButtonElement) { counter = count element.innerHTML = `count is ${counter}` } - element.addEventListener("click", () => setCounter(++counter)) + element.addEventListener('click', () => setCounter(++counter)) setCounter(0) } diff --git a/javascript/examples/vite/src/main.ts b/javascript/examples/vite/src/main.ts index 8dc8f92c..8f7551d5 100644 --- a/javascript/examples/vite/src/main.ts +++ b/javascript/examples/vite/src/main.ts @@ -3,15 +3,16 @@ import * as Automerge from "@automerge/automerge" // hello world code that will run correctly on web or node let doc = Automerge.init() -doc = Automerge.change(doc, (d: any) => (d.hello = "from automerge")) +doc = Automerge.change(doc, (d: any) => d.hello = "from automerge") const result = JSON.stringify(doc) -if (typeof document !== "undefined") { - // browser - const element = document.createElement("div") - element.innerHTML = JSON.stringify(result) - document.body.appendChild(element) +if (typeof document !== 'undefined') { + // browser + const element = document.createElement('div'); + element.innerHTML = JSON.stringify(result) + document.body.appendChild(element); } else { - // server - console.log("node:", result) + // server + console.log("node:", result) } + diff --git a/javascript/examples/vite/vite.config.js b/javascript/examples/vite/vite.config.js index d80981bf..9716d674 100644 --- a/javascript/examples/vite/vite.config.js +++ b/javascript/examples/vite/vite.config.js @@ -3,20 +3,20 @@ import wasm from "vite-plugin-wasm" import topLevelAwait from "vite-plugin-top-level-await" export default defineConfig({ - plugins: [topLevelAwait(), wasm()], - - // This is only necessary if you are using `SharedWorker` or `WebWorker`, as - // documented in https://vitejs.dev/guide/features.html#import-with-constructors - worker: { - format: "es", plugins: [topLevelAwait(), wasm()], - }, - optimizeDeps: { - // This is necessary because otherwise `vite dev` includes two separate - // versions of the JS wrapper. This causes problems because the JS - // wrapper has a module level variable to track JS side heap - // allocations, initializing this twice causes horrible breakage - exclude: ["@automerge/automerge-wasm"], - }, + // This is only necessary if you are using `SharedWorker` or `WebWorker`, as + // documented in https://vitejs.dev/guide/features.html#import-with-constructors + worker: { + format: "es", + plugins: [topLevelAwait(), wasm()] + }, + + optimizeDeps: { + // This is necessary because otherwise `vite dev` includes two separate + // versions of the JS wrapper. This causes problems because the JS + // wrapper has a module level variable to track JS side heap + // allocations, initializing this twice causes horrible breakage + exclude: ["@automerge/automerge-wasm"] + } }) diff --git a/javascript/examples/webpack/README.md b/javascript/examples/webpack/README.md index 7563f27d..917f9c8a 100644 --- a/javascript/examples/webpack/README.md +++ b/javascript/examples/webpack/README.md @@ -1,34 +1,36 @@ # Webpack + Automerge + Getting WASM working in webpack 5 is very easy. You just need to enable the `asyncWebAssembly` [experiment](https://webpack.js.org/configuration/experiments/). For example: + ```javascript -const path = require("path") +const path = require('path'); const clientConfig = { experiments: { asyncWebAssembly: true }, - target: "web", - entry: "./src/index.js", + target: 'web', + entry: './src/index.js', output: { - filename: "main.js", - path: path.resolve(__dirname, "public"), + filename: 'main.js', + path: path.resolve(__dirname, 'public'), }, mode: "development", // or production - performance: { - // we dont want the wasm blob to generate warnings - hints: false, - maxEntrypointSize: 512000, - maxAssetSize: 512000, - }, -} + performance: { // we dont want the wasm blob to generate warnings + hints: false, + maxEntrypointSize: 512000, + maxAssetSize: 512000 + } +}; module.exports = clientConfig ``` ## Running the example + ```bash yarn install yarn start diff --git a/javascript/examples/webpack/src/index.js b/javascript/examples/webpack/src/index.js index 3a9086e4..e3307083 100644 --- a/javascript/examples/webpack/src/index.js +++ b/javascript/examples/webpack/src/index.js @@ -3,15 +3,16 @@ import * as Automerge from "@automerge/automerge" // hello world code that will run correctly on web or node let doc = Automerge.init() -doc = Automerge.change(doc, d => (d.hello = "from automerge")) +doc = Automerge.change(doc, (d) => d.hello = "from automerge") const result = JSON.stringify(doc) -if (typeof document !== "undefined") { +if (typeof document !== 'undefined') { // browser - const element = document.createElement("div") + const element = document.createElement('div'); element.innerHTML = JSON.stringify(result) - document.body.appendChild(element) + document.body.appendChild(element); } else { // server console.log("node:", result) } + diff --git a/javascript/examples/webpack/webpack.config.js b/javascript/examples/webpack/webpack.config.js index 51fd5127..3a6d83ff 100644 --- a/javascript/examples/webpack/webpack.config.js +++ b/javascript/examples/webpack/webpack.config.js @@ -1,37 +1,36 @@ -const path = require("path") -const nodeExternals = require("webpack-node-externals") +const path = require('path'); +const nodeExternals = require('webpack-node-externals'); // the most basic webpack config for node or web targets for automerge-wasm const serverConfig = { // basic setup for bundling a node package - target: "node", + target: 'node', externals: [nodeExternals()], externalsPresets: { node: true }, - entry: "./src/index.js", + entry: './src/index.js', output: { - filename: "node.js", - path: path.resolve(__dirname, "dist"), + filename: 'node.js', + path: path.resolve(__dirname, 'dist'), }, mode: "development", // or production -} +}; const clientConfig = { experiments: { asyncWebAssembly: true }, - target: "web", - entry: "./src/index.js", + target: 'web', + entry: './src/index.js', output: { - filename: "main.js", - path: path.resolve(__dirname, "public"), + filename: 'main.js', + path: path.resolve(__dirname, 'public'), }, mode: "development", // or production - performance: { - // we dont want the wasm blob to generate warnings - hints: false, - maxEntrypointSize: 512000, - maxAssetSize: 512000, - }, -} + performance: { // we dont want the wasm blob to generate warnings + hints: false, + maxEntrypointSize: 512000, + maxAssetSize: 512000 + } +}; -module.exports = [serverConfig, clientConfig] +module.exports = [serverConfig, clientConfig]; diff --git a/javascript/package.json b/javascript/package.json index 79309907..b68674c9 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -4,7 +4,7 @@ "Orion Henry ", "Martin Kleppmann" ], - "version": "2.0.2", + "version": "2.0.1-alpha.1", "description": "Javascript implementation of automerge, backed by @automerge/automerge-wasm", "homepage": "https://github.com/automerge/automerge-rs/tree/main/wrappers/javascript", "repository": "github:automerge/automerge-rs", @@ -12,10 +12,26 @@ "README.md", "LICENSE", "package.json", - "dist/index.d.ts", - "dist/cjs/**/*.js", - "dist/mjs/**/*.js", - "dist/*.d.ts" + "index.d.ts", + "dist/*.d.ts", + "dist/cjs/constants.js", + "dist/cjs/types.js", + "dist/cjs/numbers.js", + "dist/cjs/index.js", + "dist/cjs/uuid.js", + "dist/cjs/counter.js", + "dist/cjs/low_level.js", + "dist/cjs/text.js", + "dist/cjs/proxies.js", + "dist/mjs/constants.js", + "dist/mjs/types.js", + "dist/mjs/numbers.js", + "dist/mjs/index.js", + "dist/mjs/uuid.js", + "dist/mjs/counter.js", + "dist/mjs/low_level.js", + "dist/mjs/text.js", + "dist/mjs/proxies.js" ], "types": "./dist/index.d.ts", "module": "./dist/mjs/index.js", @@ -23,31 +39,27 @@ "license": "MIT", "scripts": { "lint": "eslint src", - "build": "tsc -p config/mjs.json && tsc -p config/cjs.json && tsc -p config/declonly.json --emitDeclarationOnly", + "build": "tsc -p config/mjs.json && tsc -p config/cjs.json && tsc --emitDeclarationOnly", "test": "ts-mocha test/*.ts", - "deno:build": "denoify && node ./scripts/deno-prefixer.mjs", - "deno:test": "deno test ./deno-tests/deno.ts --allow-read --allow-net", - "watch-docs": "typedoc src/index.ts --watch --readme none" + "watch-docs": "typedoc src/index.ts --watch --readme typedoc-readme.md" }, "devDependencies": { "@types/expect": "^24.3.0", - "@types/mocha": "^10.0.1", - "@types/uuid": "^9.0.0", - "@typescript-eslint/eslint-plugin": "^5.46.0", - "@typescript-eslint/parser": "^5.46.0", - "denoify": "^1.4.5", - "eslint": "^8.29.0", + "@types/mocha": "^9.1.1", + "@types/uuid": "^8.3.4", + "@typescript-eslint/eslint-plugin": "^5.25.0", + "@typescript-eslint/parser": "^5.25.0", + "eslint": "^8.15.0", "fast-sha256": "^1.3.0", - "mocha": "^10.2.0", - "pako": "^2.1.0", - "prettier": "^2.8.1", + "mocha": "^10.0.0", + "pako": "^2.0.4", "ts-mocha": "^10.0.0", "ts-node": "^10.9.1", - "typedoc": "^0.23.22", - "typescript": "^4.9.4" + "typedoc": "^0.23.16", + "typescript": "^4.6.4" }, "dependencies": { - "@automerge/automerge-wasm": "0.1.25", - "uuid": "^9.0.0" + "@automerge/automerge-wasm": "0.1.18", + "uuid": "^8.3" } } diff --git a/javascript/scripts/deno-prefixer.mjs b/javascript/scripts/deno-prefixer.mjs deleted file mode 100644 index 28544102..00000000 --- a/javascript/scripts/deno-prefixer.mjs +++ /dev/null @@ -1,9 +0,0 @@ -import * as fs from "fs" - -const files = ["./deno_dist/proxies.ts"] -for (const filepath of files) { - const data = fs.readFileSync(filepath) - fs.writeFileSync(filepath, "// @ts-nocheck \n" + data) - - console.log('Prepended "// @ts-nocheck" to ' + filepath) -} diff --git a/javascript/scripts/denoify-replacer.mjs b/javascript/scripts/denoify-replacer.mjs deleted file mode 100644 index e183ba0d..00000000 --- a/javascript/scripts/denoify-replacer.mjs +++ /dev/null @@ -1,42 +0,0 @@ -// @denoify-ignore - -import { makeThisModuleAnExecutableReplacer } from "denoify" -// import { assert } from "tsafe"; -// import * as path from "path"; - -makeThisModuleAnExecutableReplacer( - async ({ parsedImportExportStatement, destDirPath, version }) => { - version = process.env.VERSION || version - - switch (parsedImportExportStatement.parsedArgument.nodeModuleName) { - case "@automerge/automerge-wasm": - { - const moduleRoot = - process.env.ROOT_MODULE || - `https://deno.land/x/automerge_wasm@${version}` - /* - *We expect not to run against statements like - *import(..).then(...) - *or - *export * from "..." - *in our code. - */ - if ( - !parsedImportExportStatement.isAsyncImport && - (parsedImportExportStatement.statementType === "import" || - parsedImportExportStatement.statementType === "export") - ) { - if (parsedImportExportStatement.isTypeOnly) { - return `${parsedImportExportStatement.statementType} type ${parsedImportExportStatement.target} from "${moduleRoot}/index.d.ts";` - } else { - return `${parsedImportExportStatement.statementType} ${parsedImportExportStatement.target} from "${moduleRoot}/automerge_wasm.js";` - } - } - } - break - } - - //The replacer should return undefined when we want to let denoify replace the statement - return undefined - } -) diff --git a/javascript/src/conflicts.ts b/javascript/src/conflicts.ts deleted file mode 100644 index 52af23e1..00000000 --- a/javascript/src/conflicts.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { Counter, type AutomergeValue } from "./types" -import { Text } from "./text" -import { type AutomergeValue as UnstableAutomergeValue } from "./unstable_types" -import { type Target, Text1Target, Text2Target } from "./proxies" -import { mapProxy, listProxy, ValueType } from "./proxies" -import type { Prop, ObjID } from "@automerge/automerge-wasm" -import { Automerge } from "@automerge/automerge-wasm" - -export type ConflictsF = { [key: string]: ValueType } -export type Conflicts = ConflictsF -export type UnstableConflicts = ConflictsF - -export function stableConflictAt( - context: Automerge, - objectId: ObjID, - prop: Prop -): Conflicts | undefined { - return conflictAt( - context, - objectId, - prop, - true, - (context: Automerge, conflictId: ObjID): AutomergeValue => { - return new Text(context.text(conflictId)) - } - ) -} - -export function unstableConflictAt( - context: Automerge, - objectId: ObjID, - prop: Prop -): UnstableConflicts | undefined { - return conflictAt( - context, - objectId, - prop, - true, - (context: Automerge, conflictId: ObjID): UnstableAutomergeValue => { - return context.text(conflictId) - } - ) -} - -function conflictAt( - context: Automerge, - objectId: ObjID, - prop: Prop, - textV2: boolean, - handleText: (a: Automerge, conflictId: ObjID) => ValueType -): ConflictsF | undefined { - const values = context.getAll(objectId, prop) - if (values.length <= 1) { - return - } - const result: ConflictsF = {} - for (const fullVal of values) { - switch (fullVal[0]) { - case "map": - result[fullVal[1]] = mapProxy( - context, - fullVal[1], - textV2, - [prop], - true - ) - break - case "list": - result[fullVal[1]] = listProxy( - context, - fullVal[1], - textV2, - [prop], - true - ) - break - case "text": - result[fullVal[1]] = handleText(context, fullVal[1] as ObjID) - break - case "str": - case "uint": - case "int": - case "f64": - case "boolean": - case "bytes": - case "null": - result[fullVal[2]] = fullVal[1] as ValueType - break - case "counter": - result[fullVal[2]] = new Counter(fullVal[1]) as ValueType - break - case "timestamp": - result[fullVal[2]] = new Date(fullVal[1]) as ValueType - break - default: - throw RangeError(`datatype ${fullVal[0]} unimplemented`) - } - } - return result -} diff --git a/javascript/src/constants.ts b/javascript/src/constants.ts index 7b714772..bc497fc5 100644 --- a/javascript/src/constants.ts +++ b/javascript/src/constants.ts @@ -1,12 +1,24 @@ // Properties of the document root object +//const OPTIONS = Symbol('_options') // object containing options passed to init() +//const CACHE = Symbol('_cache') // map from objectId to immutable object +export const STATE = Symbol.for('_am_meta') // object containing metadata about current state (e.g. sequence numbers) +export const HEADS = Symbol.for('_am_heads') // object containing metadata about current state (e.g. sequence numbers) +export const TRACE = Symbol.for('_am_trace') // object containing metadata about current state (e.g. sequence numbers) +export const OBJECT_ID = Symbol.for('_am_objectId') // object containing metadata about current state (e.g. sequence numbers) +export const IS_PROXY = Symbol.for('_am_isProxy') // object containing metadata about current state (e.g. sequence numbers) +export const READ_ONLY = Symbol.for('_am_readOnly') // object containing metadata about current state (e.g. sequence numbers) +export const FROZEN = Symbol.for('_am_frozen') // object containing metadata about current state (e.g. sequence numbers) + +export const UINT = Symbol.for('_am_uint') +export const INT = Symbol.for('_am_int') +export const F64 = Symbol.for('_am_f64') +export const COUNTER = Symbol.for('_am_counter') +export const TEXT = Symbol.for('_am_text') + +// Properties of all Automerge objects +//const OBJECT_ID = Symbol('_objectId') // the object ID of the current object (string) +//const CONFLICTS = Symbol('_conflicts') // map or list (depending on object type) of conflicts +//const CHANGE = Symbol('_change') // the context object on proxy objects used in change callback +//const ELEM_IDS = Symbol('_elemIds') // list containing the element ID of each list element -export const STATE = Symbol.for("_am_meta") // symbol used to hide application metadata on automerge objects -export const TRACE = Symbol.for("_am_trace") // used for debugging -export const OBJECT_ID = Symbol.for("_am_objectId") // symbol used to hide the object id on automerge objects -export const IS_PROXY = Symbol.for("_am_isProxy") // symbol used to test if the document is a proxy object -export const UINT = Symbol.for("_am_uint") -export const INT = Symbol.for("_am_int") -export const F64 = Symbol.for("_am_f64") -export const COUNTER = Symbol.for("_am_counter") -export const TEXT = Symbol.for("_am_text") diff --git a/javascript/src/counter.ts b/javascript/src/counter.ts index 88adb840..c20d7fcf 100644 --- a/javascript/src/counter.ts +++ b/javascript/src/counter.ts @@ -1,4 +1,4 @@ -import { Automerge, type ObjID, type Prop } from "@automerge/automerge-wasm" +import { Automerge, ObjID, Prop } from "@automerge/automerge-wasm" import { COUNTER } from "./constants" /** * The most basic CRDT: an integer value that can be changed only by @@ -6,7 +6,7 @@ import { COUNTER } from "./constants" * the value trivially converges. */ export class Counter { - value: number + value : number; constructor(value?: number) { this.value = value || 0 @@ -21,7 +21,7 @@ export class Counter { * concatenating it with another string, as in `x + ''`. * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/valueOf */ - valueOf(): number { + valueOf() : number { return this.value } @@ -30,7 +30,7 @@ export class Counter { * this method is called e.g. when you do `['value: ', x].join('')` or when * you use string interpolation: `value: ${x}`. */ - toString(): string { + toString() : string { return this.valueOf().toString() } @@ -38,7 +38,7 @@ export class Counter { * Returns the counter value, so that a JSON serialization of an Automerge * document represents the counter simply as an integer. */ - toJSON(): number { + toJSON() : number { return this.value } } @@ -49,30 +49,24 @@ export class Counter { */ class WriteableCounter extends Counter { context: Automerge - path: Prop[] + path: string[] objectId: ObjID key: Prop - constructor( - value: number, - context: Automerge, - path: Prop[], - objectId: ObjID, - key: Prop - ) { + constructor(value: number, context: Automerge, path: string[], objectId: ObjID, key: Prop) { super(value) this.context = context this.path = path this.objectId = objectId this.key = key } - + /** * Increases the value of the counter by `delta`. If `delta` is not given, * increases the value of the counter by 1. */ - increment(delta: number): number { - delta = typeof delta === "number" ? delta : 1 + increment(delta: number) : number { + delta = typeof delta === 'number' ? delta : 1 this.context.increment(this.objectId, this.key, delta) this.value += delta return this.value @@ -82,8 +76,8 @@ class WriteableCounter extends Counter { * Decreases the value of the counter by `delta`. If `delta` is not given, * decreases the value of the counter by 1. */ - decrement(delta: number): number { - return this.increment(typeof delta === "number" ? -delta : -1) + decrement(delta: number) : number { + return this.increment(typeof delta === 'number' ? -delta : -1) } } @@ -93,14 +87,8 @@ class WriteableCounter extends Counter { * `objectId` is the ID of the object containing the counter, and `key` is * the property name (key in map, or index in list) where the counter is * located. - */ -export function getWriteableCounter( - value: number, - context: Automerge, - path: Prop[], - objectId: ObjID, - key: Prop -): WriteableCounter { +*/ +export function getWriteableCounter(value: number, context: Automerge, path: string[], objectId: ObjID, key: Prop) { return new WriteableCounter(value, context, path, objectId, key) } diff --git a/javascript/src/index.ts b/javascript/src/index.ts index bf84c68d..72dfb221 100644 --- a/javascript/src/index.ts +++ b/javascript/src/index.ts @@ -1,185 +1,568 @@ + +/** @hidden **/ +export {/** @hidden */ uuid} from './uuid' + +import {rootProxy, listProxy, mapProxy} from "./proxies" +import {STATE, HEADS, TRACE, IS_PROXY, OBJECT_ID, READ_ONLY, FROZEN} from "./constants" + +import {AutomergeValue, Text, Counter} from "./types" +export {AutomergeValue, Counter, Int, Uint, Float64, ScalarValue} from "./types" + +import {type API, type Patch} from "@automerge/automerge-wasm"; +export { type Patch, PutPatch, DelPatch, SplicePatch, IncPatch, SyncMessage, } from "@automerge/automerge-wasm" +import {ApiHandler, UseApi} from "./low_level" + +import {Actor as ActorId, Prop, ObjID, Change, DecodedChange, Heads, Automerge, MaterializeValue} from "@automerge/automerge-wasm" +import {JsSyncState as SyncState, SyncMessage, DecodedSyncMessage} from "@automerge/automerge-wasm" + +/** Options passed to {@link change}, and {@link emptyChange} + * @typeParam T - The type of value contained in the document + */ +export type ChangeOptions = { + /** A message which describes the changes */ + message?: string, + /** The unix timestamp of the change (purely advisory, not used in conflict resolution) */ + time?: number, + /** A callback which will be called to notify the caller of any changes to the document */ + patchCallback?: PatchCallback +} + +/** Options passed to {@link loadIncremental}, {@link applyChanges}, and {@link receiveSyncMessage} + * @typeParam T - The type of value contained in the document + */ +export type ApplyOptions = {patchCallback?: PatchCallback} + +/** + * An automerge document. + * @typeParam T - The type of the value contained in this document + * + * Note that this provides read only access to the fields of the value. To + * modify the value use {@link change} + */ +export type Doc = {readonly [P in keyof T]: T[P]} + /** - * # Automerge + * Function which is called by {@link change} when making changes to a `Doc` + * @typeParam T - The type of value contained in the document * - * This library provides the core automerge data structure and sync algorithms. - * Other libraries can be built on top of this one which provide IO and - * persistence. + * This function may mutate `doc` + */ +export type ChangeFn = (doc: T) => void + +/** + * Callback which is called by various methods in this library to notify the + * user of what changes have been made. + * @param patch - A description of the changes made + * @param before - The document before the change was made + * @param after - The document after the change was made + */ +export type PatchCallback = (patch: Patch, before: Doc, after: Doc) => void + +/** @hidden **/ +export interface State { + change: DecodedChange + snapshot: T +} + +/** @hidden **/ +export function use(api: API) { + UseApi(api) +} + +import * as wasm from "@automerge/automerge-wasm" +use(wasm) + +/** + * Options to be passed to {@link init} or {@link load} + * @typeParam T - The type of the value the document contains + */ +export type InitOptions = { + /** The actor ID to use for this document, a random one will be generated if `null` is passed */ + actor?: ActorId, + freeze?: boolean, + /** A callback which will be called with the initial patch once the document has finished loading */ + patchCallback?: PatchCallback, +}; + + +interface InternalState { + handle: Automerge, + heads: Heads | undefined, + freeze: boolean, + patchCallback?: PatchCallback +} + +/** @hidden */ +export function getBackend(doc: Doc): Automerge { + return _state(doc).handle +} + +function _state(doc: Doc, checkroot = true): InternalState { + if (typeof doc !== 'object') { + throw new RangeError("must be the document root") + } + const state = Reflect.get(doc, STATE) as InternalState + if (state === undefined || state == null || (checkroot && _obj(doc) !== "_root")) { + throw new RangeError("must be the document root") + } + return state +} + +function _frozen(doc: Doc): boolean { + return Reflect.get(doc, FROZEN) === true +} + +function _trace(doc: Doc): string | undefined { + return Reflect.get(doc, TRACE) as string +} + +function _obj(doc: Doc): ObjID | null { + if (!(typeof doc === 'object') || doc === null) { + return null + } + return Reflect.get(doc, OBJECT_ID) as ObjID +} + +function _readonly(doc: Doc): boolean { + return Reflect.get(doc, READ_ONLY) !== false +} + +function importOpts(_actor?: ActorId | InitOptions): InitOptions { + if (typeof _actor === 'object') { + return _actor + } else { + return {actor: _actor} + } +} + +/** + * Create a new automerge document * - * An automerge document can be though of an immutable POJO (plain old javascript - * object) which `automerge` tracks the history of, allowing it to be merged with - * any other automerge document. + * @typeParam T - The type of value contained in the document. This will be the + * type that is passed to the change closure in {@link change} + * @param _opts - Either an actorId or an {@link InitOptions} (which may + * contain an actorId). If this is null the document will be initialised with a + * random actor ID + */ +export function init(_opts?: ActorId | InitOptions): Doc { + let opts = importOpts(_opts) + let freeze = !!opts.freeze + let patchCallback = opts.patchCallback + const handle = ApiHandler.create(opts.actor) + handle.enablePatches(true) + handle.enableFreeze(!!opts.freeze) + handle.registerDatatype("counter", (n) => new Counter(n)) + const doc = handle.materialize("/", undefined, {handle, heads: undefined, freeze, patchCallback}) as Doc + return doc +} + +/** + * Make an immutable view of an automerge document as at `heads` * - * ## Creating and modifying a document + * @remarks + * The document returned from this function cannot be passed to {@link change}. + * This is because it shares the same underlying memory as `doc`, but it is + * consequently a very cheap copy. * - * You can create a document with {@link init} or {@link from} and then make - * changes to it with {@link change}, you can merge two documents with {@link - * merge}. + * Note that this function will throw an error if any of the hashes in `heads` + * are not in the document. * - * ```ts - * import * as automerge from "@automerge/automerge" + * @typeParam T - The type of the value contained in the document + * @param doc - The document to create a view of + * @param heads - The hashes of the heads to create a view at + */ +export function view(doc: Doc, heads: Heads): Doc { + const state = _state(doc) + const handle = state.handle + return state.handle.materialize("/", heads, { ...state, handle, heads }) as any +} + +/** + * Make a full writable copy of an automerge document * - * type DocType = {ideas: Array} + * @remarks + * Unlike {@link view} this function makes a full copy of the memory backing + * the document and can thus be passed to {@link change}. It also generates a + * new actor ID so that changes made in the new document do not create duplicate + * sequence numbers with respect to the old document. If you need control over + * the actor ID which is generated you can pass the actor ID as the second + * argument * - * let doc1 = automerge.init() + * @typeParam T - The type of the value contained in the document + * @param doc - The document to clone + * @param _opts - Either an actor ID to use for the new doc or an {@link InitOptions} + */ +export function clone(doc: Doc, _opts?: ActorId | InitOptions): Doc { + const state = _state(doc) + const heads = state.heads + const opts = importOpts(_opts) + const handle = state.handle.fork(opts.actor, heads) + + // `change` uses the presence of state.heads to determine if we are in a view + // set it to undefined to indicate that this is a full fat document + const {heads: oldHeads, ...stateSansHeads} = state + return handle.applyPatches(doc, { ... stateSansHeads, handle }) +} + +/** Explicity free the memory backing a document. Note that this is note + * necessary in environments which support + * [`FinalizationRegistry`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/FinalizationRegistry) + */ +export function free(doc: Doc) { + return _state(doc).handle.free() +} + +/** + * Create an automerge document from a POJO + * + * @param initialState - The initial state which will be copied into the document + * @typeParam T - The type of the value passed to `from` _and_ the type the resulting document will contain + * @typeParam actor - The actor ID of the resulting document, if this is null a random actor ID will be used + * + * @example + * ``` + * const doc = automerge.from({ + * tasks: [ + * {description: "feed dogs", done: false} + * ] + * }) + * ``` + */ +export function from>(initialState: T | Doc, actor?: ActorId): Doc { + return change(init(actor), (d) => Object.assign(d, initialState)) +} + +/** + * Update the contents of an automerge document + * @typeParam T - The type of the value contained in the document + * @param doc - The document to update + * @param options - Either a message, an {@link ChangeOptions}, or a {@link ChangeFn} + * @param callback - A `ChangeFn` to be used if `options` was a `string` + * + * Note that if the second argument is a function it will be used as the `ChangeFn` regardless of what the third argument is. + * + * @example A simple change + * ``` + * let doc1 = automerge.init() * doc1 = automerge.change(doc1, d => { - * d.ideas = [new automerge.Text("an immutable document")] + * d.key = "value" * }) - * - * let doc2 = automerge.init() - * doc2 = automerge.merge(doc2, automerge.clone(doc1)) - * doc2 = automerge.change(doc2, d => { - * d.ideas.push(new automerge.Text("which records it's history")) - * }) - * - * // Note the `automerge.clone` call, see the "cloning" section of this readme for - * // more detail - * doc1 = automerge.merge(doc1, automerge.clone(doc2)) - * doc1 = automerge.change(doc1, d => { - * d.ideas[0].deleteAt(13, 8) - * d.ideas[0].insertAt(13, "object") - * }) - * - * let doc3 = automerge.merge(doc1, doc2) - * // doc3 is now {ideas: ["an immutable object", "which records it's history"]} + * assert.equal(doc1.key, "value") * ``` * - * ## Applying changes from another document + * @example A change with a message * - * You can get a representation of the result of the last {@link change} you made - * to a document with {@link getLastLocalChange} and you can apply that change to - * another document using {@link applyChanges}. - * - * If you need to get just the changes which are in one document but not in another - * you can use {@link getHeads} to get the heads of the document without the - * changes and then {@link getMissingDeps}, passing the result of {@link getHeads} - * on the document with the changes. - * - * ## Saving and loading documents - * - * You can {@link save} a document to generate a compresed binary representation of - * the document which can be loaded with {@link load}. If you have a document which - * you have recently made changes to you can generate recent changes with {@link - * saveIncremental}, this will generate all the changes since you last called - * `saveIncremental`, the changes generated can be applied to another document with - * {@link loadIncremental}. - * - * ## Viewing different versions of a document - * - * Occasionally you may wish to explicitly step to a different point in a document - * history. One common reason to do this is if you need to obtain a set of changes - * which take the document from one state to another in order to send those changes - * to another peer (or to save them somewhere). You can use {@link view} to do this. - * - * ```ts - * import * as automerge from "@automerge/automerge" - * import * as assert from "assert" - * - * let doc = automerge.from({ - * key1: "value1", - * }) - * - * // Make a clone of the document at this point, maybe this is actually on another - * // peer. - * let doc2 = automerge.clone < any > doc - * - * let heads = automerge.getHeads(doc) - * - * doc = - * automerge.change < - * any > - * (doc, - * d => { + * ``` + * doc1 = automerge.change(doc1, "add another value", d => { * d.key2 = "value2" - * }) - * - * doc = - * automerge.change < - * any > - * (doc, - * d => { - * d.key3 = "value3" - * }) - * - * // At this point we've generated two separate changes, now we want to send - * // just those changes to someone else - * - * // view is a cheap reference based copy of a document at a given set of heads - * let before = automerge.view(doc, heads) - * - * // This view doesn't show the last two changes in the document state - * assert.deepEqual(before, { - * key1: "value1", - * }) - * - * // Get the changes to send to doc2 - * let changes = automerge.getChanges(before, doc) - * - * // Apply the changes at doc2 - * doc2 = automerge.applyChanges < any > (doc2, changes)[0] - * assert.deepEqual(doc2, { - * key1: "value1", - * key2: "value2", - * key3: "value3", * }) * ``` * - * If you have a {@link view} of a document which you want to make changes to you - * can {@link clone} the viewed document. + * @example A change with a message and a timestamp + * + * ``` + * doc1 = automerge.change(doc1, {message: "add another value", timestamp: 1640995200}, d => { + * d.key2 = "value2" + * }) + * ``` * - * ## Syncing - * - * The sync protocol is stateful. This means that we start by creating a {@link - * SyncState} for each peer we are communicating with using {@link initSyncState}. - * Then we generate a message to send to the peer by calling {@link - * generateSyncMessage}. When we receive a message from the peer we call {@link - * receiveSyncMessage}. Here's a simple example of a loop which just keeps two - * peers in sync. - * - * ```ts - * let sync1 = automerge.initSyncState() - * let msg: Uint8Array | null - * ;[sync1, msg] = automerge.generateSyncMessage(doc1, sync1) - * - * while (true) { - * if (msg != null) { - * network.send(msg) - * } - * let resp: Uint8Array = - * (network.receive()[(doc1, sync1, _ignore)] = - * automerge.receiveSyncMessage(doc1, sync1, resp)[(sync1, msg)] = - * automerge.generateSyncMessage(doc1, sync1)) + * @example responding to a patch callback + * ``` + * let patchedPath + * let patchCallback = patch => { + * patchedPath = patch.path * } + * doc1 = automerge.change(doc1, {message, "add another value", timestamp: 1640995200, patchCallback}, d => { + * d.key2 = "value2" + * }) + * assert.equal(patchedPath, ["key2"]) * ``` + */ +export function change(doc: Doc, options: string | ChangeOptions | ChangeFn, callback?: ChangeFn): Doc { + if (typeof options === 'function') { + return _change(doc, {}, options) + } else if (typeof callback === 'function') { + if (typeof options === "string") { + options = {message: options} + } + return _change(doc, options, callback) + } else { + throw RangeError("Invalid args for change") + } +} + +function progressDocument(doc: Doc, heads: Heads, callback?: PatchCallback): Doc { + let state = _state(doc) + let nextState = {...state, heads: undefined}; + let nextDoc = state.handle.applyPatches(doc, nextState, callback) + state.heads = heads + return nextDoc +} + +function _change(doc: Doc, options: ChangeOptions, callback: ChangeFn): Doc { + + + if (typeof callback !== "function") { + throw new RangeError("invalid change function"); + } + + const state = _state(doc) + + if (doc === undefined || state === undefined) { + throw new RangeError("must be the document root"); + } + if (state.heads) { + throw new RangeError("Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy.") + } + if (_readonly(doc) === false) { + throw new RangeError("Calls to Automerge.change cannot be nested") + } + const heads = state.handle.getHeads() + try { + state.heads = heads + const root: T = rootProxy(state.handle); + callback(root) + if (state.handle.pendingOps() === 0) { + state.heads = undefined + return doc + } else { + state.handle.commit(options.message, options.time) + return progressDocument(doc, heads, options.patchCallback || state.patchCallback); + } + } catch (e) { + //console.log("ERROR: ",e) + state.heads = undefined + state.handle.rollback() + throw e + } +} + +/** + * Make a change to a document which does not modify the document * - * ## Conflicts + * @param doc - The doc to add the empty change to + * @param options - Either a message or a {@link ChangeOptions} for the new change * - * The only time conflicts occur in automerge documents is in concurrent - * assignments to the same key in an object. In this case automerge - * deterministically chooses an arbitrary value to present to the application but - * you can examine the conflicts using {@link getConflicts}. + * Why would you want to do this? One reason might be that you have merged + * changes from some other peers and you want to generate a change which + * depends on those merged changes so that you can sign the new change with all + * of the merged changes as part of the new change. + */ +export function emptyChange(doc: Doc, options: string | ChangeOptions) { + if (options === undefined) { + options = {} + } + if (typeof options === "string") { + options = {message: options} + } + + const state = _state(doc) + + if (state.heads) { + throw new RangeError("Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy.") + } + if (_readonly(doc) === false) { + throw new RangeError("Calls to Automerge.change cannot be nested") + } + + const heads = state.handle.getHeads() + state.handle.commit(options.message, options.time) + return progressDocument(doc, heads) +} + +/** + * Load an automerge document from a compressed document produce by {@link save} * + * @typeParam T - The type of the value which is contained in the document. + * Note that no validation is done to make sure this type is in + * fact the type of the contained value so be a bit careful + * @param data - The compressed document + * @param _opts - Either an actor ID or some {@link InitOptions}, if the actor + * ID is null a random actor ID will be created + * + * Note that `load` will throw an error if passed incomplete content (for + * example if you are receiving content over the network and don't know if you + * have the complete document yet). If you need to handle incomplete content use + * {@link init} followed by {@link loadIncremental}. + */ +export function load(data: Uint8Array, _opts?: ActorId | InitOptions): Doc { + const opts = importOpts(_opts) + const actor = opts.actor + const patchCallback = opts.patchCallback + const handle = ApiHandler.load(data, actor) + handle.enablePatches(true) + handle.enableFreeze(!!opts.freeze) + handle.registerDatatype("counter", (n) => new Counter(n)) + const doc: any = handle.materialize("/", undefined, {handle, heads: undefined, patchCallback}) as Doc + return doc +} + +/** + * Load changes produced by {@link saveIncremental}, or partial changes + * + * @typeParam T - The type of the value which is contained in the document. + * Note that no validation is done to make sure this type is in + * fact the type of the contained value so be a bit careful + * @param data - The compressedchanges + * @param opts - an {@link ApplyOptions} + * + * This function is useful when staying up to date with a connected peer. + * Perhaps the other end sent you a full compresed document which you loaded + * with {@link load} and they're sending you the result of + * {@link getLastLocalChange} every time they make a change. + * + * Note that this function will succesfully load the results of {@link save} as + * well as {@link getLastLocalChange} or any other incremental change. + */ +export function loadIncremental(doc: Doc, data: Uint8Array, opts?: ApplyOptions): Doc { + if (!opts) {opts = {}} + const state = _state(doc) + if (state.heads) { + throw new RangeError("Attempting to change an out of date document - set at: " + _trace(doc)); + } + if (_readonly(doc) === false) { + throw new RangeError("Calls to Automerge.change cannot be nested") + } + const heads = state.handle.getHeads() + state.handle.loadIncremental(data) + return progressDocument(doc, heads, opts.patchCallback || state.patchCallback) +} + +/** + * Export the contents of a document to a compressed format + * + * @param doc - The doc to save + * + * The returned bytes can be passed to {@link load} or {@link loadIncremental} + */ +export function save(doc: Doc): Uint8Array { + return _state(doc).handle.save() +} + +/** + * Merge `local` into `remote` + * @typeParam T - The type of values contained in each document + * @param local - The document to merge changes into + * @param remote - The document to merge changes from + * + * @returns - The merged document + * + * Often when you are merging documents you will also need to clone them. Both + * arguments to `merge` are frozen after the call so you can no longer call + * mutating methods (such as {@link change}) on them. The symtom of this will be + * an error which says "Attempting to change an out of date document". To + * overcome this call {@link clone} on the argument before passing it to {@link + * merge}. + */ +export function merge(local: Doc, remote: Doc): Doc { + const localState = _state(local) + + if (localState.heads) { + throw new RangeError("Attempting to change an out of date document - set at: " + _trace(local)); + } + const heads = localState.handle.getHeads() + const remoteState = _state(remote) + const changes = localState.handle.getChangesAdded(remoteState.handle) + localState.handle.applyChanges(changes) + return progressDocument(local, heads, localState.patchCallback) +} + +/** + * Get the actor ID associated with the document + */ +export function getActorId(doc: Doc): ActorId { + const state = _state(doc) + return state.handle.getActorId() +} + +/** + * The type of conflicts for particular key or index + * + * Maps and sequences in automerge can contain conflicting values for a + * particular key or index. In this case {@link getConflicts} can be used to + * obtain a `Conflicts` representing the multiple values present for the property + * + * A `Conflicts` is a map from a unique (per property or index) key to one of + * the possible conflicting values for the given property. + */ +type Conflicts = {[key: string]: AutomergeValue} + +function conflictAt(context: Automerge, objectId: ObjID, prop: Prop): Conflicts | undefined { + const values = context.getAll(objectId, prop) + if (values.length <= 1) { + return + } + const result: Conflicts = {} + for (const fullVal of values) { + switch (fullVal[0]) { + case "map": + result[fullVal[1]] = mapProxy(context, fullVal[1], [prop], true) + break; + case "list": + result[fullVal[1]] = listProxy(context, fullVal[1], [prop], true) + break; + case "text": + result[fullVal[1]] = context.text(fullVal[1]) + break; + //case "table": + //case "cursor": + case "str": + case "uint": + case "int": + case "f64": + case "boolean": + case "bytes": + case "null": + result[fullVal[2]] = fullVal[1] + break; + case "counter": + result[fullVal[2]] = new Counter(fullVal[1]) + break; + case "timestamp": + result[fullVal[2]] = new Date(fullVal[1]) + break; + default: + throw RangeError(`datatype ${fullVal[0]} unimplemented`) + } + } + return result +} + +/** + * Get the conflicts associated with a property + * + * The values of properties in a map in automerge can be conflicted if there + * are concurrent "put" operations to the same key. Automerge chooses one value + * arbitrarily (but deterministically, any two nodes who have the same set of + * changes will choose the same value) from the set of conflicting values to + * present as the value of the key. + * + * Sometimes you may want to examine these conflicts, in this case you can use + * {@link getConflicts} to get the conflicts for the key. + * + * @example * ``` * import * as automerge from "@automerge/automerge" - * + * * type Profile = { * pets: Array<{name: string, type: string}> * } - * + * * let doc1 = automerge.init("aaaa") * doc1 = automerge.change(doc1, d => { * d.pets = [{name: "Lassie", type: "dog"}] * }) * let doc2 = automerge.init("bbbb") * doc2 = automerge.merge(doc2, automerge.clone(doc1)) - * + * * doc2 = automerge.change(doc2, d => { * d.pets[0].name = "Beethoven" * }) - * + * * doc1 = automerge.change(doc1, d => { * d.pets[0].name = "Babe" * }) - * + * * const doc3 = automerge.merge(doc1, doc2) * * // Note that here we pass `doc3.pets`, not `doc3` @@ -188,55 +571,291 @@ * // The two conflicting values are the keys of the conflicts object * assert.deepEqual(Object.values(conflicts), ["Babe", Beethoven"]) * ``` - * - * ## Actor IDs - * - * By default automerge will generate a random actor ID for you, but most methods - * for creating a document allow you to set the actor ID. You can get the actor ID - * associated with the document by calling {@link getActorId}. Actor IDs must not - * be used in concurrent threads of executiong - all changes by a given actor ID - * are expected to be sequential. - * - * ## Listening to patches - * - * Sometimes you want to respond to changes made to an automerge document. In this - * case you can use the {@link PatchCallback} type to receive notifications when - * changes have been made. - * - * ## Cloning - * - * Currently you cannot make mutating changes (i.e. call {@link change}) to a - * document which you have two pointers to. For example, in this code: - * - * ```javascript - * let doc1 = automerge.init() - * let doc2 = automerge.change(doc1, d => (d.key = "value")) - * ``` - * - * `doc1` and `doc2` are both pointers to the same state. Any attempt to call - * mutating methods on `doc1` will now result in an error like - * - * Attempting to change an out of date document - * - * If you encounter this you need to clone the original document, the above sample - * would work as: - * - * ```javascript - * let doc1 = automerge.init() - * let doc2 = automerge.change(automerge.clone(doc1), d => (d.key = "value")) - * ``` - * @packageDocumentation - * - * ## The {@link unstable} module - * - * We are working on some changes to automerge which are not yet complete and - * will result in backwards incompatible API changes. Once these changes are - * ready for production use we will release a new major version of automerge. - * However, until that point you can use the {@link unstable} module to try out - * the new features, documents from the {@link unstable} module are - * interoperable with documents from the main module. Please see the docs for - * the {@link unstable} module for more details. */ -export * from "./stable" -import * as unstable from "./unstable" -export { unstable } +export function getConflicts(doc: Doc, prop: Prop): Conflicts | undefined { + const state = _state(doc, false) + const objectId = _obj(doc) + if (objectId != null) { + return conflictAt(state.handle, objectId, prop) + } else { + return undefined + } +} + +/** + * Get the binary representation of the last change which was made to this doc + * + * This is most useful when staying in sync with other peers, every time you + * make a change locally via {@link change} you immediately call {@link + * getLastLocalChange} and send the result over the network to other peers. + */ +export function getLastLocalChange(doc: Doc): Change | undefined { + const state = _state(doc) + return state.handle.getLastLocalChange() || undefined +} + +/** + * Return the object ID of an arbitrary javascript value + * + * This is useful to determine if something is actually an automerge document, + * if `doc` is not an automerge document this will return null. + */ +export function getObjectId(doc: any, prop?: Prop): ObjID | null { + if (prop) { + const state = _state(doc, false) + const objectId = _obj(doc) + if (!state || !objectId) { + throw new RangeError("invalid object for splice") + } + return state.handle.get(objectId, prop) as ObjID + } else { + return _obj(doc) + } +} + +/** + * Get the changes which are in `newState` but not in `oldState`. The returned + * changes can be loaded in `oldState` via {@link applyChanges}. + * + * Note that this will crash if there are changes in `oldState` which are not in `newState`. + */ +export function getChanges(oldState: Doc, newState: Doc): Change[] { + const o = _state(oldState) + const n = _state(newState) + return n.handle.getChanges(getHeads(oldState)) +} + +/** + * Get all the changes in a document + * + * This is different to {@link save} because the output is an array of changes + * which can be individually applied via {@link applyChanges}` + * + */ +export function getAllChanges(doc: Doc): Change[] { + const state = _state(doc) + return state.handle.getChanges([]) +} + +/** + * Apply changes received from another document + * + * `doc` will be updated to reflect the `changes`. If there are changes which + * we do not have dependencies for yet those will be stored in the document and + * applied when the depended on changes arrive. + * + * You can use the {@link ApplyOptions} to pass a patchcallback which will be + * informed of any changes which occur as a result of applying the changes + * + */ +export function applyChanges(doc: Doc, changes: Change[], opts?: ApplyOptions): [Doc] { + const state = _state(doc) + if (!opts) {opts = {}} + if (state.heads) { + throw new RangeError("Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy.") + } + if (_readonly(doc) === false) { + throw new RangeError("Calls to Automerge.change cannot be nested") + } + const heads = state.handle.getHeads(); + state.handle.applyChanges(changes) + state.heads = heads; + return [progressDocument(doc, heads, opts.patchCallback || state.patchCallback)] +} + +/** @hidden */ +export function getHistory(doc: Doc): State[] { + const history = getAllChanges(doc) + return history.map((change, index) => ({ + get change() { + return decodeChange(change) + }, + get snapshot() { + const [state] = applyChanges(init(), history.slice(0, index + 1)) + return state + } + }) + ) +} + +/** @hidden */ +// FIXME : no tests +// FIXME can we just use deep equals now? +export function equals(val1: unknown, val2: unknown): boolean { + if (!isObject(val1) || !isObject(val2)) return val1 === val2 + const keys1 = Object.keys(val1).sort(), keys2 = Object.keys(val2).sort() + if (keys1.length !== keys2.length) return false + for (let i = 0; i < keys1.length; i++) { + if (keys1[i] !== keys2[i]) return false + if (!equals(val1[keys1[i]], val2[keys2[i]])) return false + } + return true +} + +/** + * encode a {@link SyncState} into binary to send over the network + * + * @group sync + * */ +export function encodeSyncState(state: SyncState): Uint8Array { + const sync = ApiHandler.importSyncState(state) + const result = ApiHandler.encodeSyncState(sync) + sync.free() + return result +} + +/** + * Decode some binary data into a {@link SyncState} + * + * @group sync + */ +export function decodeSyncState(state: Uint8Array): SyncState { + let sync = ApiHandler.decodeSyncState(state) + let result = ApiHandler.exportSyncState(sync) + sync.free() + return result +} + +/** + * Generate a sync message to send to the peer represented by `inState` + * @param doc - The doc to generate messages about + * @param inState - The {@link SyncState} representing the peer we are talking to + * + * @group sync + * + * @returns An array of `[newSyncState, syncMessage | null]` where + * `newSyncState` should replace `inState` and `syncMessage` should be sent to + * the peer if it is not null. If `syncMessage` is null then we are up to date. + */ +export function generateSyncMessage(doc: Doc, inState: SyncState): [SyncState, SyncMessage | null] { + const state = _state(doc) + const syncState = ApiHandler.importSyncState(inState) + const message = state.handle.generateSyncMessage(syncState) + const outState = ApiHandler.exportSyncState(syncState) + return [outState, message] +} + +/** + * Update a document and our sync state on receiving a sync message + * + * @group sync + * + * @param doc - The doc the sync message is about + * @param inState - The {@link SyncState} for the peer we are communicating with + * @param message - The message which was received + * @param opts - Any {@link ApplyOption}s, used for passing a + * {@link PatchCallback} which will be informed of any changes + * in `doc` which occur because of the received sync message. + * + * @returns An array of `[newDoc, newSyncState, syncMessage | null]` where + * `newDoc` is the updated state of `doc`, `newSyncState` should replace + * `inState` and `syncMessage` should be sent to the peer if it is not null. If + * `syncMessage` is null then we are up to date. + */ +export function receiveSyncMessage(doc: Doc, inState: SyncState, message: SyncMessage, opts?: ApplyOptions): [Doc, SyncState, null] { + const syncState = ApiHandler.importSyncState(inState) + if (!opts) {opts = {}} + const state = _state(doc) + if (state.heads) { + throw new RangeError("Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy.") + } + if (_readonly(doc) === false) { + throw new RangeError("Calls to Automerge.change cannot be nested") + } + const heads = state.handle.getHeads() + state.handle.receiveSyncMessage(syncState, message) + const outSyncState = ApiHandler.exportSyncState(syncState) + return [progressDocument(doc, heads, opts.patchCallback || state.patchCallback), outSyncState, null]; +} + +/** + * Create a new, blank {@link SyncState} + * + * When communicating with a peer for the first time use this to generate a new + * {@link SyncState} for them + * + * @group sync + */ +export function initSyncState(): SyncState { + return ApiHandler.exportSyncState(ApiHandler.initSyncState()) +} + +/** @hidden */ +export function encodeChange(change: DecodedChange): Change { + return ApiHandler.encodeChange(change) +} + +/** @hidden */ +export function decodeChange(data: Change): DecodedChange { + return ApiHandler.decodeChange(data) +} + +/** @hidden */ +export function encodeSyncMessage(message: DecodedSyncMessage): SyncMessage { + return ApiHandler.encodeSyncMessage(message) +} + +/** @hidden */ +export function decodeSyncMessage(message: SyncMessage): DecodedSyncMessage { + return ApiHandler.decodeSyncMessage(message) +} + +/** + * Get any changes in `doc` which are not dependencies of `heads` + */ +export function getMissingDeps(doc: Doc, heads: Heads): Heads { + const state = _state(doc) + return state.handle.getMissingDeps(heads) +} + +export function splice(doc: Doc, prop: Prop, index: number, del: number, newText?: string) { + if (!Reflect.get(doc, IS_PROXY)) { + throw new RangeError("object cannot be modified outside of a change block") + } + const state = _state(doc, false) + const objectId = _obj(doc) + if (!objectId) { + throw new RangeError("invalid object for splice") + } + const value = state.handle.getWithType(objectId, prop) + if (value === null) { + throw new RangeError("Cannot splice, not a valid value"); + } else if (value[0] === 'text') { + return state.handle.splice(value[1], index, del, newText) + } else { + throw new RangeError(`Cannot splice, value is of type '${value[0]}', must be 'text'`); + } +} + +/** + * Get the hashes of the heads of this document + */ +export function getHeads(doc: Doc): Heads { + const state = _state(doc) + return state.heads || state.handle.getHeads() +} + +/** @hidden */ +export function dump(doc: Doc) { + const state = _state(doc) + state.handle.dump() +} + +/** @hidden */ +export function toJS(doc: Doc): T { + const state = _state(doc) + const enabled = state.handle.enableFreeze(false) + const result = state.handle.materialize() + state.handle.enableFreeze(enabled) + return result as T +} + +export function isAutomerge(doc: unknown): boolean { + return getObjectId(doc) === "_root" && !!Reflect.get(doc as Object, STATE) +} + +function isObject(obj: unknown): obj is Record { + return typeof obj === 'object' && obj !== null +} + +export type {API, SyncState, ActorId, Conflicts, Prop, Change, ObjID, DecodedChange, DecodedSyncMessage, Heads, MaterializeValue} diff --git a/javascript/src/internal_state.ts b/javascript/src/internal_state.ts deleted file mode 100644 index f3da49b1..00000000 --- a/javascript/src/internal_state.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { type ObjID, type Heads, Automerge } from "@automerge/automerge-wasm" - -import { STATE, OBJECT_ID, TRACE, IS_PROXY } from "./constants" - -import type { Doc, PatchCallback } from "./types" - -export interface InternalState { - handle: Automerge - heads: Heads | undefined - freeze: boolean - patchCallback?: PatchCallback - textV2: boolean -} - -export function _state(doc: Doc, checkroot = true): InternalState { - if (typeof doc !== "object") { - throw new RangeError("must be the document root") - } - const state = Reflect.get(doc, STATE) as InternalState - if ( - state === undefined || - state == null || - (checkroot && _obj(doc) !== "_root") - ) { - throw new RangeError("must be the document root") - } - return state -} - -export function _trace(doc: Doc): string | undefined { - return Reflect.get(doc, TRACE) as string -} - -export function _obj(doc: Doc): ObjID | null { - if (!(typeof doc === "object") || doc === null) { - return null - } - return Reflect.get(doc, OBJECT_ID) as ObjID -} - -export function _is_proxy(doc: Doc): boolean { - return !!Reflect.get(doc, IS_PROXY) -} diff --git a/javascript/src/low_level.ts b/javascript/src/low_level.ts index f44f3a32..9a5480b3 100644 --- a/javascript/src/low_level.ts +++ b/javascript/src/low_level.ts @@ -1,58 +1,25 @@ -import { - type API, - Automerge, - type Change, - type DecodedChange, - type Actor, - SyncState, - type SyncMessage, - type JsSyncState, - type DecodedSyncMessage, - type ChangeToEncode, -} from "@automerge/automerge-wasm" -export type { ChangeToEncode } from "@automerge/automerge-wasm" + +import { Automerge, Change, DecodedChange, Actor, SyncState, SyncMessage, JsSyncState, DecodedSyncMessage } from "@automerge/automerge-wasm" +import { API } from "@automerge/automerge-wasm" export function UseApi(api: API) { for (const k in api) { - // eslint-disable-next-line @typescript-eslint/no-extra-semi,@typescript-eslint/no-explicit-any - ;(ApiHandler as any)[k] = (api as any)[k] + ApiHandler[k] = api[k] } } /* eslint-disable */ -export const ApiHandler: API = { - create(textV2: boolean, actor?: Actor): Automerge { - throw new RangeError("Automerge.use() not called") - }, - load(data: Uint8Array, textV2: boolean, actor?: Actor): Automerge { - throw new RangeError("Automerge.use() not called (load)") - }, - encodeChange(change: ChangeToEncode): Change { - throw new RangeError("Automerge.use() not called (encodeChange)") - }, - decodeChange(change: Change): DecodedChange { - throw new RangeError("Automerge.use() not called (decodeChange)") - }, - initSyncState(): SyncState { - throw new RangeError("Automerge.use() not called (initSyncState)") - }, - encodeSyncMessage(message: DecodedSyncMessage): SyncMessage { - throw new RangeError("Automerge.use() not called (encodeSyncMessage)") - }, - decodeSyncMessage(msg: SyncMessage): DecodedSyncMessage { - throw new RangeError("Automerge.use() not called (decodeSyncMessage)") - }, - encodeSyncState(state: SyncState): Uint8Array { - throw new RangeError("Automerge.use() not called (encodeSyncState)") - }, - decodeSyncState(data: Uint8Array): SyncState { - throw new RangeError("Automerge.use() not called (decodeSyncState)") - }, - exportSyncState(state: SyncState): JsSyncState { - throw new RangeError("Automerge.use() not called (exportSyncState)") - }, - importSyncState(state: JsSyncState): SyncState { - throw new RangeError("Automerge.use() not called (importSyncState)") - }, +export const ApiHandler : API = { + create(actor?: Actor): Automerge { throw new RangeError("Automerge.use() not called") }, + load(data: Uint8Array, actor?: Actor): Automerge { throw new RangeError("Automerge.use() not called (load)") }, + encodeChange(change: DecodedChange): Change { throw new RangeError("Automerge.use() not called (encodeChange)") }, + decodeChange(change: Change): DecodedChange { throw new RangeError("Automerge.use() not called (decodeChange)") }, + initSyncState(): SyncState { throw new RangeError("Automerge.use() not called (initSyncState)") }, + encodeSyncMessage(message: DecodedSyncMessage): SyncMessage { throw new RangeError("Automerge.use() not called (encodeSyncMessage)") }, + decodeSyncMessage(msg: SyncMessage): DecodedSyncMessage { throw new RangeError("Automerge.use() not called (decodeSyncMessage)") }, + encodeSyncState(state: SyncState): Uint8Array { throw new RangeError("Automerge.use() not called (encodeSyncState)") }, + decodeSyncState(data: Uint8Array): SyncState { throw new RangeError("Automerge.use() not called (decodeSyncState)") }, + exportSyncState(state: SyncState): JsSyncState { throw new RangeError("Automerge.use() not called (exportSyncState)") }, + importSyncState(state: JsSyncState): SyncState { throw new RangeError("Automerge.use() not called (importSyncState)") }, } /* eslint-enable */ diff --git a/javascript/src/numbers.ts b/javascript/src/numbers.ts index 7ad95998..9d63bcc5 100644 --- a/javascript/src/numbers.ts +++ b/javascript/src/numbers.ts @@ -1,18 +1,12 @@ -// Convenience classes to allow users to strictly specify the number type they want +// Convience classes to allow users to stricly specify the number type they want import { INT, UINT, F64 } from "./constants" export class Int { - value: number + value: number; constructor(value: number) { - if ( - !( - Number.isInteger(value) && - value <= Number.MAX_SAFE_INTEGER && - value >= Number.MIN_SAFE_INTEGER - ) - ) { + if (!(Number.isInteger(value) && value <= Number.MAX_SAFE_INTEGER && value >= Number.MIN_SAFE_INTEGER)) { throw new RangeError(`Value ${value} cannot be a uint`) } this.value = value @@ -22,16 +16,10 @@ export class Int { } export class Uint { - value: number + value: number; constructor(value: number) { - if ( - !( - Number.isInteger(value) && - value <= Number.MAX_SAFE_INTEGER && - value >= 0 - ) - ) { + if (!(Number.isInteger(value) && value <= Number.MAX_SAFE_INTEGER && value >= 0)) { throw new RangeError(`Value ${value} cannot be a uint`) } this.value = value @@ -41,10 +29,10 @@ export class Uint { } export class Float64 { - value: number + value: number; constructor(value: number) { - if (typeof value !== "number") { + if (typeof value !== 'number') { throw new RangeError(`Value ${value} cannot be a float64`) } this.value = value || 0.0 @@ -52,3 +40,4 @@ export class Float64 { Object.freeze(this) } } + diff --git a/javascript/src/proxies.ts b/javascript/src/proxies.ts index 54a8dd71..0f67c36b 100644 --- a/javascript/src/proxies.ts +++ b/javascript/src/proxies.ts @@ -1,249 +1,141 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -import { Text } from "./text" -import { - Automerge, - type Heads, - type ObjID, - type Prop, -} from "@automerge/automerge-wasm" -import type { AutomergeValue, ScalarValue, MapValue, ListValue } from "./types" -import { - type AutomergeValue as UnstableAutomergeValue, - MapValue as UnstableMapValue, - ListValue as UnstableListValue, -} from "./unstable_types" +import { Automerge, Heads, ObjID } from "@automerge/automerge-wasm" +import { Prop } from "@automerge/automerge-wasm" +import { AutomergeValue, ScalarValue, MapValue, ListValue, TextValue } from "./types" import { Counter, getWriteableCounter } from "./counter" -import { - STATE, - TRACE, - IS_PROXY, - OBJECT_ID, - COUNTER, - INT, - UINT, - F64, -} from "./constants" -import { RawString } from "./raw_string" +import { Text } from "./text" +import { STATE, HEADS, TRACE, FROZEN, IS_PROXY, OBJECT_ID, READ_ONLY, COUNTER, INT, UINT, F64, TEXT } from "./constants" -type TargetCommon = { - context: Automerge - objectId: ObjID - path: Array - readonly: boolean - heads?: Array - cache: object - trace?: any - frozen: boolean -} - -export type Text2Target = TargetCommon & { textV2: true } -export type Text1Target = TargetCommon & { textV2: false } -export type Target = Text1Target | Text2Target - -export type ValueType = T extends Text2Target - ? UnstableAutomergeValue - : T extends Text1Target - ? AutomergeValue - : never -type MapValueType = T extends Text2Target - ? UnstableMapValue - : T extends Text1Target - ? MapValue - : never -type ListValueType = T extends Text2Target - ? UnstableListValue - : T extends Text1Target - ? ListValue - : never - -function parseListIndex(key: any) { - if (typeof key === "string" && /^[0-9]+$/.test(key)) key = parseInt(key, 10) - if (typeof key !== "number") { +function parseListIndex(key) { + if (typeof key === 'string' && /^[0-9]+$/.test(key)) key = parseInt(key, 10) + if (typeof key !== 'number') { + // throw new TypeError('A list index must be a number, but you passed ' + JSON.stringify(key)) return key } if (key < 0 || isNaN(key) || key === Infinity || key === -Infinity) { - throw new RangeError("A list index must be positive, but you passed " + key) + throw new RangeError('A list index must be positive, but you passed ' + key) } return key } -function valueAt( - target: T, - prop: Prop -): ValueType | undefined { - const { context, objectId, path, readonly, heads, textV2 } = target - const value = context.getWithType(objectId, prop, heads) - if (value === null) { - return - } - const datatype = value[0] - const val = value[1] - switch (datatype) { - case undefined: - return - case "map": - return mapProxy( - context, - val as ObjID, - textV2, - [...path, prop], - readonly, - heads - ) - case "list": - return listProxy( - context, - val as ObjID, - textV2, - [...path, prop], - readonly, - heads - ) - case "text": - if (textV2) { - return context.text(val as ObjID, heads) as ValueType - } else { - return textProxy( - context, - val as ObjID, - [...path, prop], - readonly, - heads - ) as unknown as ValueType +function valueAt(target, prop: Prop) : AutomergeValue | undefined { + const { context, objectId, path, readonly, heads} = target + const value = context.getWithType(objectId, prop, heads) + if (value === null) { + return } - case "str": - return val as ValueType - case "uint": - return val as ValueType - case "int": - return val as ValueType - case "f64": - return val as ValueType - case "boolean": - return val as ValueType - case "null": - return null as ValueType - case "bytes": - return val as ValueType - case "timestamp": - return val as ValueType - case "counter": { - if (readonly) { - return new Counter(val as number) as ValueType - } else { - const counter: Counter = getWriteableCounter( - val as number, - context, - path, - objectId, - prop - ) - return counter as ValueType + const datatype = value[0] + const val = value[1] + switch (datatype) { + case undefined: return; + case "map": return mapProxy(context, val, [ ... path, prop ], readonly, heads); + case "list": return listProxy(context, val, [ ... path, prop ], readonly, heads); + //case "text": return textProxy(context, val, [ ... path, prop ], readonly, heads); + case "text": return context.text(val, heads); + //case "table": + //case "cursor": + case "str": return val; + case "uint": return val; + case "int": return val; + case "f64": return val; + case "boolean": return val; + case "null": return null; + case "bytes": return val; + case "timestamp": return val; + case "counter": { + if (readonly) { + return new Counter(val); + } else { + return getWriteableCounter(val, context, path, objectId, prop) + } + } + default: + throw RangeError(`datatype ${datatype} unimplemented`) } - } - default: - throw RangeError(`datatype ${datatype} unimplemented`) - } } -type ImportedValue = - | [null, "null"] - | [number, "uint"] - | [number, "int"] - | [number, "f64"] - | [number, "counter"] - | [number, "timestamp"] - | [string, "str"] - | [Text | string, "text"] - | [Uint8Array, "bytes"] - | [Array, "list"] - | [Record, "map"] - | [boolean, "boolean"] - -function import_value(value: any, textV2: boolean): ImportedValue { - switch (typeof value) { - case "object": - if (value == null) { - return [null, "null"] - } else if (value[UINT]) { - return [value.value, "uint"] - } else if (value[INT]) { - return [value.value, "int"] - } else if (value[F64]) { - return [value.value, "f64"] - } else if (value[COUNTER]) { - return [value.value, "counter"] - } else if (value instanceof Date) { - return [value.getTime(), "timestamp"] - } else if (value instanceof RawString) { - return [value.val, "str"] - } else if (value instanceof Text) { - return [value, "text"] - } else if (value instanceof Uint8Array) { - return [value, "bytes"] - } else if (value instanceof Array) { - return [value, "list"] - } else if (Object.getPrototypeOf(value) === Object.getPrototypeOf({})) { - return [value, "map"] - } else if (value[OBJECT_ID]) { - throw new RangeError( - "Cannot create a reference to an existing document object" - ) - } else { - throw new RangeError(`Cannot assign unknown object: ${value}`) - } - case "boolean": - return [value, "boolean"] - case "number": - if (Number.isInteger(value)) { - return [value, "int"] - } else { - return [value, "f64"] - } - case "string": - if (textV2) { - return [value, "text"] - } else { - return [value, "str"] - } - default: - throw new RangeError(`Unsupported type of value: ${typeof value}`) - } +function import_value(value) { + switch (typeof value) { + case 'object': + if (value == null) { + return [ null, "null"] + } else if (value[UINT]) { + return [ value.value, "uint" ] + } else if (value[INT]) { + return [ value.value, "int" ] + } else if (value[F64]) { + return [ value.value, "f64" ] + } else if (value[COUNTER]) { + return [ value.value, "counter" ] + //} else if (value[TEXT]) { + // return [ value, "text" ] + } else if (value instanceof Date) { + return [ value.getTime(), "timestamp" ] + } else if (value instanceof Uint8Array) { + return [ value, "bytes" ] + } else if (value instanceof Array) { + return [ value, "list" ] + } else if (Object.getPrototypeOf(value) === Object.getPrototypeOf({})) { + return [ value, "map" ] + } else if (value[OBJECT_ID]) { + throw new RangeError('Cannot create a reference to an existing document object') + } else { + throw new RangeError(`Cannot assign unknown object: ${value}`) + } + break; + case 'boolean': + return [ value, "boolean" ] + case 'number': + if (Number.isInteger(value)) { + return [ value, "int" ] + } else { + return [ value, "f64" ] + } + break; + case 'string': + return [ value, "text" ] + break; + default: + throw new RangeError(`Unsupported type of value: ${typeof value}`) + } } const MapHandler = { - get( - target: T, - key: any - ): ValueType | ObjID | boolean | { handle: Automerge } { - const { context, objectId, cache } = target - if (key === Symbol.toStringTag) { - return target[Symbol.toStringTag] - } + get (target, key) : AutomergeValue { + const { context, objectId, readonly, frozen, heads, cache } = target + if (key === Symbol.toStringTag) { return target[Symbol.toStringTag] } if (key === OBJECT_ID) return objectId if (key === IS_PROXY) return true + if (key === READ_ONLY) return readonly + if (key === FROZEN) return frozen + if (key === HEADS) return heads if (key === TRACE) return target.trace - if (key === STATE) return { handle: context } + if (key === STATE) return { handle: context }; if (!cache[key]) { cache[key] = valueAt(target, key) } return cache[key] }, - set(target: Target, key: any, val: any) { - const { context, objectId, path, readonly, frozen, textV2 } = target + set (target, key, val) { + const { context, objectId, path, readonly, frozen} = target target.cache = {} // reset cache on set if (val && val[OBJECT_ID]) { - throw new RangeError( - "Cannot create a reference to an existing document object" - ) + throw new RangeError('Cannot create a reference to an existing document object') + } + if (key === FROZEN) { + target.frozen = val + return true + } + if (key === HEADS) { + target.heads = val + return true } if (key === TRACE) { target.trace = val return true } - const [value, datatype] = import_value(val, textV2) + const [ value, datatype ] = import_value(val) if (frozen) { throw new RangeError("Attempting to use an outdated Automerge document") } @@ -253,45 +145,30 @@ const MapHandler = { switch (datatype) { case "list": { const list = context.putObject(objectId, key, []) - const proxyList = listProxy( - context, - list, - textV2, - [...path, key], - readonly - ) + const proxyList = listProxy(context, list, [ ... path, key ], readonly ); for (let i = 0; i < value.length; i++) { proxyList[i] = value[i] } break } case "text": { - if (textV2) { - assertString(value) - context.putObject(objectId, key, value) - } else { - assertText(value) - const text = context.putObject(objectId, key, "") - const proxyText = textProxy(context, text, [...path, key], readonly) - for (let i = 0; i < value.length; i++) { - proxyText[i] = value.get(i) - } + context.putObject(objectId, key, value, "text") +/* + const text = context.putObject(objectId, key, value, "text") + const proxyText = textProxy(context, text, [ ... path, key ], readonly ); + for (let i = 0; i < value.length; i++) { + proxyText[i] = value.get(i) } +*/ break } case "map": { const map = context.putObject(objectId, key, {}) - const proxyMap = mapProxy( - context, - map, - textV2, - [...path, key], - readonly - ) + const proxyMap = mapProxy(context, map, [ ... path, key ], readonly ); for (const key in value) { proxyMap[key] = value[key] } - break + break; } default: context.put(objectId, key, value, datatype) @@ -299,7 +176,7 @@ const MapHandler = { return true }, - deleteProperty(target: Target, key: any) { + deleteProperty (target, key) { const { context, objectId, readonly } = target target.cache = {} // reset cache on delete if (readonly) { @@ -309,80 +186,73 @@ const MapHandler = { return true }, - has(target: Target, key: any) { + has (target, key) { const value = this.get(target, key) return value !== undefined }, - getOwnPropertyDescriptor(target: Target, key: any) { + getOwnPropertyDescriptor (target, key) { // const { context, objectId } = target const value = this.get(target, key) - if (typeof value !== "undefined") { + if (typeof value !== 'undefined') { return { - configurable: true, - enumerable: true, - value, + configurable: true, enumerable: true, value } } }, - ownKeys(target: Target) { - const { context, objectId, heads } = target + ownKeys (target) { + const { context, objectId, heads} = target // FIXME - this is a tmp workaround until fix the dupe key bug in keys() const keys = context.keys(objectId, heads) return [...new Set(keys)] }, } + const ListHandler = { - get( - target: T, - index: any - ): - | ValueType - | boolean - | ObjID - | { handle: Automerge } - | number - | ((_: any) => boolean) { - const { context, objectId, heads } = target + get (target, index) { + const {context, objectId, readonly, frozen, heads } = target index = parseListIndex(index) - if (index === Symbol.hasInstance) { - return (instance: any) => { - return Array.isArray(instance) - } - } - if (index === Symbol.toStringTag) { - return target[Symbol.toStringTag] - } + if (index === Symbol.hasInstance) { return (instance) => { return Array.isArray(instance) } } + if (index === Symbol.toStringTag) { return target[Symbol.toStringTag] } if (index === OBJECT_ID) return objectId if (index === IS_PROXY) return true + if (index === READ_ONLY) return readonly + if (index === FROZEN) return frozen + if (index === HEADS) return heads if (index === TRACE) return target.trace - if (index === STATE) return { handle: context } - if (index === "length") return context.length(objectId, heads) - if (typeof index === "number") { - return valueAt(target, index) as ValueType + if (index === STATE) return { handle: context }; + if (index === 'length') return context.length(objectId, heads); + if (typeof index === 'number') { + return valueAt(target, index) } else { return listMethods(target)[index] } }, - set(target: Target, index: any, val: any) { - const { context, objectId, path, readonly, frozen, textV2 } = target + set (target, index, val) { + const {context, objectId, path, readonly, frozen } = target index = parseListIndex(index) if (val && val[OBJECT_ID]) { - throw new RangeError( - "Cannot create a reference to an existing document object" - ) + throw new RangeError('Cannot create a reference to an existing document object') + } + if (index === FROZEN) { + target.frozen = val + return true + } + if (index === HEADS) { + target.heads = val + return true } if (index === TRACE) { target.trace = val return true } if (typeof index == "string") { - throw new RangeError("list index must be a number") + throw new RangeError('list index must be a number') } - const [value, datatype] = import_value(val, textV2) + const [ value, datatype] = import_value(val) if (frozen) { throw new RangeError("Attempting to use an outdated Automerge document") } @@ -391,61 +261,39 @@ const ListHandler = { } switch (datatype) { case "list": { - let list: ObjID + let list if (index >= context.length(objectId)) { list = context.insertObject(objectId, index, []) } else { list = context.putObject(objectId, index, []) } - const proxyList = listProxy( - context, - list, - textV2, - [...path, index], - readonly - ) - proxyList.splice(0, 0, ...value) - break + const proxyList = listProxy(context, list, [ ... path, index ], readonly); + proxyList.splice(0,0,...value) + break; } case "text": { - if (textV2) { - assertString(value) - if (index >= context.length(objectId)) { - context.insertObject(objectId, index, value) - } else { - context.putObject(objectId, index, value) - } + let text + if (index >= context.length(objectId)) { + text = context.insertObject(objectId, index, value, "text") } else { - let text: ObjID - assertText(value) - if (index >= context.length(objectId)) { - text = context.insertObject(objectId, index, "") - } else { - text = context.putObject(objectId, index, "") - } - const proxyText = textProxy(context, text, [...path, index], readonly) - proxyText.splice(0, 0, ...value) + text = context.putObject(objectId, index, value, "text") } - break + //const proxyText = textProxy(context, text, [ ... path, index ], readonly); + //proxyText.splice(0,0,...value) + break; } case "map": { - let map: ObjID + let map if (index >= context.length(objectId)) { map = context.insertObject(objectId, index, {}) } else { map = context.putObject(objectId, index, {}) } - const proxyMap = mapProxy( - context, - map, - textV2, - [...path, index], - readonly - ) + const proxyMap = mapProxy(context, map, [ ... path, index ], readonly); for (const key in value) { proxyMap[key] = value[key] } - break + break; } default: if (index >= context.length(objectId)) { @@ -457,35 +305,30 @@ const ListHandler = { return true }, - deleteProperty(target: Target, index: any) { - const { context, objectId } = target + deleteProperty (target, index) { + const {context, objectId} = target index = parseListIndex(index) - const elem = context.get(objectId, index) - if (elem != null && elem[0] == "counter") { - throw new TypeError( - "Unsupported operation: deleting a counter from a list" - ) + if (context.get(objectId, index)[0] == "counter") { + throw new TypeError('Unsupported operation: deleting a counter from a list') } context.delete(objectId, index) return true }, - has(target: Target, index: any) { - const { context, objectId, heads } = target + has (target, index) { + const {context, objectId, heads} = target index = parseListIndex(index) - if (typeof index === "number") { + if (typeof index === 'number') { return index < context.length(objectId, heads) } - return index === "length" + return index === 'length' }, - getOwnPropertyDescriptor(target: Target, index: any) { - const { context, objectId, heads } = target + getOwnPropertyDescriptor (target, index) { + const {context, objectId, heads} = target - if (index === "length") - return { writable: true, value: context.length(objectId, heads) } - if (index === OBJECT_ID) - return { configurable: false, enumerable: false, value: objectId } + if (index === 'length') return {writable: true, value: context.length(objectId, heads) } + if (index === OBJECT_ID) return {configurable: false, enumerable: false, value: objectId} index = parseListIndex(index) @@ -493,38 +336,34 @@ const ListHandler = { return { configurable: true, enumerable: true, value } }, - getPrototypeOf(target: Target) { - return Object.getPrototypeOf(target) - }, - ownKeys(/*target*/): string[] { - const keys: string[] = [] + getPrototypeOf(target) { return Object.getPrototypeOf(target) }, + ownKeys (/*target*/) : string[] { + const keys : string[] = [] // uncommenting this causes assert.deepEqual() to fail when comparing to a pojo array // but not uncommenting it causes for (i in list) {} to not enumerate values properly //const {context, objectId, heads } = target //for (let i = 0; i < target.context.length(objectId, heads); i++) { keys.push(i.toString()) } - keys.push("length") + keys.push("length"); return keys - }, + } } const TextHandler = Object.assign({}, ListHandler, { - get(target: Target, index: any) { - const { context, objectId, heads } = target + get (target, index) { + // FIXME this is a one line change from ListHandler.get() + const {context, objectId, readonly, frozen, heads } = target index = parseListIndex(index) - if (index === Symbol.hasInstance) { - return (instance: any) => { - return Array.isArray(instance) - } - } - if (index === Symbol.toStringTag) { - return target[Symbol.toStringTag] - } + if (index === Symbol.toStringTag) { return target[Symbol.toStringTag] } + if (index === Symbol.hasInstance) { return (instance) => { return Array.isArray(instance) } } if (index === OBJECT_ID) return objectId if (index === IS_PROXY) return true + if (index === READ_ONLY) return readonly + if (index === FROZEN) return frozen + if (index === HEADS) return heads if (index === TRACE) return target.trace - if (index === STATE) return { handle: context } - if (index === "length") return context.length(objectId, heads) - if (typeof index === "number") { + if (index === STATE) return { handle: context }; + if (index === 'length') return context.length(objectId, heads); + if (typeof index === 'number') { return valueAt(target, index) } else { return textMethods(target)[index] || listMethods(target)[index] @@ -535,96 +374,34 @@ const TextHandler = Object.assign({}, ListHandler, { }, }) -export function mapProxy( - context: Automerge, - objectId: ObjID, - textV2: boolean, - path?: Prop[], - readonly?: boolean, - heads?: Heads -): MapValueType { - const target: Target = { - context, - objectId, - path: path || [], - readonly: !!readonly, - frozen: false, - heads, - cache: {}, - textV2, - } - const proxied = {} - Object.assign(proxied, target) - const result = new Proxy(proxied, MapHandler) - // conversion through unknown is necessary because the types are so different - return result as unknown as MapValueType +export function mapProxy(context: Automerge, objectId: ObjID, path?: Prop[], readonly?: boolean, heads?: Heads) : MapValue { + return new Proxy({context, objectId, path, readonly: !!readonly, frozen: false, heads, cache: {}}, MapHandler) } -export function listProxy( - context: Automerge, - objectId: ObjID, - textV2: boolean, - path?: Prop[], - readonly?: boolean, - heads?: Heads -): ListValueType { - const target: Target = { - context, - objectId, - path: path || [], - readonly: !!readonly, - frozen: false, - heads, - cache: {}, - textV2, - } - const proxied = [] - Object.assign(proxied, target) - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - return new Proxy(proxied, ListHandler) as unknown as ListValue +export function listProxy(context: Automerge, objectId: ObjID, path?: Prop[], readonly?: boolean, heads?: Heads) : ListValue { + const target = [] + Object.assign(target, {context, objectId, path, readonly: !!readonly, frozen: false, heads, cache: {}}) + return new Proxy(target, ListHandler) } -interface TextProxy extends Text { - splice: (index: any, del: any, ...vals: any[]) => void +/* +export function textProxy(context: Automerge, objectId: ObjID, path?: Prop[], readonly?: boolean, heads?: Heads) : TextValue { + const target = [] + Object.assign(target, {context, objectId, path, readonly: !!readonly, frozen: false, heads, cache: {}}) + return new Proxy(target, TextHandler) } +*/ -export function textProxy( - context: Automerge, - objectId: ObjID, - path?: Prop[], - readonly?: boolean, - heads?: Heads -): TextProxy { - const target: Target = { - context, - objectId, - path: path || [], - readonly: !!readonly, - frozen: false, - heads, - cache: {}, - textV2: false, - } - const proxied = {} - Object.assign(proxied, target) - return new Proxy(proxied, TextHandler) as unknown as TextProxy -} - -export function rootProxy( - context: Automerge, - textV2: boolean, - readonly?: boolean -): T { +export function rootProxy(context: Automerge, readonly?: boolean) : T { /* eslint-disable-next-line */ - return mapProxy(context, "_root", textV2, [], !!readonly) + return mapProxy(context, "_root", [], !!readonly) } -function listMethods(target: T) { - const { context, objectId, path, readonly, frozen, heads, textV2 } = target +function listMethods(target) { + const {context, objectId, path, readonly, frozen, heads} = target const methods = { - deleteAt(index: number, numDelete: number) { - if (typeof numDelete === "number") { + deleteAt(index, numDelete) { + if (typeof numDelete === 'number') { context.splice(objectId, index, numDelete) } else { context.delete(objectId, index) @@ -633,25 +410,13 @@ function listMethods(target: T) { }, fill(val: ScalarValue, start: number, end: number) { - const [value, datatype] = import_value(val, textV2) + const [value, datatype] = import_value(val) const length = context.length(objectId) start = parseListIndex(start || 0) end = parseListIndex(end || length) for (let i = start; i < Math.min(end, length); i++) { - if (datatype === "list" || datatype === "map") { - context.putObject(objectId, i, value) - } else if (datatype === "text") { - if (textV2) { - assertString(value) - context.putObject(objectId, i, value) - } else { - assertText(value) - const text = context.putObject(objectId, i, "") - const proxyText = textProxy(context, text, [...path, i], readonly) - for (let i = 0; i < value.length; i++) { - proxyText[i] = value.get(i) - } - } + if (datatype === "text" || datatype === "list" || datatype === "map") { + context.putObject(objectId, i, value, datatype) } else { context.put(objectId, i, value, datatype) } @@ -659,18 +424,18 @@ function listMethods(target: T) { return this }, - indexOf(o: any, start = 0) { + indexOf(o, start = 0) { const length = context.length(objectId) for (let i = start; i < length; i++) { const value = context.getWithType(objectId, i, heads) - if (value && (value[1] === o[OBJECT_ID] || value[1] === o)) { + if (value && value[1] === o[OBJECT_ID] || value[1] === o) { return i } } return -1 }, - insertAt(index: number, ...values: any[]) { + insertAt(index, ...values) { this.splice(index, 0, ...values) return this }, @@ -685,7 +450,7 @@ function listMethods(target: T) { return last }, - push(...values: any[]) { + push(...values) { const len = context.length(objectId) this.splice(len, 0, ...values) return context.length(objectId) @@ -698,76 +463,48 @@ function listMethods(target: T) { return first }, - splice(index: any, del: any, ...vals: any[]) { + splice(index, del, ...vals) { index = parseListIndex(index) del = parseListIndex(del) for (const val of vals) { if (val && val[OBJECT_ID]) { - throw new RangeError( - "Cannot create a reference to an existing document object" - ) + throw new RangeError('Cannot create a reference to an existing document object') } } if (frozen) { throw new RangeError("Attempting to use an outdated Automerge document") } if (readonly) { - throw new RangeError( - "Sequence object cannot be modified outside of a change block" - ) + throw new RangeError("Sequence object cannot be modified outside of a change block") } - const result: ValueType[] = [] + const result : AutomergeValue[] = [] for (let i = 0; i < del; i++) { - const value = valueAt(target, index) + const value = valueAt(target, index) if (value !== undefined) { result.push(value) } context.delete(objectId, index) } - const values = vals.map(val => import_value(val, textV2)) - for (const [value, datatype] of values) { + const values = vals.map((val) => import_value(val)) + for (const [value,datatype] of values) { switch (datatype) { case "list": { const list = context.insertObject(objectId, index, []) - const proxyList = listProxy( - context, - list, - textV2, - [...path, index], - readonly - ) - proxyList.splice(0, 0, ...value) - break + const proxyList = listProxy(context, list, [ ... path, index ], readonly); + proxyList.splice(0,0,...value) + break; } case "text": { - if (textV2) { - assertString(value) - context.insertObject(objectId, index, value) - } else { - const text = context.insertObject(objectId, index, "") - const proxyText = textProxy( - context, - text, - [...path, index], - readonly - ) - proxyText.splice(0, 0, ...value) - } - break + context.insertObject(objectId, index, value) + break; } case "map": { const map = context.insertObject(objectId, index, {}) - const proxyMap = mapProxy( - context, - map, - textV2, - [...path, index], - readonly - ) + const proxyMap = mapProxy(context, map, [ ... path, index ], readonly); for (const key in value) { proxyMap[key] = value[key] } - break + break; } default: context.insert(objectId, index, value, datatype) @@ -777,44 +514,41 @@ function listMethods(target: T) { return result }, - unshift(...values: any) { + unshift(...values) { this.splice(0, 0, ...values) return context.length(objectId) }, entries() { - const i = 0 + const i = 0; const iterator = { next: () => { const value = valueAt(target, i) if (value === undefined) { return { value: undefined, done: true } } else { - return { value: [i, value], done: false } + return { value: [ i, value ], done: false } } - }, + } } return iterator }, keys() { - let i = 0 + let i = 0; const len = context.length(objectId, heads) const iterator = { next: () => { - let value: undefined | number = undefined - if (i < len) { - value = i - i++ - } + let value : undefined | number = undefined + if (i < len) { value = i; i++ } return { value, done: true } - }, + } } return iterator }, values() { - const i = 0 + const i = 0; const iterator = { next: () => { const value = valueAt(target, i) @@ -823,16 +557,16 @@ function listMethods(target: T) { } else { return { value, done: false } } - }, + } } return iterator }, - toArray(): ValueType[] { - const list: Array> = [] - let value: ValueType | undefined + toArray() : AutomergeValue[] { + const list : AutomergeValue = [] + let value do { - value = valueAt(target, list.length) + value = valueAt(target, list.length) if (value !== undefined) { list.push(value) } @@ -841,40 +575,38 @@ function listMethods(target: T) { return list }, - map(f: (_a: ValueType, _n: number) => U): U[] { + map(f: (AutomergeValue, number) => T) : T[] { return this.toArray().map(f) }, - toString(): string { + toString() : string { return this.toArray().toString() }, - toLocaleString(): string { + toLocaleString() : string { return this.toArray().toLocaleString() }, - forEach(f: (_a: ValueType, _n: number) => undefined) { + forEach(f: (AutomergeValue, number) => undefined ) { return this.toArray().forEach(f) }, // todo: real concat function is different - concat(other: ValueType[]): ValueType[] { + concat(other: AutomergeValue[]) : AutomergeValue[] { return this.toArray().concat(other) }, - every(f: (_a: ValueType, _n: number) => boolean): boolean { + every(f: (AutomergeValue, number) => boolean) : boolean { return this.toArray().every(f) }, - filter(f: (_a: ValueType, _n: number) => boolean): ValueType[] { + filter(f: (AutomergeValue, number) => boolean) : AutomergeValue[] { return this.toArray().filter(f) }, - find( - f: (_a: ValueType, _n: number) => boolean - ): ValueType | undefined { + find(f: (AutomergeValue, number) => boolean) : AutomergeValue | undefined { let index = 0 - for (const v of this) { + for (let v of this) { if (f(v, index)) { return v } @@ -882,9 +614,9 @@ function listMethods(target: T) { } }, - findIndex(f: (_a: ValueType, _n: number) => boolean): number { + findIndex(f: (AutomergeValue, number) => boolean) : number { let index = 0 - for (const v of this) { + for (let v of this) { if (f(v, index)) { return index } @@ -893,41 +625,37 @@ function listMethods(target: T) { return -1 }, - includes(elem: ValueType): boolean { - return this.find(e => e === elem) !== undefined + includes(elem: AutomergeValue) : boolean { + return this.find((e) => e === elem) !== undefined }, - join(sep?: string): string { + join(sep?: string) : string { return this.toArray().join(sep) }, - reduce( - f: (acc: U, currentValue: ValueType) => U, - initialValue: U - ): U | undefined { - return this.toArray().reduce(f, initialValue) + // todo: remove the any + reduce(f: (any, AutomergeValue) => T, initalValue?: T) : T | undefined { + return this.toArray().reduce(f,initalValue) }, - reduceRight( - f: (acc: U, item: ValueType) => U, - initialValue: U - ): U | undefined { - return this.toArray().reduceRight(f, initialValue) + // todo: remove the any + reduceRight(f: (any, AutomergeValue) => T, initalValue?: T) : T | undefined{ + return this.toArray().reduceRight(f,initalValue) }, - lastIndexOf(search: ValueType, fromIndex = +Infinity): number { + lastIndexOf(search: AutomergeValue, fromIndex = +Infinity) : number { // this can be faster - return this.toArray().lastIndexOf(search, fromIndex) + return this.toArray().lastIndexOf(search,fromIndex) }, - slice(index?: number, num?: number): ValueType[] { - return this.toArray().slice(index, num) + slice(index?: number, num?: number) : AutomergeValue[] { + return this.toArray().slice(index,num) }, - some(f: (v: ValueType, i: number) => boolean): boolean { - let index = 0 - for (const v of this) { - if (f(v, index)) { + some(f: (AutomergeValue, number) => boolean) : boolean { + let index = 0; + for (let v of this) { + if (f(v,index)) { return true } index += 1 @@ -935,43 +663,43 @@ function listMethods(target: T) { return false }, - [Symbol.iterator]: function* () { - let i = 0 + [Symbol.iterator]: function *() { + let i = 0; let value = valueAt(target, i) while (value !== undefined) { - yield value - i += 1 - value = valueAt(target, i) + yield value + i += 1 + value = valueAt(target, i) } - }, + } } return methods } -function textMethods(target: Target) { - const { context, objectId, heads } = target +function textMethods(target) { + const {context, objectId, heads } = target const methods = { - set(index: number, value: any) { - return (this[index] = value) + set (index: number, value) { + return this[index] = value }, - get(index: number): AutomergeValue { + get (index: number) : AutomergeValue { return this[index] }, - toString(): string { - return context.text(objectId, heads).replace(//g, "") + toString () : string { + return context.text(objectId, heads).replace(//g,'') }, - toSpans(): AutomergeValue[] { - const spans: AutomergeValue[] = [] - let chars = "" + toSpans () : AutomergeValue[] { + const spans : AutomergeValue[] = [] + let chars = '' const length = context.length(objectId) for (let i = 0; i < length; i++) { const value = this[i] - if (typeof value === "string") { + if (typeof value === 'string') { chars += value } else { if (chars.length > 0) { spans.push(chars) - chars = "" + chars = '' } spans.push(value) } @@ -981,25 +709,14 @@ function textMethods(target: Target) { } return spans }, - toJSON(): string { + toJSON () : string { return this.toString() }, - indexOf(o: any, start = 0) { + indexOf(o, start = 0) { const text = context.text(objectId) - return text.indexOf(o, start) - }, + return text.indexOf(o,start) + } } return methods } -function assertText(value: Text | string): asserts value is Text { - if (!(value instanceof Text)) { - throw new Error("value was not a Text instance") - } -} - -function assertString(value: Text | string): asserts value is string { - if (typeof value !== "string") { - throw new Error("value was not a string") - } -} diff --git a/javascript/src/raw_string.ts b/javascript/src/raw_string.ts deleted file mode 100644 index 7fc02084..00000000 --- a/javascript/src/raw_string.ts +++ /dev/null @@ -1,6 +0,0 @@ -export class RawString { - val: string - constructor(val: string) { - this.val = val - } -} diff --git a/javascript/src/stable.ts b/javascript/src/stable.ts deleted file mode 100644 index e83b127f..00000000 --- a/javascript/src/stable.ts +++ /dev/null @@ -1,944 +0,0 @@ -/** @hidden **/ -export { /** @hidden */ uuid } from "./uuid" - -import { rootProxy } from "./proxies" -import { STATE } from "./constants" - -import { - type AutomergeValue, - Counter, - type Doc, - type PatchCallback, -} from "./types" -export { - type AutomergeValue, - Counter, - type Doc, - Int, - Uint, - Float64, - type Patch, - type PatchCallback, - type ScalarValue, -} from "./types" - -import { Text } from "./text" -export { Text } from "./text" - -import type { - API as WasmAPI, - Actor as ActorId, - Prop, - ObjID, - Change, - DecodedChange, - Heads, - MaterializeValue, - JsSyncState, - SyncMessage, - DecodedSyncMessage, -} from "@automerge/automerge-wasm" -export type { - PutPatch, - DelPatch, - SpliceTextPatch, - InsertPatch, - IncPatch, - SyncMessage, -} from "@automerge/automerge-wasm" - -/** @hidden **/ -type API = WasmAPI - -const SyncStateSymbol = Symbol("_syncstate") - -/** - * An opaque type tracking the state of sync with a remote peer - */ -type SyncState = JsSyncState & { _opaque: typeof SyncStateSymbol } - -import { ApiHandler, type ChangeToEncode, UseApi } from "./low_level" - -import { Automerge } from "@automerge/automerge-wasm" - -import { RawString } from "./raw_string" - -import { _state, _is_proxy, _trace, _obj } from "./internal_state" - -import { stableConflictAt } from "./conflicts" - -/** Options passed to {@link change}, and {@link emptyChange} - * @typeParam T - The type of value contained in the document - */ -export type ChangeOptions = { - /** A message which describes the changes */ - message?: string - /** The unix timestamp of the change (purely advisory, not used in conflict resolution) */ - time?: number - /** A callback which will be called to notify the caller of any changes to the document */ - patchCallback?: PatchCallback -} - -/** Options passed to {@link loadIncremental}, {@link applyChanges}, and {@link receiveSyncMessage} - * @typeParam T - The type of value contained in the document - */ -export type ApplyOptions = { patchCallback?: PatchCallback } - -/** - * A List is an extended Array that adds the two helper methods `deleteAt` and `insertAt`. - */ -export interface List extends Array { - insertAt(index: number, ...args: T[]): List - deleteAt(index: number, numDelete?: number): List -} - -/** - * To extend an arbitrary type, we have to turn any arrays that are part of the type's definition into Lists. - * So we recurse through the properties of T, turning any Arrays we find into Lists. - */ -export type Extend = - // is it an array? make it a list (we recursively extend the type of the array's elements as well) - T extends Array - ? List> - : // is it an object? recursively extend all of its properties - // eslint-disable-next-line @typescript-eslint/ban-types - T extends Object - ? { [P in keyof T]: Extend } - : // otherwise leave the type alone - T - -/** - * Function which is called by {@link change} when making changes to a `Doc` - * @typeParam T - The type of value contained in the document - * - * This function may mutate `doc` - */ -export type ChangeFn = (doc: Extend) => void - -/** @hidden **/ -export interface State { - change: DecodedChange - snapshot: T -} - -/** @hidden **/ -export function use(api: API) { - UseApi(api) -} - -import * as wasm from "@automerge/automerge-wasm" -use(wasm) - -/** - * Options to be passed to {@link init} or {@link load} - * @typeParam T - The type of the value the document contains - */ -export type InitOptions = { - /** The actor ID to use for this document, a random one will be generated if `null` is passed */ - actor?: ActorId - freeze?: boolean - /** A callback which will be called with the initial patch once the document has finished loading */ - patchCallback?: PatchCallback - /** @hidden */ - enableTextV2?: boolean -} - -/** @hidden */ -export function getBackend(doc: Doc): Automerge { - return _state(doc).handle -} - -function importOpts(_actor?: ActorId | InitOptions): InitOptions { - if (typeof _actor === "object") { - return _actor - } else { - return { actor: _actor } - } -} - -/** - * Create a new automerge document - * - * @typeParam T - The type of value contained in the document. This will be the - * type that is passed to the change closure in {@link change} - * @param _opts - Either an actorId or an {@link InitOptions} (which may - * contain an actorId). If this is null the document will be initialised with a - * random actor ID - */ -export function init(_opts?: ActorId | InitOptions): Doc { - const opts = importOpts(_opts) - const freeze = !!opts.freeze - const patchCallback = opts.patchCallback - const handle = ApiHandler.create(opts.enableTextV2 || false, opts.actor) - handle.enablePatches(true) - handle.enableFreeze(!!opts.freeze) - handle.registerDatatype("counter", (n: number) => new Counter(n)) - const textV2 = opts.enableTextV2 || false - if (textV2) { - handle.registerDatatype("str", (n: string) => new RawString(n)) - } else { - // eslint-disable-next-line @typescript-eslint/no-explicit-any - handle.registerDatatype("text", (n: any) => new Text(n)) - } - const doc = handle.materialize("/", undefined, { - handle, - heads: undefined, - freeze, - patchCallback, - textV2, - }) as Doc - return doc -} - -/** - * Make an immutable view of an automerge document as at `heads` - * - * @remarks - * The document returned from this function cannot be passed to {@link change}. - * This is because it shares the same underlying memory as `doc`, but it is - * consequently a very cheap copy. - * - * Note that this function will throw an error if any of the hashes in `heads` - * are not in the document. - * - * @typeParam T - The type of the value contained in the document - * @param doc - The document to create a view of - * @param heads - The hashes of the heads to create a view at - */ -export function view(doc: Doc, heads: Heads): Doc { - const state = _state(doc) - const handle = state.handle - return state.handle.materialize("/", heads, { - ...state, - handle, - heads, - }) as Doc -} - -/** - * Make a full writable copy of an automerge document - * - * @remarks - * Unlike {@link view} this function makes a full copy of the memory backing - * the document and can thus be passed to {@link change}. It also generates a - * new actor ID so that changes made in the new document do not create duplicate - * sequence numbers with respect to the old document. If you need control over - * the actor ID which is generated you can pass the actor ID as the second - * argument - * - * @typeParam T - The type of the value contained in the document - * @param doc - The document to clone - * @param _opts - Either an actor ID to use for the new doc or an {@link InitOptions} - */ -export function clone( - doc: Doc, - _opts?: ActorId | InitOptions -): Doc { - const state = _state(doc) - const heads = state.heads - const opts = importOpts(_opts) - const handle = state.handle.fork(opts.actor, heads) - - // `change` uses the presence of state.heads to determine if we are in a view - // set it to undefined to indicate that this is a full fat document - const { heads: _oldHeads, ...stateSansHeads } = state - return handle.applyPatches(doc, { ...stateSansHeads, handle }) -} - -/** Explicity free the memory backing a document. Note that this is note - * necessary in environments which support - * [`FinalizationRegistry`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/FinalizationRegistry) - */ -export function free(doc: Doc) { - return _state(doc).handle.free() -} - -/** - * Create an automerge document from a POJO - * - * @param initialState - The initial state which will be copied into the document - * @typeParam T - The type of the value passed to `from` _and_ the type the resulting document will contain - * @typeParam actor - The actor ID of the resulting document, if this is null a random actor ID will be used - * - * @example - * ``` - * const doc = automerge.from({ - * tasks: [ - * {description: "feed dogs", done: false} - * ] - * }) - * ``` - */ -export function from>( - initialState: T | Doc, - _opts?: ActorId | InitOptions -): Doc { - return change(init(_opts), d => Object.assign(d, initialState)) -} - -/** - * Update the contents of an automerge document - * @typeParam T - The type of the value contained in the document - * @param doc - The document to update - * @param options - Either a message, an {@link ChangeOptions}, or a {@link ChangeFn} - * @param callback - A `ChangeFn` to be used if `options` was a `string` - * - * Note that if the second argument is a function it will be used as the `ChangeFn` regardless of what the third argument is. - * - * @example A simple change - * ``` - * let doc1 = automerge.init() - * doc1 = automerge.change(doc1, d => { - * d.key = "value" - * }) - * assert.equal(doc1.key, "value") - * ``` - * - * @example A change with a message - * - * ``` - * doc1 = automerge.change(doc1, "add another value", d => { - * d.key2 = "value2" - * }) - * ``` - * - * @example A change with a message and a timestamp - * - * ``` - * doc1 = automerge.change(doc1, {message: "add another value", time: 1640995200}, d => { - * d.key2 = "value2" - * }) - * ``` - * - * @example responding to a patch callback - * ``` - * let patchedPath - * let patchCallback = patch => { - * patchedPath = patch.path - * } - * doc1 = automerge.change(doc1, {message, "add another value", time: 1640995200, patchCallback}, d => { - * d.key2 = "value2" - * }) - * assert.equal(patchedPath, ["key2"]) - * ``` - */ -export function change( - doc: Doc, - options: string | ChangeOptions | ChangeFn, - callback?: ChangeFn -): Doc { - if (typeof options === "function") { - return _change(doc, {}, options) - } else if (typeof callback === "function") { - if (typeof options === "string") { - options = { message: options } - } - return _change(doc, options, callback) - } else { - throw RangeError("Invalid args for change") - } -} - -function progressDocument( - doc: Doc, - heads: Heads | null, - callback?: PatchCallback -): Doc { - if (heads == null) { - return doc - } - const state = _state(doc) - const nextState = { ...state, heads: undefined } - const nextDoc = state.handle.applyPatches(doc, nextState, callback) - state.heads = heads - return nextDoc -} - -function _change( - doc: Doc, - options: ChangeOptions, - callback: ChangeFn -): Doc { - if (typeof callback !== "function") { - throw new RangeError("invalid change function") - } - - const state = _state(doc) - - if (doc === undefined || state === undefined) { - throw new RangeError("must be the document root") - } - if (state.heads) { - throw new RangeError( - "Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy." - ) - } - if (_is_proxy(doc)) { - throw new RangeError("Calls to Automerge.change cannot be nested") - } - const heads = state.handle.getHeads() - try { - state.heads = heads - const root: T = rootProxy(state.handle, state.textV2) - callback(root as Extend) - if (state.handle.pendingOps() === 0) { - state.heads = undefined - return doc - } else { - state.handle.commit(options.message, options.time) - return progressDocument( - doc, - heads, - options.patchCallback || state.patchCallback - ) - } - } catch (e) { - state.heads = undefined - state.handle.rollback() - throw e - } -} - -/** - * Make a change to a document which does not modify the document - * - * @param doc - The doc to add the empty change to - * @param options - Either a message or a {@link ChangeOptions} for the new change - * - * Why would you want to do this? One reason might be that you have merged - * changes from some other peers and you want to generate a change which - * depends on those merged changes so that you can sign the new change with all - * of the merged changes as part of the new change. - */ -export function emptyChange( - doc: Doc, - options: string | ChangeOptions | void -) { - if (options === undefined) { - options = {} - } - if (typeof options === "string") { - options = { message: options } - } - - const state = _state(doc) - - if (state.heads) { - throw new RangeError( - "Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy." - ) - } - if (_is_proxy(doc)) { - throw new RangeError("Calls to Automerge.change cannot be nested") - } - - const heads = state.handle.getHeads() - state.handle.emptyChange(options.message, options.time) - return progressDocument(doc, heads) -} - -/** - * Load an automerge document from a compressed document produce by {@link save} - * - * @typeParam T - The type of the value which is contained in the document. - * Note that no validation is done to make sure this type is in - * fact the type of the contained value so be a bit careful - * @param data - The compressed document - * @param _opts - Either an actor ID or some {@link InitOptions}, if the actor - * ID is null a random actor ID will be created - * - * Note that `load` will throw an error if passed incomplete content (for - * example if you are receiving content over the network and don't know if you - * have the complete document yet). If you need to handle incomplete content use - * {@link init} followed by {@link loadIncremental}. - */ -export function load( - data: Uint8Array, - _opts?: ActorId | InitOptions -): Doc { - const opts = importOpts(_opts) - const actor = opts.actor - const patchCallback = opts.patchCallback - const handle = ApiHandler.load(data, opts.enableTextV2 || false, actor) - handle.enablePatches(true) - handle.enableFreeze(!!opts.freeze) - handle.registerDatatype("counter", (n: number) => new Counter(n)) - const textV2 = opts.enableTextV2 || false - if (textV2) { - handle.registerDatatype("str", (n: string) => new RawString(n)) - } else { - handle.registerDatatype("text", (n: string) => new Text(n)) - } - const doc = handle.materialize("/", undefined, { - handle, - heads: undefined, - patchCallback, - textV2, - }) as Doc - return doc -} - -/** - * Load changes produced by {@link saveIncremental}, or partial changes - * - * @typeParam T - The type of the value which is contained in the document. - * Note that no validation is done to make sure this type is in - * fact the type of the contained value so be a bit careful - * @param data - The compressedchanges - * @param opts - an {@link ApplyOptions} - * - * This function is useful when staying up to date with a connected peer. - * Perhaps the other end sent you a full compresed document which you loaded - * with {@link load} and they're sending you the result of - * {@link getLastLocalChange} every time they make a change. - * - * Note that this function will succesfully load the results of {@link save} as - * well as {@link getLastLocalChange} or any other incremental change. - */ -export function loadIncremental( - doc: Doc, - data: Uint8Array, - opts?: ApplyOptions -): Doc { - if (!opts) { - opts = {} - } - const state = _state(doc) - if (state.heads) { - throw new RangeError( - "Attempting to change an out of date document - set at: " + _trace(doc) - ) - } - if (_is_proxy(doc)) { - throw new RangeError("Calls to Automerge.change cannot be nested") - } - const heads = state.handle.getHeads() - state.handle.loadIncremental(data) - return progressDocument(doc, heads, opts.patchCallback || state.patchCallback) -} - -/** - * Export the contents of a document to a compressed format - * - * @param doc - The doc to save - * - * The returned bytes can be passed to {@link load} or {@link loadIncremental} - */ -export function save(doc: Doc): Uint8Array { - return _state(doc).handle.save() -} - -/** - * Merge `local` into `remote` - * @typeParam T - The type of values contained in each document - * @param local - The document to merge changes into - * @param remote - The document to merge changes from - * - * @returns - The merged document - * - * Often when you are merging documents you will also need to clone them. Both - * arguments to `merge` are frozen after the call so you can no longer call - * mutating methods (such as {@link change}) on them. The symtom of this will be - * an error which says "Attempting to change an out of date document". To - * overcome this call {@link clone} on the argument before passing it to {@link - * merge}. - */ -export function merge(local: Doc, remote: Doc): Doc { - const localState = _state(local) - - if (localState.heads) { - throw new RangeError( - "Attempting to change an out of date document - set at: " + _trace(local) - ) - } - const heads = localState.handle.getHeads() - const remoteState = _state(remote) - const changes = localState.handle.getChangesAdded(remoteState.handle) - localState.handle.applyChanges(changes) - return progressDocument(local, heads, localState.patchCallback) -} - -/** - * Get the actor ID associated with the document - */ -export function getActorId(doc: Doc): ActorId { - const state = _state(doc) - return state.handle.getActorId() -} - -/** - * The type of conflicts for particular key or index - * - * Maps and sequences in automerge can contain conflicting values for a - * particular key or index. In this case {@link getConflicts} can be used to - * obtain a `Conflicts` representing the multiple values present for the property - * - * A `Conflicts` is a map from a unique (per property or index) key to one of - * the possible conflicting values for the given property. - */ -type Conflicts = { [key: string]: AutomergeValue } - -/** - * Get the conflicts associated with a property - * - * The values of properties in a map in automerge can be conflicted if there - * are concurrent "put" operations to the same key. Automerge chooses one value - * arbitrarily (but deterministically, any two nodes who have the same set of - * changes will choose the same value) from the set of conflicting values to - * present as the value of the key. - * - * Sometimes you may want to examine these conflicts, in this case you can use - * {@link getConflicts} to get the conflicts for the key. - * - * @example - * ``` - * import * as automerge from "@automerge/automerge" - * - * type Profile = { - * pets: Array<{name: string, type: string}> - * } - * - * let doc1 = automerge.init("aaaa") - * doc1 = automerge.change(doc1, d => { - * d.pets = [{name: "Lassie", type: "dog"}] - * }) - * let doc2 = automerge.init("bbbb") - * doc2 = automerge.merge(doc2, automerge.clone(doc1)) - * - * doc2 = automerge.change(doc2, d => { - * d.pets[0].name = "Beethoven" - * }) - * - * doc1 = automerge.change(doc1, d => { - * d.pets[0].name = "Babe" - * }) - * - * const doc3 = automerge.merge(doc1, doc2) - * - * // Note that here we pass `doc3.pets`, not `doc3` - * let conflicts = automerge.getConflicts(doc3.pets[0], "name") - * - * // The two conflicting values are the keys of the conflicts object - * assert.deepEqual(Object.values(conflicts), ["Babe", Beethoven"]) - * ``` - */ -export function getConflicts( - doc: Doc, - prop: Prop -): Conflicts | undefined { - const state = _state(doc, false) - if (state.textV2) { - throw new Error("use unstable.getConflicts for an unstable document") - } - const objectId = _obj(doc) - if (objectId != null) { - return stableConflictAt(state.handle, objectId, prop) - } else { - return undefined - } -} - -/** - * Get the binary representation of the last change which was made to this doc - * - * This is most useful when staying in sync with other peers, every time you - * make a change locally via {@link change} you immediately call {@link - * getLastLocalChange} and send the result over the network to other peers. - */ -export function getLastLocalChange(doc: Doc): Change | undefined { - const state = _state(doc) - return state.handle.getLastLocalChange() || undefined -} - -/** - * Return the object ID of an arbitrary javascript value - * - * This is useful to determine if something is actually an automerge document, - * if `doc` is not an automerge document this will return null. - */ -// eslint-disable-next-line @typescript-eslint/no-explicit-any -export function getObjectId(doc: any, prop?: Prop): ObjID | null { - if (prop) { - const state = _state(doc, false) - const objectId = _obj(doc) - if (!state || !objectId) { - return null - } - return state.handle.get(objectId, prop) as ObjID - } else { - return _obj(doc) - } -} - -/** - * Get the changes which are in `newState` but not in `oldState`. The returned - * changes can be loaded in `oldState` via {@link applyChanges}. - * - * Note that this will crash if there are changes in `oldState` which are not in `newState`. - */ -export function getChanges(oldState: Doc, newState: Doc): Change[] { - const n = _state(newState) - return n.handle.getChanges(getHeads(oldState)) -} - -/** - * Get all the changes in a document - * - * This is different to {@link save} because the output is an array of changes - * which can be individually applied via {@link applyChanges}` - * - */ -export function getAllChanges(doc: Doc): Change[] { - const state = _state(doc) - return state.handle.getChanges([]) -} - -/** - * Apply changes received from another document - * - * `doc` will be updated to reflect the `changes`. If there are changes which - * we do not have dependencies for yet those will be stored in the document and - * applied when the depended on changes arrive. - * - * You can use the {@link ApplyOptions} to pass a patchcallback which will be - * informed of any changes which occur as a result of applying the changes - * - */ -export function applyChanges( - doc: Doc, - changes: Change[], - opts?: ApplyOptions -): [Doc] { - const state = _state(doc) - if (!opts) { - opts = {} - } - if (state.heads) { - throw new RangeError( - "Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy." - ) - } - if (_is_proxy(doc)) { - throw new RangeError("Calls to Automerge.change cannot be nested") - } - const heads = state.handle.getHeads() - state.handle.applyChanges(changes) - state.heads = heads - return [ - progressDocument(doc, heads, opts.patchCallback || state.patchCallback), - ] -} - -/** @hidden */ -export function getHistory(doc: Doc): State[] { - const textV2 = _state(doc).textV2 - const history = getAllChanges(doc) - return history.map((change, index) => ({ - get change() { - return decodeChange(change) - }, - get snapshot() { - const [state] = applyChanges( - init({ enableTextV2: textV2 }), - history.slice(0, index + 1) - ) - return state - }, - })) -} - -/** @hidden */ -// FIXME : no tests -// FIXME can we just use deep equals now? -export function equals(val1: unknown, val2: unknown): boolean { - if (!isObject(val1) || !isObject(val2)) return val1 === val2 - const keys1 = Object.keys(val1).sort(), - keys2 = Object.keys(val2).sort() - if (keys1.length !== keys2.length) return false - for (let i = 0; i < keys1.length; i++) { - if (keys1[i] !== keys2[i]) return false - if (!equals(val1[keys1[i]], val2[keys2[i]])) return false - } - return true -} - -/** - * encode a {@link SyncState} into binary to send over the network - * - * @group sync - * */ -export function encodeSyncState(state: SyncState): Uint8Array { - const sync = ApiHandler.importSyncState(state) - const result = ApiHandler.encodeSyncState(sync) - sync.free() - return result -} - -/** - * Decode some binary data into a {@link SyncState} - * - * @group sync - */ -export function decodeSyncState(state: Uint8Array): SyncState { - const sync = ApiHandler.decodeSyncState(state) - const result = ApiHandler.exportSyncState(sync) - sync.free() - return result as SyncState -} - -/** - * Generate a sync message to send to the peer represented by `inState` - * @param doc - The doc to generate messages about - * @param inState - The {@link SyncState} representing the peer we are talking to - * - * @group sync - * - * @returns An array of `[newSyncState, syncMessage | null]` where - * `newSyncState` should replace `inState` and `syncMessage` should be sent to - * the peer if it is not null. If `syncMessage` is null then we are up to date. - */ -export function generateSyncMessage( - doc: Doc, - inState: SyncState -): [SyncState, SyncMessage | null] { - const state = _state(doc) - const syncState = ApiHandler.importSyncState(inState) - const message = state.handle.generateSyncMessage(syncState) - const outState = ApiHandler.exportSyncState(syncState) as SyncState - return [outState, message] -} - -/** - * Update a document and our sync state on receiving a sync message - * - * @group sync - * - * @param doc - The doc the sync message is about - * @param inState - The {@link SyncState} for the peer we are communicating with - * @param message - The message which was received - * @param opts - Any {@link ApplyOption}s, used for passing a - * {@link PatchCallback} which will be informed of any changes - * in `doc` which occur because of the received sync message. - * - * @returns An array of `[newDoc, newSyncState, syncMessage | null]` where - * `newDoc` is the updated state of `doc`, `newSyncState` should replace - * `inState` and `syncMessage` should be sent to the peer if it is not null. If - * `syncMessage` is null then we are up to date. - */ -export function receiveSyncMessage( - doc: Doc, - inState: SyncState, - message: SyncMessage, - opts?: ApplyOptions -): [Doc, SyncState, null] { - const syncState = ApiHandler.importSyncState(inState) - if (!opts) { - opts = {} - } - const state = _state(doc) - if (state.heads) { - throw new RangeError( - "Attempting to change an outdated document. Use Automerge.clone() if you wish to make a writable copy." - ) - } - if (_is_proxy(doc)) { - throw new RangeError("Calls to Automerge.change cannot be nested") - } - const heads = state.handle.getHeads() - state.handle.receiveSyncMessage(syncState, message) - const outSyncState = ApiHandler.exportSyncState(syncState) as SyncState - return [ - progressDocument(doc, heads, opts.patchCallback || state.patchCallback), - outSyncState, - null, - ] -} - -/** - * Create a new, blank {@link SyncState} - * - * When communicating with a peer for the first time use this to generate a new - * {@link SyncState} for them - * - * @group sync - */ -export function initSyncState(): SyncState { - return ApiHandler.exportSyncState(ApiHandler.initSyncState()) as SyncState -} - -/** @hidden */ -export function encodeChange(change: ChangeToEncode): Change { - return ApiHandler.encodeChange(change) -} - -/** @hidden */ -export function decodeChange(data: Change): DecodedChange { - return ApiHandler.decodeChange(data) -} - -/** @hidden */ -export function encodeSyncMessage(message: DecodedSyncMessage): SyncMessage { - return ApiHandler.encodeSyncMessage(message) -} - -/** @hidden */ -export function decodeSyncMessage(message: SyncMessage): DecodedSyncMessage { - return ApiHandler.decodeSyncMessage(message) -} - -/** - * Get any changes in `doc` which are not dependencies of `heads` - */ -export function getMissingDeps(doc: Doc, heads: Heads): Heads { - const state = _state(doc) - return state.handle.getMissingDeps(heads) -} - -/** - * Get the hashes of the heads of this document - */ -export function getHeads(doc: Doc): Heads { - const state = _state(doc) - return state.heads || state.handle.getHeads() -} - -/** @hidden */ -export function dump(doc: Doc) { - const state = _state(doc) - state.handle.dump() -} - -/** @hidden */ -export function toJS(doc: Doc): T { - const state = _state(doc) - const enabled = state.handle.enableFreeze(false) - const result = state.handle.materialize() - state.handle.enableFreeze(enabled) - return result as T -} - -export function isAutomerge(doc: unknown): boolean { - if (typeof doc == "object" && doc !== null) { - return getObjectId(doc) === "_root" && !!Reflect.get(doc, STATE) - } else { - return false - } -} - -function isObject(obj: unknown): obj is Record { - return typeof obj === "object" && obj !== null -} - -export type { - API, - SyncState, - ActorId, - Conflicts, - Prop, - Change, - ObjID, - DecodedChange, - DecodedSyncMessage, - Heads, - MaterializeValue, -} diff --git a/javascript/src/text.ts b/javascript/src/text.ts index b01bd7db..a6c51940 100644 --- a/javascript/src/text.ts +++ b/javascript/src/text.ts @@ -1,18 +1,13 @@ -import type { Value } from "@automerge/automerge-wasm" +import { Value } from "@automerge/automerge-wasm" import { TEXT, STATE } from "./constants" -import type { InternalState } from "./internal_state" export class Text { - //eslint-disable-next-line @typescript-eslint/no-explicit-any - elems: Array + elems: Value[] str: string | undefined - //eslint-disable-next-line @typescript-eslint/no-explicit-any - spans: Array | undefined; - //eslint-disable-next-line @typescript-eslint/no-explicit-any - [STATE]?: InternalState + spans: Value[] | undefined - constructor(text?: string | string[] | Value[]) { - if (typeof text === "string") { + constructor (text?: string | string[] | Value[]) { + if (typeof text === 'string') { this.elems = [...text] } else if (Array.isArray(text)) { this.elems = text @@ -24,12 +19,11 @@ export class Text { Reflect.defineProperty(this, TEXT, { value: true }) } - get length(): number { + get length () : number { return this.elems.length } - //eslint-disable-next-line @typescript-eslint/no-explicit-any - get(index: number): any { + get (index: number) : Value | undefined { return this.elems[index] } @@ -37,18 +31,18 @@ export class Text { * Iterates over the text elements character by character, including any * inline objects. */ - [Symbol.iterator]() { + [Symbol.iterator] () { const elems = this.elems let index = -1 return { - next() { + next () { index += 1 if (index < elems.length) { - return { done: false, value: elems[index] } + return {done: false, value: elems[index]} } else { - return { done: true } + return {done: true} } - }, + } } } @@ -56,15 +50,15 @@ export class Text { * Returns the content of the Text object as a simple string, ignoring any * non-character elements. */ - toString(): string { + toString() : string { if (!this.str) { // Concatting to a string is faster than creating an array and then // .join()ing for small (<100KB) arrays. // https://jsperf.com/join-vs-loop-w-type-test - this.str = "" + this.str = '' for (const elem of this.elems) { - if (typeof elem === "string") this.str += elem - else this.str += "\uFFFC" + if (typeof elem === 'string') this.str += elem + else this.str += '\uFFFC' } } return this.str @@ -74,20 +68,20 @@ export class Text { * Returns the content of the Text object as a sequence of strings, * interleaved with non-character elements. * - * For example, the value `['a', 'b', {x: 3}, 'c', 'd']` has spans: - * `=> ['ab', {x: 3}, 'cd']` + * For example, the value ['a', 'b', {x: 3}, 'c', 'd'] has spans: + * => ['ab', {x: 3}, 'cd'] */ - toSpans(): Array { + toSpans() : Value[] { if (!this.spans) { this.spans = [] - let chars = "" + let chars = '' for (const elem of this.elems) { - if (typeof elem === "string") { + if (typeof elem === 'string') { chars += elem } else { if (chars.length > 0) { this.spans.push(chars) - chars = "" + chars = '' } this.spans.push(elem) } @@ -103,18 +97,16 @@ export class Text { * Returns the content of the Text object as a simple string, so that the * JSON serialization of an Automerge document represents text nicely. */ - toJSON(): string { + toJSON() : string { return this.toString() } /** * Updates the list item at position `index` to a new value `value`. */ - set(index: number, value: Value) { + set (index: number, value: Value) { if (this[STATE]) { - throw new RangeError( - "object cannot be modified outside of a change block" - ) + throw new RangeError("object cannot be modified outside of a change block") } this.elems[index] = value } @@ -122,13 +114,11 @@ export class Text { /** * Inserts new list items `values` starting at position `index`. */ - insertAt(index: number, ...values: Array) { + insertAt(index: number, ...values: Value[]) { if (this[STATE]) { - throw new RangeError( - "object cannot be modified outside of a change block" - ) + throw new RangeError("object cannot be modified outside of a change block") } - this.elems.splice(index, 0, ...values) + this.elems.splice(index, 0, ... values) } /** @@ -137,14 +127,12 @@ export class Text { */ deleteAt(index: number, numDelete = 1) { if (this[STATE]) { - throw new RangeError( - "object cannot be modified outside of a change block" - ) + throw new RangeError("object cannot be modified outside of a change block") } this.elems.splice(index, numDelete) } - map(callback: (e: Value | object) => T) { + map(callback: (e: Value) => T) { this.elems.map(callback) } @@ -152,31 +140,31 @@ export class Text { this.elems.lastIndexOf(searchElement, fromIndex) } - concat(other: Text): Text { + concat(other: Text) : Text { return new Text(this.elems.concat(other.elems)) } - every(test: (v: Value) => boolean): boolean { + every(test: (Value) => boolean) : boolean { return this.elems.every(test) } - filter(test: (v: Value) => boolean): Text { + filter(test: (Value) => boolean) : Text { return new Text(this.elems.filter(test)) } - find(test: (v: Value) => boolean): Value | undefined { + find(test: (Value) => boolean) : Value | undefined { return this.elems.find(test) } - findIndex(test: (v: Value) => boolean): number | undefined { + findIndex(test: (Value) => boolean) : number | undefined { return this.elems.findIndex(test) } - forEach(f: (v: Value) => undefined) { + forEach(f: (Value) => undefined) { this.elems.forEach(f) } - includes(elem: Value): boolean { + includes(elem: Value) : boolean { return this.elems.includes(elem) } @@ -184,37 +172,23 @@ export class Text { return this.elems.indexOf(elem) } - join(sep?: string): string { + join(sep?: string) : string{ return this.elems.join(sep) } - reduce( - f: ( - previousValue: Value, - currentValue: Value, - currentIndex: number, - array: Value[] - ) => Value - ) { + reduce(f: (previousValue: Value, currentValue: Value, currentIndex: number, array: Value[]) => Value) { this.elems.reduce(f) } - reduceRight( - f: ( - previousValue: Value, - currentValue: Value, - currentIndex: number, - array: Value[] - ) => Value - ) { + reduceRight(f: (previousValue: Value, currentValue: Value, currentIndex: number, array: Value[]) => Value) { this.elems.reduceRight(f) } slice(start?: number, end?: number) { - new Text(this.elems.slice(start, end)) + new Text(this.elems.slice(start,end)) } - some(test: (arg: Value) => boolean): boolean { + some(test: (Value) => boolean) : boolean { return this.elems.some(test) } @@ -222,3 +196,4 @@ export class Text { this.toString() } } + diff --git a/javascript/src/types.ts b/javascript/src/types.ts index beb5cf70..764d328c 100644 --- a/javascript/src/types.ts +++ b/javascript/src/types.ts @@ -1,46 +1,13 @@ -export { Text } from "./text" + import { Text } from "./text" -export { Counter } from "./counter" -export { Int, Uint, Float64 } from "./numbers" +export { Text } from "./text" +export { Counter } from "./counter" +export { Int, Uint, Float64 } from "./numbers" import { Counter } from "./counter" -import type { Patch } from "@automerge/automerge-wasm" -export type { Patch } from "@automerge/automerge-wasm" -export type AutomergeValue = - | ScalarValue - | { [key: string]: AutomergeValue } - | Array - | Text -export type MapValue = { [key: string]: AutomergeValue } -export type ListValue = Array -export type ScalarValue = - | string - | number - | null - | boolean - | Date - | Counter - | Uint8Array - -/** - * An automerge document. - * @typeParam T - The type of the value contained in this document - * - * Note that this provides read only access to the fields of the value. To - * modify the value use {@link change} - */ -export type Doc = { readonly [P in keyof T]: T[P] } - -/** - * Callback which is called by various methods in this library to notify the - * user of what changes have been made. - * @param patch - A description of the changes made - * @param before - The document before the change was made - * @param after - The document after the change was made - */ -export type PatchCallback = ( - patches: Array, - before: Doc, - after: Doc -) => void +export type AutomergeValue = ScalarValue | { [key: string]: AutomergeValue } | Array | Text +export type MapValue = { [key: string]: AutomergeValue } +export type ListValue = Array +export type TextValue = Array +export type ScalarValue = string | number | null | boolean | Date | Counter | Uint8Array diff --git a/javascript/src/unstable.ts b/javascript/src/unstable.ts deleted file mode 100644 index 7c73afb9..00000000 --- a/javascript/src/unstable.ts +++ /dev/null @@ -1,294 +0,0 @@ -/** - * # The unstable API - * - * This module contains new features we are working on which are either not yet - * ready for a stable release and/or which will result in backwards incompatible - * API changes. The API of this module may change in arbitrary ways between - * point releases - we will always document what these changes are in the - * [CHANGELOG](#changelog) below, but only depend on this module if you are prepared to deal - * with frequent changes. - * - * ## Differences from stable - * - * In the stable API text objects are represented using the {@link Text} class. - * This means you must decide up front whether your string data might need - * concurrent merges in the future and if you change your mind you have to - * figure out how to migrate your data. In the unstable API the `Text` class is - * gone and all `string`s are represented using the text CRDT, allowing for - * concurrent changes. Modifying a string is done using the {@link splice} - * function. You can still access the old behaviour of strings which do not - * support merging behaviour via the {@link RawString} class. - * - * This leads to the following differences from `stable`: - * - * * There is no `unstable.Text` class, all strings are text objects - * * Reading strings in an `unstable` document is the same as reading any other - * javascript string - * * To modify strings in an `unstable` document use {@link splice} - * * The {@link AutomergeValue} type does not include the {@link Text} - * class but the {@link RawString} class is included in the {@link ScalarValue} - * type - * - * ## CHANGELOG - * * Introduce this module to expose the new API which has no `Text` class - * - * - * @module - */ - -export { - Counter, - type Doc, - Int, - Uint, - Float64, - type Patch, - type PatchCallback, - type AutomergeValue, - type ScalarValue, -} from "./unstable_types" - -import type { PatchCallback } from "./stable" - -import { type UnstableConflicts as Conflicts } from "./conflicts" -import { unstableConflictAt } from "./conflicts" - -export type { - PutPatch, - DelPatch, - SpliceTextPatch, - InsertPatch, - IncPatch, - SyncMessage, -} from "@automerge/automerge-wasm" - -export type { ChangeOptions, ApplyOptions, ChangeFn } from "./stable" -export { - view, - free, - getHeads, - change, - emptyChange, - loadIncremental, - save, - merge, - getActorId, - getLastLocalChange, - getChanges, - getAllChanges, - applyChanges, - getHistory, - equals, - encodeSyncState, - decodeSyncState, - generateSyncMessage, - receiveSyncMessage, - initSyncState, - encodeChange, - decodeChange, - encodeSyncMessage, - decodeSyncMessage, - getMissingDeps, - dump, - toJS, - isAutomerge, - getObjectId, -} from "./stable" - -export type InitOptions = { - /** The actor ID to use for this document, a random one will be generated if `null` is passed */ - actor?: ActorId - freeze?: boolean - /** A callback which will be called with the initial patch once the document has finished loading */ - patchCallback?: PatchCallback -} - -import { ActorId, Doc } from "./stable" -import * as stable from "./stable" -export { RawString } from "./raw_string" - -/** @hidden */ -export const getBackend = stable.getBackend - -import { _is_proxy, _state, _obj } from "./internal_state" - -/** - * Create a new automerge document - * - * @typeParam T - The type of value contained in the document. This will be the - * type that is passed to the change closure in {@link change} - * @param _opts - Either an actorId or an {@link InitOptions} (which may - * contain an actorId). If this is null the document will be initialised with a - * random actor ID - */ -export function init(_opts?: ActorId | InitOptions): Doc { - const opts = importOpts(_opts) - opts.enableTextV2 = true - return stable.init(opts) -} - -/** - * Make a full writable copy of an automerge document - * - * @remarks - * Unlike {@link view} this function makes a full copy of the memory backing - * the document and can thus be passed to {@link change}. It also generates a - * new actor ID so that changes made in the new document do not create duplicate - * sequence numbers with respect to the old document. If you need control over - * the actor ID which is generated you can pass the actor ID as the second - * argument - * - * @typeParam T - The type of the value contained in the document - * @param doc - The document to clone - * @param _opts - Either an actor ID to use for the new doc or an {@link InitOptions} - */ -export function clone( - doc: Doc, - _opts?: ActorId | InitOptions -): Doc { - const opts = importOpts(_opts) - opts.enableTextV2 = true - return stable.clone(doc, opts) -} - -/** - * Create an automerge document from a POJO - * - * @param initialState - The initial state which will be copied into the document - * @typeParam T - The type of the value passed to `from` _and_ the type the resulting document will contain - * @typeParam actor - The actor ID of the resulting document, if this is null a random actor ID will be used - * - * @example - * ``` - * const doc = automerge.from({ - * tasks: [ - * {description: "feed dogs", done: false} - * ] - * }) - * ``` - */ -export function from>( - initialState: T | Doc, - _opts?: ActorId | InitOptions -): Doc { - const opts = importOpts(_opts) - opts.enableTextV2 = true - return stable.from(initialState, opts) -} - -/** - * Load an automerge document from a compressed document produce by {@link save} - * - * @typeParam T - The type of the value which is contained in the document. - * Note that no validation is done to make sure this type is in - * fact the type of the contained value so be a bit careful - * @param data - The compressed document - * @param _opts - Either an actor ID or some {@link InitOptions}, if the actor - * ID is null a random actor ID will be created - * - * Note that `load` will throw an error if passed incomplete content (for - * example if you are receiving content over the network and don't know if you - * have the complete document yet). If you need to handle incomplete content use - * {@link init} followed by {@link loadIncremental}. - */ -export function load( - data: Uint8Array, - _opts?: ActorId | InitOptions -): Doc { - const opts = importOpts(_opts) - opts.enableTextV2 = true - return stable.load(data, opts) -} - -function importOpts( - _actor?: ActorId | InitOptions -): stable.InitOptions { - if (typeof _actor === "object") { - return _actor - } else { - return { actor: _actor } - } -} - -export function splice( - doc: Doc, - prop: stable.Prop, - index: number, - del: number, - newText?: string -) { - if (!_is_proxy(doc)) { - throw new RangeError("object cannot be modified outside of a change block") - } - const state = _state(doc, false) - const objectId = _obj(doc) - if (!objectId) { - throw new RangeError("invalid object for splice") - } - const value = `${objectId}/${prop}` - try { - return state.handle.splice(value, index, del, newText) - } catch (e) { - throw new RangeError(`Cannot splice: ${e}`) - } -} - -/** - * Get the conflicts associated with a property - * - * The values of properties in a map in automerge can be conflicted if there - * are concurrent "put" operations to the same key. Automerge chooses one value - * arbitrarily (but deterministically, any two nodes who have the same set of - * changes will choose the same value) from the set of conflicting values to - * present as the value of the key. - * - * Sometimes you may want to examine these conflicts, in this case you can use - * {@link getConflicts} to get the conflicts for the key. - * - * @example - * ``` - * import * as automerge from "@automerge/automerge" - * - * type Profile = { - * pets: Array<{name: string, type: string}> - * } - * - * let doc1 = automerge.init("aaaa") - * doc1 = automerge.change(doc1, d => { - * d.pets = [{name: "Lassie", type: "dog"}] - * }) - * let doc2 = automerge.init("bbbb") - * doc2 = automerge.merge(doc2, automerge.clone(doc1)) - * - * doc2 = automerge.change(doc2, d => { - * d.pets[0].name = "Beethoven" - * }) - * - * doc1 = automerge.change(doc1, d => { - * d.pets[0].name = "Babe" - * }) - * - * const doc3 = automerge.merge(doc1, doc2) - * - * // Note that here we pass `doc3.pets`, not `doc3` - * let conflicts = automerge.getConflicts(doc3.pets[0], "name") - * - * // The two conflicting values are the keys of the conflicts object - * assert.deepEqual(Object.values(conflicts), ["Babe", Beethoven"]) - * ``` - */ -export function getConflicts( - doc: Doc, - prop: stable.Prop -): Conflicts | undefined { - const state = _state(doc, false) - if (!state.textV2) { - throw new Error("use getConflicts for a stable document") - } - const objectId = _obj(doc) - if (objectId != null) { - return unstableConflictAt(state.handle, objectId, prop) - } else { - return undefined - } -} diff --git a/javascript/src/unstable_types.ts b/javascript/src/unstable_types.ts deleted file mode 100644 index 071e2cc4..00000000 --- a/javascript/src/unstable_types.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Counter } from "./types" - -export { - Counter, - type Doc, - Int, - Uint, - Float64, - type Patch, - type PatchCallback, -} from "./types" - -import { RawString } from "./raw_string" -export { RawString } from "./raw_string" - -export type AutomergeValue = - | ScalarValue - | { [key: string]: AutomergeValue } - | Array -export type MapValue = { [key: string]: AutomergeValue } -export type ListValue = Array -export type ScalarValue = - | string - | number - | null - | boolean - | Date - | Counter - | Uint8Array - | RawString diff --git a/javascript/src/uuid.deno.ts b/javascript/src/uuid.deno.ts deleted file mode 100644 index 04c9b93d..00000000 --- a/javascript/src/uuid.deno.ts +++ /dev/null @@ -1,26 +0,0 @@ -import * as v4 from "https://deno.land/x/uuid@v0.1.2/mod.ts" - -// this file is a deno only port of the uuid module - -function defaultFactory() { - return v4.uuid().replace(/-/g, "") -} - -let factory = defaultFactory - -interface UUIDFactory extends Function { - setFactory(f: typeof factory): void - reset(): void -} - -export const uuid: UUIDFactory = () => { - return factory() -} - -uuid.setFactory = newFactory => { - factory = newFactory -} - -uuid.reset = () => { - factory = defaultFactory -} diff --git a/javascript/src/uuid.ts b/javascript/src/uuid.ts index 421ddf9d..5ddb5ae6 100644 --- a/javascript/src/uuid.ts +++ b/javascript/src/uuid.ts @@ -1,24 +1,21 @@ -import { v4 } from "uuid" +import { v4 } from 'uuid' function defaultFactory() { - return v4().replace(/-/g, "") + return v4().replace(/-/g, '') } let factory = defaultFactory interface UUIDFactory extends Function { - setFactory(f: typeof factory): void - reset(): void + setFactory(f: typeof factory): void; + reset(): void; } -export const uuid: UUIDFactory = () => { +export const uuid : UUIDFactory = () => { return factory() } -uuid.setFactory = newFactory => { - factory = newFactory -} +uuid.setFactory = newFactory => { factory = newFactory } + +uuid.reset = () => { factory = defaultFactory } -uuid.reset = () => { - factory = defaultFactory -} diff --git a/javascript/test/basic_test.ts b/javascript/test/basic_test.ts index e34484c4..49241707 100644 --- a/javascript/test/basic_test.ts +++ b/javascript/test/basic_test.ts @@ -1,488 +1,350 @@ -import * as assert from "assert" -import { unstable as Automerge } from "../src" +import * as assert from 'assert' +import {Counter} from 'automerge' +import * as Automerge from '../src' import * as WASM from "@automerge/automerge-wasm" -describe("Automerge", () => { - describe("basics", () => { - it("should init clone and free", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.clone(doc1) +describe('Automerge', () => { + describe('basics', () => { + it('should init clone and free', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.clone(doc1); - // this is only needed if weakrefs are not supported - Automerge.free(doc1) - Automerge.free(doc2) - }) - - it("should be able to make a view with specifc heads", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => (d.value = 1)) - let heads2 = Automerge.getHeads(doc2) - let doc3 = Automerge.change(doc2, d => (d.value = 2)) - let doc2_v2 = Automerge.view(doc3, heads2) - assert.deepEqual(doc2, doc2_v2) - let doc2_v2_clone = Automerge.clone(doc2, "aabbcc") - assert.deepEqual(doc2, doc2_v2_clone) - assert.equal(Automerge.getActorId(doc2_v2_clone), "aabbcc") - }) - - it("should allow you to change a clone of a view", () => { - let doc1 = Automerge.init() - doc1 = Automerge.change(doc1, d => (d.key = "value")) - let heads = Automerge.getHeads(doc1) - doc1 = Automerge.change(doc1, d => (d.key = "value2")) - let fork = Automerge.clone(Automerge.view(doc1, heads)) - assert.deepEqual(fork, { key: "value" }) - fork = Automerge.change(fork, d => (d.key = "value3")) - assert.deepEqual(fork, { key: "value3" }) - }) - - it("handle basic set and read on root object", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.hello = "world" - d.big = "little" - d.zip = "zop" - d.app = "dap" - assert.deepEqual(d, { - hello: "world", - big: "little", - zip: "zop", - app: "dap", + // this is only needed if weakrefs are not supported + Automerge.free(doc1) + Automerge.free(doc2) }) - }) - assert.deepEqual(doc2, { - hello: "world", - big: "little", - zip: "zop", - app: "dap", - }) - }) - it("should be able to insert and delete a large number of properties", () => { - let doc = Automerge.init() - - doc = Automerge.change(doc, doc => { - doc["k1"] = true - }) - - for (let idx = 1; idx <= 200; idx++) { - doc = Automerge.change(doc, doc => { - delete doc["k" + idx] - doc["k" + (idx + 1)] = true - assert(Object.keys(doc).length == 1) + it('should be able to make a view with specifc heads', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => d.value = 1) + let heads2 = Automerge.getHeads(doc2) + let doc3 = Automerge.change(doc2, (d) => d.value = 2) + let doc2_v2 = Automerge.view(doc3, heads2) + assert.deepEqual(doc2, doc2_v2) + let doc2_v2_clone = Automerge.clone(doc2, "aabbcc") + assert.deepEqual(doc2, doc2_v2_clone) + assert.equal(Automerge.getActorId(doc2_v2_clone), "aabbcc") }) - } - }) - it("can detect an automerge doc with isAutomerge()", () => { - const doc1 = Automerge.from({ sub: { object: true } }) - assert(Automerge.isAutomerge(doc1)) - assert(!Automerge.isAutomerge(doc1.sub)) - assert(!Automerge.isAutomerge("String")) - assert(!Automerge.isAutomerge({ sub: { object: true } })) - assert(!Automerge.isAutomerge(undefined)) - const jsObj = Automerge.toJS(doc1) - assert(!Automerge.isAutomerge(jsObj)) - assert.deepEqual(jsObj, doc1) - }) - - it("it should recursively freeze the document if requested", () => { - let doc1 = Automerge.init({ freeze: true }) - let doc2 = Automerge.init() - - assert(Object.isFrozen(doc1)) - assert(!Object.isFrozen(doc2)) - - // will also freeze sub objects - doc1 = Automerge.change( - doc1, - doc => (doc.book = { title: "how to win friends" }) - ) - doc2 = Automerge.merge(doc2, doc1) - assert(Object.isFrozen(doc1)) - assert(Object.isFrozen(doc1.book)) - assert(!Object.isFrozen(doc2)) - assert(!Object.isFrozen(doc2.book)) - - // works on from - let doc3 = Automerge.from({ sub: { obj: "inner" } }, { freeze: true }) - assert(Object.isFrozen(doc3)) - assert(Object.isFrozen(doc3.sub)) - - // works on load - let doc4 = Automerge.load(Automerge.save(doc3), { freeze: true }) - assert(Object.isFrozen(doc4)) - assert(Object.isFrozen(doc4.sub)) - - // follows clone - let doc5 = Automerge.clone(doc4) - assert(Object.isFrozen(doc5)) - assert(Object.isFrozen(doc5.sub)) - - // toJS does not freeze - let exported = Automerge.toJS(doc5) - assert(!Object.isFrozen(exported)) - }) - - it("handle basic sets over many changes", () => { - let doc1 = Automerge.init() - let timestamp = new Date() - let counter = new Automerge.Counter(100) - let bytes = new Uint8Array([10, 11, 12]) - let doc2 = Automerge.change(doc1, d => { - d.hello = "world" - }) - let doc3 = Automerge.change(doc2, d => { - d.counter1 = counter - }) - let doc4 = Automerge.change(doc3, d => { - d.timestamp1 = timestamp - }) - let doc5 = Automerge.change(doc4, d => { - d.app = null - }) - let doc6 = Automerge.change(doc5, d => { - d.bytes1 = bytes - }) - let doc7 = Automerge.change(doc6, d => { - d.uint = new Automerge.Uint(1) - d.int = new Automerge.Int(-1) - d.float64 = new Automerge.Float64(5.5) - d.number1 = 100 - d.number2 = -45.67 - d.true = true - d.false = false - }) - - assert.deepEqual(doc7, { - hello: "world", - true: true, - false: false, - int: -1, - uint: 1, - float64: 5.5, - number1: 100, - number2: -45.67, - counter1: counter, - timestamp1: timestamp, - bytes1: bytes, - app: null, - }) - - let changes = Automerge.getAllChanges(doc7) - let t1 = Automerge.init() - let [t2] = Automerge.applyChanges(t1, changes) - assert.deepEqual(doc7, t2) - }) - - it("handle overwrites to values", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.hello = "world1" - }) - let doc3 = Automerge.change(doc2, d => { - d.hello = "world2" - }) - let doc4 = Automerge.change(doc3, d => { - d.hello = "world3" - }) - let doc5 = Automerge.change(doc4, d => { - d.hello = "world4" - }) - assert.deepEqual(doc5, { hello: "world4" }) - }) - - it("handle set with object value", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.subobj = { hello: "world", subsubobj: { zip: "zop" } } - }) - assert.deepEqual(doc2, { - subobj: { hello: "world", subsubobj: { zip: "zop" } }, - }) - }) - - it("handle simple list creation", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => (d.list = [])) - assert.deepEqual(doc2, { list: [] }) - }) - - it("handle simple lists", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.list = [1, 2, 3] - }) - assert.deepEqual(doc2.list.length, 3) - assert.deepEqual(doc2.list[0], 1) - assert.deepEqual(doc2.list[1], 2) - assert.deepEqual(doc2.list[2], 3) - assert.deepEqual(doc2, { list: [1, 2, 3] }) - // assert.deepStrictEqual(Automerge.toJS(doc2), { list: [1,2,3] }) - - let doc3 = Automerge.change(doc2, d => { - d.list[1] = "a" - }) - - assert.deepEqual(doc3.list.length, 3) - assert.deepEqual(doc3.list[0], 1) - assert.deepEqual(doc3.list[1], "a") - assert.deepEqual(doc3.list[2], 3) - assert.deepEqual(doc3, { list: [1, "a", 3] }) - }) - it("handle simple lists", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.list = [1, 2, 3] - }) - let changes = Automerge.getChanges(doc1, doc2) - let docB1 = Automerge.init() - let [docB2] = Automerge.applyChanges(docB1, changes) - assert.deepEqual(docB2, doc2) - }) - it("handle text", () => { - let doc1 = Automerge.init() - let doc2 = Automerge.change(doc1, d => { - d.list = "hello" - Automerge.splice(d, "list", 2, 0, "Z") - }) - let changes = Automerge.getChanges(doc1, doc2) - let docB1 = Automerge.init() - let [docB2] = Automerge.applyChanges(docB1, changes) - assert.deepEqual(docB2, doc2) - }) - - it("handle non-text strings", () => { - let doc1 = WASM.create(true) - doc1.put("_root", "text", "hello world") - let doc2 = Automerge.load(doc1.save()) - assert.throws(() => { - Automerge.change(doc2, d => { - Automerge.splice(d, "text", 1, 0, "Z") + it("should allow you to change a clone of a view", () => { + let doc1 = Automerge.init() + doc1 = Automerge.change(doc1, d => d.key = "value") + let heads = Automerge.getHeads(doc1) + doc1 = Automerge.change(doc1, d => d.key = "value2") + let fork = Automerge.clone(Automerge.view(doc1, heads)) + assert.deepEqual(fork, {key: "value"}) + fork = Automerge.change(fork, d => d.key = "value3") + assert.deepEqual(fork, {key: "value3"}) + }) + + it('handle basic set and read on root object', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.hello = "world" + d.big = "little" + d.zip = "zop" + d.app = "dap" + assert.deepEqual(d, { hello: "world", big: "little", zip: "zop", app: "dap" }) + }) + assert.deepEqual(doc2, { hello: "world", big: "little", zip: "zop", app: "dap" }) + }) + + it('can detect an automerge doc with isAutomerge()', () => { + const doc1 = Automerge.from({ sub: { object: true } }) + assert(Automerge.isAutomerge(doc1)) + assert(!Automerge.isAutomerge(doc1.sub)) + assert(!Automerge.isAutomerge("String")) + assert(!Automerge.isAutomerge({ sub: { object: true }})) + assert(!Automerge.isAutomerge(undefined)) + const jsObj = Automerge.toJS(doc1) + assert(!Automerge.isAutomerge(jsObj)) + assert.deepEqual(jsObj, doc1) + }) + + it('it should recursively freeze the document if requested', () => { + let doc1 = Automerge.init({ freeze: true } ) + let doc2 = Automerge.init() + + assert(Object.isFrozen(doc1)) + assert(!Object.isFrozen(doc2)) + + // will also freeze sub objects + doc1 = Automerge.change(doc1, (doc) => doc.book = { title: "how to win friends" }) + doc2 = Automerge.merge(doc2,doc1) + assert(Object.isFrozen(doc1)) + assert(Object.isFrozen(doc1.book)) + assert(!Object.isFrozen(doc2)) + assert(!Object.isFrozen(doc2.book)) + + // works on from + let doc3 = Automerge.from({ sub: { obj: "inner" } }, { freeze: true }) + assert(Object.isFrozen(doc3)) + assert(Object.isFrozen(doc3.sub)) + + // works on load + let doc4 = Automerge.load(Automerge.save(doc3), { freeze: true }) + assert(Object.isFrozen(doc4)) + assert(Object.isFrozen(doc4.sub)) + + // follows clone + let doc5 = Automerge.clone(doc4) + assert(Object.isFrozen(doc5)) + assert(Object.isFrozen(doc5.sub)) + + // toJS does not freeze + let exported = Automerge.toJS(doc5) + assert(!Object.isFrozen(exported)) + }) + + it('handle basic sets over many changes', () => { + let doc1 = Automerge.init() + let timestamp = new Date(); + let counter = new Automerge.Counter(100); + let bytes = new Uint8Array([10,11,12]); + let doc2 = Automerge.change(doc1, (d) => { + d.hello = "world" + }) + let doc3 = Automerge.change(doc2, (d) => { + d.counter1 = counter + }) + let doc4 = Automerge.change(doc3, (d) => { + d.timestamp1 = timestamp + }) + let doc5 = Automerge.change(doc4, (d) => { + d.app = null + }) + let doc6 = Automerge.change(doc5, (d) => { + d.bytes1 = bytes + }) + let doc7 = Automerge.change(doc6, (d) => { + d.uint = new Automerge.Uint(1) + d.int = new Automerge.Int(-1) + d.float64 = new Automerge.Float64(5.5) + d.number1 = 100 + d.number2 = -45.67 + d.true = true + d.false = false + }) + + assert.deepEqual(doc7, { hello: "world", true: true, false: false, int: -1, uint: 1, float64: 5.5, number1: 100, number2: -45.67, counter1: counter, timestamp1: timestamp, bytes1: bytes, app: null }) + + let changes = Automerge.getAllChanges(doc7) + let t1 = Automerge.init() + ;let [t2] = Automerge.applyChanges(t1, changes) + assert.deepEqual(doc7,t2) + }) + + it('handle overwrites to values', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.hello = "world1" + }) + let doc3 = Automerge.change(doc2, (d) => { + d.hello = "world2" + }) + let doc4 = Automerge.change(doc3, (d) => { + d.hello = "world3" + }) + let doc5 = Automerge.change(doc4, (d) => { + d.hello = "world4" + }) + assert.deepEqual(doc5, { hello: "world4" } ) + }) + + it('handle set with object value', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.subobj = { hello: "world", subsubobj: { zip: "zop" } } + }) + assert.deepEqual(doc2, { subobj: { hello: "world", subsubobj: { zip: "zop" } } }) + }) + + it('handle simple list creation', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => d.list = []) + assert.deepEqual(doc2, { list: []}) + }) + + it('handle simple lists', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.list = [ 1, 2, 3 ] + }) + assert.deepEqual(doc2.list.length, 3) + assert.deepEqual(doc2.list[0], 1) + assert.deepEqual(doc2.list[1], 2) + assert.deepEqual(doc2.list[2], 3) + assert.deepEqual(doc2, { list: [1,2,3] }) + // assert.deepStrictEqual(Automerge.toJS(doc2), { list: [1,2,3] }) + + let doc3 = Automerge.change(doc2, (d) => { + d.list[1] = "a" + }) + + assert.deepEqual(doc3.list.length, 3) + assert.deepEqual(doc3.list[0], 1) + assert.deepEqual(doc3.list[1], "a") + assert.deepEqual(doc3.list[2], 3) + assert.deepEqual(doc3, { list: [1,"a",3] }) + }) + it('handle simple lists', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.list = [ 1, 2, 3 ] + }) + let changes = Automerge.getChanges(doc1, doc2) + let docB1 = Automerge.init() + ;let [docB2] = Automerge.applyChanges(docB1, changes) + assert.deepEqual(docB2, doc2); + }) + it('handle text', () => { + let doc1 = Automerge.init() + let doc2 = Automerge.change(doc1, (d) => { + d.list = "hello" + Automerge.splice(d, "list", 2, 0, "Z") + }) + let changes = Automerge.getChanges(doc1, doc2) + let docB1 = Automerge.init() + ;let [docB2] = Automerge.applyChanges(docB1, changes) + assert.deepEqual(docB2, doc2); + }) + + it('handle non-text strings', () => { + let doc1 = WASM.create(); + doc1.put("_root", "text", "hello world"); + let doc2 = Automerge.load(doc1.save()) + assert.throws(() => { + Automerge.change(doc2, (d) => { Automerge.splice(d, "text", 1, 0, "Z") }) + }, /Cannot splice/) + }) + + it('have many list methods', () => { + let doc1 = Automerge.from({ list: [1,2,3] }) + assert.deepEqual(doc1, { list: [1,2,3] }); + let doc2 = Automerge.change(doc1, (d) => { + d.list.splice(1,1,9,10) + }) + assert.deepEqual(doc2, { list: [1,9,10,3] }); + let doc3 = Automerge.change(doc2, (d) => { + d.list.push(11,12) + }) + assert.deepEqual(doc3, { list: [1,9,10,3,11,12] }); + let doc4 = Automerge.change(doc3, (d) => { + d.list.unshift(2,2) + }) + assert.deepEqual(doc4, { list: [2,2,1,9,10,3,11,12] }); + let doc5 = Automerge.change(doc4, (d) => { + d.list.shift() + }) + assert.deepEqual(doc5, { list: [2,1,9,10,3,11,12] }); + let doc6 = Automerge.change(doc5, (d) => { + d.list.insertAt(3,100,101) + }) + assert.deepEqual(doc6, { list: [2,1,9,100,101,10,3,11,12] }); + }) + + it('allows access to the backend', () => { + let doc = Automerge.init() + assert.deepEqual(Object.keys(Automerge.getBackend(doc)), ["ptr"]) + }) + + it('lists and text have indexof', () => { + let doc = Automerge.from({ list: [0,1,2,3,4,5,6], text: "hello world" }) + console.log(doc.list.indexOf(5)) + console.log(doc.text.indexOf("world")) }) - }, /Cannot splice/) }) - it("have many list methods", () => { - let doc1 = Automerge.from({ list: [1, 2, 3] }) - assert.deepEqual(doc1, { list: [1, 2, 3] }) - let doc2 = Automerge.change(doc1, d => { - d.list.splice(1, 1, 9, 10) - }) - assert.deepEqual(doc2, { list: [1, 9, 10, 3] }) - let doc3 = Automerge.change(doc2, d => { - d.list.push(11, 12) - }) - assert.deepEqual(doc3, { list: [1, 9, 10, 3, 11, 12] }) - let doc4 = Automerge.change(doc3, d => { - d.list.unshift(2, 2) - }) - assert.deepEqual(doc4, { list: [2, 2, 1, 9, 10, 3, 11, 12] }) - let doc5 = Automerge.change(doc4, d => { - d.list.shift() - }) - assert.deepEqual(doc5, { list: [2, 1, 9, 10, 3, 11, 12] }) - let doc6 = Automerge.change(doc5, d => { - d.list.insertAt(3, 100, 101) - }) - assert.deepEqual(doc6, { list: [2, 1, 9, 100, 101, 10, 3, 11, 12] }) + describe('proxy lists', () => { + it('behave like arrays', () => { + let doc = Automerge.from({ + chars: ["a","b","c"], + numbers: [20,3,100], + repeats: [20,20,3,3,3,3,100,100] + }) + let r1 = [] + doc = Automerge.change(doc, (d) => { + assert.deepEqual(d.chars.concat([1,2]), ["a","b","c",1,2]) + assert.deepEqual(d.chars.map((n) => n + "!"), ["a!", "b!", "c!"]) + assert.deepEqual(d.numbers.map((n) => n + 10), [30, 13, 110]) + assert.deepEqual(d.numbers.toString(), "20,3,100") + assert.deepEqual(d.numbers.toLocaleString(), "20,3,100") + assert.deepEqual(d.numbers.forEach((n) => r1.push(n)), undefined) + assert.deepEqual(d.numbers.every((n) => n > 1), true) + assert.deepEqual(d.numbers.every((n) => n > 10), false) + assert.deepEqual(d.numbers.filter((n) => n > 10), [20,100]) + assert.deepEqual(d.repeats.find((n) => n < 10), 3) + assert.deepEqual(d.repeats.toArray().find((n) => n < 10), 3) + assert.deepEqual(d.repeats.find((n) => n < 0), undefined) + assert.deepEqual(d.repeats.findIndex((n) => n < 10), 2) + assert.deepEqual(d.repeats.findIndex((n) => n < 0), -1) + assert.deepEqual(d.repeats.toArray().findIndex((n) => n < 10), 2) + assert.deepEqual(d.repeats.toArray().findIndex((n) => n < 0), -1) + assert.deepEqual(d.numbers.includes(3), true) + assert.deepEqual(d.numbers.includes(-3), false) + assert.deepEqual(d.numbers.join("|"), "20|3|100") + assert.deepEqual(d.numbers.join(), "20,3,100") + assert.deepEqual(d.numbers.some((f) => f === 3), true) + assert.deepEqual(d.numbers.some((f) => f < 0), false) + assert.deepEqual(d.numbers.reduce((sum,n) => sum + n, 100), 223) + assert.deepEqual(d.repeats.reduce((sum,n) => sum + n, 100), 352) + assert.deepEqual(d.chars.reduce((sum,n) => sum + n, "="), "=abc") + assert.deepEqual(d.chars.reduceRight((sum,n) => sum + n, "="), "=cba") + assert.deepEqual(d.numbers.reduceRight((sum,n) => sum + n, 100), 223) + assert.deepEqual(d.repeats.lastIndexOf(3), 5) + assert.deepEqual(d.repeats.lastIndexOf(3,3), 3) + }) + doc = Automerge.change(doc, (d) => { + assert.deepEqual(d.numbers.fill(-1,1,2), [20,-1,100]) + assert.deepEqual(d.chars.fill("z",1,100), ["a","z","z"]) + }) + assert.deepEqual(r1, [20,3,100]) + assert.deepEqual(doc.numbers, [20,-1,100]) + assert.deepEqual(doc.chars, ["a","z","z"]) + }) + }) + + it('should obtain the same conflicts, regardless of merge order', () => { + let s1 = Automerge.init() + let s2 = Automerge.init() + s1 = Automerge.change(s1, doc => { doc.x = 1; doc.y = 2 }) + s2 = Automerge.change(s2, doc => { doc.x = 3; doc.y = 4 }) + const m1 = Automerge.merge(Automerge.clone(s1), Automerge.clone(s2)) + const m2 = Automerge.merge(Automerge.clone(s2), Automerge.clone(s1)) + assert.deepStrictEqual(Automerge.getConflicts(m1, 'x'), Automerge.getConflicts(m2, 'x')) }) - it("allows access to the backend", () => { - let doc = Automerge.init() - assert.deepEqual(Object.keys(Automerge.getBackend(doc)), ["ptr"]) - }) + describe("getObjectId", () => { + let s1 = Automerge.from({ + "string": "string", + "number": 1, + "null": null, + "date": new Date(), + "counter": new Automerge.Counter(), + "bytes": new Uint8Array(10), + "text": "", + "list": [], + "map": {} + }) - it("lists and text have indexof", () => { - let doc = Automerge.from({ - list: [0, 1, 2, 3, 4, 5, 6], - text: "hello world", - }) - assert.deepEqual(doc.list.indexOf(5), 5) - assert.deepEqual(doc.text.indexOf("world"), 6) - }) - }) + it("should return null for scalar values", () => { + assert.equal(Automerge.getObjectId(s1.string), null) + assert.equal(Automerge.getObjectId(s1.number), null) + assert.equal(Automerge.getObjectId(s1.null), null) + assert.equal(Automerge.getObjectId(s1.date), null) + assert.equal(Automerge.getObjectId(s1.counter), null) + assert.equal(Automerge.getObjectId(s1.bytes), null) + }) - describe("emptyChange", () => { - it("should generate a hash", () => { - let doc = Automerge.init() - doc = Automerge.change(doc, d => { - d.key = "value" - }) - Automerge.save(doc) - let headsBefore = Automerge.getHeads(doc) - headsBefore.sort() - doc = Automerge.emptyChange(doc, "empty change") - let headsAfter = Automerge.getHeads(doc) - headsAfter.sort() - assert.notDeepEqual(headsBefore, headsAfter) - }) - }) + it("should return _root for the root object", () => { + assert.equal(Automerge.getObjectId(s1), "_root") + }) - describe("proxy lists", () => { - it("behave like arrays", () => { - let doc = Automerge.from({ - chars: ["a", "b", "c"], - numbers: [20, 3, 100], - repeats: [20, 20, 3, 3, 3, 3, 100, 100], - }) - let r1: Array = [] - doc = Automerge.change(doc, d => { - assert.deepEqual((d.chars as any[]).concat([1, 2]), [ - "a", - "b", - "c", - 1, - 2, - ]) - assert.deepEqual( - d.chars.map(n => n + "!"), - ["a!", "b!", "c!"] - ) - assert.deepEqual( - d.numbers.map(n => n + 10), - [30, 13, 110] - ) - assert.deepEqual(d.numbers.toString(), "20,3,100") - assert.deepEqual(d.numbers.toLocaleString(), "20,3,100") - assert.deepEqual( - d.numbers.forEach((n: number) => r1.push(n)), - undefined - ) - assert.deepEqual( - d.numbers.every(n => n > 1), - true - ) - assert.deepEqual( - d.numbers.every(n => n > 10), - false - ) - assert.deepEqual( - d.numbers.filter(n => n > 10), - [20, 100] - ) - assert.deepEqual( - d.repeats.find(n => n < 10), - 3 - ) - assert.deepEqual( - d.repeats.find(n => n < 10), - 3 - ) - assert.deepEqual( - d.repeats.find(n => n < 0), - undefined - ) - assert.deepEqual( - d.repeats.findIndex(n => n < 10), - 2 - ) - assert.deepEqual( - d.repeats.findIndex(n => n < 0), - -1 - ) - assert.deepEqual( - d.repeats.findIndex(n => n < 10), - 2 - ) - assert.deepEqual( - d.repeats.findIndex(n => n < 0), - -1 - ) - assert.deepEqual(d.numbers.includes(3), true) - assert.deepEqual(d.numbers.includes(-3), false) - assert.deepEqual(d.numbers.join("|"), "20|3|100") - assert.deepEqual(d.numbers.join(), "20,3,100") - assert.deepEqual( - d.numbers.some(f => f === 3), - true - ) - assert.deepEqual( - d.numbers.some(f => f < 0), - false - ) - assert.deepEqual( - d.numbers.reduce((sum, n) => sum + n, 100), - 223 - ) - assert.deepEqual( - d.repeats.reduce((sum, n) => sum + n, 100), - 352 - ) - assert.deepEqual( - d.chars.reduce((sum, n) => sum + n, "="), - "=abc" - ) - assert.deepEqual( - d.chars.reduceRight((sum, n) => sum + n, "="), - "=cba" - ) - assert.deepEqual( - d.numbers.reduceRight((sum, n) => sum + n, 100), - 223 - ) - assert.deepEqual(d.repeats.lastIndexOf(3), 5) - assert.deepEqual(d.repeats.lastIndexOf(3, 3), 3) - }) - doc = Automerge.change(doc, d => { - assert.deepEqual(d.numbers.fill(-1, 1, 2), [20, -1, 100]) - assert.deepEqual(d.chars.fill("z", 1, 100), ["a", "z", "z"]) - }) - assert.deepEqual(r1, [20, 3, 100]) - assert.deepEqual(doc.numbers, [20, -1, 100]) - assert.deepEqual(doc.chars, ["a", "z", "z"]) + it("should return non-null for map, list, text, and objects", () => { + assert.equal(Automerge.getObjectId(s1.text), null) + assert.notEqual(Automerge.getObjectId(s1.list), null) + assert.notEqual(Automerge.getObjectId(s1.map), null) + }) }) - }) - - it("should obtain the same conflicts, regardless of merge order", () => { - let s1 = Automerge.init() - let s2 = Automerge.init() - s1 = Automerge.change(s1, doc => { - doc.x = 1 - doc.y = 2 - }) - s2 = Automerge.change(s2, doc => { - doc.x = 3 - doc.y = 4 - }) - const m1 = Automerge.merge(Automerge.clone(s1), Automerge.clone(s2)) - const m2 = Automerge.merge(Automerge.clone(s2), Automerge.clone(s1)) - assert.deepStrictEqual( - Automerge.getConflicts(m1, "x"), - Automerge.getConflicts(m2, "x") - ) - }) - - describe("getObjectId", () => { - let s1 = Automerge.from({ - string: "string", - number: 1, - null: null, - date: new Date(), - counter: new Automerge.Counter(), - bytes: new Uint8Array(10), - text: "", - list: [], - map: {}, - }) - - it("should return null for scalar values", () => { - assert.equal(Automerge.getObjectId(s1.string), null) - assert.equal(Automerge.getObjectId(s1.number), null) - assert.equal(Automerge.getObjectId(s1.null!), null) - assert.equal(Automerge.getObjectId(s1.date), null) - assert.equal(Automerge.getObjectId(s1.counter), null) - assert.equal(Automerge.getObjectId(s1.bytes), null) - }) - - it("should return _root for the root object", () => { - assert.equal(Automerge.getObjectId(s1), "_root") - }) - - it("should return non-null for map, list, text, and objects", () => { - assert.equal(Automerge.getObjectId(s1.text), null) - assert.notEqual(Automerge.getObjectId(s1.list), null) - assert.notEqual(Automerge.getObjectId(s1.map), null) - }) - }) }) + diff --git a/javascript/test/columnar_test.ts b/javascript/test/columnar_test.ts new file mode 100644 index 00000000..ca670377 --- /dev/null +++ b/javascript/test/columnar_test.ts @@ -0,0 +1,97 @@ +import * as assert from 'assert' +import { checkEncoded } from './helpers' +import * as Automerge from '../src' +import { encodeChange, decodeChange } from '../src' + +describe('change encoding', () => { + it('should encode text edits', () => { + /* + const change1 = {actor: 'aaaa', seq: 1, startOp: 1, time: 9, message: '', deps: [], ops: [ + {action: 'makeText', obj: '_root', key: 'text', insert: false, pred: []}, + {action: 'set', obj: '1@aaaa', elemId: '_head', insert: true, value: 'h', pred: []}, + {action: 'del', obj: '1@aaaa', elemId: '2@aaaa', insert: false, pred: ['2@aaaa']}, + {action: 'set', obj: '1@aaaa', elemId: '_head', insert: true, value: 'H', pred: []}, + {action: 'set', obj: '1@aaaa', elemId: '4@aaaa', insert: true, value: 'i', pred: []} + ]} + */ + const change1 = {actor: 'aaaa', seq: 1, startOp: 1, time: 9, message: null, deps: [], ops: [ + {action: 'makeText', obj: '_root', key: 'text', pred: []}, + {action: 'set', obj: '1@aaaa', elemId: '_head', insert: true, value: 'h', pred: []}, + {action: 'del', obj: '1@aaaa', elemId: '2@aaaa', pred: ['2@aaaa']}, + {action: 'set', obj: '1@aaaa', elemId: '_head', insert: true, value: 'H', pred: []}, + {action: 'set', obj: '1@aaaa', elemId: '4@aaaa', insert: true, value: 'i', pred: []} + ]} + checkEncoded(encodeChange(change1), [ + 0x85, 0x6f, 0x4a, 0x83, // magic bytes + 0xe2, 0xbd, 0xfb, 0xf5, // checksum + 1, 94, 0, 2, 0xaa, 0xaa, // chunkType: change, length, deps, actor 'aaaa' + 1, 1, 9, 0, 0, // seq, startOp, time, message, actor list + 12, 0x01, 4, 0x02, 4, // column count, objActor, objCtr + 0x11, 8, 0x13, 7, 0x15, 8, // keyActor, keyCtr, keyStr + 0x34, 4, 0x42, 6, // insert, action + 0x56, 6, 0x57, 3, // valLen, valRaw + 0x70, 6, 0x71, 2, 0x73, 2, // predNum, predActor, predCtr + 0, 1, 4, 0, // objActor column: null, 0, 0, 0, 0 + 0, 1, 4, 1, // objCtr column: null, 1, 1, 1, 1 + 0, 2, 0x7f, 0, 0, 1, 0x7f, 0, // keyActor column: null, null, 0, null, 0 + 0, 1, 0x7c, 0, 2, 0x7e, 4, // keyCtr column: null, 0, 2, 0, 4 + 0x7f, 4, 0x74, 0x65, 0x78, 0x74, 0, 4, // keyStr column: 'text', null, null, null, null + 1, 1, 1, 2, // insert column: false, true, false, true, true + 0x7d, 4, 1, 3, 2, 1, // action column: makeText, set, del, set, set + 0x7d, 0, 0x16, 0, 2, 0x16, // valLen column: 0, 0x16, 0, 0x16, 0x16 + 0x68, 0x48, 0x69, // valRaw column: 'h', 'H', 'i' + 2, 0, 0x7f, 1, 2, 0, // predNum column: 0, 0, 1, 0, 0 + 0x7f, 0, // predActor column: 0 + 0x7f, 2 // predCtr column: 2 + ]) + const decoded = decodeChange(encodeChange(change1)) + assert.deepStrictEqual(decoded, Object.assign({hash: decoded.hash}, change1)) + }) + + // FIXME - skipping this b/c it was never implemented in the rust impl and isnt trivial +/* + it.skip('should require strict ordering of preds', () => { + const change = new Uint8Array([ + 133, 111, 74, 131, 31, 229, 112, 44, 1, 105, 1, 58, 30, 190, 100, 253, 180, 180, 66, 49, 126, + 81, 142, 10, 3, 35, 140, 189, 231, 34, 145, 57, 66, 23, 224, 149, 64, 97, 88, 140, 168, 194, + 229, 4, 244, 209, 58, 138, 67, 140, 1, 152, 236, 250, 2, 0, 1, 4, 55, 234, 66, 242, 8, 21, 11, + 52, 1, 66, 2, 86, 3, 87, 10, 112, 2, 113, 3, 115, 4, 127, 9, 99, 111, 109, 109, 111, 110, 86, + 97, 114, 1, 127, 1, 127, 166, 1, 52, 48, 57, 49, 52, 57, 52, 53, 56, 50, 127, 2, 126, 0, 1, + 126, 139, 1, 0 + ]) + assert.throws(() => { decodeChange(change) }, /operation IDs are not in ascending order/) + }) +*/ + + describe('with trailing bytes', () => { + let change = new Uint8Array([ + 0x85, 0x6f, 0x4a, 0x83, // magic bytes + 0xb2, 0x98, 0x9e, 0xa9, // checksum + 1, 61, 0, 2, 0x12, 0x34, // chunkType: change, length, deps, actor '1234' + 1, 1, 252, 250, 220, 255, 5, // seq, startOp, time + 14, 73, 110, 105, 116, 105, 97, 108, 105, 122, 97, 116, 105, 111, 110, // message: 'Initialization' + 0, 6, // actor list, column count + 0x15, 3, 0x34, 1, 0x42, 2, // keyStr, insert, action + 0x56, 2, 0x57, 1, 0x70, 2, // valLen, valRaw, predNum + 0x7f, 1, 0x78, // keyStr: 'x' + 1, // insert: false + 0x7f, 1, // action: set + 0x7f, 19, // valLen: 1 byte of type uint + 1, // valRaw: 1 + 0x7f, 0, // predNum: 0 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 // 10 trailing bytes + ]) + + it('should allow decoding and re-encoding', () => { + // NOTE: This calls the JavaScript encoding and decoding functions, even when the WebAssembly + // backend is loaded. Should the wasm backend export its own functions for testing? + checkEncoded(change, encodeChange(decodeChange(change))) + }) + + it('should be preserved in document encoding', () => { + const [doc] = Automerge.applyChanges(Automerge.init(), [change]) + const [reconstructed] = Automerge.getAllChanges(Automerge.load(Automerge.save(doc))) + checkEncoded(change, reconstructed) + }) + }) +}) diff --git a/javascript/test/extra_api_tests.ts b/javascript/test/extra_api_tests.ts index 84fa4c39..ce0438d5 100644 --- a/javascript/test/extra_api_tests.ts +++ b/javascript/test/extra_api_tests.ts @@ -1,28 +1,20 @@ -import * as assert from "assert" -import { unstable as Automerge } from "../src" -describe("Automerge", () => { - describe("basics", () => { - it("should allow you to load incrementally", () => { - let doc1 = Automerge.from({ foo: "bar" }) - let doc2 = Automerge.init() - doc2 = Automerge.loadIncremental(doc2, Automerge.save(doc1)) - doc1 = Automerge.change(doc1, d => (d.foo2 = "bar2")) - doc2 = Automerge.loadIncremental( - doc2, - Automerge.getBackend(doc1).saveIncremental() - ) - doc1 = Automerge.change(doc1, d => (d.foo = "bar2")) - doc2 = Automerge.loadIncremental( - doc2, - Automerge.getBackend(doc1).saveIncremental() - ) - doc1 = Automerge.change(doc1, d => (d.x = "y")) - doc2 = Automerge.loadIncremental( - doc2, - Automerge.getBackend(doc1).saveIncremental() - ) - assert.deepEqual(doc1, doc2) +import * as assert from 'assert' +import * as Automerge from '../src' + +describe('Automerge', () => { + describe('basics', () => { + it('should allow you to load incrementally', () => { + let doc1 = Automerge.from({ foo: "bar" }) + let doc2 = Automerge.init(); + doc2 = Automerge.loadIncremental(doc2, Automerge.save(doc1)) + doc1 = Automerge.change(doc1, (d) => d.foo2 = "bar2") + doc2 = Automerge.loadIncremental(doc2, Automerge.getBackend(doc1).saveIncremental() ) + doc1 = Automerge.change(doc1, (d) => d.foo = "bar2") + doc2 = Automerge.loadIncremental(doc2, Automerge.getBackend(doc1).saveIncremental() ) + doc1 = Automerge.change(doc1, (d) => d.x = "y") + doc2 = Automerge.loadIncremental(doc2, Automerge.getBackend(doc1).saveIncremental() ) + assert.deepEqual(doc1,doc2) + }) }) - }) }) diff --git a/javascript/test/helpers.ts b/javascript/test/helpers.ts index df76e558..d5292130 100644 --- a/javascript/test/helpers.ts +++ b/javascript/test/helpers.ts @@ -1,21 +1,16 @@ -import * as assert from "assert" -import { Encoder } from "./legacy/encoding" +import * as assert from 'assert' +import { Encoder } from './legacy/encoding' // Assertion that succeeds if the first argument deepStrictEquals at least one of the // subsequent arguments (but we don't care which one) -export function assertEqualsOneOf(actual, ...expected) { +function assertEqualsOneOf(actual, ...expected) { assert(expected.length > 0) for (let i = 0; i < expected.length; i++) { try { assert.deepStrictEqual(actual, expected[i]) return // if we get here without an exception, that means success } catch (e) { - if (e instanceof assert.AssertionError) { - if (!e.name.match(/^AssertionError/) || i === expected.length - 1) - throw e - } else { - throw e - } + if (!e.name.match(/^AssertionError/) || i === expected.length - 1) throw e } } } @@ -24,13 +19,14 @@ export function assertEqualsOneOf(actual, ...expected) { * Asserts that the byte array maintained by `encoder` contains the same byte * sequence as the array `bytes`. */ -export function checkEncoded(encoder, bytes, detail?) { - const encoded = encoder instanceof Encoder ? encoder.buffer : encoder +function checkEncoded(encoder, bytes, detail) { + const encoded = (encoder instanceof Encoder) ? encoder.buffer : encoder const expected = new Uint8Array(bytes) - const message = - (detail ? `${detail}: ` : "") + `${encoded} expected to equal ${expected}` + const message = (detail ? `${detail}: ` : '') + `${encoded} expected to equal ${expected}` assert(encoded.byteLength === expected.byteLength, message) for (let i = 0; i < encoded.byteLength; i++) { assert(encoded[i] === expected[i], message) } } + +module.exports = { assertEqualsOneOf, checkEncoded } diff --git a/javascript/test/legacy/columnar.js b/javascript/test/legacy/columnar.js index 6a9b5874..b97e6275 100644 --- a/javascript/test/legacy/columnar.js +++ b/javascript/test/legacy/columnar.js @@ -1,18 +1,9 @@ -const pako = require("pako") -const { copyObject, parseOpId, equalBytes } = require("./common") +const pako = require('pako') +const { copyObject, parseOpId, equalBytes } = require('./common') const { - utf8ToString, - hexStringToBytes, - bytesToHexString, - Encoder, - Decoder, - RLEEncoder, - RLEDecoder, - DeltaEncoder, - DeltaDecoder, - BooleanEncoder, - BooleanDecoder, -} = require("./encoding") + utf8ToString, hexStringToBytes, bytesToHexString, + Encoder, Decoder, RLEEncoder, RLEDecoder, DeltaEncoder, DeltaDecoder, BooleanEncoder, BooleanDecoder +} = require('./encoding') // Maybe we should be using the platform's built-in hash implementation? // Node has the crypto module: https://nodejs.org/api/crypto.html and browsers have @@ -27,7 +18,7 @@ const { // - It does not need a secure source of random bits and does not need to be // constant-time; // - I have reviewed the source code and it seems pretty reasonable. -const { Hash } = require("fast-sha256") +const { Hash } = require('fast-sha256') // These bytes don't mean anything, they were generated randomly const MAGIC_BYTES = new Uint8Array([0x85, 0x6f, 0x4a, 0x83]) @@ -42,14 +33,8 @@ const DEFLATE_MIN_SIZE = 256 // The least-significant 3 bits of a columnId indicate its datatype const COLUMN_TYPE = { - GROUP_CARD: 0, - ACTOR_ID: 1, - INT_RLE: 2, - INT_DELTA: 3, - BOOLEAN: 4, - STRING_RLE: 5, - VALUE_LEN: 6, - VALUE_RAW: 7, + GROUP_CARD: 0, ACTOR_ID: 1, INT_RLE: 2, INT_DELTA: 3, BOOLEAN: 4, + STRING_RLE: 5, VALUE_LEN: 6, VALUE_RAW: 7 } // The 4th-least-significant bit of a columnId is set if the column is DEFLATE-compressed @@ -59,77 +44,53 @@ const COLUMN_TYPE_DEFLATE = 8 // one of the following types in VALUE_TYPE. The higher bits indicate the length of the value in the // associated VALUE_RAW column (in bytes). const VALUE_TYPE = { - NULL: 0, - FALSE: 1, - TRUE: 2, - LEB128_UINT: 3, - LEB128_INT: 4, - IEEE754: 5, - UTF8: 6, - BYTES: 7, - COUNTER: 8, - TIMESTAMP: 9, - MIN_UNKNOWN: 10, - MAX_UNKNOWN: 15, + NULL: 0, FALSE: 1, TRUE: 2, LEB128_UINT: 3, LEB128_INT: 4, IEEE754: 5, + UTF8: 6, BYTES: 7, COUNTER: 8, TIMESTAMP: 9, MIN_UNKNOWN: 10, MAX_UNKNOWN: 15 } // make* actions must be at even-numbered indexes in this list -const ACTIONS = [ - "makeMap", - "set", - "makeList", - "del", - "makeText", - "inc", - "makeTable", - "link", -] +const ACTIONS = ['makeMap', 'set', 'makeList', 'del', 'makeText', 'inc', 'makeTable', 'link'] -const OBJECT_TYPE = { - makeMap: "map", - makeList: "list", - makeText: "text", - makeTable: "table", -} +const OBJECT_TYPE = {makeMap: 'map', makeList: 'list', makeText: 'text', makeTable: 'table'} const COMMON_COLUMNS = [ - { columnName: "objActor", columnId: (0 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "objCtr", columnId: (0 << 4) | COLUMN_TYPE.INT_RLE }, - { columnName: "keyActor", columnId: (1 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "keyCtr", columnId: (1 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "keyStr", columnId: (1 << 4) | COLUMN_TYPE.STRING_RLE }, - { columnName: "idActor", columnId: (2 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "idCtr", columnId: (2 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "insert", columnId: (3 << 4) | COLUMN_TYPE.BOOLEAN }, - { columnName: "action", columnId: (4 << 4) | COLUMN_TYPE.INT_RLE }, - { columnName: "valLen", columnId: (5 << 4) | COLUMN_TYPE.VALUE_LEN }, - { columnName: "valRaw", columnId: (5 << 4) | COLUMN_TYPE.VALUE_RAW }, - { columnName: "chldActor", columnId: (6 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "chldCtr", columnId: (6 << 4) | COLUMN_TYPE.INT_DELTA }, + {columnName: 'objActor', columnId: 0 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'objCtr', columnId: 0 << 4 | COLUMN_TYPE.INT_RLE}, + {columnName: 'keyActor', columnId: 1 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'keyCtr', columnId: 1 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'keyStr', columnId: 1 << 4 | COLUMN_TYPE.STRING_RLE}, + {columnName: 'idActor', columnId: 2 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'idCtr', columnId: 2 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'insert', columnId: 3 << 4 | COLUMN_TYPE.BOOLEAN}, + {columnName: 'action', columnId: 4 << 4 | COLUMN_TYPE.INT_RLE}, + {columnName: 'valLen', columnId: 5 << 4 | COLUMN_TYPE.VALUE_LEN}, + {columnName: 'valRaw', columnId: 5 << 4 | COLUMN_TYPE.VALUE_RAW}, + {columnName: 'chldActor', columnId: 6 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'chldCtr', columnId: 6 << 4 | COLUMN_TYPE.INT_DELTA} ] const CHANGE_COLUMNS = COMMON_COLUMNS.concat([ - { columnName: "predNum", columnId: (7 << 4) | COLUMN_TYPE.GROUP_CARD }, - { columnName: "predActor", columnId: (7 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "predCtr", columnId: (7 << 4) | COLUMN_TYPE.INT_DELTA }, + {columnName: 'predNum', columnId: 7 << 4 | COLUMN_TYPE.GROUP_CARD}, + {columnName: 'predActor', columnId: 7 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'predCtr', columnId: 7 << 4 | COLUMN_TYPE.INT_DELTA} ]) const DOC_OPS_COLUMNS = COMMON_COLUMNS.concat([ - { columnName: "succNum", columnId: (8 << 4) | COLUMN_TYPE.GROUP_CARD }, - { columnName: "succActor", columnId: (8 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "succCtr", columnId: (8 << 4) | COLUMN_TYPE.INT_DELTA }, + {columnName: 'succNum', columnId: 8 << 4 | COLUMN_TYPE.GROUP_CARD}, + {columnName: 'succActor', columnId: 8 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'succCtr', columnId: 8 << 4 | COLUMN_TYPE.INT_DELTA} ]) const DOCUMENT_COLUMNS = [ - { columnName: "actor", columnId: (0 << 4) | COLUMN_TYPE.ACTOR_ID }, - { columnName: "seq", columnId: (0 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "maxOp", columnId: (1 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "time", columnId: (2 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "message", columnId: (3 << 4) | COLUMN_TYPE.STRING_RLE }, - { columnName: "depsNum", columnId: (4 << 4) | COLUMN_TYPE.GROUP_CARD }, - { columnName: "depsIndex", columnId: (4 << 4) | COLUMN_TYPE.INT_DELTA }, - { columnName: "extraLen", columnId: (5 << 4) | COLUMN_TYPE.VALUE_LEN }, - { columnName: "extraRaw", columnId: (5 << 4) | COLUMN_TYPE.VALUE_RAW }, + {columnName: 'actor', columnId: 0 << 4 | COLUMN_TYPE.ACTOR_ID}, + {columnName: 'seq', columnId: 0 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'maxOp', columnId: 1 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'time', columnId: 2 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'message', columnId: 3 << 4 | COLUMN_TYPE.STRING_RLE}, + {columnName: 'depsNum', columnId: 4 << 4 | COLUMN_TYPE.GROUP_CARD}, + {columnName: 'depsIndex', columnId: 4 << 4 | COLUMN_TYPE.INT_DELTA}, + {columnName: 'extraLen', columnId: 5 << 4 | COLUMN_TYPE.VALUE_LEN}, + {columnName: 'extraRaw', columnId: 5 << 4 | COLUMN_TYPE.VALUE_RAW} ] /** @@ -141,8 +102,8 @@ function actorIdToActorNum(opId, actorIds) { if (!opId || !opId.actorId) return opId const counter = opId.counter const actorNum = actorIds.indexOf(opId.actorId) - if (actorNum < 0) throw new RangeError("missing actorId") // should not happen - return { counter, actorNum, actorId: opId.actorId } + if (actorNum < 0) throw new RangeError('missing actorId') // should not happen + return {counter, actorNum, actorId: opId.actorId} } /** @@ -170,16 +131,15 @@ function compareParsedOpIds(id1, id2) { * false. */ function parseAllOpIds(changes, single) { - const actors = {}, - newChanges = [] + const actors = {}, newChanges = [] for (let change of changes) { change = copyObject(change) actors[change.actor] = true change.ops = expandMultiOps(change.ops, change.startOp, change.actor) change.ops = change.ops.map(op => { op = copyObject(op) - if (op.obj !== "_root") op.obj = parseOpId(op.obj) - if (op.elemId && op.elemId !== "_head") op.elemId = parseOpId(op.elemId) + if (op.obj !== '_root') op.obj = parseOpId(op.obj) + if (op.elemId && op.elemId !== '_head') op.elemId = parseOpId(op.elemId) if (op.child) op.child = parseOpId(op.child) if (op.pred) op.pred = op.pred.map(parseOpId) if (op.obj.actorId) actors[op.obj.actorId] = true @@ -193,26 +153,20 @@ function parseAllOpIds(changes, single) { let actorIds = Object.keys(actors).sort() if (single) { - actorIds = [changes[0].actor].concat( - actorIds.filter(actor => actor !== changes[0].actor) - ) + actorIds = [changes[0].actor].concat(actorIds.filter(actor => actor !== changes[0].actor)) } for (let change of newChanges) { change.actorNum = actorIds.indexOf(change.actor) for (let i = 0; i < change.ops.length; i++) { let op = change.ops[i] - op.id = { - counter: change.startOp + i, - actorNum: change.actorNum, - actorId: change.actor, - } + op.id = {counter: change.startOp + i, actorNum: change.actorNum, actorId: change.actor} op.obj = actorIdToActorNum(op.obj, actorIds) op.elemId = actorIdToActorNum(op.elemId, actorIds) op.child = actorIdToActorNum(op.child, actorIds) op.pred = op.pred.map(pred => actorIdToActorNum(pred, actorIds)) } } - return { changes: newChanges, actorIds } + return {changes: newChanges, actorIds} } /** @@ -220,16 +174,14 @@ function parseAllOpIds(changes, single) { * `objActor` and `objCtr`. */ function encodeObjectId(op, columns) { - if (op.obj === "_root") { + if (op.obj === '_root') { columns.objActor.appendValue(null) columns.objCtr.appendValue(null) } else if (op.obj.actorNum >= 0 && op.obj.counter > 0) { columns.objActor.appendValue(op.obj.actorNum) columns.objCtr.appendValue(op.obj.counter) } else { - throw new RangeError( - `Unexpected objectId reference: ${JSON.stringify(op.obj)}` - ) + throw new RangeError(`Unexpected objectId reference: ${JSON.stringify(op.obj)}`) } } @@ -242,7 +194,7 @@ function encodeOperationKey(op, columns) { columns.keyActor.appendValue(null) columns.keyCtr.appendValue(null) columns.keyStr.appendValue(op.key) - } else if (op.elemId === "_head" && op.insert) { + } else if (op.elemId === '_head' && op.insert) { columns.keyActor.appendValue(null) columns.keyCtr.appendValue(0) columns.keyStr.appendValue(null) @@ -262,7 +214,7 @@ function encodeOperationAction(op, columns) { const actionCode = ACTIONS.indexOf(op.action) if (actionCode >= 0) { columns.action.appendValue(actionCode) - } else if (typeof op.action === "number") { + } else if (typeof op.action === 'number') { columns.action.appendValue(op.action) } else { throw new RangeError(`Unexpected operation action: ${op.action}`) @@ -276,32 +228,26 @@ function encodeOperationAction(op, columns) { function getNumberTypeAndValue(op) { switch (op.datatype) { case "counter": - return [VALUE_TYPE.COUNTER, op.value] + return [ VALUE_TYPE.COUNTER, op.value ] case "timestamp": - return [VALUE_TYPE.TIMESTAMP, op.value] + return [ VALUE_TYPE.TIMESTAMP, op.value ] case "uint": - return [VALUE_TYPE.LEB128_UINT, op.value] + return [ VALUE_TYPE.LEB128_UINT, op.value ] case "int": - return [VALUE_TYPE.LEB128_INT, op.value] + return [ VALUE_TYPE.LEB128_INT, op.value ] case "float64": { - const buf64 = new ArrayBuffer(8), - view64 = new DataView(buf64) + const buf64 = new ArrayBuffer(8), view64 = new DataView(buf64) view64.setFloat64(0, op.value, true) - return [VALUE_TYPE.IEEE754, new Uint8Array(buf64)] + return [ VALUE_TYPE.IEEE754, new Uint8Array(buf64) ] } default: // increment operators get resolved here ... - if ( - Number.isInteger(op.value) && - op.value <= Number.MAX_SAFE_INTEGER && - op.value >= Number.MIN_SAFE_INTEGER - ) { - return [VALUE_TYPE.LEB128_INT, op.value] + if (Number.isInteger(op.value) && op.value <= Number.MAX_SAFE_INTEGER && op.value >= Number.MIN_SAFE_INTEGER) { + return [ VALUE_TYPE.LEB128_INT, op.value ] } else { - const buf64 = new ArrayBuffer(8), - view64 = new DataView(buf64) + const buf64 = new ArrayBuffer(8), view64 = new DataView(buf64) view64.setFloat64(0, op.value, true) - return [VALUE_TYPE.IEEE754, new Uint8Array(buf64)] + return [ VALUE_TYPE.IEEE754, new Uint8Array(buf64) ] } } } @@ -311,21 +257,19 @@ function getNumberTypeAndValue(op) { * `valLen` and `valRaw`. */ function encodeValue(op, columns) { - if ((op.action !== "set" && op.action !== "inc") || op.value === null) { + if ((op.action !== 'set' && op.action !== 'inc') || op.value === null) { columns.valLen.appendValue(VALUE_TYPE.NULL) } else if (op.value === false) { columns.valLen.appendValue(VALUE_TYPE.FALSE) } else if (op.value === true) { columns.valLen.appendValue(VALUE_TYPE.TRUE) - } else if (typeof op.value === "string") { + } else if (typeof op.value === 'string') { const numBytes = columns.valRaw.appendRawString(op.value) - columns.valLen.appendValue((numBytes << 4) | VALUE_TYPE.UTF8) + columns.valLen.appendValue(numBytes << 4 | VALUE_TYPE.UTF8) } else if (ArrayBuffer.isView(op.value)) { - const numBytes = columns.valRaw.appendRawBytes( - new Uint8Array(op.value.buffer) - ) - columns.valLen.appendValue((numBytes << 4) | VALUE_TYPE.BYTES) - } else if (typeof op.value === "number") { + const numBytes = columns.valRaw.appendRawBytes(new Uint8Array(op.value.buffer)) + columns.valLen.appendValue(numBytes << 4 | VALUE_TYPE.BYTES) + } else if (typeof op.value === 'number') { let [typeTag, value] = getNumberTypeAndValue(op) let numBytes if (typeTag === VALUE_TYPE.LEB128_UINT) { @@ -335,19 +279,13 @@ function encodeValue(op, columns) { } else { numBytes = columns.valRaw.appendInt53(value) } - columns.valLen.appendValue((numBytes << 4) | typeTag) - } else if ( - typeof op.datatype === "number" && - op.datatype >= VALUE_TYPE.MIN_UNKNOWN && - op.datatype <= VALUE_TYPE.MAX_UNKNOWN && - op.value instanceof Uint8Array - ) { + columns.valLen.appendValue(numBytes << 4 | typeTag) + } else if (typeof op.datatype === 'number' && op.datatype >= VALUE_TYPE.MIN_UNKNOWN && + op.datatype <= VALUE_TYPE.MAX_UNKNOWN && op.value instanceof Uint8Array) { const numBytes = columns.valRaw.appendRawBytes(op.value) - columns.valLen.appendValue((numBytes << 4) | op.datatype) + columns.valLen.appendValue(numBytes << 4 | op.datatype) } else if (op.datatype) { - throw new RangeError( - `Unknown datatype ${op.datatype} for value ${op.value}` - ) + throw new RangeError(`Unknown datatype ${op.datatype} for value ${op.value}`) } else { throw new RangeError(`Unsupported value in operation: ${op.value}`) } @@ -361,37 +299,31 @@ function encodeValue(op, columns) { */ function decodeValue(sizeTag, bytes) { if (sizeTag === VALUE_TYPE.NULL) { - return { value: null } + return {value: null} } else if (sizeTag === VALUE_TYPE.FALSE) { - return { value: false } + return {value: false} } else if (sizeTag === VALUE_TYPE.TRUE) { - return { value: true } + return {value: true} } else if (sizeTag % 16 === VALUE_TYPE.UTF8) { - return { value: utf8ToString(bytes) } + return {value: utf8ToString(bytes)} } else { if (sizeTag % 16 === VALUE_TYPE.LEB128_UINT) { - return { value: new Decoder(bytes).readUint53(), datatype: "uint" } + return {value: new Decoder(bytes).readUint53(), datatype: "uint"} } else if (sizeTag % 16 === VALUE_TYPE.LEB128_INT) { - return { value: new Decoder(bytes).readInt53(), datatype: "int" } + return {value: new Decoder(bytes).readInt53(), datatype: "int"} } else if (sizeTag % 16 === VALUE_TYPE.IEEE754) { - const view = new DataView( - bytes.buffer, - bytes.byteOffset, - bytes.byteLength - ) + const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength) if (bytes.byteLength === 8) { - return { value: view.getFloat64(0, true), datatype: "float64" } + return {value: view.getFloat64(0, true), datatype: "float64"} } else { - throw new RangeError( - `Invalid length for floating point number: ${bytes.byteLength}` - ) + throw new RangeError(`Invalid length for floating point number: ${bytes.byteLength}`) } } else if (sizeTag % 16 === VALUE_TYPE.COUNTER) { - return { value: new Decoder(bytes).readInt53(), datatype: "counter" } + return {value: new Decoder(bytes).readInt53(), datatype: 'counter'} } else if (sizeTag % 16 === VALUE_TYPE.TIMESTAMP) { - return { value: new Decoder(bytes).readInt53(), datatype: "timestamp" } + return {value: new Decoder(bytes).readInt53(), datatype: 'timestamp'} } else { - return { value: bytes, datatype: sizeTag % 16 } + return {value: bytes, datatype: sizeTag % 16} } } } @@ -406,24 +338,20 @@ function decodeValue(sizeTag, bytes) { */ function decodeValueColumns(columns, colIndex, actorIds, result) { const { columnId, columnName, decoder } = columns[colIndex] - if ( - columnId % 8 === COLUMN_TYPE.VALUE_LEN && - colIndex + 1 < columns.length && - columns[colIndex + 1].columnId === columnId + 1 - ) { + if (columnId % 8 === COLUMN_TYPE.VALUE_LEN && colIndex + 1 < columns.length && + columns[colIndex + 1].columnId === columnId + 1) { const sizeTag = decoder.readValue() const rawValue = columns[colIndex + 1].decoder.readRawBytes(sizeTag >> 4) const { value, datatype } = decodeValue(sizeTag, rawValue) result[columnName] = value - if (datatype) result[columnName + "_datatype"] = datatype + if (datatype) result[columnName + '_datatype'] = datatype return 2 } else if (columnId % 8 === COLUMN_TYPE.ACTOR_ID) { const actorNum = decoder.readValue() if (actorNum === null) { result[columnName] = null } else { - if (!actorIds[actorNum]) - throw new RangeError(`No actor index ${actorNum}`) + if (!actorIds[actorNum]) throw new RangeError(`No actor index ${actorNum}`) result[columnName] = actorIds[actorNum] } } else { @@ -441,29 +369,29 @@ function decodeValueColumns(columns, colIndex, actorIds, result) { */ function encodeOps(ops, forDocument) { const columns = { - objActor: new RLEEncoder("uint"), - objCtr: new RLEEncoder("uint"), - keyActor: new RLEEncoder("uint"), - keyCtr: new DeltaEncoder(), - keyStr: new RLEEncoder("utf8"), - insert: new BooleanEncoder(), - action: new RLEEncoder("uint"), - valLen: new RLEEncoder("uint"), - valRaw: new Encoder(), - chldActor: new RLEEncoder("uint"), - chldCtr: new DeltaEncoder(), + objActor : new RLEEncoder('uint'), + objCtr : new RLEEncoder('uint'), + keyActor : new RLEEncoder('uint'), + keyCtr : new DeltaEncoder(), + keyStr : new RLEEncoder('utf8'), + insert : new BooleanEncoder(), + action : new RLEEncoder('uint'), + valLen : new RLEEncoder('uint'), + valRaw : new Encoder(), + chldActor : new RLEEncoder('uint'), + chldCtr : new DeltaEncoder() } if (forDocument) { - columns.idActor = new RLEEncoder("uint") - columns.idCtr = new DeltaEncoder() - columns.succNum = new RLEEncoder("uint") - columns.succActor = new RLEEncoder("uint") - columns.succCtr = new DeltaEncoder() + columns.idActor = new RLEEncoder('uint') + columns.idCtr = new DeltaEncoder() + columns.succNum = new RLEEncoder('uint') + columns.succActor = new RLEEncoder('uint') + columns.succCtr = new DeltaEncoder() } else { - columns.predNum = new RLEEncoder("uint") - columns.predCtr = new DeltaEncoder() - columns.predActor = new RLEEncoder("uint") + columns.predNum = new RLEEncoder('uint') + columns.predCtr = new DeltaEncoder() + columns.predActor = new RLEEncoder('uint') } for (let op of ops) { @@ -501,22 +429,17 @@ function encodeOps(ops, forDocument) { } let columnList = [] - for (let { columnName, columnId } of forDocument - ? DOC_OPS_COLUMNS - : CHANGE_COLUMNS) { - if (columns[columnName]) - columnList.push({ columnId, columnName, encoder: columns[columnName] }) + for (let {columnName, columnId} of forDocument ? DOC_OPS_COLUMNS : CHANGE_COLUMNS) { + if (columns[columnName]) columnList.push({columnId, columnName, encoder: columns[columnName]}) } return columnList.sort((a, b) => a.columnId - b.columnId) } function validDatatype(value, datatype) { if (datatype === undefined) { - return ( - typeof value === "string" || typeof value === "boolean" || value === null - ) + return (typeof value === 'string' || typeof value === 'boolean' || value === null) } else { - return typeof value === "number" + return typeof value === 'number' } } @@ -524,37 +447,23 @@ function expandMultiOps(ops, startOp, actor) { let opNum = startOp let expandedOps = [] for (const op of ops) { - if (op.action === "set" && op.values && op.insert) { - if (op.pred.length !== 0) - throw new RangeError("multi-insert pred must be empty") + if (op.action === 'set' && op.values && op.insert) { + if (op.pred.length !== 0) throw new RangeError('multi-insert pred must be empty') let lastElemId = op.elemId const datatype = op.datatype for (const value of op.values) { - if (!validDatatype(value, datatype)) - throw new RangeError( - `Decode failed: bad value/datatype association (${value},${datatype})` - ) - expandedOps.push({ - action: "set", - obj: op.obj, - elemId: lastElemId, - datatype, - value, - pred: [], - insert: true, - }) + if (!validDatatype(value, datatype)) throw new RangeError(`Decode failed: bad value/datatype association (${value},${datatype})`) + expandedOps.push({action: 'set', obj: op.obj, elemId: lastElemId, datatype, value, pred: [], insert: true}) lastElemId = `${opNum}@${actor}` opNum += 1 } - } else if (op.action === "del" && op.multiOp > 1) { - if (op.pred.length !== 1) - throw new RangeError("multiOp deletion must have exactly one pred") - const startElemId = parseOpId(op.elemId), - startPred = parseOpId(op.pred[0]) + } else if (op.action === 'del' && op.multiOp > 1) { + if (op.pred.length !== 1) throw new RangeError('multiOp deletion must have exactly one pred') + const startElemId = parseOpId(op.elemId), startPred = parseOpId(op.pred[0]) for (let i = 0; i < op.multiOp; i++) { const elemId = `${startElemId.counter + i}@${startElemId.actorId}` const pred = [`${startPred.counter + i}@${startPred.actorId}`] - expandedOps.push({ action: "del", obj: op.obj, elemId, pred }) + expandedOps.push({action: 'del', obj: op.obj, elemId, pred}) opNum += 1 } } else { @@ -574,44 +483,26 @@ function expandMultiOps(ops, startOp, actor) { function decodeOps(ops, forDocument) { const newOps = [] for (let op of ops) { - const obj = op.objCtr === null ? "_root" : `${op.objCtr}@${op.objActor}` - const elemId = op.keyStr - ? undefined - : op.keyCtr === 0 - ? "_head" - : `${op.keyCtr}@${op.keyActor}` + const obj = (op.objCtr === null) ? '_root' : `${op.objCtr}@${op.objActor}` + const elemId = op.keyStr ? undefined : (op.keyCtr === 0 ? '_head' : `${op.keyCtr}@${op.keyActor}`) const action = ACTIONS[op.action] || op.action - const newOp = elemId - ? { obj, elemId, action } - : { obj, key: op.keyStr, action } + const newOp = elemId ? {obj, elemId, action} : {obj, key: op.keyStr, action} newOp.insert = !!op.insert - if (ACTIONS[op.action] === "set" || ACTIONS[op.action] === "inc") { + if (ACTIONS[op.action] === 'set' || ACTIONS[op.action] === 'inc') { newOp.value = op.valLen if (op.valLen_datatype) newOp.datatype = op.valLen_datatype } if (!!op.chldCtr !== !!op.chldActor) { - throw new RangeError( - `Mismatched child columns: ${op.chldCtr} and ${op.chldActor}` - ) + throw new RangeError(`Mismatched child columns: ${op.chldCtr} and ${op.chldActor}`) } if (op.chldCtr !== null) newOp.child = `${op.chldCtr}@${op.chldActor}` if (forDocument) { newOp.id = `${op.idCtr}@${op.idActor}` newOp.succ = op.succNum.map(succ => `${succ.succCtr}@${succ.succActor}`) - checkSortedOpIds( - op.succNum.map(succ => ({ - counter: succ.succCtr, - actorId: succ.succActor, - })) - ) + checkSortedOpIds(op.succNum.map(succ => ({counter: succ.succCtr, actorId: succ.succActor}))) } else { newOp.pred = op.predNum.map(pred => `${pred.predCtr}@${pred.predActor}`) - checkSortedOpIds( - op.predNum.map(pred => ({ - counter: pred.predCtr, - actorId: pred.predActor, - })) - ) + checkSortedOpIds(op.predNum.map(pred => ({counter: pred.predCtr, actorId: pred.predActor}))) } newOps.push(newOp) } @@ -625,7 +516,7 @@ function checkSortedOpIds(opIds) { let last = null for (let opId of opIds) { if (last && compareParsedOpIds(last, opId) !== -1) { - throw new RangeError("operation IDs are not in ascending order") + throw new RangeError('operation IDs are not in ascending order') } last = opId } @@ -637,11 +528,11 @@ function encoderByColumnId(columnId) { } else if ((columnId & 7) === COLUMN_TYPE.BOOLEAN) { return new BooleanEncoder() } else if ((columnId & 7) === COLUMN_TYPE.STRING_RLE) { - return new RLEEncoder("utf8") + return new RLEEncoder('utf8') } else if ((columnId & 7) === COLUMN_TYPE.VALUE_RAW) { return new Encoder() } else { - return new RLEEncoder("uint") + return new RLEEncoder('uint') } } @@ -651,49 +542,31 @@ function decoderByColumnId(columnId, buffer) { } else if ((columnId & 7) === COLUMN_TYPE.BOOLEAN) { return new BooleanDecoder(buffer) } else if ((columnId & 7) === COLUMN_TYPE.STRING_RLE) { - return new RLEDecoder("utf8", buffer) + return new RLEDecoder('utf8', buffer) } else if ((columnId & 7) === COLUMN_TYPE.VALUE_RAW) { return new Decoder(buffer) } else { - return new RLEDecoder("uint", buffer) + return new RLEDecoder('uint', buffer) } } function makeDecoders(columns, columnSpec) { const emptyBuf = new Uint8Array(0) - let decoders = [], - columnIndex = 0, - specIndex = 0 + let decoders = [], columnIndex = 0, specIndex = 0 while (columnIndex < columns.length || specIndex < columnSpec.length) { - if ( - columnIndex === columns.length || - (specIndex < columnSpec.length && - columnSpec[specIndex].columnId < columns[columnIndex].columnId) - ) { - const { columnId, columnName } = columnSpec[specIndex] - decoders.push({ - columnId, - columnName, - decoder: decoderByColumnId(columnId, emptyBuf), - }) + if (columnIndex === columns.length || + (specIndex < columnSpec.length && columnSpec[specIndex].columnId < columns[columnIndex].columnId)) { + const {columnId, columnName} = columnSpec[specIndex] + decoders.push({columnId, columnName, decoder: decoderByColumnId(columnId, emptyBuf)}) specIndex++ - } else if ( - specIndex === columnSpec.length || - columns[columnIndex].columnId < columnSpec[specIndex].columnId - ) { - const { columnId, buffer } = columns[columnIndex] - decoders.push({ columnId, decoder: decoderByColumnId(columnId, buffer) }) + } else if (specIndex === columnSpec.length || columns[columnIndex].columnId < columnSpec[specIndex].columnId) { + const {columnId, buffer} = columns[columnIndex] + decoders.push({columnId, decoder: decoderByColumnId(columnId, buffer)}) columnIndex++ - } else { - // columns[columnIndex].columnId === columnSpec[specIndex].columnId - const { columnId, buffer } = columns[columnIndex], - { columnName } = columnSpec[specIndex] - decoders.push({ - columnId, - columnName, - decoder: decoderByColumnId(columnId, buffer), - }) + } else { // columns[columnIndex].columnId === columnSpec[specIndex].columnId + const {columnId, buffer} = columns[columnIndex], {columnName} = columnSpec[specIndex] + decoders.push({columnId, columnName, decoder: decoderByColumnId(columnId, buffer)}) columnIndex++ specIndex++ } @@ -705,22 +578,16 @@ function decodeColumns(columns, actorIds, columnSpec) { columns = makeDecoders(columns, columnSpec) let parsedRows = [] while (columns.some(col => !col.decoder.done)) { - let row = {}, - col = 0 + let row = {}, col = 0 while (col < columns.length) { const columnId = columns[col].columnId - let groupId = columnId >> 4, - groupCols = 1 - while ( - col + groupCols < columns.length && - columns[col + groupCols].columnId >> 4 === groupId - ) { + let groupId = columnId >> 4, groupCols = 1 + while (col + groupCols < columns.length && columns[col + groupCols].columnId >> 4 === groupId) { groupCols++ } if (columnId % 8 === COLUMN_TYPE.GROUP_CARD) { - const values = [], - count = columns[col].decoder.readValue() + const values = [], count = columns[col].decoder.readValue() for (let i = 0; i < count; i++) { let value = {} for (let colOffset = 1; colOffset < groupCols; colOffset++) { @@ -744,25 +611,20 @@ function decodeColumnInfo(decoder) { // deflate-compressed. We ignore this bit when checking whether columns are sorted by ID. const COLUMN_ID_MASK = (-1 ^ COLUMN_TYPE_DEFLATE) >>> 0 - let lastColumnId = -1, - columns = [], - numColumns = decoder.readUint53() + let lastColumnId = -1, columns = [], numColumns = decoder.readUint53() for (let i = 0; i < numColumns; i++) { - const columnId = decoder.readUint53(), - bufferLen = decoder.readUint53() + const columnId = decoder.readUint53(), bufferLen = decoder.readUint53() if ((columnId & COLUMN_ID_MASK) <= (lastColumnId & COLUMN_ID_MASK)) { - throw new RangeError("Columns must be in ascending order") + throw new RangeError('Columns must be in ascending order') } lastColumnId = columnId - columns.push({ columnId, bufferLen }) + columns.push({columnId, bufferLen}) } return columns } function encodeColumnInfo(encoder, columns) { - const nonEmptyColumns = columns.filter( - column => column.encoder.buffer.byteLength > 0 - ) + const nonEmptyColumns = columns.filter(column => column.encoder.buffer.byteLength > 0) encoder.appendUint53(nonEmptyColumns.length) for (let column of nonEmptyColumns) { encoder.appendUint53(column.columnId) @@ -771,21 +633,19 @@ function encodeColumnInfo(encoder, columns) { } function decodeChangeHeader(decoder) { - const numDeps = decoder.readUint53(), - deps = [] + const numDeps = decoder.readUint53(), deps = [] for (let i = 0; i < numDeps; i++) { deps.push(bytesToHexString(decoder.readRawBytes(32))) } let change = { - actor: decoder.readHexString(), - seq: decoder.readUint53(), + actor: decoder.readHexString(), + seq: decoder.readUint53(), startOp: decoder.readUint53(), - time: decoder.readInt53(), + time: decoder.readInt53(), message: decoder.readPrefixedString(), - deps, + deps } - const actorIds = [change.actor], - numActorIds = decoder.readUint53() + const actorIds = [change.actor], numActorIds = decoder.readUint53() for (let i = 0; i < numActorIds; i++) actorIds.push(decoder.readHexString()) change.actorIds = actorIds return change @@ -816,47 +676,31 @@ function encodeContainer(chunkType, encodeContentsCallback) { const sha256 = new Hash() sha256.update(headerBuf) sha256.update(bodyBuf.subarray(HEADER_SPACE)) - const hash = sha256.digest(), - checksum = hash.subarray(0, CHECKSUM_SIZE) + const hash = sha256.digest(), checksum = hash.subarray(0, CHECKSUM_SIZE) // Copy header into the body buffer so that they are contiguous - bodyBuf.set( - MAGIC_BYTES, - HEADER_SPACE - headerBuf.byteLength - CHECKSUM_SIZE - MAGIC_BYTES.byteLength - ) - bodyBuf.set(checksum, HEADER_SPACE - headerBuf.byteLength - CHECKSUM_SIZE) - bodyBuf.set(headerBuf, HEADER_SPACE - headerBuf.byteLength) - return { - hash, - bytes: bodyBuf.subarray( - HEADER_SPACE - - headerBuf.byteLength - - CHECKSUM_SIZE - - MAGIC_BYTES.byteLength - ), - } + bodyBuf.set(MAGIC_BYTES, HEADER_SPACE - headerBuf.byteLength - CHECKSUM_SIZE - MAGIC_BYTES.byteLength) + bodyBuf.set(checksum, HEADER_SPACE - headerBuf.byteLength - CHECKSUM_SIZE) + bodyBuf.set(headerBuf, HEADER_SPACE - headerBuf.byteLength) + return {hash, bytes: bodyBuf.subarray(HEADER_SPACE - headerBuf.byteLength - CHECKSUM_SIZE - MAGIC_BYTES.byteLength)} } function decodeContainerHeader(decoder, computeHash) { if (!equalBytes(decoder.readRawBytes(MAGIC_BYTES.byteLength), MAGIC_BYTES)) { - throw new RangeError("Data does not begin with magic bytes 85 6f 4a 83") + throw new RangeError('Data does not begin with magic bytes 85 6f 4a 83') } const expectedHash = decoder.readRawBytes(4) const hashStartOffset = decoder.offset const chunkType = decoder.readByte() const chunkLength = decoder.readUint53() - const header = { - chunkType, - chunkLength, - chunkData: decoder.readRawBytes(chunkLength), - } + const header = {chunkType, chunkLength, chunkData: decoder.readRawBytes(chunkLength)} if (computeHash) { const sha256 = new Hash() sha256.update(decoder.buf.subarray(hashStartOffset, decoder.offset)) const binaryHash = sha256.digest() if (!equalBytes(binaryHash.subarray(0, 4), expectedHash)) { - throw new RangeError("checksum does not match data") + throw new RangeError('checksum does not match data') } header.hash = bytesToHexString(binaryHash) } @@ -868,7 +712,7 @@ function encodeChange(changeObj) { const change = changes[0] const { hash, bytes } = encodeContainer(CHUNK_TYPE_CHANGE, encoder => { - if (!Array.isArray(change.deps)) throw new TypeError("deps is not an array") + if (!Array.isArray(change.deps)) throw new TypeError('deps is not an array') encoder.appendUint53(change.deps.length) for (let hash of change.deps.slice().sort()) { encoder.appendRawBytes(hexStringToBytes(hash)) @@ -877,7 +721,7 @@ function encodeChange(changeObj) { encoder.appendUint53(change.seq) encoder.appendUint53(change.startOp) encoder.appendInt53(change.time) - encoder.appendPrefixedString(change.message || "") + encoder.appendPrefixedString(change.message || '') encoder.appendUint53(actorIds.length - 1) for (let actor of actorIds.slice(1)) encoder.appendHexString(actor) @@ -889,11 +733,9 @@ function encodeChange(changeObj) { const hexHash = bytesToHexString(hash) if (changeObj.hash && changeObj.hash !== hexHash) { - throw new RangeError( - `Change hash does not match encoding: ${changeObj.hash} != ${hexHash}` - ) + throw new RangeError(`Change hash does not match encoding: ${changeObj.hash} != ${hexHash}`) } - return bytes.byteLength >= DEFLATE_MIN_SIZE ? deflateChange(bytes) : bytes + return (bytes.byteLength >= DEFLATE_MIN_SIZE) ? deflateChange(bytes) : bytes } function decodeChangeColumns(buffer) { @@ -901,15 +743,14 @@ function decodeChangeColumns(buffer) { const decoder = new Decoder(buffer) const header = decodeContainerHeader(decoder, true) const chunkDecoder = new Decoder(header.chunkData) - if (!decoder.done) throw new RangeError("Encoded change has trailing data") - if (header.chunkType !== CHUNK_TYPE_CHANGE) - throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) + if (!decoder.done) throw new RangeError('Encoded change has trailing data') + if (header.chunkType !== CHUNK_TYPE_CHANGE) throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) const change = decodeChangeHeader(chunkDecoder) const columns = decodeColumnInfo(chunkDecoder) for (let i = 0; i < columns.length; i++) { if ((columns[i].columnId & COLUMN_TYPE_DEFLATE) !== 0) { - throw new RangeError("change must not contain deflated columns") + throw new RangeError('change must not contain deflated columns') } columns[i].buffer = chunkDecoder.readRawBytes(columns[i].bufferLen) } @@ -928,10 +769,7 @@ function decodeChangeColumns(buffer) { */ function decodeChange(buffer) { const change = decodeChangeColumns(buffer) - change.ops = decodeOps( - decodeColumns(change.columns, change.actorIds, CHANGE_COLUMNS), - false - ) + change.ops = decodeOps(decodeColumns(change.columns, change.actorIds, CHANGE_COLUMNS), false) delete change.actorIds delete change.columns return change @@ -946,7 +784,7 @@ function decodeChangeMeta(buffer, computeHash) { if (buffer[8] === CHUNK_TYPE_DEFLATE) buffer = inflateChange(buffer) const header = decodeContainerHeader(new Decoder(buffer), computeHash) if (header.chunkType !== CHUNK_TYPE_CHANGE) { - throw new RangeError("Buffer chunk type is not a change") + throw new RangeError('Buffer chunk type is not a change') } const meta = decodeChangeHeader(new Decoder(header.chunkData)) meta.change = buffer @@ -959,8 +797,7 @@ function decodeChangeMeta(buffer, computeHash) { */ function deflateChange(buffer) { const header = decodeContainerHeader(new Decoder(buffer), false) - if (header.chunkType !== CHUNK_TYPE_CHANGE) - throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) + if (header.chunkType !== CHUNK_TYPE_CHANGE) throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) const compressed = pako.deflateRaw(header.chunkData) const encoder = new Encoder() encoder.appendRawBytes(buffer.subarray(0, 8)) // copy MAGIC_BYTES and checksum @@ -975,8 +812,7 @@ function deflateChange(buffer) { */ function inflateChange(buffer) { const header = decodeContainerHeader(new Decoder(buffer), false) - if (header.chunkType !== CHUNK_TYPE_DEFLATE) - throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) + if (header.chunkType !== CHUNK_TYPE_DEFLATE) throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) const decompressed = pako.inflateRaw(header.chunkData) const encoder = new Encoder() encoder.appendRawBytes(buffer.subarray(0, 8)) // copy MAGIC_BYTES and checksum @@ -991,9 +827,7 @@ function inflateChange(buffer) { * returns an array of subarrays, each subarray containing one change. */ function splitContainers(buffer) { - let decoder = new Decoder(buffer), - chunks = [], - startOffset = 0 + let decoder = new Decoder(buffer), chunks = [], startOffset = 0 while (!decoder.done) { decodeContainerHeader(decoder, false) chunks.push(buffer.subarray(startOffset, decoder.offset)) @@ -1012,10 +846,7 @@ function decodeChanges(binaryChanges) { for (let chunk of splitContainers(binaryChange)) { if (chunk[8] === CHUNK_TYPE_DOCUMENT) { decoded = decoded.concat(decodeDocument(chunk)) - } else if ( - chunk[8] === CHUNK_TYPE_CHANGE || - chunk[8] === CHUNK_TYPE_DEFLATE - ) { + } else if (chunk[8] === CHUNK_TYPE_CHANGE || chunk[8] === CHUNK_TYPE_DEFLATE) { decoded.push(decodeChange(chunk)) } else { // ignoring chunk of unknown type @@ -1027,10 +858,9 @@ function decodeChanges(binaryChanges) { function sortOpIds(a, b) { if (a === b) return 0 - if (a === "_root") return -1 - if (b === "_root") return +1 - const a_ = parseOpId(a), - b_ = parseOpId(b) + if (a === '_root') return -1 + if (b === '_root') return +1 + const a_ = parseOpId(a), b_ = parseOpId(b) if (a_.counter < b_.counter) return -1 if (a_.counter > b_.counter) return +1 if (a_.actorId < b_.actorId) return -1 @@ -1049,46 +879,26 @@ function groupChangeOps(changes, ops) { change.ops = [] if (!changesByActor[change.actor]) changesByActor[change.actor] = [] if (change.seq !== changesByActor[change.actor].length + 1) { - throw new RangeError( - `Expected seq = ${changesByActor[change.actor].length + 1}, got ${ - change.seq - }` - ) + throw new RangeError(`Expected seq = ${changesByActor[change.actor].length + 1}, got ${change.seq}`) } - if ( - change.seq > 1 && - changesByActor[change.actor][change.seq - 2].maxOp > change.maxOp - ) { - throw new RangeError("maxOp must increase monotonically per actor") + if (change.seq > 1 && changesByActor[change.actor][change.seq - 2].maxOp > change.maxOp) { + throw new RangeError('maxOp must increase monotonically per actor') } changesByActor[change.actor].push(change) } let opsById = {} for (let op of ops) { - if (op.action === "del") - throw new RangeError("document should not contain del operations") + if (op.action === 'del') throw new RangeError('document should not contain del operations') op.pred = opsById[op.id] ? opsById[op.id].pred : [] opsById[op.id] = op for (let succ of op.succ) { if (!opsById[succ]) { if (op.elemId) { const elemId = op.insert ? op.id : op.elemId - opsById[succ] = { - id: succ, - action: "del", - obj: op.obj, - elemId, - pred: [], - } + opsById[succ] = {id: succ, action: 'del', obj: op.obj, elemId, pred: []} } else { - opsById[succ] = { - id: succ, - action: "del", - obj: op.obj, - key: op.key, - pred: [], - } + opsById[succ] = {id: succ, action: 'del', obj: op.obj, key: op.key, pred: []} } } opsById[succ].pred.push(op.id) @@ -1096,15 +906,14 @@ function groupChangeOps(changes, ops) { delete op.succ } for (let op of Object.values(opsById)) { - if (op.action === "del") ops.push(op) + if (op.action === 'del') ops.push(op) } for (let op of ops) { const { counter, actorId } = parseOpId(op.id) const actorChanges = changesByActor[actorId] // Binary search to find the change that should contain this operation - let left = 0, - right = actorChanges.length + let left = 0, right = actorChanges.length while (left < right) { const index = Math.floor((left + right) / 2) if (actorChanges[index].maxOp < counter) { @@ -1124,8 +933,7 @@ function groupChangeOps(changes, ops) { change.startOp = change.maxOp - change.ops.length + 1 delete change.maxOp for (let i = 0; i < change.ops.length; i++) { - const op = change.ops[i], - expectedId = `${change.startOp + i}@${change.actor}` + const op = change.ops[i], expectedId = `${change.startOp + i}@${change.actor}` if (op.id !== expectedId) { throw new RangeError(`Expected opId ${expectedId}, got ${op.id}`) } @@ -1141,9 +949,7 @@ function decodeDocumentChanges(changes, expectedHeads) { change.deps = [] for (let index of change.depsNum.map(d => d.depsIndex)) { if (!changes[index] || !changes[index].hash) { - throw new RangeError( - `No hash for index ${index} while processing index ${i}` - ) + throw new RangeError(`No hash for index ${index} while processing index ${i}`) } const hash = changes[index].hash change.deps.push(hash) @@ -1164,30 +970,18 @@ function decodeDocumentChanges(changes, expectedHeads) { } const actualHeads = Object.keys(heads).sort() - let headsEqual = actualHeads.length === expectedHeads.length, - i = 0 + let headsEqual = (actualHeads.length === expectedHeads.length), i = 0 while (headsEqual && i < actualHeads.length) { - headsEqual = actualHeads[i] === expectedHeads[i] + headsEqual = (actualHeads[i] === expectedHeads[i]) i++ } if (!headsEqual) { - throw new RangeError( - `Mismatched heads hashes: expected ${expectedHeads.join( - ", " - )}, got ${actualHeads.join(", ")}` - ) + throw new RangeError(`Mismatched heads hashes: expected ${expectedHeads.join(', ')}, got ${actualHeads.join(', ')}`) } } function encodeDocumentHeader(doc) { - const { - changesColumns, - opsColumns, - actorIds, - heads, - headsIndexes, - extraBytes, - } = doc + const { changesColumns, opsColumns, actorIds, heads, headsIndexes, extraBytes } = doc for (let column of changesColumns) deflateColumn(column) for (let column of opsColumns) deflateColumn(column) @@ -1202,8 +996,7 @@ function encodeDocumentHeader(doc) { } encodeColumnInfo(encoder, changesColumns) encodeColumnInfo(encoder, opsColumns) - for (let column of changesColumns) - encoder.appendRawBytes(column.encoder.buffer) + for (let column of changesColumns) encoder.appendRawBytes(column.encoder.buffer) for (let column of opsColumns) encoder.appendRawBytes(column.encoder.buffer) for (let index of headsIndexes) encoder.appendUint53(index) if (extraBytes) encoder.appendRawBytes(extraBytes) @@ -1214,19 +1007,14 @@ function decodeDocumentHeader(buffer) { const documentDecoder = new Decoder(buffer) const header = decodeContainerHeader(documentDecoder, true) const decoder = new Decoder(header.chunkData) - if (!documentDecoder.done) - throw new RangeError("Encoded document has trailing data") - if (header.chunkType !== CHUNK_TYPE_DOCUMENT) - throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) + if (!documentDecoder.done) throw new RangeError('Encoded document has trailing data') + if (header.chunkType !== CHUNK_TYPE_DOCUMENT) throw new RangeError(`Unexpected chunk type: ${header.chunkType}`) - const actorIds = [], - numActors = decoder.readUint53() + const actorIds = [], numActors = decoder.readUint53() for (let i = 0; i < numActors; i++) { actorIds.push(decoder.readHexString()) } - const heads = [], - headsIndexes = [], - numHeads = decoder.readUint53() + const heads = [], headsIndexes = [], numHeads = decoder.readUint53() for (let i = 0; i < numHeads; i++) { heads.push(bytesToHexString(decoder.readRawBytes(32))) } @@ -1245,27 +1033,14 @@ function decodeDocumentHeader(buffer) { for (let i = 0; i < numHeads; i++) headsIndexes.push(decoder.readUint53()) } - const extraBytes = decoder.readRawBytes( - decoder.buf.byteLength - decoder.offset - ) - return { - changesColumns, - opsColumns, - actorIds, - heads, - headsIndexes, - extraBytes, - } + const extraBytes = decoder.readRawBytes(decoder.buf.byteLength - decoder.offset) + return { changesColumns, opsColumns, actorIds, heads, headsIndexes, extraBytes } } function decodeDocument(buffer) { - const { changesColumns, opsColumns, actorIds, heads } = - decodeDocumentHeader(buffer) + const { changesColumns, opsColumns, actorIds, heads } = decodeDocumentHeader(buffer) const changes = decodeColumns(changesColumns, actorIds, DOCUMENT_COLUMNS) - const ops = decodeOps( - decodeColumns(opsColumns, actorIds, DOC_OPS_COLUMNS), - true - ) + const ops = decodeOps(decodeColumns(opsColumns, actorIds, DOC_OPS_COLUMNS), true) groupChangeOps(changes, ops) decodeDocumentChanges(changes, heads) return changes @@ -1276,7 +1051,7 @@ function decodeDocument(buffer) { */ function deflateColumn(column) { if (column.encoder.buffer.byteLength >= DEFLATE_MIN_SIZE) { - column.encoder = { buffer: pako.deflateRaw(column.encoder.buffer) } + column.encoder = {buffer: pako.deflateRaw(column.encoder.buffer)} column.columnId |= COLUMN_TYPE_DEFLATE } } @@ -1292,24 +1067,8 @@ function inflateColumn(column) { } module.exports = { - COLUMN_TYPE, - VALUE_TYPE, - ACTIONS, - OBJECT_TYPE, - DOC_OPS_COLUMNS, - CHANGE_COLUMNS, - DOCUMENT_COLUMNS, - encoderByColumnId, - decoderByColumnId, - makeDecoders, - decodeValue, - splitContainers, - encodeChange, - decodeChangeColumns, - decodeChange, - decodeChangeMeta, - decodeChanges, - encodeDocumentHeader, - decodeDocumentHeader, - decodeDocument, + COLUMN_TYPE, VALUE_TYPE, ACTIONS, OBJECT_TYPE, DOC_OPS_COLUMNS, CHANGE_COLUMNS, DOCUMENT_COLUMNS, + encoderByColumnId, decoderByColumnId, makeDecoders, decodeValue, + splitContainers, encodeChange, decodeChangeColumns, decodeChange, decodeChangeMeta, decodeChanges, + encodeDocumentHeader, decodeDocumentHeader, decodeDocument } diff --git a/javascript/test/legacy/common.js b/javascript/test/legacy/common.js index 7668e982..02e91392 100644 --- a/javascript/test/legacy/common.js +++ b/javascript/test/legacy/common.js @@ -1,5 +1,5 @@ function isObject(obj) { - return typeof obj === "object" && obj !== null + return typeof obj === 'object' && obj !== null } /** @@ -20,11 +20,11 @@ function copyObject(obj) { * with an actor ID, separated by an `@` sign) and returns an object `{counter, actorId}`. */ function parseOpId(opId) { - const match = /^(\d+)@(.*)$/.exec(opId || "") + const match = /^(\d+)@(.*)$/.exec(opId || '') if (!match) { throw new RangeError(`Not a valid opId: ${opId}`) } - return { counter: parseInt(match[1], 10), actorId: match[2] } + return {counter: parseInt(match[1], 10), actorId: match[2]} } /** @@ -32,7 +32,7 @@ function parseOpId(opId) { */ function equalBytes(array1, array2) { if (!(array1 instanceof Uint8Array) || !(array2 instanceof Uint8Array)) { - throw new TypeError("equalBytes can only compare Uint8Arrays") + throw new TypeError('equalBytes can only compare Uint8Arrays') } if (array1.byteLength !== array2.byteLength) return false for (let i = 0; i < array1.byteLength; i++) { @@ -51,9 +51,5 @@ function createArrayOfNulls(length) { } module.exports = { - isObject, - copyObject, - parseOpId, - equalBytes, - createArrayOfNulls, + isObject, copyObject, parseOpId, equalBytes, createArrayOfNulls } diff --git a/javascript/test/legacy/encoding.js b/javascript/test/legacy/encoding.js index f7650faf..92b62df6 100644 --- a/javascript/test/legacy/encoding.js +++ b/javascript/test/legacy/encoding.js @@ -6,7 +6,7 @@ * https://github.com/anonyco/FastestSmallestTextEncoderDecoder */ const utf8encoder = new TextEncoder() -const utf8decoder = new TextDecoder("utf-8") +const utf8decoder = new TextDecoder('utf-8') function stringToUtf8(string) { return utf8encoder.encode(string) @@ -20,48 +20,30 @@ function utf8ToString(buffer) { * Converts a string consisting of hexadecimal digits into an Uint8Array. */ function hexStringToBytes(value) { - if (typeof value !== "string") { - throw new TypeError("value is not a string") + if (typeof value !== 'string') { + throw new TypeError('value is not a string') } if (!/^([0-9a-f][0-9a-f])*$/.test(value)) { - throw new RangeError("value is not hexadecimal") + throw new RangeError('value is not hexadecimal') } - if (value === "") { + if (value === '') { return new Uint8Array(0) } else { return new Uint8Array(value.match(/../g).map(b => parseInt(b, 16))) } } -const NIBBLE_TO_HEX = [ - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "a", - "b", - "c", - "d", - "e", - "f", -] +const NIBBLE_TO_HEX = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'] const BYTE_TO_HEX = new Array(256) for (let i = 0; i < 256; i++) { - BYTE_TO_HEX[i] = `${NIBBLE_TO_HEX[(i >>> 4) & 0xf]}${NIBBLE_TO_HEX[i & 0xf]}` + BYTE_TO_HEX[i] = `${NIBBLE_TO_HEX[(i >>> 4) & 0xf]}${NIBBLE_TO_HEX[i & 0xf]}`; } /** * Converts a Uint8Array into the equivalent hexadecimal string. */ function bytesToHexString(bytes) { - let hex = "", - len = bytes.byteLength + let hex = '', len = bytes.byteLength for (let i = 0; i < len; i++) { hex += BYTE_TO_HEX[bytes[i]] } @@ -113,17 +95,14 @@ class Encoder { * appends it to the buffer. Returns the number of bytes written. */ appendUint32(value) { - if (!Number.isInteger(value)) - throw new RangeError("value is not an integer") - if (value < 0 || value > 0xffffffff) - throw new RangeError("number out of range") + if (!Number.isInteger(value)) throw new RangeError('value is not an integer') + if (value < 0 || value > 0xffffffff) throw new RangeError('number out of range') const numBytes = Math.max(1, Math.ceil((32 - Math.clz32(value)) / 7)) if (this.offset + numBytes > this.buf.byteLength) this.grow() for (let i = 0; i < numBytes; i++) { - this.buf[this.offset + i] = - (value & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) + this.buf[this.offset + i] = (value & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) value >>>= 7 // zero-filling right shift } this.offset += numBytes @@ -136,19 +115,14 @@ class Encoder { * it to the buffer. Returns the number of bytes written. */ appendInt32(value) { - if (!Number.isInteger(value)) - throw new RangeError("value is not an integer") - if (value < -0x80000000 || value > 0x7fffffff) - throw new RangeError("number out of range") + if (!Number.isInteger(value)) throw new RangeError('value is not an integer') + if (value < -0x80000000 || value > 0x7fffffff) throw new RangeError('number out of range') - const numBytes = Math.ceil( - (33 - Math.clz32(value >= 0 ? value : -value - 1)) / 7 - ) + const numBytes = Math.ceil((33 - Math.clz32(value >= 0 ? value : -value - 1)) / 7) if (this.offset + numBytes > this.buf.byteLength) this.grow() for (let i = 0; i < numBytes; i++) { - this.buf[this.offset + i] = - (value & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) + this.buf[this.offset + i] = (value & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) value >>= 7 // sign-propagating right shift } this.offset += numBytes @@ -161,10 +135,9 @@ class Encoder { * (53 bits). */ appendUint53(value) { - if (!Number.isInteger(value)) - throw new RangeError("value is not an integer") + if (!Number.isInteger(value)) throw new RangeError('value is not an integer') if (value < 0 || value > Number.MAX_SAFE_INTEGER) { - throw new RangeError("number out of range") + throw new RangeError('number out of range') } const high32 = Math.floor(value / 0x100000000) const low32 = (value & 0xffffffff) >>> 0 // right shift to interpret as unsigned @@ -177,10 +150,9 @@ class Encoder { * (53 bits). */ appendInt53(value) { - if (!Number.isInteger(value)) - throw new RangeError("value is not an integer") + if (!Number.isInteger(value)) throw new RangeError('value is not an integer') if (value < Number.MIN_SAFE_INTEGER || value > Number.MAX_SAFE_INTEGER) { - throw new RangeError("number out of range") + throw new RangeError('number out of range') } const high32 = Math.floor(value / 0x100000000) const low32 = (value & 0xffffffff) >>> 0 // right shift to interpret as unsigned @@ -195,10 +167,10 @@ class Encoder { */ appendUint64(high32, low32) { if (!Number.isInteger(high32) || !Number.isInteger(low32)) { - throw new RangeError("value is not an integer") + throw new RangeError('value is not an integer') } if (high32 < 0 || high32 > 0xffffffff || low32 < 0 || low32 > 0xffffffff) { - throw new RangeError("number out of range") + throw new RangeError('number out of range') } if (high32 === 0) return this.appendUint32(low32) @@ -208,12 +180,10 @@ class Encoder { this.buf[this.offset + i] = (low32 & 0x7f) | 0x80 low32 >>>= 7 // zero-filling right shift } - this.buf[this.offset + 4] = - (low32 & 0x0f) | ((high32 & 0x07) << 4) | (numBytes === 5 ? 0x00 : 0x80) + this.buf[this.offset + 4] = (low32 & 0x0f) | ((high32 & 0x07) << 4) | (numBytes === 5 ? 0x00 : 0x80) high32 >>>= 3 for (let i = 5; i < numBytes; i++) { - this.buf[this.offset + i] = - (high32 & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) + this.buf[this.offset + i] = (high32 & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) high32 >>>= 7 } this.offset += numBytes @@ -230,35 +200,25 @@ class Encoder { */ appendInt64(high32, low32) { if (!Number.isInteger(high32) || !Number.isInteger(low32)) { - throw new RangeError("value is not an integer") + throw new RangeError('value is not an integer') } - if ( - high32 < -0x80000000 || - high32 > 0x7fffffff || - low32 < -0x80000000 || - low32 > 0xffffffff - ) { - throw new RangeError("number out of range") + if (high32 < -0x80000000 || high32 > 0x7fffffff || low32 < -0x80000000 || low32 > 0xffffffff) { + throw new RangeError('number out of range') } low32 >>>= 0 // interpret as unsigned if (high32 === 0 && low32 <= 0x7fffffff) return this.appendInt32(low32) - if (high32 === -1 && low32 >= 0x80000000) - return this.appendInt32(low32 - 0x100000000) + if (high32 === -1 && low32 >= 0x80000000) return this.appendInt32(low32 - 0x100000000) - const numBytes = Math.ceil( - (65 - Math.clz32(high32 >= 0 ? high32 : -high32 - 1)) / 7 - ) + const numBytes = Math.ceil((65 - Math.clz32(high32 >= 0 ? high32 : -high32 - 1)) / 7) if (this.offset + numBytes > this.buf.byteLength) this.grow() for (let i = 0; i < 4; i++) { this.buf[this.offset + i] = (low32 & 0x7f) | 0x80 low32 >>>= 7 // zero-filling right shift } - this.buf[this.offset + 4] = - (low32 & 0x0f) | ((high32 & 0x07) << 4) | (numBytes === 5 ? 0x00 : 0x80) + this.buf[this.offset + 4] = (low32 & 0x0f) | ((high32 & 0x07) << 4) | (numBytes === 5 ? 0x00 : 0x80) high32 >>= 3 // sign-propagating right shift for (let i = 5; i < numBytes; i++) { - this.buf[this.offset + i] = - (high32 & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) + this.buf[this.offset + i] = (high32 & 0x7f) | (i === numBytes - 1 ? 0x00 : 0x80) high32 >>= 7 } this.offset += numBytes @@ -283,7 +243,7 @@ class Encoder { * number of bytes appended. */ appendRawString(value) { - if (typeof value !== "string") throw new TypeError("value is not a string") + if (typeof value !== 'string') throw new TypeError('value is not a string') return this.appendRawBytes(stringToUtf8(value)) } @@ -302,7 +262,7 @@ class Encoder { * (where the length is encoded as an unsigned LEB128 integer). */ appendPrefixedString(value) { - if (typeof value !== "string") throw new TypeError("value is not a string") + if (typeof value !== 'string') throw new TypeError('value is not a string') this.appendPrefixedBytes(stringToUtf8(value)) return this } @@ -321,7 +281,8 @@ class Encoder { * Flushes any unwritten data to the buffer. Call this before reading from * the buffer constructed by this Encoder. */ - finish() {} + finish() { + } } /** @@ -360,7 +321,7 @@ class Decoder { */ skip(bytes) { if (this.offset + bytes > this.buf.byteLength) { - throw new RangeError("cannot skip beyond end of buffer") + throw new RangeError('cannot skip beyond end of buffer') } this.offset += bytes } @@ -378,20 +339,18 @@ class Decoder { * Throws an exception if the value doesn't fit in a 32-bit unsigned int. */ readUint32() { - let result = 0, - shift = 0 + let result = 0, shift = 0 while (this.offset < this.buf.byteLength) { const nextByte = this.buf[this.offset] - if (shift === 28 && (nextByte & 0xf0) !== 0) { - // more than 5 bytes, or value > 0xffffffff - throw new RangeError("number out of range") + if (shift === 28 && (nextByte & 0xf0) !== 0) { // more than 5 bytes, or value > 0xffffffff + throw new RangeError('number out of range') } - result = (result | ((nextByte & 0x7f) << shift)) >>> 0 // right shift to interpret value as unsigned + result = (result | (nextByte & 0x7f) << shift) >>> 0 // right shift to interpret value as unsigned shift += 7 this.offset++ if ((nextByte & 0x80) === 0) return result } - throw new RangeError("buffer ended with incomplete number") + throw new RangeError('buffer ended with incomplete number') } /** @@ -399,17 +358,13 @@ class Decoder { * Throws an exception if the value doesn't fit in a 32-bit signed int. */ readInt32() { - let result = 0, - shift = 0 + let result = 0, shift = 0 while (this.offset < this.buf.byteLength) { const nextByte = this.buf[this.offset] - if ( - (shift === 28 && (nextByte & 0x80) !== 0) || // more than 5 bytes - (shift === 28 && (nextByte & 0x40) === 0 && (nextByte & 0x38) !== 0) || // positive int > 0x7fffffff - (shift === 28 && (nextByte & 0x40) !== 0 && (nextByte & 0x38) !== 0x38) - ) { - // negative int < -0x80000000 - throw new RangeError("number out of range") + if ((shift === 28 && (nextByte & 0x80) !== 0) || // more than 5 bytes + (shift === 28 && (nextByte & 0x40) === 0 && (nextByte & 0x38) !== 0) || // positive int > 0x7fffffff + (shift === 28 && (nextByte & 0x40) !== 0 && (nextByte & 0x38) !== 0x38)) { // negative int < -0x80000000 + throw new RangeError('number out of range') } result |= (nextByte & 0x7f) << shift shift += 7 @@ -423,7 +378,7 @@ class Decoder { } } } - throw new RangeError("buffer ended with incomplete number") + throw new RangeError('buffer ended with incomplete number') } /** @@ -434,7 +389,7 @@ class Decoder { readUint53() { const { low32, high32 } = this.readUint64() if (high32 < 0 || high32 > 0x1fffff) { - throw new RangeError("number out of range") + throw new RangeError('number out of range') } return high32 * 0x100000000 + low32 } @@ -446,12 +401,8 @@ class Decoder { */ readInt53() { const { low32, high32 } = this.readInt64() - if ( - high32 < -0x200000 || - (high32 === -0x200000 && low32 === 0) || - high32 > 0x1fffff - ) { - throw new RangeError("number out of range") + if (high32 < -0x200000 || (high32 === -0x200000 && low32 === 0) || high32 > 0x1fffff) { + throw new RangeError('number out of range') } return high32 * 0x100000000 + low32 } @@ -463,12 +414,10 @@ class Decoder { * `{high32, low32}`. */ readUint64() { - let low32 = 0, - high32 = 0, - shift = 0 + let low32 = 0, high32 = 0, shift = 0 while (this.offset < this.buf.byteLength && shift <= 28) { const nextByte = this.buf[this.offset] - low32 = (low32 | ((nextByte & 0x7f) << shift)) >>> 0 // right shift to interpret value as unsigned + low32 = (low32 | (nextByte & 0x7f) << shift) >>> 0 // right shift to interpret value as unsigned if (shift === 28) { high32 = (nextByte & 0x70) >>> 4 } @@ -480,16 +429,15 @@ class Decoder { shift = 3 while (this.offset < this.buf.byteLength) { const nextByte = this.buf[this.offset] - if (shift === 31 && (nextByte & 0xfe) !== 0) { - // more than 10 bytes, or value > 2^64 - 1 - throw new RangeError("number out of range") + if (shift === 31 && (nextByte & 0xfe) !== 0) { // more than 10 bytes, or value > 2^64 - 1 + throw new RangeError('number out of range') } - high32 = (high32 | ((nextByte & 0x7f) << shift)) >>> 0 + high32 = (high32 | (nextByte & 0x7f) << shift) >>> 0 shift += 7 this.offset++ if ((nextByte & 0x80) === 0) return { high32, low32 } } - throw new RangeError("buffer ended with incomplete number") + throw new RangeError('buffer ended with incomplete number') } /** @@ -500,20 +448,17 @@ class Decoder { * sign of the `high32` half indicates the sign of the 64-bit number. */ readInt64() { - let low32 = 0, - high32 = 0, - shift = 0 + let low32 = 0, high32 = 0, shift = 0 while (this.offset < this.buf.byteLength && shift <= 28) { const nextByte = this.buf[this.offset] - low32 = (low32 | ((nextByte & 0x7f) << shift)) >>> 0 // right shift to interpret value as unsigned + low32 = (low32 | (nextByte & 0x7f) << shift) >>> 0 // right shift to interpret value as unsigned if (shift === 28) { high32 = (nextByte & 0x70) >>> 4 } shift += 7 this.offset++ if ((nextByte & 0x80) === 0) { - if ((nextByte & 0x40) !== 0) { - // sign-extend negative integer + if ((nextByte & 0x40) !== 0) { // sign-extend negative integer if (shift < 32) low32 = (low32 | (-1 << shift)) >>> 0 high32 |= -1 << Math.max(shift - 32, 0) } @@ -527,20 +472,19 @@ class Decoder { // On the 10th byte there are only two valid values: all 7 value bits zero // (if the value is positive) or all 7 bits one (if the value is negative) if (shift === 31 && nextByte !== 0 && nextByte !== 0x7f) { - throw new RangeError("number out of range") + throw new RangeError('number out of range') } high32 |= (nextByte & 0x7f) << shift shift += 7 this.offset++ if ((nextByte & 0x80) === 0) { - if ((nextByte & 0x40) !== 0 && shift < 32) { - // sign-extend negative integer + if ((nextByte & 0x40) !== 0 && shift < 32) { // sign-extend negative integer high32 |= -1 << shift } return { high32, low32 } } } - throw new RangeError("buffer ended with incomplete number") + throw new RangeError('buffer ended with incomplete number') } /** @@ -550,7 +494,7 @@ class Decoder { readRawBytes(length) { const start = this.offset if (start + length > this.buf.byteLength) { - throw new RangeError("subarray exceeds buffer size") + throw new RangeError('subarray exceeds buffer size') } this.offset += length return this.buf.subarray(start, this.offset) @@ -615,7 +559,7 @@ class RLEEncoder extends Encoder { constructor(type) { super() this.type = type - this.state = "empty" + this.state = 'empty' this.lastValue = undefined this.count = 0 this.literal = [] @@ -634,81 +578,76 @@ class RLEEncoder extends Encoder { */ _appendValue(value, repetitions = 1) { if (repetitions <= 0) return - if (this.state === "empty") { - this.state = - value === null - ? "nulls" - : repetitions === 1 - ? "loneValue" - : "repetition" + if (this.state === 'empty') { + this.state = (value === null ? 'nulls' : (repetitions === 1 ? 'loneValue' : 'repetition')) this.lastValue = value this.count = repetitions - } else if (this.state === "loneValue") { + } else if (this.state === 'loneValue') { if (value === null) { this.flush() - this.state = "nulls" + this.state = 'nulls' this.count = repetitions } else if (value === this.lastValue) { - this.state = "repetition" + this.state = 'repetition' this.count = 1 + repetitions } else if (repetitions > 1) { this.flush() - this.state = "repetition" + this.state = 'repetition' this.count = repetitions this.lastValue = value } else { - this.state = "literal" + this.state = 'literal' this.literal = [this.lastValue] this.lastValue = value } - } else if (this.state === "repetition") { + } else if (this.state === 'repetition') { if (value === null) { this.flush() - this.state = "nulls" + this.state = 'nulls' this.count = repetitions } else if (value === this.lastValue) { this.count += repetitions } else if (repetitions > 1) { this.flush() - this.state = "repetition" + this.state = 'repetition' this.count = repetitions this.lastValue = value } else { this.flush() - this.state = "loneValue" + this.state = 'loneValue' this.lastValue = value } - } else if (this.state === "literal") { + } else if (this.state === 'literal') { if (value === null) { this.literal.push(this.lastValue) this.flush() - this.state = "nulls" + this.state = 'nulls' this.count = repetitions } else if (value === this.lastValue) { this.flush() - this.state = "repetition" + this.state = 'repetition' this.count = 1 + repetitions } else if (repetitions > 1) { this.literal.push(this.lastValue) this.flush() - this.state = "repetition" + this.state = 'repetition' this.count = repetitions this.lastValue = value } else { this.literal.push(this.lastValue) this.lastValue = value } - } else if (this.state === "nulls") { + } else if (this.state === 'nulls') { if (value === null) { this.count += repetitions } else if (repetitions > 1) { this.flush() - this.state = "repetition" + this.state = 'repetition' this.count = repetitions this.lastValue = value } else { this.flush() - this.state = "loneValue" + this.state = 'loneValue' this.lastValue = value } } @@ -727,16 +666,13 @@ class RLEEncoder extends Encoder { */ copyFrom(decoder, options = {}) { const { count, sumValues, sumShift } = options - if (!(decoder instanceof RLEDecoder) || decoder.type !== this.type) { - throw new TypeError("incompatible type of decoder") + if (!(decoder instanceof RLEDecoder) || (decoder.type !== this.type)) { + throw new TypeError('incompatible type of decoder') } - let remaining = typeof count === "number" ? count : Number.MAX_SAFE_INTEGER - let nonNullValues = 0, - sum = 0 - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) - if (remaining === 0 || decoder.done) - return sumValues ? { nonNullValues, sum } : { nonNullValues } + let remaining = (typeof count === 'number' ? count : Number.MAX_SAFE_INTEGER) + let nonNullValues = 0, sum = 0 + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) + if (remaining === 0 || decoder.done) return sumValues ? {nonNullValues, sum} : {nonNullValues} // Copy a value so that we have a well-defined starting state. NB: when super.copyFrom() is // called by the DeltaEncoder subclass, the following calls to readValue() and appendValue() @@ -748,101 +684,87 @@ class RLEEncoder extends Encoder { remaining -= numNulls decoder.count -= numNulls - 1 this.appendValue(null, numNulls) - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) - if (remaining === 0 || decoder.done) - return sumValues ? { nonNullValues, sum } : { nonNullValues } + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) + if (remaining === 0 || decoder.done) return sumValues ? {nonNullValues, sum} : {nonNullValues} firstValue = decoder.readValue() - if (firstValue === null) - throw new RangeError("null run must be followed by non-null value") + if (firstValue === null) throw new RangeError('null run must be followed by non-null value') } this.appendValue(firstValue) remaining-- nonNullValues++ - if (sumValues) sum += sumShift ? firstValue >>> sumShift : firstValue - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) - if (remaining === 0 || decoder.done) - return sumValues ? { nonNullValues, sum } : { nonNullValues } + if (sumValues) sum += (sumShift ? (firstValue >>> sumShift) : firstValue) + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) + if (remaining === 0 || decoder.done) return sumValues ? {nonNullValues, sum} : {nonNullValues} // Copy data at the record level without expanding repetitions - let firstRun = decoder.count > 0 + let firstRun = (decoder.count > 0) while (remaining > 0 && !decoder.done) { if (!firstRun) decoder.readRecord() const numValues = Math.min(decoder.count, remaining) decoder.count -= numValues - if (decoder.state === "literal") { + if (decoder.state === 'literal') { nonNullValues += numValues for (let i = 0; i < numValues; i++) { - if (decoder.done) throw new RangeError("incomplete literal") + if (decoder.done) throw new RangeError('incomplete literal') const value = decoder.readRawValue() - if (value === decoder.lastValue) - throw new RangeError( - "Repetition of values is not allowed in literal" - ) + if (value === decoder.lastValue) throw new RangeError('Repetition of values is not allowed in literal') decoder.lastValue = value this._appendValue(value) - if (sumValues) sum += sumShift ? value >>> sumShift : value + if (sumValues) sum += (sumShift ? (value >>> sumShift) : value) } - } else if (decoder.state === "repetition") { + } else if (decoder.state === 'repetition') { nonNullValues += numValues - if (sumValues) - sum += - numValues * - (sumShift ? decoder.lastValue >>> sumShift : decoder.lastValue) + if (sumValues) sum += numValues * (sumShift ? (decoder.lastValue >>> sumShift) : decoder.lastValue) const value = decoder.lastValue this._appendValue(value) if (numValues > 1) { this._appendValue(value) - if (this.state !== "repetition") - throw new RangeError(`Unexpected state ${this.state}`) + if (this.state !== 'repetition') throw new RangeError(`Unexpected state ${this.state}`) this.count += numValues - 2 } - } else if (decoder.state === "nulls") { + } else if (decoder.state === 'nulls') { this._appendValue(null) - if (this.state !== "nulls") - throw new RangeError(`Unexpected state ${this.state}`) + if (this.state !== 'nulls') throw new RangeError(`Unexpected state ${this.state}`) this.count += numValues - 1 } firstRun = false remaining -= numValues } - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) - return sumValues ? { nonNullValues, sum } : { nonNullValues } + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) + return sumValues ? {nonNullValues, sum} : {nonNullValues} } /** * Private method, do not call from outside the class. */ flush() { - if (this.state === "loneValue") { + if (this.state === 'loneValue') { this.appendInt32(-1) this.appendRawValue(this.lastValue) - } else if (this.state === "repetition") { + } else if (this.state === 'repetition') { this.appendInt53(this.count) this.appendRawValue(this.lastValue) - } else if (this.state === "literal") { + } else if (this.state === 'literal') { this.appendInt53(-this.literal.length) for (let v of this.literal) this.appendRawValue(v) - } else if (this.state === "nulls") { + } else if (this.state === 'nulls') { this.appendInt32(0) this.appendUint53(this.count) } - this.state = "empty" + this.state = 'empty' } /** * Private method, do not call from outside the class. */ appendRawValue(value) { - if (this.type === "int") { + if (this.type === 'int') { this.appendInt53(value) - } else if (this.type === "uint") { + } else if (this.type === 'uint') { this.appendUint53(value) - } else if (this.type === "utf8") { + } else if (this.type === 'utf8') { this.appendPrefixedString(value) } else { throw new RangeError(`Unknown RLEEncoder datatype: ${this.type}`) @@ -854,9 +776,9 @@ class RLEEncoder extends Encoder { * the buffer constructed by this Encoder. */ finish() { - if (this.state === "literal") this.literal.push(this.lastValue) + if (this.state === 'literal') this.literal.push(this.lastValue) // Don't write anything if the only values we have seen are nulls - if (this.state !== "nulls" || this.offset > 0) this.flush() + if (this.state !== 'nulls' || this.offset > 0) this.flush() } } @@ -878,7 +800,7 @@ class RLEDecoder extends Decoder { * position, and true if we are at the end of the buffer. */ get done() { - return this.count === 0 && this.offset === this.buf.byteLength + return (this.count === 0) && (this.offset === this.buf.byteLength) } /** @@ -899,10 +821,9 @@ class RLEDecoder extends Decoder { if (this.done) return null if (this.count === 0) this.readRecord() this.count -= 1 - if (this.state === "literal") { + if (this.state === 'literal') { const value = this.readRawValue() - if (value === this.lastValue) - throw new RangeError("Repetition of values is not allowed in literal") + if (value === this.lastValue) throw new RangeError('Repetition of values is not allowed in literal') this.lastValue = value return value } else { @@ -918,22 +839,20 @@ class RLEDecoder extends Decoder { if (this.count === 0) { this.count = this.readInt53() if (this.count > 0) { - this.lastValue = - this.count <= numSkip ? this.skipRawValues(1) : this.readRawValue() - this.state = "repetition" + this.lastValue = (this.count <= numSkip) ? this.skipRawValues(1) : this.readRawValue() + this.state = 'repetition' } else if (this.count < 0) { this.count = -this.count - this.state = "literal" - } else { - // this.count == 0 + this.state = 'literal' + } else { // this.count == 0 this.count = this.readUint53() this.lastValue = null - this.state = "nulls" + this.state = 'nulls' } } const consume = Math.min(numSkip, this.count) - if (this.state === "literal") this.skipRawValues(consume) + if (this.state === 'literal') this.skipRawValues(consume) numSkip -= consume this.count -= consume } @@ -947,34 +866,23 @@ class RLEDecoder extends Decoder { this.count = this.readInt53() if (this.count > 1) { const value = this.readRawValue() - if ( - (this.state === "repetition" || this.state === "literal") && - this.lastValue === value - ) { - throw new RangeError( - "Successive repetitions with the same value are not allowed" - ) + if ((this.state === 'repetition' || this.state === 'literal') && this.lastValue === value) { + throw new RangeError('Successive repetitions with the same value are not allowed') } - this.state = "repetition" + this.state = 'repetition' this.lastValue = value } else if (this.count === 1) { - throw new RangeError( - "Repetition count of 1 is not allowed, use a literal instead" - ) + throw new RangeError('Repetition count of 1 is not allowed, use a literal instead') } else if (this.count < 0) { this.count = -this.count - if (this.state === "literal") - throw new RangeError("Successive literals are not allowed") - this.state = "literal" - } else { - // this.count == 0 - if (this.state === "nulls") - throw new RangeError("Successive null runs are not allowed") + if (this.state === 'literal') throw new RangeError('Successive literals are not allowed') + this.state = 'literal' + } else { // this.count == 0 + if (this.state === 'nulls') throw new RangeError('Successive null runs are not allowed') this.count = this.readUint53() - if (this.count === 0) - throw new RangeError("Zero-length null runs are not allowed") + if (this.count === 0) throw new RangeError('Zero-length null runs are not allowed') this.lastValue = null - this.state = "nulls" + this.state = 'nulls' } } @@ -983,11 +891,11 @@ class RLEDecoder extends Decoder { * Reads one value of the datatype configured on construction. */ readRawValue() { - if (this.type === "int") { + if (this.type === 'int') { return this.readInt53() - } else if (this.type === "uint") { + } else if (this.type === 'uint') { return this.readUint53() - } else if (this.type === "utf8") { + } else if (this.type === 'utf8') { return this.readPrefixedString() } else { throw new RangeError(`Unknown RLEDecoder datatype: ${this.type}`) @@ -999,14 +907,14 @@ class RLEDecoder extends Decoder { * Skips over `num` values of the datatype configured on construction. */ skipRawValues(num) { - if (this.type === "utf8") { + if (this.type === 'utf8') { for (let i = 0; i < num; i++) this.skip(this.readUint53()) } else { while (num > 0 && this.offset < this.buf.byteLength) { if ((this.buf[this.offset] & 0x80) === 0) num-- this.offset++ } - if (num > 0) throw new RangeError("cannot skip beyond end of buffer") + if (num > 0) throw new RangeError('cannot skip beyond end of buffer') } } } @@ -1023,7 +931,7 @@ class RLEDecoder extends Decoder { */ class DeltaEncoder extends RLEEncoder { constructor() { - super("int") + super('int') this.absoluteValue = 0 } @@ -1033,7 +941,7 @@ class DeltaEncoder extends RLEEncoder { */ appendValue(value, repetitions = 1) { if (repetitions <= 0) return - if (typeof value === "number") { + if (typeof value === 'number') { super.appendValue(value - this.absoluteValue, 1) this.absoluteValue = value if (repetitions > 1) super.appendValue(0, repetitions - 1) @@ -1049,29 +957,26 @@ class DeltaEncoder extends RLEEncoder { */ copyFrom(decoder, options = {}) { if (options.sumValues) { - throw new RangeError("unsupported options for DeltaEncoder.copyFrom()") + throw new RangeError('unsupported options for DeltaEncoder.copyFrom()') } if (!(decoder instanceof DeltaDecoder)) { - throw new TypeError("incompatible type of decoder") + throw new TypeError('incompatible type of decoder') } let remaining = options.count - if (remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${remaining} values`) + if (remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${remaining} values`) if (remaining === 0 || decoder.done) return // Copy any null values, and the first non-null value, so that appendValue() computes the // difference between the encoder's last value and the decoder's first (absolute) value. - let value = decoder.readValue(), - nulls = 0 + let value = decoder.readValue(), nulls = 0 this.appendValue(value) if (value === null) { nulls = decoder.count + 1 if (remaining !== undefined && remaining < nulls) nulls = remaining decoder.count -= nulls - 1 this.count += nulls - 1 - if (remaining > nulls && decoder.done) - throw new RangeError(`cannot copy ${remaining} values`) + if (remaining > nulls && decoder.done) throw new RangeError(`cannot copy ${remaining} values`) if (remaining === nulls || decoder.done) return // The next value read is certain to be non-null because we're not at the end of the decoder, @@ -1084,10 +989,7 @@ class DeltaEncoder extends RLEEncoder { // value, while subsequent values are relative. Thus, the sum of all of the (non-null) copied // values must equal the absolute value of the final element copied. if (remaining !== undefined) remaining -= nulls + 1 - const { nonNullValues, sum } = super.copyFrom(decoder, { - count: remaining, - sumValues: true, - }) + const { nonNullValues, sum } = super.copyFrom(decoder, {count: remaining, sumValues: true}) if (nonNullValues > 0) { this.absoluteValue = sum decoder.absoluteValue = sum @@ -1101,7 +1003,7 @@ class DeltaEncoder extends RLEEncoder { */ class DeltaDecoder extends RLEDecoder { constructor(buffer) { - super("int", buffer) + super('int', buffer) this.absoluteValue = 0 } @@ -1134,12 +1036,12 @@ class DeltaDecoder extends RLEDecoder { while (numSkip > 0 && !this.done) { if (this.count === 0) this.readRecord() const consume = Math.min(numSkip, this.count) - if (this.state === "literal") { + if (this.state === 'literal') { for (let i = 0; i < consume; i++) { this.lastValue = this.readRawValue() this.absoluteValue += this.lastValue } - } else if (this.state === "repetition") { + } else if (this.state === 'repetition') { this.absoluteValue += consume * this.lastValue } numSkip -= consume @@ -1188,13 +1090,12 @@ class BooleanEncoder extends Encoder { */ copyFrom(decoder, options = {}) { if (!(decoder instanceof BooleanDecoder)) { - throw new TypeError("incompatible type of decoder") + throw new TypeError('incompatible type of decoder') } const { count } = options - let remaining = typeof count === "number" ? count : Number.MAX_SAFE_INTEGER - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) + let remaining = (typeof count === 'number' ? count : Number.MAX_SAFE_INTEGER) + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) if (remaining === 0 || decoder.done) return // Copy one value to bring decoder and encoder state into sync, then finish that value's repetitions @@ -1207,8 +1108,7 @@ class BooleanEncoder extends Encoder { while (remaining > 0 && !decoder.done) { decoder.count = decoder.readUint53() - if (decoder.count === 0) - throw new RangeError("Zero-length runs are not allowed") + if (decoder.count === 0) throw new RangeError('Zero-length runs are not allowed') decoder.lastValue = !decoder.lastValue this.appendUint53(this.count) @@ -1219,8 +1119,7 @@ class BooleanEncoder extends Encoder { remaining -= numCopied } - if (count && remaining > 0 && decoder.done) - throw new RangeError(`cannot copy ${count} values`) + if (count && remaining > 0 && decoder.done) throw new RangeError(`cannot copy ${count} values`) } /** @@ -1252,7 +1151,7 @@ class BooleanDecoder extends Decoder { * position, and true if we are at the end of the buffer. */ get done() { - return this.count === 0 && this.offset === this.buf.byteLength + return (this.count === 0) && (this.offset === this.buf.byteLength) } /** @@ -1275,7 +1174,7 @@ class BooleanDecoder extends Decoder { this.count = this.readUint53() this.lastValue = !this.lastValue if (this.count === 0 && !this.firstRun) { - throw new RangeError("Zero-length runs are not allowed") + throw new RangeError('Zero-length runs are not allowed') } this.firstRun = false } @@ -1291,8 +1190,7 @@ class BooleanDecoder extends Decoder { if (this.count === 0) { this.count = this.readUint53() this.lastValue = !this.lastValue - if (this.count === 0) - throw new RangeError("Zero-length runs are not allowed") + if (this.count === 0) throw new RangeError('Zero-length runs are not allowed') } if (this.count < numSkip) { numSkip -= this.count @@ -1306,16 +1204,6 @@ class BooleanDecoder extends Decoder { } module.exports = { - stringToUtf8, - utf8ToString, - hexStringToBytes, - bytesToHexString, - Encoder, - Decoder, - RLEEncoder, - RLEDecoder, - DeltaEncoder, - DeltaDecoder, - BooleanEncoder, - BooleanDecoder, + stringToUtf8, utf8ToString, hexStringToBytes, bytesToHexString, + Encoder, Decoder, RLEEncoder, RLEDecoder, DeltaEncoder, DeltaDecoder, BooleanEncoder, BooleanDecoder } diff --git a/javascript/test/legacy/sync.js b/javascript/test/legacy/sync.js index 233c4292..3bb1571d 100644 --- a/javascript/test/legacy/sync.js +++ b/javascript/test/legacy/sync.js @@ -17,14 +17,9 @@ */ const Backend = null //require('./backend') -const { - hexStringToBytes, - bytesToHexString, - Encoder, - Decoder, -} = require("./encoding") -const { decodeChangeMeta } = require("./columnar") -const { copyObject } = require("./common") +const { hexStringToBytes, bytesToHexString, Encoder, Decoder } = require('./encoding') +const { decodeChangeMeta } = require('./columnar') +const { copyObject } = require('./common') const HASH_SIZE = 32 // 256 bits = 32 bytes const MESSAGE_TYPE_SYNC = 0x42 // first byte of a sync message, for identification @@ -33,8 +28,7 @@ const PEER_STATE_TYPE = 0x43 // first byte of an encoded peer state, for identif // These constants correspond to a 1% false positive rate. The values can be changed without // breaking compatibility of the network protocol, since the parameters used for a particular // Bloom filter are encoded in the wire format. -const BITS_PER_ENTRY = 10, - NUM_PROBES = 7 +const BITS_PER_ENTRY = 10, NUM_PROBES = 7 /** * A Bloom filter implementation that can be serialised to a byte array for transmission @@ -42,15 +36,13 @@ const BITS_PER_ENTRY = 10, * so this implementation does not perform its own hashing. */ class BloomFilter { - constructor(arg) { + constructor (arg) { if (Array.isArray(arg)) { // arg is an array of SHA256 hashes in hexadecimal encoding this.numEntries = arg.length this.numBitsPerEntry = BITS_PER_ENTRY this.numProbes = NUM_PROBES - this.bits = new Uint8Array( - Math.ceil((this.numEntries * this.numBitsPerEntry) / 8) - ) + this.bits = new Uint8Array(Math.ceil(this.numEntries * this.numBitsPerEntry / 8)) for (let hash of arg) this.addHash(hash) } else if (arg instanceof Uint8Array) { if (arg.byteLength === 0) { @@ -63,12 +55,10 @@ class BloomFilter { this.numEntries = decoder.readUint32() this.numBitsPerEntry = decoder.readUint32() this.numProbes = decoder.readUint32() - this.bits = decoder.readRawBytes( - Math.ceil((this.numEntries * this.numBitsPerEntry) / 8) - ) + this.bits = decoder.readRawBytes(Math.ceil(this.numEntries * this.numBitsPerEntry / 8)) } } else { - throw new TypeError("invalid argument") + throw new TypeError('invalid argument') } } @@ -96,32 +86,12 @@ class BloomFilter { * http://www.ccis.northeastern.edu/home/pete/pub/bloom-filters-verification.pdf */ getProbes(hash) { - const hashBytes = hexStringToBytes(hash), - modulo = 8 * this.bits.byteLength - if (hashBytes.byteLength !== 32) - throw new RangeError(`Not a 256-bit hash: ${hash}`) + const hashBytes = hexStringToBytes(hash), modulo = 8 * this.bits.byteLength + if (hashBytes.byteLength !== 32) throw new RangeError(`Not a 256-bit hash: ${hash}`) // on the next three lines, the right shift means interpret value as unsigned - let x = - ((hashBytes[0] | - (hashBytes[1] << 8) | - (hashBytes[2] << 16) | - (hashBytes[3] << 24)) >>> - 0) % - modulo - let y = - ((hashBytes[4] | - (hashBytes[5] << 8) | - (hashBytes[6] << 16) | - (hashBytes[7] << 24)) >>> - 0) % - modulo - let z = - ((hashBytes[8] | - (hashBytes[9] << 8) | - (hashBytes[10] << 16) | - (hashBytes[11] << 24)) >>> - 0) % - modulo + let x = ((hashBytes[0] | hashBytes[1] << 8 | hashBytes[2] << 16 | hashBytes[3] << 24) >>> 0) % modulo + let y = ((hashBytes[4] | hashBytes[5] << 8 | hashBytes[6] << 16 | hashBytes[7] << 24) >>> 0) % modulo + let z = ((hashBytes[8] | hashBytes[9] << 8 | hashBytes[10] << 16 | hashBytes[11] << 24) >>> 0) % modulo const probes = [x] for (let i = 1; i < this.numProbes; i++) { x = (x + y) % modulo @@ -158,14 +128,12 @@ class BloomFilter { * Encodes a sorted array of SHA-256 hashes (as hexadecimal strings) into a byte array. */ function encodeHashes(encoder, hashes) { - if (!Array.isArray(hashes)) throw new TypeError("hashes must be an array") + if (!Array.isArray(hashes)) throw new TypeError('hashes must be an array') encoder.appendUint32(hashes.length) for (let i = 0; i < hashes.length; i++) { - if (i > 0 && hashes[i - 1] >= hashes[i]) - throw new RangeError("hashes must be sorted") + if (i > 0 && hashes[i - 1] >= hashes[i]) throw new RangeError('hashes must be sorted') const bytes = hexStringToBytes(hashes[i]) - if (bytes.byteLength !== HASH_SIZE) - throw new TypeError("heads hashes must be 256 bits") + if (bytes.byteLength !== HASH_SIZE) throw new TypeError('heads hashes must be 256 bits') encoder.appendRawBytes(bytes) } } @@ -175,8 +143,7 @@ function encodeHashes(encoder, hashes) { * array of hex strings. */ function decodeHashes(decoder) { - let length = decoder.readUint32(), - hashes = [] + let length = decoder.readUint32(), hashes = [] for (let i = 0; i < length; i++) { hashes.push(bytesToHexString(decoder.readRawBytes(HASH_SIZE))) } @@ -216,11 +183,11 @@ function decodeSyncMessage(bytes) { const heads = decodeHashes(decoder) const need = decodeHashes(decoder) const haveCount = decoder.readUint32() - let message = { heads, need, have: [], changes: [] } + let message = {heads, need, have: [], changes: []} for (let i = 0; i < haveCount; i++) { const lastSync = decodeHashes(decoder) const bloom = decoder.readPrefixedBytes(decoder) - message.have.push({ lastSync, bloom }) + message.have.push({lastSync, bloom}) } const changeCount = decoder.readUint32() for (let i = 0; i < changeCount; i++) { @@ -267,7 +234,7 @@ function decodeSyncState(bytes) { function makeBloomFilter(backend, lastSync) { const newChanges = Backend.getChanges(backend, lastSync) const hashes = newChanges.map(change => decodeChangeMeta(change, true).hash) - return { lastSync, bloom: new BloomFilter(hashes).bytes } + return {lastSync, bloom: new BloomFilter(hashes).bytes} } /** @@ -278,26 +245,20 @@ function makeBloomFilter(backend, lastSync) { */ function getChangesToSend(backend, have, need) { if (have.length === 0) { - return need - .map(hash => Backend.getChangeByHash(backend, hash)) - .filter(change => change !== undefined) + return need.map(hash => Backend.getChangeByHash(backend, hash)).filter(change => change !== undefined) } - let lastSyncHashes = {}, - bloomFilters = [] + let lastSyncHashes = {}, bloomFilters = [] for (let h of have) { for (let hash of h.lastSync) lastSyncHashes[hash] = true bloomFilters.push(new BloomFilter(h.bloom)) } // Get all changes that were added since the last sync - const changes = Backend.getChanges(backend, Object.keys(lastSyncHashes)).map( - change => decodeChangeMeta(change, true) - ) + const changes = Backend.getChanges(backend, Object.keys(lastSyncHashes)) + .map(change => decodeChangeMeta(change, true)) - let changeHashes = {}, - dependents = {}, - hashesToSend = {} + let changeHashes = {}, dependents = {}, hashesToSend = {} for (let change of changes) { changeHashes[change.hash] = true @@ -331,8 +292,7 @@ function getChangesToSend(backend, have, need) { let changesToSend = [] for (let hash of need) { hashesToSend[hash] = true - if (!changeHashes[hash]) { - // Change is not among those returned by getMissingChanges()? + if (!changeHashes[hash]) { // Change is not among those returned by getMissingChanges()? const change = Backend.getChangeByHash(backend, hash) if (change) changesToSend.push(change) } @@ -357,7 +317,7 @@ function initSyncState() { } function compareArrays(a, b) { - return a.length === b.length && a.every((v, i) => v === b[i]) + return (a.length === b.length) && a.every((v, i) => v === b[i]) } /** @@ -369,19 +329,10 @@ function generateSyncMessage(backend, syncState) { throw new Error("generateSyncMessage called with no Automerge document") } if (!syncState) { - throw new Error( - "generateSyncMessage requires a syncState, which can be created with initSyncState()" - ) + throw new Error("generateSyncMessage requires a syncState, which can be created with initSyncState()") } - let { - sharedHeads, - lastSentHeads, - theirHeads, - theirNeed, - theirHave, - sentHashes, - } = syncState + let { sharedHeads, lastSentHeads, theirHeads, theirNeed, theirHave, sentHashes } = syncState const ourHeads = Backend.getHeads(backend) // Hashes to explicitly request from the remote peer: any missing dependencies of unapplied @@ -405,28 +356,18 @@ function generateSyncMessage(backend, syncState) { const lastSync = theirHave[0].lastSync if (!lastSync.every(hash => Backend.getChangeByHash(backend, hash))) { // we need to queue them to send us a fresh sync message, the one they sent is uninteligible so we don't know what they need - const resetMsg = { - heads: ourHeads, - need: [], - have: [{ lastSync: [], bloom: new Uint8Array(0) }], - changes: [], - } + const resetMsg = {heads: ourHeads, need: [], have: [{ lastSync: [], bloom: new Uint8Array(0) }], changes: []} return [syncState, encodeSyncMessage(resetMsg)] } } // XXX: we should limit ourselves to only sending a subset of all the messages, probably limited by a total message size // these changes should ideally be RLE encoded but we haven't implemented that yet. - let changesToSend = - Array.isArray(theirHave) && Array.isArray(theirNeed) - ? getChangesToSend(backend, theirHave, theirNeed) - : [] + let changesToSend = Array.isArray(theirHave) && Array.isArray(theirNeed) ? getChangesToSend(backend, theirHave, theirNeed) : [] // If the heads are equal, we're in sync and don't need to do anything further - const headsUnchanged = - Array.isArray(lastSentHeads) && compareArrays(ourHeads, lastSentHeads) - const headsEqual = - Array.isArray(theirHeads) && compareArrays(ourHeads, theirHeads) + const headsUnchanged = Array.isArray(lastSentHeads) && compareArrays(ourHeads, lastSentHeads) + const headsEqual = Array.isArray(theirHeads) && compareArrays(ourHeads, theirHeads) if (headsUnchanged && headsEqual && changesToSend.length === 0) { // no need to send a sync message if we know we're synced! return [syncState, null] @@ -434,19 +375,12 @@ function generateSyncMessage(backend, syncState) { // TODO: this recomputes the SHA-256 hash of each change; we should restructure this to avoid the // unnecessary recomputation - changesToSend = changesToSend.filter( - change => !sentHashes[decodeChangeMeta(change, true).hash] - ) + changesToSend = changesToSend.filter(change => !sentHashes[decodeChangeMeta(change, true).hash]) // Regular response to a sync message: send any changes that the other node // doesn't have. We leave the "have" field empty because the previous message // generated by `syncStart` already indicated what changes we have. - const syncMessage = { - heads: ourHeads, - have: ourHave, - need: ourNeed, - changes: changesToSend, - } + const syncMessage = {heads: ourHeads, have: ourHave, need: ourNeed, changes: changesToSend} if (changesToSend.length > 0) { sentHashes = copyObject(sentHashes) for (const change of changesToSend) { @@ -454,10 +388,7 @@ function generateSyncMessage(backend, syncState) { } } - syncState = Object.assign({}, syncState, { - lastSentHeads: ourHeads, - sentHashes, - }) + syncState = Object.assign({}, syncState, {lastSentHeads: ourHeads, sentHashes}) return [syncState, encodeSyncMessage(syncMessage)] } @@ -475,14 +406,13 @@ function generateSyncMessage(backend, syncState) { * another peer, that means that peer had those changes, and therefore we now both know about them. */ function advanceHeads(myOldHeads, myNewHeads, ourOldSharedHeads) { - const newHeads = myNewHeads.filter(head => !myOldHeads.includes(head)) - const commonHeads = ourOldSharedHeads.filter(head => - myNewHeads.includes(head) - ) + const newHeads = myNewHeads.filter((head) => !myOldHeads.includes(head)) + const commonHeads = ourOldSharedHeads.filter((head) => myNewHeads.includes(head)) const advancedHeads = [...new Set([...newHeads, ...commonHeads])].sort() return advancedHeads } + /** * Given a backend, a message message and the state of our peer, apply any changes, update what * we believe about the peer, and (if there were applied changes) produce a patch for the frontend @@ -492,13 +422,10 @@ function receiveSyncMessage(backend, oldSyncState, binaryMessage) { throw new Error("generateSyncMessage called with no Automerge document") } if (!oldSyncState) { - throw new Error( - "generateSyncMessage requires a syncState, which can be created with initSyncState()" - ) + throw new Error("generateSyncMessage requires a syncState, which can be created with initSyncState()") } - let { sharedHeads, lastSentHeads, sentHashes } = oldSyncState, - patch = null + let { sharedHeads, lastSentHeads, sentHashes } = oldSyncState, patch = null const message = decodeSyncMessage(binaryMessage) const beforeHeads = Backend.getHeads(backend) @@ -507,27 +434,18 @@ function receiveSyncMessage(backend, oldSyncState, binaryMessage) { // changes without applying them. The set of changes may also be incomplete if the sender decided // to break a large set of changes into chunks. if (message.changes.length > 0) { - ;[backend, patch] = Backend.applyChanges(backend, message.changes) - sharedHeads = advanceHeads( - beforeHeads, - Backend.getHeads(backend), - sharedHeads - ) + [backend, patch] = Backend.applyChanges(backend, message.changes) + sharedHeads = advanceHeads(beforeHeads, Backend.getHeads(backend), sharedHeads) } // If heads are equal, indicate we don't need to send a response message - if ( - message.changes.length === 0 && - compareArrays(message.heads, beforeHeads) - ) { + if (message.changes.length === 0 && compareArrays(message.heads, beforeHeads)) { lastSentHeads = message.heads } // If all of the remote heads are known to us, that means either our heads are equal, or we are // ahead of the remote peer. In this case, take the remote heads to be our shared heads. - const knownHeads = message.heads.filter(head => - Backend.getChangeByHash(backend, head) - ) + const knownHeads = message.heads.filter(head => Backend.getChangeByHash(backend, head)) if (knownHeads.length === message.heads.length) { sharedHeads = message.heads // If the remote peer has lost all its data, reset our state to perform a full resync @@ -549,18 +467,14 @@ function receiveSyncMessage(backend, oldSyncState, binaryMessage) { theirHave: message.have, // the information we need to calculate the changes they need theirHeads: message.heads, theirNeed: message.need, - sentHashes, + sentHashes } return [backend, syncState, patch] } module.exports = { - receiveSyncMessage, - generateSyncMessage, - encodeSyncMessage, - decodeSyncMessage, - initSyncState, - encodeSyncState, - decodeSyncState, - BloomFilter, // BloomFilter is a private API, exported only for testing purposes + receiveSyncMessage, generateSyncMessage, + encodeSyncMessage, decodeSyncMessage, + initSyncState, encodeSyncState, decodeSyncState, + BloomFilter // BloomFilter is a private API, exported only for testing purposes } diff --git a/javascript/test/legacy_tests.ts b/javascript/test/legacy_tests.ts index 8c2e552e..2320f909 100644 --- a/javascript/test/legacy_tests.ts +++ b/javascript/test/legacy_tests.ts @@ -1,7 +1,7 @@ -import * as assert from "assert" -import { unstable as Automerge } from "../src" -import { assertEqualsOneOf } from "./helpers" -import { decodeChange } from "./legacy/columnar" +import * as assert from 'assert' +import * as Automerge from '../src' +import { assertEqualsOneOf } from './helpers' +import { decodeChange } from './legacy/columnar' const UUID_PATTERN = /^[0-9a-f]{32}$/ const OPID_PATTERN = /^[0-9]+@([0-9a-f][0-9a-f])*$/ @@ -13,764 +13,603 @@ const OPID_PATTERN = /^[0-9]+@([0-9a-f][0-9a-f])*$/ // TODO - on-pass load() & reconstruct change from opset // TODO - micro-patches (needed for fully hydrated object in js) // TODO - valueAt(heads) / GC -// +// // AUTOMERGE UNSUPPORTED // // TODO - patchCallback -describe("Automerge", () => { - describe("initialization ", () => { - it("should initially be an empty map", () => { + +describe('Automerge', () => { + describe('initialization ', () => { + it('should initially be an empty map', () => { const doc = Automerge.init() assert.deepStrictEqual(doc, {}) }) - it("should allow instantiating from an existing object", () => { + it('should allow instantiating from an existing object', () => { const initialState = { birds: { wrens: 3, magpies: 4 } } const doc = Automerge.from(initialState) assert.deepStrictEqual(doc, initialState) }) - it("should allow merging of an object initialized with `from`", () => { + it('should allow merging of an object initialized with `from`', () => { let doc1 = Automerge.from({ cards: [] }) let doc2 = Automerge.merge(Automerge.init(), doc1) assert.deepStrictEqual(doc2, { cards: [] }) }) - it("should allow passing an actorId when instantiating from an existing object", () => { - const actorId = "1234" + it('should allow passing an actorId when instantiating from an existing object', () => { + const actorId = '1234' let doc = Automerge.from({ foo: 1 }, actorId) - assert.strictEqual(Automerge.getActorId(doc), "1234") + assert.strictEqual(Automerge.getActorId(doc), '1234') }) - it("accepts an empty object as initial state", () => { + it('accepts an empty object as initial state', () => { const doc = Automerge.from({}) assert.deepStrictEqual(doc, {}) }) - it("accepts an array as initial state, but converts it to an object", () => { - // @ts-ignore - const doc = Automerge.from(["a", "b", "c"]) - assert.deepStrictEqual(doc, { "0": "a", "1": "b", "2": "c" }) + it('accepts an array as initial state, but converts it to an object', () => { + const doc = Automerge.from(['a', 'b', 'c']) + assert.deepStrictEqual(doc, { '0': 'a', '1': 'b', '2': 'c' }) }) - it("accepts strings as initial values, but treats them as an array of characters", () => { - // @ts-ignore - const doc = Automerge.from("abc") - assert.deepStrictEqual(doc, { "0": "a", "1": "b", "2": "c" }) + it('accepts strings as initial values, but treats them as an array of characters', () => { + const doc = Automerge.from('abc') + assert.deepStrictEqual(doc, { '0': 'a', '1': 'b', '2': 'c' }) }) - it("ignores numbers provided as initial values", () => { - // @ts-ignore + it('ignores numbers provided as initial values', () => { const doc = Automerge.from(123) assert.deepStrictEqual(doc, {}) }) - it("ignores booleans provided as initial values", () => { - // @ts-ignore + it('ignores booleans provided as initial values', () => { const doc1 = Automerge.from(false) assert.deepStrictEqual(doc1, {}) - // @ts-ignore const doc2 = Automerge.from(true) assert.deepStrictEqual(doc2, {}) }) }) - describe("sequential use", () => { - let s1: Automerge.Doc, s2: Automerge.Doc + describe('sequential use', () => { + let s1, s2 beforeEach(() => { s1 = Automerge.init("aabbcc") }) - it("should not mutate objects", () => { - s2 = Automerge.change(s1, doc => (doc.foo = "bar")) + it('should not mutate objects', () => { + s2 = Automerge.change(s1, doc => doc.foo = 'bar') assert.strictEqual(s1.foo, undefined) - assert.strictEqual(s2.foo, "bar") + assert.strictEqual(s2.foo, 'bar') }) - it("changes should be retrievable", () => { + it('changes should be retrievable', () => { const change1 = Automerge.getLastLocalChange(s1) - s2 = Automerge.change(s1, doc => (doc.foo = "bar")) + s2 = Automerge.change(s1, doc => doc.foo = 'bar') const change2 = Automerge.getLastLocalChange(s2) assert.strictEqual(change1, undefined) - const change = Automerge.decodeChange(change2!) + const change = decodeChange(change2) assert.deepStrictEqual(change, { - actor: change.actor, - deps: [], - seq: 1, - startOp: 1, - hash: change.hash, - message: null, - time: change.time, + actor: change.actor, deps: [], seq: 1, startOp: 1, + hash: change.hash, message: '', time: change.time, ops: [ - { obj: "_root", key: "foo", action: "makeText", pred: [] }, - { - action: "set", - elemId: "_head", - insert: true, - obj: "1@aabbcc", - pred: [], - value: "b", - }, - { - action: "set", - elemId: "2@aabbcc", - insert: true, - obj: "1@aabbcc", - pred: [], - value: "a", - }, - { - action: "set", - elemId: "3@aabbcc", - insert: true, - obj: "1@aabbcc", - pred: [], - value: "r", - }, - ], + {obj: '_root', key: 'foo', action: 'makeText', insert: false, pred: []}, + {action: 'set', elemId: '_head', insert: true, obj: '1@aabbcc', pred: [], value: 'b' }, + {action: 'set', elemId: '2@aabbcc', insert: true, obj: '1@aabbcc', pred: [], value: 'a' }, + {action: 'set', elemId: '3@aabbcc', insert: true, obj: '1@aabbcc', pred: [], value: 'r' }] }) }) - it("should not register any conflicts on repeated assignment", () => { - assert.strictEqual(Automerge.getConflicts(s1, "foo"), undefined) - s1 = Automerge.change(s1, "change", doc => (doc.foo = "one")) - assert.strictEqual(Automerge.getConflicts(s1, "foo"), undefined) - s1 = Automerge.change(s1, "change", doc => (doc.foo = "two")) - assert.strictEqual(Automerge.getConflicts(s1, "foo"), undefined) + it('should not register any conflicts on repeated assignment', () => { + assert.strictEqual(Automerge.getConflicts(s1, 'foo'), undefined) + s1 = Automerge.change(s1, 'change', doc => doc.foo = 'one') + assert.strictEqual(Automerge.getConflicts(s1, 'foo'), undefined) + s1 = Automerge.change(s1, 'change', doc => doc.foo = 'two') + assert.strictEqual(Automerge.getConflicts(s1, 'foo'), undefined) }) - describe("changes", () => { - it("should group several changes", () => { - s2 = Automerge.change(s1, "change message", doc => { - doc.first = "one" - assert.strictEqual(doc.first, "one") - doc.second = "two" + describe('changes', () => { + it('should group several changes', () => { + s2 = Automerge.change(s1, 'change message', doc => { + doc.first = 'one' + assert.strictEqual(doc.first, 'one') + doc.second = 'two' assert.deepStrictEqual(doc, { - first: "one", - second: "two", + first: 'one', second: 'two' }) }) assert.deepStrictEqual(s1, {}) - assert.deepStrictEqual(s2, { first: "one", second: "two" }) + assert.deepStrictEqual(s2, {first: 'one', second: 'two'}) }) - it("should freeze objects if desired", () => { - s1 = Automerge.init({ freeze: true }) - s2 = Automerge.change(s1, doc => (doc.foo = "bar")) + it('should freeze objects if desired', () => { + s1 = Automerge.init({freeze: true}) + s2 = Automerge.change(s1, doc => doc.foo = 'bar') try { - // @ts-ignore - s2.foo = "lemon" - } catch (e) {} - assert.strictEqual(s2.foo, "bar") + s2.foo = 'lemon' + } catch (e) { } + assert.strictEqual(s2.foo, 'bar') let deleted = false try { - // @ts-ignore deleted = delete s2.foo - } catch (e) {} - assert.strictEqual(s2.foo, "bar") + } catch (e) { } + assert.strictEqual(s2.foo, 'bar') assert.strictEqual(deleted, false) Automerge.change(s2, () => { try { - // @ts-ignore - s2.foo = "lemon" - } catch (e) {} - assert.strictEqual(s2.foo, "bar") + s2.foo = 'lemon' + } catch (e) { } + assert.strictEqual(s2.foo, 'bar') }) - assert.throws(() => { - Object.assign(s2, { x: 4 }) - }) + assert.throws(() => { Object.assign(s2, {x: 4}) }) assert.strictEqual(s2.x, undefined) }) - it("should allow repeated reading and writing of values", () => { - s2 = Automerge.change(s1, "change message", doc => { - doc.value = "a" - assert.strictEqual(doc.value, "a") - doc.value = "b" - doc.value = "c" - assert.strictEqual(doc.value, "c") + it('should allow repeated reading and writing of values', () => { + s2 = Automerge.change(s1, 'change message', doc => { + doc.value = 'a' + assert.strictEqual(doc.value, 'a') + doc.value = 'b' + doc.value = 'c' + assert.strictEqual(doc.value, 'c') }) assert.deepStrictEqual(s1, {}) - assert.deepStrictEqual(s2, { value: "c" }) + assert.deepStrictEqual(s2, {value: 'c'}) }) - it("should not record conflicts when writing the same field several times within one change", () => { - s1 = Automerge.change(s1, "change message", doc => { - doc.value = "a" - doc.value = "b" - doc.value = "c" + it('should not record conflicts when writing the same field several times within one change', () => { + s1 = Automerge.change(s1, 'change message', doc => { + doc.value = 'a' + doc.value = 'b' + doc.value = 'c' }) - assert.strictEqual(s1.value, "c") - assert.strictEqual(Automerge.getConflicts(s1, "value"), undefined) + assert.strictEqual(s1.value, 'c') + assert.strictEqual(Automerge.getConflicts(s1, 'value'), undefined) }) - it("should return the unchanged state object if nothing changed", () => { + it('should return the unchanged state object if nothing changed', () => { s2 = Automerge.change(s1, () => {}) assert.strictEqual(s2, s1) }) - it("should ignore field updates that write the existing value", () => { - s1 = Automerge.change(s1, doc => (doc.field = 123)) - s2 = Automerge.change(s1, doc => (doc.field = 123)) + it('should ignore field updates that write the existing value', () => { + s1 = Automerge.change(s1, doc => doc.field = 123) + s2 = Automerge.change(s1, doc => doc.field = 123) assert.strictEqual(s2, s1) }) - it("should not ignore field updates that resolve a conflict", () => { + it('should not ignore field updates that resolve a conflict', () => { s2 = Automerge.merge(Automerge.init(), s1) - s1 = Automerge.change(s1, doc => (doc.field = 123)) - s2 = Automerge.change(s2, doc => (doc.field = 321)) + s1 = Automerge.change(s1, doc => doc.field = 123) + s2 = Automerge.change(s2, doc => doc.field = 321) s1 = Automerge.merge(s1, s2) - assert.strictEqual( - Object.keys(Automerge.getConflicts(s1, "field")!).length, - 2 - ) - const resolved = Automerge.change(s1, doc => (doc.field = s1.field)) + assert.strictEqual(Object.keys(Automerge.getConflicts(s1, 'field')).length, 2) + const resolved = Automerge.change(s1, doc => doc.field = s1.field) assert.notStrictEqual(resolved, s1) - assert.deepStrictEqual(resolved, { field: s1.field }) - assert.strictEqual(Automerge.getConflicts(resolved, "field"), undefined) + assert.deepStrictEqual(resolved, {field: s1.field}) + assert.strictEqual(Automerge.getConflicts(resolved, 'field'), undefined) }) - it("should ignore list element updates that write the existing value", () => { - s1 = Automerge.change(s1, doc => (doc.list = [123])) - s2 = Automerge.change(s1, doc => (doc.list[0] = 123)) + it('should ignore list element updates that write the existing value', () => { + s1 = Automerge.change(s1, doc => doc.list = [123]) + s2 = Automerge.change(s1, doc => doc.list[0] = 123) assert.strictEqual(s2, s1) }) - it("should not ignore list element updates that resolve a conflict", () => { - s1 = Automerge.change(s1, doc => (doc.list = [1])) + it('should not ignore list element updates that resolve a conflict', () => { + s1 = Automerge.change(s1, doc => doc.list = [1]) s2 = Automerge.merge(Automerge.init(), s1) - s1 = Automerge.change(s1, doc => (doc.list[0] = 123)) - s2 = Automerge.change(s2, doc => (doc.list[0] = 321)) + s1 = Automerge.change(s1, doc => doc.list[0] = 123) + s2 = Automerge.change(s2, doc => doc.list[0] = 321) s1 = Automerge.merge(s1, s2) assert.deepStrictEqual(Automerge.getConflicts(s1.list, 0), { [`3@${Automerge.getActorId(s1)}`]: 123, - [`3@${Automerge.getActorId(s2)}`]: 321, + [`3@${Automerge.getActorId(s2)}`]: 321 }) - const resolved = Automerge.change(s1, doc => (doc.list[0] = s1.list[0])) + const resolved = Automerge.change(s1, doc => doc.list[0] = s1.list[0]) assert.deepStrictEqual(resolved, s1) assert.notStrictEqual(resolved, s1) assert.strictEqual(Automerge.getConflicts(resolved.list, 0), undefined) }) - it("should sanity-check arguments", () => { - s1 = Automerge.change(s1, doc => (doc.nested = {})) - assert.throws(() => { - // @ts-ignore - Automerge.change({}, doc => (doc.foo = "bar")) - }, /must be the document root/) - assert.throws(() => { - // @ts-ignore - Automerge.change(s1.nested, doc => (doc.foo = "bar")) - }, /must be the document root/) + it('should sanity-check arguments', () => { + s1 = Automerge.change(s1, doc => doc.nested = {}) + assert.throws(() => { Automerge.change({}, doc => doc.foo = 'bar') }, /must be the document root/) + assert.throws(() => { Automerge.change(s1.nested, doc => doc.foo = 'bar') }, /must be the document root/) }) - it("should not allow nested change blocks", () => { + it('should not allow nested change blocks', () => { assert.throws(() => { Automerge.change(s1, doc1 => { Automerge.change(doc1, doc2 => { - // @ts-ignore - doc2.foo = "bar" + doc2.foo = 'bar' }) }) }, /Calls to Automerge.change cannot be nested/) assert.throws(() => { s1 = Automerge.change(s1, doc1 => { - s2 = Automerge.change(s1, doc2 => (doc2.two = 2)) + s2 = Automerge.change(s1, doc2 => doc2.two = 2) doc1.one = 1 }) }, /Attempting to change an outdated document/) }) - it("should not allow the same base document to be used for multiple changes", () => { + it('should not allow the same base document to be used for multiple changes', () => { assert.throws(() => { - Automerge.change(s1, doc => (doc.one = 1)) - Automerge.change(s1, doc => (doc.two = 2)) + Automerge.change(s1, doc => doc.one = 1) + Automerge.change(s1, doc => doc.two = 2) }, /Attempting to change an outdated document/) }) - it("should allow a document to be cloned", () => { - s1 = Automerge.change(s1, doc => (doc.zero = 0)) + it('should allow a document to be cloned', () => { + s1 = Automerge.change(s1, doc => doc.zero = 0) s2 = Automerge.clone(s1) - s1 = Automerge.change(s1, doc => (doc.one = 1)) - s2 = Automerge.change(s2, doc => (doc.two = 2)) - assert.deepStrictEqual(s1, { zero: 0, one: 1 }) - assert.deepStrictEqual(s2, { zero: 0, two: 2 }) + s1 = Automerge.change(s1, doc => doc.one = 1) + s2 = Automerge.change(s2, doc => doc.two = 2) + assert.deepStrictEqual(s1, {zero: 0, one: 1}) + assert.deepStrictEqual(s2, {zero: 0, two: 2}) Automerge.free(s1) Automerge.free(s2) }) - it("should work with Object.assign merges", () => { + it('should work with Object.assign merges', () => { s1 = Automerge.change(s1, doc1 => { - doc1.stuff = { foo: "bar", baz: "blur" } + doc1.stuff = {foo: 'bar', baz: 'blur'} }) s1 = Automerge.change(s1, doc1 => { - doc1.stuff = Object.assign({}, doc1.stuff, { baz: "updated!" }) + doc1.stuff = Object.assign({}, doc1.stuff, {baz: 'updated!'}) }) - assert.deepStrictEqual(s1, { stuff: { foo: "bar", baz: "updated!" } }) + assert.deepStrictEqual(s1, {stuff: {foo: 'bar', baz: 'updated!'}}) }) - it("should support Date objects in maps", () => { + it('should support Date objects in maps', () => { const now = new Date() - s1 = Automerge.change(s1, doc => (doc.now = now)) + s1 = Automerge.change(s1, doc => doc.now = now) let changes = Automerge.getAllChanges(s1) ;[s2] = Automerge.applyChanges(Automerge.init(), changes) assert.strictEqual(s2.now instanceof Date, true) assert.strictEqual(s2.now.getTime(), now.getTime()) }) - it("should support Date objects in lists", () => { + it('should support Date objects in lists', () => { const now = new Date() - s1 = Automerge.change(s1, doc => (doc.list = [now])) + s1 = Automerge.change(s1, doc => doc.list = [now]) let changes = Automerge.getAllChanges(s1) ;[s2] = Automerge.applyChanges(Automerge.init(), changes) assert.strictEqual(s2.list[0] instanceof Date, true) assert.strictEqual(s2.list[0].getTime(), now.getTime()) }) - it("should call patchCallback if supplied", () => { - const callbacks: Array<{ - patches: Array - before: Automerge.Doc - after: Automerge.Doc - }> = [] - const s2 = Automerge.change( - s1, - { - patchCallback: (patches, before, after) => - callbacks.push({ patches, before, after }), - }, - doc => { - doc.birds = ["Goldfinch"] - } - ) + it('should call patchCallback if supplied', () => { + const callbacks = [], actor = Automerge.getActorId(s1) + const s2 = Automerge.change(s1, { + patchCallback: (patch, before, after) => callbacks.push({patch, before, after}) + }, doc => { + doc.birds = ['Goldfinch'] + }) assert.strictEqual(callbacks.length, 1) - assert.deepStrictEqual(callbacks[0].patches[0], { - action: "put", - path: ["birds"], - value: [], - }) - assert.deepStrictEqual(callbacks[0].patches[1], { - action: "insert", - path: ["birds", 0], - values: [""], - }) - assert.deepStrictEqual(callbacks[0].patches[2], { - action: "splice", - path: ["birds", 0, 0], - value: "Goldfinch", - }) + assert.deepStrictEqual(callbacks[0].patch[0], { action: "put", path: ["birds"], value: [] }) + assert.deepStrictEqual(callbacks[0].patch[1], { action: "insert", path: ["birds",0], values: [""] }) + assert.deepStrictEqual(callbacks[0].patch[2], { action: "splice", path: ["birds",0, 0], value: "Goldfinch" }) assert.strictEqual(callbacks[0].before, s1) assert.strictEqual(callbacks[0].after, s2) }) - it("should call a patchCallback set up on document initialisation", () => { - const callbacks: Array<{ - patches: Array - before: Automerge.Doc - after: Automerge.Doc - }> = [] + it('should call a patchCallback set up on document initialisation', () => { + const callbacks = [] s1 = Automerge.init({ - patchCallback: (patches, before, after) => - callbacks.push({ patches, before, after }), + patchCallback: (patch, before, after) => callbacks.push({patch, before, after }) }) - const s2 = Automerge.change(s1, doc => (doc.bird = "Goldfinch")) + const s2 = Automerge.change(s1, doc => doc.bird = 'Goldfinch') + const actor = Automerge.getActorId(s1) assert.strictEqual(callbacks.length, 1) - assert.deepStrictEqual(callbacks[0].patches[0], { - action: "put", - path: ["bird"], - value: "", + assert.deepStrictEqual(callbacks[0].patch[0], { + action: "put", path: ["bird"], value: "" }) - assert.deepStrictEqual(callbacks[0].patches[1], { - action: "splice", - path: ["bird", 0], - value: "Goldfinch", + assert.deepStrictEqual(callbacks[0].patch[1], { + action: "splice", path: ["bird", 0], value: "Goldfinch" }) assert.strictEqual(callbacks[0].before, s1) assert.strictEqual(callbacks[0].after, s2) }) }) - describe("emptyChange()", () => { - it("should append an empty change to the history", () => { - s1 = Automerge.change(s1, "first change", doc => (doc.field = 123)) - s2 = Automerge.emptyChange(s1, "empty change") + describe('emptyChange()', () => { + it('should append an empty change to the history', () => { + s1 = Automerge.change(s1, 'first change', doc => doc.field = 123) + s2 = Automerge.emptyChange(s1, 'empty change') assert.notStrictEqual(s2, s1) assert.deepStrictEqual(s2, s1) - assert.deepStrictEqual( - Automerge.getHistory(s2).map(state => state.change.message), - ["first change", "empty change"] - ) + assert.deepStrictEqual(Automerge.getHistory(s2).map(state => state.change.message), ['first change', 'empty change']) }) - it("should reference dependencies", () => { - s1 = Automerge.change(s1, doc => (doc.field = 123)) + it('should reference dependencies', () => { + s1 = Automerge.change(s1, doc => doc.field = 123) s2 = Automerge.merge(Automerge.init(), s1) - s2 = Automerge.change(s2, doc => (doc.other = "hello")) + s2 = Automerge.change(s2, doc => doc.other = 'hello') s1 = Automerge.emptyChange(Automerge.merge(s1, s2)) const history = Automerge.getHistory(s1) const emptyChange = history[2].change - assert.deepStrictEqual( - emptyChange.deps, - [history[0].change.hash, history[1].change.hash].sort() - ) + assert.deepStrictEqual(emptyChange.deps, [history[0].change.hash, history[1].change.hash].sort()) assert.deepStrictEqual(emptyChange.ops, []) }) }) - describe("root object", () => { - it("should handle single-property assignment", () => { - s1 = Automerge.change(s1, "set bar", doc => (doc.foo = "bar")) - s1 = Automerge.change(s1, "set zap", doc => (doc.zip = "zap")) - assert.strictEqual(s1.foo, "bar") - assert.strictEqual(s1.zip, "zap") - assert.deepStrictEqual(s1, { foo: "bar", zip: "zap" }) + describe('root object', () => { + it('should handle single-property assignment', () => { + s1 = Automerge.change(s1, 'set bar', doc => doc.foo = 'bar') + s1 = Automerge.change(s1, 'set zap', doc => doc.zip = 'zap') + assert.strictEqual(s1.foo, 'bar') + assert.strictEqual(s1.zip, 'zap') + assert.deepStrictEqual(s1, {foo: 'bar', zip: 'zap'}) }) - it("should allow floating-point values", () => { - s1 = Automerge.change(s1, doc => (doc.number = 1589032171.1)) + it('should allow floating-point values', () => { + s1 = Automerge.change(s1, doc => doc.number = 1589032171.1) assert.strictEqual(s1.number, 1589032171.1) }) - it("should handle multi-property assignment", () => { - s1 = Automerge.change(s1, "multi-assign", doc => { - Object.assign(doc, { foo: "bar", answer: 42 }) + it('should handle multi-property assignment', () => { + s1 = Automerge.change(s1, 'multi-assign', doc => { + Object.assign(doc, {foo: 'bar', answer: 42}) }) - assert.strictEqual(s1.foo, "bar") + assert.strictEqual(s1.foo, 'bar') assert.strictEqual(s1.answer, 42) - assert.deepStrictEqual(s1, { foo: "bar", answer: 42 }) + assert.deepStrictEqual(s1, {foo: 'bar', answer: 42}) }) - it("should handle root property deletion", () => { - s1 = Automerge.change(s1, "set foo", doc => { - doc.foo = "bar" - doc.something = null - }) - s1 = Automerge.change(s1, "del foo", doc => { - delete doc.foo - }) + it('should handle root property deletion', () => { + s1 = Automerge.change(s1, 'set foo', doc => { doc.foo = 'bar'; doc.something = null }) + s1 = Automerge.change(s1, 'del foo', doc => { delete doc.foo }) assert.strictEqual(s1.foo, undefined) assert.strictEqual(s1.something, null) - assert.deepStrictEqual(s1, { something: null }) + assert.deepStrictEqual(s1, {something: null}) }) - it("should follow JS delete behavior", () => { - s1 = Automerge.change(s1, "set foo", doc => { - doc.foo = "bar" - }) - let deleted: any - s1 = Automerge.change(s1, "del foo", doc => { + it('should follow JS delete behavior', () => { + s1 = Automerge.change(s1, 'set foo', doc => { doc.foo = 'bar' }) + let deleted + s1 = Automerge.change(s1, 'del foo', doc => { deleted = delete doc.foo }) assert.strictEqual(deleted, true) - let deleted2: any + let deleted2 assert.doesNotThrow(() => { - s1 = Automerge.change(s1, "del baz", doc => { + s1 = Automerge.change(s1, 'del baz', doc => { deleted2 = delete doc.baz }) }) assert.strictEqual(deleted2, true) }) - it("should allow the type of a property to be changed", () => { - s1 = Automerge.change(s1, "set number", doc => (doc.prop = 123)) + it('should allow the type of a property to be changed', () => { + s1 = Automerge.change(s1, 'set number', doc => doc.prop = 123) assert.strictEqual(s1.prop, 123) - s1 = Automerge.change(s1, "set string", doc => (doc.prop = "123")) - assert.strictEqual(s1.prop, "123") - s1 = Automerge.change(s1, "set null", doc => (doc.prop = null)) + s1 = Automerge.change(s1, 'set string', doc => doc.prop = '123') + assert.strictEqual(s1.prop, '123') + s1 = Automerge.change(s1, 'set null', doc => doc.prop = null) assert.strictEqual(s1.prop, null) - s1 = Automerge.change(s1, "set bool", doc => (doc.prop = true)) + s1 = Automerge.change(s1, 'set bool', doc => doc.prop = true) assert.strictEqual(s1.prop, true) }) - it("should require property names to be valid", () => { + it('should require property names to be valid', () => { assert.throws(() => { - Automerge.change(s1, "foo", doc => (doc[""] = "x")) + Automerge.change(s1, 'foo', doc => doc[''] = 'x') }, /must not be an empty string/) }) - it("should not allow assignment of unsupported datatypes", () => { + it('should not allow assignment of unsupported datatypes', () => { Automerge.change(s1, doc => { - assert.throws(() => { - doc.foo = undefined - }, /Unsupported type of value: undefined/) - assert.throws(() => { - doc.foo = { prop: undefined } - }, /Unsupported type of value: undefined/) - assert.throws(() => { - doc.foo = () => {} - }, /Unsupported type of value: function/) - assert.throws(() => { - doc.foo = Symbol("foo") - }, /Unsupported type of value: symbol/) + assert.throws(() => { doc.foo = undefined }, /Unsupported type of value: undefined/) + assert.throws(() => { doc.foo = {prop: undefined} }, /Unsupported type of value: undefined/) + assert.throws(() => { doc.foo = () => {} }, /Unsupported type of value: function/) + assert.throws(() => { doc.foo = Symbol('foo') }, /Unsupported type of value: symbol/) }) }) }) - describe("nested maps", () => { - it("should assign an objectId to nested maps", () => { - s1 = Automerge.change(s1, doc => { - doc.nested = {} - }) - Automerge.getObjectId(s1.nested) - assert.strictEqual( - OPID_PATTERN.test(Automerge.getObjectId(s1.nested)!), - true - ) - assert.notEqual(Automerge.getObjectId(s1.nested), "_root") + describe('nested maps', () => { + it('should assign an objectId to nested maps', () => { + s1 = Automerge.change(s1, doc => { doc.nested = {} }) + let id = Automerge.getObjectId(s1.nested) + assert.strictEqual(OPID_PATTERN.test(Automerge.getObjectId(s1.nested)), true) + assert.notEqual(Automerge.getObjectId(s1.nested), '_root') }) - it("should handle assignment of a nested property", () => { - s1 = Automerge.change(s1, "first change", doc => { + it('should handle assignment of a nested property', () => { + s1 = Automerge.change(s1, 'first change', doc => { doc.nested = {} - doc.nested.foo = "bar" + doc.nested.foo = 'bar' }) - s1 = Automerge.change(s1, "second change", doc => { + s1 = Automerge.change(s1, 'second change', doc => { doc.nested.one = 1 }) - assert.deepStrictEqual(s1, { nested: { foo: "bar", one: 1 } }) - assert.deepStrictEqual(s1.nested, { foo: "bar", one: 1 }) - assert.strictEqual(s1.nested.foo, "bar") + assert.deepStrictEqual(s1, {nested: {foo: 'bar', one: 1}}) + assert.deepStrictEqual(s1.nested, {foo: 'bar', one: 1}) + assert.strictEqual(s1.nested.foo, 'bar') assert.strictEqual(s1.nested.one, 1) }) - it("should handle assignment of an object literal", () => { + it('should handle assignment of an object literal', () => { s1 = Automerge.change(s1, doc => { - doc.textStyle = { bold: false, fontSize: 12 } + doc.textStyle = {bold: false, fontSize: 12} }) - assert.deepStrictEqual(s1, { - textStyle: { bold: false, fontSize: 12 }, - }) - assert.deepStrictEqual(s1.textStyle, { bold: false, fontSize: 12 }) + assert.deepStrictEqual(s1, {textStyle: {bold: false, fontSize: 12}}) + assert.deepStrictEqual(s1.textStyle, {bold: false, fontSize: 12}) assert.strictEqual(s1.textStyle.bold, false) assert.strictEqual(s1.textStyle.fontSize, 12) }) - it("should handle assignment of multiple nested properties", () => { + it('should handle assignment of multiple nested properties', () => { s1 = Automerge.change(s1, doc => { - doc.textStyle = { bold: false, fontSize: 12 } - Object.assign(doc.textStyle, { typeface: "Optima", fontSize: 14 }) + doc.textStyle = {bold: false, fontSize: 12} + Object.assign(doc.textStyle, {typeface: 'Optima', fontSize: 14}) }) - assert.strictEqual(s1.textStyle.typeface, "Optima") + assert.strictEqual(s1.textStyle.typeface, 'Optima') assert.strictEqual(s1.textStyle.bold, false) assert.strictEqual(s1.textStyle.fontSize, 14) - assert.deepStrictEqual(s1.textStyle, { - typeface: "Optima", - bold: false, - fontSize: 14, - }) + assert.deepStrictEqual(s1.textStyle, {typeface: 'Optima', bold: false, fontSize: 14}) }) - it("should handle arbitrary-depth nesting", () => { + it('should handle arbitrary-depth nesting', () => { s1 = Automerge.change(s1, doc => { - doc.a = { b: { c: { d: { e: { f: { g: "h" } } } } } } + doc.a = {b: {c: {d: {e: {f: {g: 'h'}}}}}} }) s1 = Automerge.change(s1, doc => { - doc.a.b.c.d.e.f.i = "j" + doc.a.b.c.d.e.f.i = 'j' }) - assert.deepStrictEqual(s1, { - a: { b: { c: { d: { e: { f: { g: "h", i: "j" } } } } } }, - }) - assert.strictEqual(s1.a.b.c.d.e.f.g, "h") - assert.strictEqual(s1.a.b.c.d.e.f.i, "j") + assert.deepStrictEqual(s1, {a: { b: { c: { d: { e: { f: { g: 'h', i: 'j'}}}}}}}) + assert.strictEqual(s1.a.b.c.d.e.f.g, 'h') + assert.strictEqual(s1.a.b.c.d.e.f.i, 'j') }) - it("should allow an old object to be replaced with a new one", () => { - s1 = Automerge.change(s1, "change 1", doc => { - doc.myPet = { species: "dog", legs: 4, breed: "dachshund" } + it('should allow an old object to be replaced with a new one', () => { + s1 = Automerge.change(s1, 'change 1', doc => { + doc.myPet = {species: 'dog', legs: 4, breed: 'dachshund'} }) - let s2 = Automerge.change(s1, "change 2", doc => { - doc.myPet = { - species: "koi", - variety: "紅白", - colors: { red: true, white: true, black: false }, - } + s2 = Automerge.change(s1, 'change 2', doc => { + doc.myPet = {species: 'koi', variety: '紅白', colors: {red: true, white: true, black: false}} }) assert.deepStrictEqual(s1.myPet, { - species: "dog", - legs: 4, - breed: "dachshund", + species: 'dog', legs: 4, breed: 'dachshund' }) - assert.strictEqual(s1.myPet.breed, "dachshund") + assert.strictEqual(s1.myPet.breed, 'dachshund') assert.deepStrictEqual(s2.myPet, { - species: "koi", - variety: "紅白", - colors: { red: true, white: true, black: false }, + species: 'koi', variety: '紅白', + colors: {red: true, white: true, black: false} }) - // @ts-ignore assert.strictEqual(s2.myPet.breed, undefined) - assert.strictEqual(s2.myPet.variety, "紅白") + assert.strictEqual(s2.myPet.variety, '紅白') }) - it("should allow fields to be changed between primitive and nested map", () => { - s1 = Automerge.change(s1, doc => (doc.color = "#ff7f00")) - assert.strictEqual(s1.color, "#ff7f00") - s1 = Automerge.change( - s1, - doc => (doc.color = { red: 255, green: 127, blue: 0 }) - ) - assert.deepStrictEqual(s1.color, { red: 255, green: 127, blue: 0 }) - s1 = Automerge.change(s1, doc => (doc.color = "#ff7f00")) - assert.strictEqual(s1.color, "#ff7f00") + it('should allow fields to be changed between primitive and nested map', () => { + s1 = Automerge.change(s1, doc => doc.color = '#ff7f00') + assert.strictEqual(s1.color, '#ff7f00') + s1 = Automerge.change(s1, doc => doc.color = {red: 255, green: 127, blue: 0}) + assert.deepStrictEqual(s1.color, {red: 255, green: 127, blue: 0}) + s1 = Automerge.change(s1, doc => doc.color = '#ff7f00') + assert.strictEqual(s1.color, '#ff7f00') }) - it("should not allow several references to the same map object", () => { - s1 = Automerge.change(s1, doc => (doc.object = {})) + it('should not allow several references to the same map object', () => { + s1 = Automerge.change(s1, doc => doc.object = {}) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = doc.object - }) + Automerge.change(s1, doc => { doc.x = doc.object }) }, /Cannot create a reference to an existing document object/) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = s1.object - }) + Automerge.change(s1, doc => { doc.x = s1.object }) }, /Cannot create a reference to an existing document object/) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = {} - doc.y = doc.x - }) + Automerge.change(s1, doc => { doc.x = {}; doc.y = doc.x }) }, /Cannot create a reference to an existing document object/) }) - it("should not allow object-copying idioms", () => { + it('should not allow object-copying idioms', () => { s1 = Automerge.change(s1, doc => { - doc.items = [ - { id: "id1", name: "one" }, - { id: "id2", name: "two" }, - ] + doc.items = [{id: 'id1', name: 'one'}, {id: 'id2', name: 'two'}] }) // People who have previously worked with immutable state in JavaScript may be tempted // to use idioms like this, which don't work well with Automerge -- see e.g. // https://github.com/automerge/automerge/issues/260 assert.throws(() => { Automerge.change(s1, doc => { - doc.items = [...doc.items, { id: "id3", name: "three" }] + doc.items = [...doc.items, {id: 'id3', name: 'three'}] }) }, /Cannot create a reference to an existing document object/) }) - it("should handle deletion of properties within a map", () => { - s1 = Automerge.change(s1, "set style", doc => { - doc.textStyle = { typeface: "Optima", bold: false, fontSize: 12 } + it('should handle deletion of properties within a map', () => { + s1 = Automerge.change(s1, 'set style', doc => { + doc.textStyle = {typeface: 'Optima', bold: false, fontSize: 12} }) - s1 = Automerge.change(s1, "non-bold", doc => delete doc.textStyle.bold) + s1 = Automerge.change(s1, 'non-bold', doc => delete doc.textStyle.bold) assert.strictEqual(s1.textStyle.bold, undefined) - assert.deepStrictEqual(s1.textStyle, { - typeface: "Optima", - fontSize: 12, - }) + assert.deepStrictEqual(s1.textStyle, {typeface: 'Optima', fontSize: 12}) }) - it("should handle deletion of references to a map", () => { - s1 = Automerge.change(s1, "make rich text doc", doc => { - Object.assign(doc, { - title: "Hello", - textStyle: { typeface: "Optima", fontSize: 12 }, - }) + it('should handle deletion of references to a map', () => { + s1 = Automerge.change(s1, 'make rich text doc', doc => { + Object.assign(doc, {title: 'Hello', textStyle: {typeface: 'Optima', fontSize: 12}}) }) s1 = Automerge.change(s1, doc => delete doc.textStyle) assert.strictEqual(s1.textStyle, undefined) - assert.deepStrictEqual(s1, { title: "Hello" }) + assert.deepStrictEqual(s1, {title: 'Hello'}) }) - it("should validate field names", () => { - s1 = Automerge.change(s1, doc => (doc.nested = {})) - assert.throws(() => { - Automerge.change(s1, doc => (doc.nested[""] = "x")) - }, /must not be an empty string/) - assert.throws(() => { - Automerge.change(s1, doc => (doc.nested = { "": "x" })) - }, /must not be an empty string/) + it('should validate field names', () => { + s1 = Automerge.change(s1, doc => doc.nested = {}) + assert.throws(() => { Automerge.change(s1, doc => doc.nested[''] = 'x') }, /must not be an empty string/) + assert.throws(() => { Automerge.change(s1, doc => doc.nested = {'': 'x'}) }, /must not be an empty string/) }) }) - describe("lists", () => { - it("should allow elements to be inserted", () => { - s1 = Automerge.change(s1, doc => (doc.noodles = [])) - s1 = Automerge.change(s1, doc => - doc.noodles.insertAt(0, "udon", "soba") - ) - s1 = Automerge.change(s1, doc => doc.noodles.insertAt(1, "ramen")) - assert.deepStrictEqual(s1, { noodles: ["udon", "ramen", "soba"] }) - assert.deepStrictEqual(s1.noodles, ["udon", "ramen", "soba"]) - assert.strictEqual(s1.noodles[0], "udon") - assert.strictEqual(s1.noodles[1], "ramen") - assert.strictEqual(s1.noodles[2], "soba") + describe('lists', () => { + it('should allow elements to be inserted', () => { + s1 = Automerge.change(s1, doc => doc.noodles = []) + s1 = Automerge.change(s1, doc => doc.noodles.insertAt(0, 'udon', 'soba')) + s1 = Automerge.change(s1, doc => doc.noodles.insertAt(1, 'ramen')) + assert.deepStrictEqual(s1, {noodles: ['udon', 'ramen', 'soba']}) + assert.deepStrictEqual(s1.noodles, ['udon', 'ramen', 'soba']) + assert.strictEqual(s1.noodles[0], 'udon') + assert.strictEqual(s1.noodles[1], 'ramen') + assert.strictEqual(s1.noodles[2], 'soba') assert.strictEqual(s1.noodles.length, 3) }) - it("should handle assignment of a list literal", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "ramen", "soba"]) - ) - assert.deepStrictEqual(s1, { noodles: ["udon", "ramen", "soba"] }) - assert.deepStrictEqual(s1.noodles, ["udon", "ramen", "soba"]) - assert.strictEqual(s1.noodles[0], "udon") - assert.strictEqual(s1.noodles[1], "ramen") - assert.strictEqual(s1.noodles[2], "soba") + it('should handle assignment of a list literal', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'ramen', 'soba']) + assert.deepStrictEqual(s1, {noodles: ['udon', 'ramen', 'soba']}) + assert.deepStrictEqual(s1.noodles, ['udon', 'ramen', 'soba']) + assert.strictEqual(s1.noodles[0], 'udon') + assert.strictEqual(s1.noodles[1], 'ramen') + assert.strictEqual(s1.noodles[2], 'soba') assert.strictEqual(s1.noodles[3], undefined) assert.strictEqual(s1.noodles.length, 3) }) - it("should only allow numeric indexes", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "ramen", "soba"]) - ) - s1 = Automerge.change(s1, doc => (doc.noodles[1] = "Ramen!")) - assert.strictEqual(s1.noodles[1], "Ramen!") - s1 = Automerge.change(s1, doc => (doc.noodles["1"] = "RAMEN!!!")) - assert.strictEqual(s1.noodles[1], "RAMEN!!!") - assert.throws(() => { - Automerge.change(s1, doc => (doc.noodles.favourite = "udon")) - }, /list index must be a number/) - assert.throws(() => { - Automerge.change(s1, doc => (doc.noodles[""] = "udon")) - }, /list index must be a number/) - assert.throws(() => { - Automerge.change(s1, doc => (doc.noodles["1e6"] = "udon")) - }, /list index must be a number/) + it('should only allow numeric indexes', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'ramen', 'soba']) + s1 = Automerge.change(s1, doc => doc.noodles[1] = 'Ramen!') + assert.strictEqual(s1.noodles[1], 'Ramen!') + s1 = Automerge.change(s1, doc => doc.noodles['1'] = 'RAMEN!!!') + assert.strictEqual(s1.noodles[1], 'RAMEN!!!') + assert.throws(() => { Automerge.change(s1, doc => doc.noodles.favourite = 'udon') }, /list index must be a number/) + assert.throws(() => { Automerge.change(s1, doc => doc.noodles[''] = 'udon') }, /list index must be a number/) + assert.throws(() => { Automerge.change(s1, doc => doc.noodles['1e6'] = 'udon') }, /list index must be a number/) }) - it("should handle deletion of list elements", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "ramen", "soba"]) - ) + it('should handle deletion of list elements', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'ramen', 'soba']) s1 = Automerge.change(s1, doc => delete doc.noodles[1]) - assert.deepStrictEqual(s1.noodles, ["udon", "soba"]) + assert.deepStrictEqual(s1.noodles, ['udon', 'soba']) s1 = Automerge.change(s1, doc => doc.noodles.deleteAt(1)) - assert.deepStrictEqual(s1.noodles, ["udon"]) - assert.strictEqual(s1.noodles[0], "udon") + assert.deepStrictEqual(s1.noodles, ['udon']) + assert.strictEqual(s1.noodles[0], 'udon') assert.strictEqual(s1.noodles[1], undefined) assert.strictEqual(s1.noodles[2], undefined) assert.strictEqual(s1.noodles.length, 1) }) - it("should handle assignment of individual list indexes", () => { - s1 = Automerge.change( - s1, - doc => (doc.japaneseFood = ["udon", "ramen", "soba"]) - ) - s1 = Automerge.change(s1, doc => (doc.japaneseFood[1] = "sushi")) - assert.deepStrictEqual(s1.japaneseFood, ["udon", "sushi", "soba"]) - assert.strictEqual(s1.japaneseFood[0], "udon") - assert.strictEqual(s1.japaneseFood[1], "sushi") - assert.strictEqual(s1.japaneseFood[2], "soba") + it('should handle assignment of individual list indexes', () => { + s1 = Automerge.change(s1, doc => doc.japaneseFood = ['udon', 'ramen', 'soba']) + s1 = Automerge.change(s1, doc => doc.japaneseFood[1] = 'sushi') + assert.deepStrictEqual(s1.japaneseFood, ['udon', 'sushi', 'soba']) + assert.strictEqual(s1.japaneseFood[0], 'udon') + assert.strictEqual(s1.japaneseFood[1], 'sushi') + assert.strictEqual(s1.japaneseFood[2], 'soba') assert.strictEqual(s1.japaneseFood[3], undefined) assert.strictEqual(s1.japaneseFood.length, 3) }) - it("concurrent edits insert in reverse actorid order if counters equal", () => { - s1 = Automerge.init("aaaa") - s2 = Automerge.init("bbbb") - s1 = Automerge.change(s1, doc => (doc.list = [])) + it('concurrent edits insert in reverse actorid order if counters equal', () => { + s1 = Automerge.init('aaaa') + s2 = Automerge.init('bbbb') + s1 = Automerge.change(s1, doc => doc.list = []) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.list.splice(0, 0, "2@aaaa")) s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "2@bbbb")) @@ -778,112 +617,75 @@ describe("Automerge", () => { assert.deepStrictEqual(Automerge.toJS(s2).list, ["2@bbbb", "2@aaaa"]) }) - it("concurrent edits insert in reverse counter order if different", () => { - s1 = Automerge.init("aaaa") - s2 = Automerge.init("bbbb") - s1 = Automerge.change(s1, doc => (doc.list = [])) + it('concurrent edits insert in reverse counter order if different', () => { + s1 = Automerge.init('aaaa') + s2 = Automerge.init('bbbb') + s1 = Automerge.change(s1, doc => doc.list = []) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.list.splice(0, 0, "2@aaaa")) - s2 = Automerge.change(s2, doc => (doc.foo = "2@bbbb")) - s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "3@bbbb")) - s2 = Automerge.merge(s2, s1) - assert.deepStrictEqual(s2.list, ["3@bbbb", "2@aaaa"]) + s2 = Automerge.change(s2, doc => doc.foo = "2@bbbb") + s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "3@bbbb")) + s2 = Automerge.merge(s2, s1) + assert.deepStrictEqual(s2.list, ["3@bbbb", "2@aaaa"]) }) - it("should treat out-by-one assignment as insertion", () => { - s1 = Automerge.change(s1, doc => (doc.japaneseFood = ["udon"])) - s1 = Automerge.change(s1, doc => (doc.japaneseFood[1] = "sushi")) - assert.deepStrictEqual(s1.japaneseFood, ["udon", "sushi"]) - assert.strictEqual(s1.japaneseFood[0], "udon") - assert.strictEqual(s1.japaneseFood[1], "sushi") + it('should treat out-by-one assignment as insertion', () => { + s1 = Automerge.change(s1, doc => doc.japaneseFood = ['udon']) + s1 = Automerge.change(s1, doc => doc.japaneseFood[1] = 'sushi') + assert.deepStrictEqual(s1.japaneseFood, ['udon', 'sushi']) + assert.strictEqual(s1.japaneseFood[0], 'udon') + assert.strictEqual(s1.japaneseFood[1], 'sushi') assert.strictEqual(s1.japaneseFood[2], undefined) assert.strictEqual(s1.japaneseFood.length, 2) }) - it("should not allow out-of-range assignment", () => { - s1 = Automerge.change(s1, doc => (doc.japaneseFood = ["udon"])) - assert.throws(() => { - Automerge.change(s1, doc => (doc.japaneseFood[4] = "ramen")) - }, /is out of bounds/) + it('should not allow out-of-range assignment', () => { + s1 = Automerge.change(s1, doc => doc.japaneseFood = ['udon']) + assert.throws(() => { Automerge.change(s1, doc => doc.japaneseFood[4] = 'ramen') }, /is out of bounds/) }) - it("should allow bulk assignment of multiple list indexes", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "ramen", "soba"]) - ) - s1 = Automerge.change(s1, doc => - Object.assign(doc.noodles, { 0: "うどん", 2: "そば" }) - ) - assert.deepStrictEqual(s1.noodles, ["うどん", "ramen", "そば"]) - assert.strictEqual(s1.noodles[0], "うどん") - assert.strictEqual(s1.noodles[1], "ramen") - assert.strictEqual(s1.noodles[2], "そば") + it('should allow bulk assignment of multiple list indexes', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'ramen', 'soba']) + s1 = Automerge.change(s1, doc => Object.assign(doc.noodles, {0: 'うどん', 2: 'そば'})) + assert.deepStrictEqual(s1.noodles, ['うどん', 'ramen', 'そば']) + assert.strictEqual(s1.noodles[0], 'うどん') + assert.strictEqual(s1.noodles[1], 'ramen') + assert.strictEqual(s1.noodles[2], 'そば') assert.strictEqual(s1.noodles.length, 3) }) - it("should handle nested objects", () => { - s1 = Automerge.change( - s1, - doc => - (doc.noodles = [{ type: "ramen", dishes: ["tonkotsu", "shoyu"] }]) - ) - s1 = Automerge.change(s1, doc => - doc.noodles.push({ type: "udon", dishes: ["tempura udon"] }) - ) - s1 = Automerge.change(s1, doc => doc.noodles[0].dishes.push("miso")) - assert.deepStrictEqual(s1, { - noodles: [ - { type: "ramen", dishes: ["tonkotsu", "shoyu", "miso"] }, - { type: "udon", dishes: ["tempura udon"] }, - ], - }) + it('should handle nested objects', () => { + s1 = Automerge.change(s1, doc => doc.noodles = [{type: 'ramen', dishes: ['tonkotsu', 'shoyu']}]) + s1 = Automerge.change(s1, doc => doc.noodles.push({type: 'udon', dishes: ['tempura udon']})) + s1 = Automerge.change(s1, doc => doc.noodles[0].dishes.push('miso')) + assert.deepStrictEqual(s1, {noodles: [ + {type: 'ramen', dishes: ['tonkotsu', 'shoyu', 'miso']}, + {type: 'udon', dishes: ['tempura udon']} + ]}) assert.deepStrictEqual(s1.noodles[0], { - type: "ramen", - dishes: ["tonkotsu", "shoyu", "miso"], + type: 'ramen', dishes: ['tonkotsu', 'shoyu', 'miso'] }) assert.deepStrictEqual(s1.noodles[1], { - type: "udon", - dishes: ["tempura udon"], + type: 'udon', dishes: ['tempura udon'] }) }) - it("should handle nested lists", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodleMatrix = [["ramen", "tonkotsu", "shoyu"]]) - ) - s1 = Automerge.change(s1, doc => - doc.noodleMatrix.push(["udon", "tempura udon"]) - ) - s1 = Automerge.change(s1, doc => doc.noodleMatrix[0].push("miso")) - assert.deepStrictEqual(s1.noodleMatrix, [ - ["ramen", "tonkotsu", "shoyu", "miso"], - ["udon", "tempura udon"], - ]) - assert.deepStrictEqual(s1.noodleMatrix[0], [ - "ramen", - "tonkotsu", - "shoyu", - "miso", - ]) - assert.deepStrictEqual(s1.noodleMatrix[1], ["udon", "tempura udon"]) + it('should handle nested lists', () => { + s1 = Automerge.change(s1, doc => doc.noodleMatrix = [['ramen', 'tonkotsu', 'shoyu']]) + s1 = Automerge.change(s1, doc => doc.noodleMatrix.push(['udon', 'tempura udon'])) + s1 = Automerge.change(s1, doc => doc.noodleMatrix[0].push('miso')) + assert.deepStrictEqual(s1.noodleMatrix, [['ramen', 'tonkotsu', 'shoyu', 'miso'], ['udon', 'tempura udon']]) + assert.deepStrictEqual(s1.noodleMatrix[0], ['ramen', 'tonkotsu', 'shoyu', 'miso']) + assert.deepStrictEqual(s1.noodleMatrix[1], ['udon', 'tempura udon']) }) - it("should handle deep nesting", () => { - s1 = Automerge.change( - s1, - doc => - (doc.nesting = { - maps: { m1: { m2: { foo: "bar", baz: {} }, m2a: {} } }, - lists: [ - [1, 2, 3], - [[3, 4, 5, [6]], 7], - ], - mapsinlists: [{ foo: "bar" }, [{ bar: "baz" }]], - listsinmaps: { foo: [1, 2, 3], bar: [[{ baz: "123" }]] }, - }) - ) + it('should handle deep nesting', () => { + s1 = Automerge.change(s1, doc => doc.nesting = { + maps: { m1: { m2: { foo: "bar", baz: {} }, m2a: { } } }, + lists: [ [ 1, 2, 3 ], [ [ 3, 4, 5, [6]], 7 ] ], + mapsinlists: [ { foo: "bar" }, [ { bar: "baz" } ] ], + listsinmaps: { foo: [1, 2, 3], bar: [ [ { baz: "123" } ] ] } + }) s1 = Automerge.change(s1, doc => { doc.nesting.maps.m1a = "123" doc.nesting.maps.m1.m2.baz.xxx = "123" @@ -898,152 +700,94 @@ describe("Automerge", () => { doc.nesting.listsinmaps.bar[0][0].baz = "456" delete doc.nesting.listsinmaps.bar }) - assert.deepStrictEqual(s1, { - nesting: { - maps: { - m1: { m2: { foo: "bar", baz: { xxx: "123" } } }, - m1a: "123", - }, - lists: [[[3, 4, 5, 100], 7]], - mapsinlists: [{ foo: "baz" }], - listsinmaps: { foo: [1, 2, 3, 4] }, - }, - }) + assert.deepStrictEqual(s1, { nesting: { + maps: { m1: { m2: { foo: "bar", baz: { xxx: "123" } } }, m1a: "123" }, + lists: [ [ [ 3, 4, 5, 100 ], 7 ] ], + mapsinlists: [ { foo: "baz" } ], + listsinmaps: { foo: [1, 2, 3, 4] } + }}) }) - it("should handle replacement of the entire list", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "soba", "ramen"]) - ) - s1 = Automerge.change( - s1, - doc => (doc.japaneseNoodles = doc.noodles.slice()) - ) - s1 = Automerge.change(s1, doc => (doc.noodles = ["wonton", "pho"])) + it('should handle replacement of the entire list', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'soba', 'ramen']) + s1 = Automerge.change(s1, doc => doc.japaneseNoodles = doc.noodles.slice()) + s1 = Automerge.change(s1, doc => doc.noodles = ['wonton', 'pho']) assert.deepStrictEqual(s1, { - noodles: ["wonton", "pho"], - japaneseNoodles: ["udon", "soba", "ramen"], + noodles: ['wonton', 'pho'], + japaneseNoodles: ['udon', 'soba', 'ramen'] }) - assert.deepStrictEqual(s1.noodles, ["wonton", "pho"]) - assert.strictEqual(s1.noodles[0], "wonton") - assert.strictEqual(s1.noodles[1], "pho") + assert.deepStrictEqual(s1.noodles, ['wonton', 'pho']) + assert.strictEqual(s1.noodles[0], 'wonton') + assert.strictEqual(s1.noodles[1], 'pho') assert.strictEqual(s1.noodles[2], undefined) assert.strictEqual(s1.noodles.length, 2) }) - it("should allow assignment to change the type of a list element", () => { - s1 = Automerge.change( - s1, - doc => (doc.noodles = ["udon", "soba", "ramen"]) - ) - assert.deepStrictEqual(s1.noodles, ["udon", "soba", "ramen"]) - s1 = Automerge.change( - s1, - doc => (doc.noodles[1] = { type: "soba", options: ["hot", "cold"] }) - ) - assert.deepStrictEqual(s1.noodles, [ - "udon", - { type: "soba", options: ["hot", "cold"] }, - "ramen", - ]) - s1 = Automerge.change( - s1, - doc => (doc.noodles[1] = ["hot soba", "cold soba"]) - ) - assert.deepStrictEqual(s1.noodles, [ - "udon", - ["hot soba", "cold soba"], - "ramen", - ]) - s1 = Automerge.change(s1, doc => (doc.noodles[1] = "soba is the best")) - assert.deepStrictEqual(s1.noodles, [ - "udon", - "soba is the best", - "ramen", - ]) + it('should allow assignment to change the type of a list element', () => { + s1 = Automerge.change(s1, doc => doc.noodles = ['udon', 'soba', 'ramen']) + assert.deepStrictEqual(s1.noodles, ['udon', 'soba', 'ramen']) + s1 = Automerge.change(s1, doc => doc.noodles[1] = {type: 'soba', options: ['hot', 'cold']}) + assert.deepStrictEqual(s1.noodles, ['udon', {type: 'soba', options: ['hot', 'cold']}, 'ramen']) + s1 = Automerge.change(s1, doc => doc.noodles[1] = ['hot soba', 'cold soba']) + assert.deepStrictEqual(s1.noodles, ['udon', ['hot soba', 'cold soba'], 'ramen']) + s1 = Automerge.change(s1, doc => doc.noodles[1] = 'soba is the best') + assert.deepStrictEqual(s1.noodles, ['udon', 'soba is the best', 'ramen']) }) - it("should allow list creation and assignment in the same change callback", () => { + it('should allow list creation and assignment in the same change callback', () => { s1 = Automerge.change(Automerge.init(), doc => { - doc.letters = ["a", "b", "c"] - doc.letters[1] = "d" + doc.letters = ['a', 'b', 'c'] + doc.letters[1] = 'd' }) - assert.strictEqual(s1.letters[1], "d") + assert.strictEqual(s1.letters[1], 'd') }) - it("should allow adding and removing list elements in the same change callback", () => { - let s1 = Automerge.change( - Automerge.init<{ noodles: Array }>(), - // @ts-ignore - doc => (doc.noodles = []) - ) + it('should allow adding and removing list elements in the same change callback', () => { + s1 = Automerge.change(Automerge.init(), doc => doc.noodles = []) s1 = Automerge.change(s1, doc => { - doc.noodles.push("udon") - // @ts-ignore + doc.noodles.push('udon') doc.noodles.deleteAt(0) }) - assert.deepStrictEqual(s1, { noodles: [] }) + assert.deepStrictEqual(s1, {noodles: []}) // do the add-remove cycle twice, test for #151 (https://github.com/automerge/automerge/issues/151) s1 = Automerge.change(s1, doc => { - // @ts-ignore - doc.noodles.push("soba") - // @ts-ignore + doc.noodles.push('soba') doc.noodles.deleteAt(0) }) - assert.deepStrictEqual(s1, { noodles: [] }) + assert.deepStrictEqual(s1, {noodles: []}) }) - it("should handle arbitrary-depth nesting", () => { - s1 = Automerge.change( - s1, - doc => (doc.maze = [[[[[[[["noodles", ["here"]]]]]]]]]) - ) - s1 = Automerge.change(s1, doc => - doc.maze[0][0][0][0][0][0][0][1].unshift("found") - ) - assert.deepStrictEqual(s1.maze, [ - [[[[[[["noodles", ["found", "here"]]]]]]]], - ]) - assert.deepStrictEqual(s1.maze[0][0][0][0][0][0][0][1][1], "here") + it('should handle arbitrary-depth nesting', () => { + s1 = Automerge.change(s1, doc => doc.maze = [[[[[[[['noodles', ['here']]]]]]]]]) + s1 = Automerge.change(s1, doc => doc.maze[0][0][0][0][0][0][0][1].unshift('found')) + assert.deepStrictEqual(s1.maze, [[[[[[[['noodles', ['found', 'here']]]]]]]]]) + assert.deepStrictEqual(s1.maze[0][0][0][0][0][0][0][1][1], 'here') s2 = Automerge.load(Automerge.save(s1)) - assert.deepStrictEqual(s1, s2) + assert.deepStrictEqual(s1,s2) }) - it("should not allow several references to the same list object", () => { - s1 = Automerge.change(s1, doc => (doc.list = [])) + it('should not allow several references to the same list object', () => { + s1 = Automerge.change(s1, doc => doc.list = []) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = doc.list - }) + Automerge.change(s1, doc => { doc.x = doc.list }) }, /Cannot create a reference to an existing document object/) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = s1.list - }) + Automerge.change(s1, doc => { doc.x = s1.list }) }, /Cannot create a reference to an existing document object/) assert.throws(() => { - Automerge.change(s1, doc => { - doc.x = [] - doc.y = doc.x - }) + Automerge.change(s1, doc => { doc.x = []; doc.y = doc.x }) }, /Cannot create a reference to an existing document object/) }) }) - describe("counters", () => { + describe('counters', () => { // counter - it("should allow deleting counters from maps", () => { - const s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = { wrens: new Automerge.Counter(1) }) - ) + it('should allow deleting counters from maps', () => { + const s1 = Automerge.change(Automerge.init(), doc => doc.birds = {wrens: new Automerge.Counter(1)}) const s2 = Automerge.change(s1, doc => doc.birds.wrens.increment(2)) const s3 = Automerge.change(s2, doc => delete doc.birds.wrens) - assert.deepStrictEqual(s2, { - birds: { wrens: new Automerge.Counter(3) }, - }) - assert.deepStrictEqual(s3, { birds: {} }) + assert.deepStrictEqual(s2, {birds: {wrens: new Automerge.Counter(3)}}) + assert.deepStrictEqual(s3, {birds: {}}) }) // counter @@ -1058,33 +802,30 @@ describe("Automerge", () => { }) }) - describe("concurrent use", () => { - let s1: Automerge.Doc, - s2: Automerge.Doc, - s3: Automerge.Doc, - s4: Automerge.Doc + describe('concurrent use', () => { + let s1, s2, s3, s4 beforeEach(() => { - s1 = Automerge.init() - s2 = Automerge.init() - s3 = Automerge.init() - s4 = Automerge.init() + s1 = Automerge.init() + s2 = Automerge.init() + s3 = Automerge.init() + s4 = Automerge.init() }) - it("should merge concurrent updates of different properties", () => { - s1 = Automerge.change(s1, doc => (doc.foo = "bar")) - s2 = Automerge.change(s2, doc => (doc.hello = "world")) + it('should merge concurrent updates of different properties', () => { + s1 = Automerge.change(s1, doc => doc.foo = 'bar') + s2 = Automerge.change(s2, doc => doc.hello = 'world') s3 = Automerge.merge(s1, s2) - assert.strictEqual(s3.foo, "bar") - assert.strictEqual(s3.hello, "world") - assert.deepStrictEqual(s3, { foo: "bar", hello: "world" }) - assert.strictEqual(Automerge.getConflicts(s3, "foo"), undefined) - assert.strictEqual(Automerge.getConflicts(s3, "hello"), undefined) + assert.strictEqual(s3.foo, 'bar') + assert.strictEqual(s3.hello, 'world') + assert.deepStrictEqual(s3, {foo: 'bar', hello: 'world'}) + assert.strictEqual(Automerge.getConflicts(s3, 'foo'), undefined) + assert.strictEqual(Automerge.getConflicts(s3, 'hello'), undefined) s4 = Automerge.load(Automerge.save(s3)) - assert.deepEqual(s3, s4) + assert.deepEqual(s3,s4) }) - it("should add concurrent increments of the same property", () => { - s1 = Automerge.change(s1, doc => (doc.counter = new Automerge.Counter())) + it('should add concurrent increments of the same property', () => { + s1 = Automerge.change(s1, doc => doc.counter = new Automerge.Counter()) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.counter.increment()) s2 = Automerge.change(s2, doc => doc.counter.increment(2)) @@ -1092,523 +833,391 @@ describe("Automerge", () => { assert.strictEqual(s1.counter.value, 1) assert.strictEqual(s2.counter.value, 2) assert.strictEqual(s3.counter.value, 3) - assert.strictEqual(Automerge.getConflicts(s3, "counter"), undefined) + assert.strictEqual(Automerge.getConflicts(s3, 'counter'), undefined) s4 = Automerge.load(Automerge.save(s3)) - assert.deepEqual(s3, s4) + assert.deepEqual(s3,s4) }) - it("should add increments only to the values they precede", () => { - s1 = Automerge.change(s1, doc => (doc.counter = new Automerge.Counter(0))) + it('should add increments only to the values they precede', () => { + s1 = Automerge.change(s1, doc => doc.counter = new Automerge.Counter(0)) s1 = Automerge.change(s1, doc => doc.counter.increment()) - s2 = Automerge.change( - s2, - doc => (doc.counter = new Automerge.Counter(100)) - ) + s2 = Automerge.change(s2, doc => doc.counter = new Automerge.Counter(100)) s2 = Automerge.change(s2, doc => doc.counter.increment(3)) s3 = Automerge.merge(s1, s2) if (Automerge.getActorId(s1) > Automerge.getActorId(s2)) { - assert.deepStrictEqual(s3, { counter: new Automerge.Counter(1) }) + assert.deepStrictEqual(s3, {counter: new Automerge.Counter(1)}) } else { - assert.deepStrictEqual(s3, { counter: new Automerge.Counter(103) }) + assert.deepStrictEqual(s3, {counter: new Automerge.Counter(103)}) } - assert.deepStrictEqual(Automerge.getConflicts(s3, "counter"), { + assert.deepStrictEqual(Automerge.getConflicts(s3, 'counter'), { [`1@${Automerge.getActorId(s1)}`]: new Automerge.Counter(1), - [`1@${Automerge.getActorId(s2)}`]: new Automerge.Counter(103), + [`1@${Automerge.getActorId(s2)}`]: new Automerge.Counter(103) }) s4 = Automerge.load(Automerge.save(s3)) - assert.deepEqual(s3, s4) + assert.deepEqual(s3,s4) }) - it("should detect concurrent updates of the same field", () => { - s1 = Automerge.change(s1, doc => (doc.field = "one")) - s2 = Automerge.change(s2, doc => (doc.field = "two")) + it('should detect concurrent updates of the same field', () => { + s1 = Automerge.change(s1, doc => doc.field = 'one') + s2 = Automerge.change(s2, doc => doc.field = 'two') s3 = Automerge.merge(s1, s2) if (Automerge.getActorId(s1) > Automerge.getActorId(s2)) { - assert.deepStrictEqual(s3, { field: "one" }) + assert.deepStrictEqual(s3, {field: 'one'}) } else { - assert.deepStrictEqual(s3, { field: "two" }) + assert.deepStrictEqual(s3, {field: 'two'}) } - assert.deepStrictEqual(Automerge.getConflicts(s3, "field"), { - [`1@${Automerge.getActorId(s1)}`]: "one", - [`1@${Automerge.getActorId(s2)}`]: "two", + assert.deepStrictEqual(Automerge.getConflicts(s3, 'field'), { + [`1@${Automerge.getActorId(s1)}`]: 'one', + [`1@${Automerge.getActorId(s2)}`]: 'two' }) }) - it("should detect concurrent updates of the same list element", () => { - s1 = Automerge.change(s1, doc => (doc.birds = ["finch"])) + it('should detect concurrent updates of the same list element', () => { + s1 = Automerge.change(s1, doc => doc.birds = ['finch']) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => (doc.birds[0] = "greenfinch")) - s2 = Automerge.change(s2, doc => (doc.birds[0] = "goldfinch_")) + s1 = Automerge.change(s1, doc => doc.birds[0] = 'greenfinch') + s2 = Automerge.change(s2, doc => doc.birds[0] = 'goldfinch_') s3 = Automerge.merge(s1, s2) if (Automerge.getActorId(s1) > Automerge.getActorId(s2)) { - assert.deepStrictEqual(s3.birds, ["greenfinch"]) + assert.deepStrictEqual(s3.birds, ['greenfinch']) } else { - assert.deepStrictEqual(s3.birds, ["goldfinch_"]) + assert.deepStrictEqual(s3.birds, ['goldfinch_']) } assert.deepStrictEqual(Automerge.getConflicts(s3.birds, 0), { - [`8@${Automerge.getActorId(s1)}`]: "greenfinch", - [`8@${Automerge.getActorId(s2)}`]: "goldfinch_", + [`8@${Automerge.getActorId(s1)}`]: 'greenfinch', + [`8@${Automerge.getActorId(s2)}`]: 'goldfinch_' }) }) - it("should handle assignment conflicts of different types", () => { - s1 = Automerge.change(s1, doc => (doc.field = "string")) - s2 = Automerge.change(s2, doc => (doc.field = ["list"])) - s3 = Automerge.change(s3, doc => (doc.field = { thing: "map" })) + it('should handle assignment conflicts of different types', () => { + s1 = Automerge.change(s1, doc => doc.field = 'string') + s2 = Automerge.change(s2, doc => doc.field = ['list']) + s3 = Automerge.change(s3, doc => doc.field = {thing: 'map'}) s1 = Automerge.merge(Automerge.merge(s1, s2), s3) - assertEqualsOneOf(s1.field, "string", ["list"], { thing: "map" }) - assert.deepStrictEqual(Automerge.getConflicts(s1, "field"), { - [`1@${Automerge.getActorId(s1)}`]: "string", - [`1@${Automerge.getActorId(s2)}`]: ["list"], - [`1@${Automerge.getActorId(s3)}`]: { thing: "map" }, + assertEqualsOneOf(s1.field, 'string', ['list'], {thing: 'map'}) + assert.deepStrictEqual(Automerge.getConflicts(s1, 'field'), { + [`1@${Automerge.getActorId(s1)}`]: 'string', + [`1@${Automerge.getActorId(s2)}`]: ['list'], + [`1@${Automerge.getActorId(s3)}`]: {thing: 'map'} }) }) - it("should handle changes within a conflicting map field", () => { - s1 = Automerge.change(s1, doc => (doc.field = "string")) - s2 = Automerge.change(s2, doc => (doc.field = {})) - s2 = Automerge.change(s2, doc => (doc.field.innerKey = 42)) + it('should handle changes within a conflicting map field', () => { + s1 = Automerge.change(s1, doc => doc.field = 'string') + s2 = Automerge.change(s2, doc => doc.field = {}) + s2 = Automerge.change(s2, doc => doc.field.innerKey = 42) s3 = Automerge.merge(s1, s2) - assertEqualsOneOf(s3.field, "string", { innerKey: 42 }) - assert.deepStrictEqual(Automerge.getConflicts(s3, "field"), { - [`1@${Automerge.getActorId(s1)}`]: "string", - [`1@${Automerge.getActorId(s2)}`]: { innerKey: 42 }, + assertEqualsOneOf(s3.field, 'string', {innerKey: 42}) + assert.deepStrictEqual(Automerge.getConflicts(s3, 'field'), { + [`1@${Automerge.getActorId(s1)}`]: 'string', + [`1@${Automerge.getActorId(s2)}`]: {innerKey: 42} }) }) - it("should handle changes within a conflicting list element", () => { - s1 = Automerge.change(s1, doc => (doc.list = ["hello"])) + it('should handle changes within a conflicting list element', () => { + s1 = Automerge.change(s1, doc => doc.list = ['hello']) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => (doc.list[0] = { map1: true })) - s1 = Automerge.change(s1, doc => (doc.list[0].key = 1)) - s2 = Automerge.change(s2, doc => (doc.list[0] = { map2: true })) - s2 = Automerge.change(s2, doc => (doc.list[0].key = 2)) + s1 = Automerge.change(s1, doc => doc.list[0] = {map1: true}) + s1 = Automerge.change(s1, doc => doc.list[0].key = 1) + s2 = Automerge.change(s2, doc => doc.list[0] = {map2: true}) + s2 = Automerge.change(s2, doc => doc.list[0].key = 2) s3 = Automerge.merge(s1, s2) if (Automerge.getActorId(s1) > Automerge.getActorId(s2)) { - assert.deepStrictEqual(s3.list, [{ map1: true, key: 1 }]) + assert.deepStrictEqual(s3.list, [{map1: true, key: 1}]) } else { - assert.deepStrictEqual(s3.list, [{ map2: true, key: 2 }]) + assert.deepStrictEqual(s3.list, [{map2: true, key: 2}]) } - assert.deepStrictEqual(Automerge.getConflicts(s3.list, 0), { - [`8@${Automerge.getActorId(s1)}`]: { map1: true, key: 1 }, - [`8@${Automerge.getActorId(s2)}`]: { map2: true, key: 2 }, + assert.deepStrictEqual(Automerge.getConflicts(s3.list, 0), { + [`8@${Automerge.getActorId(s1)}`]: {map1: true, key: 1}, + [`8@${Automerge.getActorId(s2)}`]: {map2: true, key: 2} }) }) - it("should not merge concurrently assigned nested maps", () => { - s1 = Automerge.change(s1, doc => (doc.config = { background: "blue" })) - s2 = Automerge.change(s2, doc => (doc.config = { logo_url: "logo.png" })) + it('should not merge concurrently assigned nested maps', () => { + s1 = Automerge.change(s1, doc => doc.config = {background: 'blue'}) + s2 = Automerge.change(s2, doc => doc.config = {logo_url: 'logo.png'}) s3 = Automerge.merge(s1, s2) - assertEqualsOneOf( - s3.config, - { background: "blue" }, - { logo_url: "logo.png" } - ) - assert.deepStrictEqual(Automerge.getConflicts(s3, "config"), { - [`1@${Automerge.getActorId(s1)}`]: { background: "blue" }, - [`1@${Automerge.getActorId(s2)}`]: { logo_url: "logo.png" }, + assertEqualsOneOf(s3.config, {background: 'blue'}, {logo_url: 'logo.png'}) + assert.deepStrictEqual(Automerge.getConflicts(s3, 'config'), { + [`1@${Automerge.getActorId(s1)}`]: {background: 'blue'}, + [`1@${Automerge.getActorId(s2)}`]: {logo_url: 'logo.png'} }) }) - it("should clear conflicts after assigning a new value", () => { - s1 = Automerge.change(s1, doc => (doc.field = "one")) - s2 = Automerge.change(s2, doc => (doc.field = "two")) + it('should clear conflicts after assigning a new value', () => { + s1 = Automerge.change(s1, doc => doc.field = 'one') + s2 = Automerge.change(s2, doc => doc.field = 'two') s3 = Automerge.merge(s1, s2) - s3 = Automerge.change(s3, doc => (doc.field = "three")) - assert.deepStrictEqual(s3, { field: "three" }) - assert.strictEqual(Automerge.getConflicts(s3, "field"), undefined) + s3 = Automerge.change(s3, doc => doc.field = 'three') + assert.deepStrictEqual(s3, {field: 'three'}) + assert.strictEqual(Automerge.getConflicts(s3, 'field'), undefined) s2 = Automerge.merge(s2, s3) - assert.deepStrictEqual(s2, { field: "three" }) - assert.strictEqual(Automerge.getConflicts(s2, "field"), undefined) + assert.deepStrictEqual(s2, {field: 'three'}) + assert.strictEqual(Automerge.getConflicts(s2, 'field'), undefined) }) - it("should handle concurrent insertions at different list positions", () => { - s1 = Automerge.change(s1, doc => (doc.list = ["one", "three"])) + it('should handle concurrent insertions at different list positions', () => { + s1 = Automerge.change(s1, doc => doc.list = ['one', 'three']) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => doc.list.splice(1, 0, "two")) - s2 = Automerge.change(s2, doc => doc.list.push("four")) + s1 = Automerge.change(s1, doc => doc.list.splice(1, 0, 'two')) + s2 = Automerge.change(s2, doc => doc.list.push('four')) s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s3, { list: ["one", "two", "three", "four"] }) - assert.strictEqual(Automerge.getConflicts(s3, "list"), undefined) + assert.deepStrictEqual(s3, {list: ['one', 'two', 'three', 'four']}) + assert.strictEqual(Automerge.getConflicts(s3, 'list'), undefined) }) - it("should handle concurrent insertions at the same list position", () => { - s1 = Automerge.change(s1, doc => (doc.birds = ["parakeet"])) + it('should handle concurrent insertions at the same list position', () => { + s1 = Automerge.change(s1, doc => doc.birds = ['parakeet']) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => doc.birds.push("starling")) - s2 = Automerge.change(s2, doc => doc.birds.push("chaffinch")) + s1 = Automerge.change(s1, doc => doc.birds.push('starling')) + s2 = Automerge.change(s2, doc => doc.birds.push('chaffinch')) s3 = Automerge.merge(s1, s2) - assertEqualsOneOf( - s3.birds, - ["parakeet", "starling", "chaffinch"], - ["parakeet", "chaffinch", "starling"] - ) + assertEqualsOneOf(s3.birds, ['parakeet', 'starling', 'chaffinch'], ['parakeet', 'chaffinch', 'starling']) s2 = Automerge.merge(s2, s3) assert.deepStrictEqual(s2, s3) }) - it("should handle concurrent assignment and deletion of a map entry", () => { + it('should handle concurrent assignment and deletion of a map entry', () => { // Add-wins semantics - s1 = Automerge.change(s1, doc => (doc.bestBird = "robin")) + s1 = Automerge.change(s1, doc => doc.bestBird = 'robin') s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => delete doc.bestBird) - s2 = Automerge.change(s2, doc => (doc.bestBird = "magpie")) + s2 = Automerge.change(s2, doc => doc.bestBird = 'magpie') s3 = Automerge.merge(s1, s2) assert.deepStrictEqual(s1, {}) - assert.deepStrictEqual(s2, { bestBird: "magpie" }) - assert.deepStrictEqual(s3, { bestBird: "magpie" }) - assert.strictEqual(Automerge.getConflicts(s3, "bestBird"), undefined) + assert.deepStrictEqual(s2, {bestBird: 'magpie'}) + assert.deepStrictEqual(s3, {bestBird: 'magpie'}) + assert.strictEqual(Automerge.getConflicts(s3, 'bestBird'), undefined) }) - it("should handle concurrent assignment and deletion of a list element", () => { + it('should handle concurrent assignment and deletion of a list element', () => { // Concurrent assignment ressurects a deleted list element. Perhaps a little // surprising, but consistent with add-wins semantics of maps (see test above) - s1 = Automerge.change( - s1, - doc => (doc.birds = ["blackbird", "thrush", "goldfinch"]) - ) + s1 = Automerge.change(s1, doc => doc.birds = ['blackbird', 'thrush', 'goldfinch']) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => (doc.birds[1] = "starling")) + s1 = Automerge.change(s1, doc => doc.birds[1] = 'starling') s2 = Automerge.change(s2, doc => doc.birds.splice(1, 1)) s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s1.birds, ["blackbird", "starling", "goldfinch"]) - assert.deepStrictEqual(s2.birds, ["blackbird", "goldfinch"]) - assert.deepStrictEqual(s3.birds, ["blackbird", "starling", "goldfinch"]) + assert.deepStrictEqual(s1.birds, ['blackbird', 'starling', 'goldfinch']) + assert.deepStrictEqual(s2.birds, ['blackbird', 'goldfinch']) + assert.deepStrictEqual(s3.birds, ['blackbird', 'starling', 'goldfinch']) s4 = Automerge.load(Automerge.save(s3)) - assert.deepStrictEqual(s3, s4) + assert.deepStrictEqual(s3, s4); }) - it("should handle insertion after a deleted list element", () => { - s1 = Automerge.change( - s1, - doc => (doc.birds = ["blackbird", "thrush", "goldfinch"]) - ) + it('should handle insertion after a deleted list element', () => { + s1 = Automerge.change(s1, doc => doc.birds = ['blackbird', 'thrush', 'goldfinch']) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.birds.splice(1, 2)) - s2 = Automerge.change(s2, doc => doc.birds.splice(2, 0, "starling")) + s2 = Automerge.change(s2, doc => doc.birds.splice(2, 0, 'starling')) s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s3, { birds: ["blackbird", "starling"] }) - assert.deepStrictEqual(Automerge.merge(s2, s3), { - birds: ["blackbird", "starling"], - }) + assert.deepStrictEqual(s3, {birds: ['blackbird', 'starling']}) + assert.deepStrictEqual(Automerge.merge(s2, s3), {birds: ['blackbird', 'starling']}) }) - it("should handle concurrent deletion of the same element", () => { - s1 = Automerge.change( - s1, - doc => (doc.birds = ["albatross", "buzzard", "cormorant"]) - ) + it('should handle concurrent deletion of the same element', () => { + s1 = Automerge.change(s1, doc => doc.birds = ['albatross', 'buzzard', 'cormorant']) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.birds.deleteAt(1)) // buzzard s2 = Automerge.change(s2, doc => doc.birds.deleteAt(1)) // buzzard s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s3.birds, ["albatross", "cormorant"]) + assert.deepStrictEqual(s3.birds, ['albatross', 'cormorant']) }) - it("should handle concurrent deletion of different elements", () => { - s1 = Automerge.change( - s1, - doc => (doc.birds = ["albatross", "buzzard", "cormorant"]) - ) + it('should handle concurrent deletion of different elements', () => { + s1 = Automerge.change(s1, doc => doc.birds = ['albatross', 'buzzard', 'cormorant']) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => doc.birds.deleteAt(0)) // albatross s2 = Automerge.change(s2, doc => doc.birds.deleteAt(1)) // buzzard s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s3.birds, ["cormorant"]) + assert.deepStrictEqual(s3.birds, ['cormorant']) }) - it("should handle concurrent updates at different levels of the tree", () => { + it('should handle concurrent updates at different levels of the tree', () => { // A delete higher up in the tree overrides an update in a subtree - s1 = Automerge.change( - s1, - doc => - (doc.animals = { - birds: { pink: "flamingo", black: "starling" }, - mammals: ["badger"], - }) - ) + s1 = Automerge.change(s1, doc => doc.animals = {birds: {pink: 'flamingo', black: 'starling'}, mammals: ['badger']}) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => (doc.animals.birds.brown = "sparrow")) + s1 = Automerge.change(s1, doc => doc.animals.birds.brown = 'sparrow') s2 = Automerge.change(s2, doc => delete doc.animals.birds) s3 = Automerge.merge(s1, s2) assert.deepStrictEqual(s1.animals, { birds: { - pink: "flamingo", - brown: "sparrow", - black: "starling", + pink: 'flamingo', brown: 'sparrow', black: 'starling' }, - mammals: ["badger"], + mammals: ['badger'] }) - assert.deepStrictEqual(s2.animals, { mammals: ["badger"] }) - assert.deepStrictEqual(s3.animals, { mammals: ["badger"] }) + assert.deepStrictEqual(s2.animals, {mammals: ['badger']}) + assert.deepStrictEqual(s3.animals, {mammals: ['badger']}) }) - it("should handle updates of concurrently deleted objects", () => { - s1 = Automerge.change( - s1, - doc => (doc.birds = { blackbird: { feathers: "black" } }) - ) + it('should handle updates of concurrently deleted objects', () => { + s1 = Automerge.change(s1, doc => doc.birds = {blackbird: {feathers: 'black'}}) s2 = Automerge.merge(s2, s1) s1 = Automerge.change(s1, doc => delete doc.birds.blackbird) - s2 = Automerge.change(s2, doc => (doc.birds.blackbird.beak = "orange")) + s2 = Automerge.change(s2, doc => doc.birds.blackbird.beak = 'orange') s3 = Automerge.merge(s1, s2) - assert.deepStrictEqual(s1, { birds: {} }) + assert.deepStrictEqual(s1, {birds: {}}) }) - it("should not interleave sequence insertions at the same position", () => { - s1 = Automerge.change(s1, doc => (doc.wisdom = [])) + it('should not interleave sequence insertions at the same position', () => { + s1 = Automerge.change(s1, doc => doc.wisdom = []) s2 = Automerge.merge(s2, s1) - s1 = Automerge.change(s1, doc => - doc.wisdom.push("to", "be", "is", "to", "do") - ) - s2 = Automerge.change(s2, doc => - doc.wisdom.push("to", "do", "is", "to", "be") - ) + s1 = Automerge.change(s1, doc => doc.wisdom.push('to', 'be', 'is', 'to', 'do')) + s2 = Automerge.change(s2, doc => doc.wisdom.push('to', 'do', 'is', 'to', 'be')) s3 = Automerge.merge(s1, s2) - assertEqualsOneOf( - s3.wisdom, - ["to", "be", "is", "to", "do", "to", "do", "is", "to", "be"], - ["to", "do", "is", "to", "be", "to", "be", "is", "to", "do"] - ) + assertEqualsOneOf(s3.wisdom, + ['to', 'be', 'is', 'to', 'do', 'to', 'do', 'is', 'to', 'be'], + ['to', 'do', 'is', 'to', 'be', 'to', 'be', 'is', 'to', 'do']) // In case you're wondering: http://quoteinvestigator.com/2013/09/16/do-be-do/ }) - describe("multiple insertions at the same list position", () => { - it("should handle insertion by greater actor ID", () => { - s1 = Automerge.init("aaaa") - s2 = Automerge.init("bbbb") - s1 = Automerge.change(s1, doc => (doc.list = ["two"])) + describe('multiple insertions at the same list position', () => { + it('should handle insertion by greater actor ID', () => { + s1 = Automerge.init('aaaa') + s2 = Automerge.init('bbbb') + s1 = Automerge.change(s1, doc => doc.list = ['two']) s2 = Automerge.merge(s2, s1) - s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "one")) - assert.deepStrictEqual(s2.list, ["one", "two"]) + s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, 'one')) + assert.deepStrictEqual(s2.list, ['one', 'two']) }) - it("should handle insertion by lesser actor ID", () => { - s1 = Automerge.init("bbbb") - s2 = Automerge.init("aaaa") - s1 = Automerge.change(s1, doc => (doc.list = ["two"])) + it('should handle insertion by lesser actor ID', () => { + s1 = Automerge.init('bbbb') + s2 = Automerge.init('aaaa') + s1 = Automerge.change(s1, doc => doc.list = ['two']) s2 = Automerge.merge(s2, s1) - s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "one")) - assert.deepStrictEqual(s2.list, ["one", "two"]) + s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, 'one')) + assert.deepStrictEqual(s2.list, ['one', 'two']) }) - it("should handle insertion regardless of actor ID", () => { - s1 = Automerge.change(s1, doc => (doc.list = ["two"])) + it('should handle insertion regardless of actor ID', () => { + s1 = Automerge.change(s1, doc => doc.list = ['two']) s2 = Automerge.merge(s2, s1) - s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, "one")) - assert.deepStrictEqual(s2.list, ["one", "two"]) + s2 = Automerge.change(s2, doc => doc.list.splice(0, 0, 'one')) + assert.deepStrictEqual(s2.list, ['one', 'two']) }) - it("should make insertion order consistent with causality", () => { - s1 = Automerge.change(s1, doc => (doc.list = ["four"])) + it('should make insertion order consistent with causality', () => { + s1 = Automerge.change(s1, doc => doc.list = ['four']) s2 = Automerge.merge(s2, s1) - s2 = Automerge.change(s2, doc => doc.list.unshift("three")) + s2 = Automerge.change(s2, doc => doc.list.unshift('three')) s1 = Automerge.merge(s1, s2) - s1 = Automerge.change(s1, doc => doc.list.unshift("two")) + s1 = Automerge.change(s1, doc => doc.list.unshift('two')) s2 = Automerge.merge(s2, s1) - s2 = Automerge.change(s2, doc => doc.list.unshift("one")) - assert.deepStrictEqual(s2.list, ["one", "two", "three", "four"]) + s2 = Automerge.change(s2, doc => doc.list.unshift('one')) + assert.deepStrictEqual(s2.list, ['one', 'two', 'three', 'four']) }) }) }) - describe("saving and loading", () => { - it("should save and restore an empty document", () => { + describe('saving and loading', () => { + it('should save and restore an empty document', () => { let s = Automerge.load(Automerge.save(Automerge.init())) assert.deepStrictEqual(s, {}) }) - it("should generate a new random actor ID", () => { + it('should generate a new random actor ID', () => { let s1 = Automerge.init() let s2 = Automerge.load(Automerge.save(s1)) - assert.strictEqual( - UUID_PATTERN.test(Automerge.getActorId(s1).toString()), - true - ) - assert.strictEqual( - UUID_PATTERN.test(Automerge.getActorId(s2).toString()), - true - ) + assert.strictEqual(UUID_PATTERN.test(Automerge.getActorId(s1).toString()), true) + assert.strictEqual(UUID_PATTERN.test(Automerge.getActorId(s2).toString()), true) assert.notEqual(Automerge.getActorId(s1), Automerge.getActorId(s2)) }) - it("should allow a custom actor ID to be set", () => { - let s = Automerge.load(Automerge.save(Automerge.init()), "333333") - assert.strictEqual(Automerge.getActorId(s), "333333") + it('should allow a custom actor ID to be set', () => { + let s = Automerge.load(Automerge.save(Automerge.init()), '333333') + assert.strictEqual(Automerge.getActorId(s), '333333') }) - it("should reconstitute complex datatypes", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.todos = [{ title: "water plants", done: false }]) - ) + it('should reconstitute complex datatypes', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc.todos = [{title: 'water plants', done: false}]) let s2 = Automerge.load(Automerge.save(s1)) - assert.deepStrictEqual(s2, { - todos: [{ title: "water plants", done: false }], - }) + assert.deepStrictEqual(s2, {todos: [{title: 'water plants', done: false}]}) }) - it("should save and load maps with @ symbols in the keys", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc["123@4567"] = "hello") - ) + it('should save and load maps with @ symbols in the keys', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc["123@4567"] = "hello") let s2 = Automerge.load(Automerge.save(s1)) assert.deepStrictEqual(s2, { "123@4567": "hello" }) }) - it("should reconstitute conflicts", () => { - let s1 = Automerge.change( - Automerge.init("111111"), - doc => (doc.x = 3) - ) - let s2 = Automerge.change( - Automerge.init("222222"), - doc => (doc.x = 5) - ) + it('should reconstitute conflicts', () => { + let s1 = Automerge.change(Automerge.init('111111'), doc => doc.x = 3) + let s2 = Automerge.change(Automerge.init('222222'), doc => doc.x = 5) s1 = Automerge.merge(s1, s2) - let s3 = Automerge.load(Automerge.save(s1)) + let s3 = Automerge.load(Automerge.save(s1)) assert.strictEqual(s1.x, 5) assert.strictEqual(s3.x, 5) - assert.deepStrictEqual(Automerge.getConflicts(s1, "x"), { - "1@111111": 3, - "1@222222": 5, - }) - assert.deepStrictEqual(Automerge.getConflicts(s3, "x"), { - "1@111111": 3, - "1@222222": 5, - }) + assert.deepStrictEqual(Automerge.getConflicts(s1, 'x'), {'1@111111': 3, '1@222222': 5}) + assert.deepStrictEqual(Automerge.getConflicts(s3, 'x'), {'1@111111': 3, '1@222222': 5}) }) - it("should reconstitute element ID counters", () => { - const s1 = Automerge.init("01234567") - const s2 = Automerge.change(s1, doc => (doc.list = ["a"])) + it('should reconstitute element ID counters', () => { + const s1 = Automerge.init('01234567') + const s2 = Automerge.change(s1, doc => doc.list = ['a']) const listId = Automerge.getObjectId(s2.list) - const changes12 = Automerge.getAllChanges(s2).map(Automerge.decodeChange) - assert.deepStrictEqual(changes12, [ - { - hash: changes12[0].hash, - actor: "01234567", - seq: 1, - startOp: 1, - time: changes12[0].time, - message: null, - deps: [], - ops: [ - { obj: "_root", action: "makeList", key: "list", pred: [] }, - { - obj: listId, - action: "makeText", - elemId: "_head", - insert: true, - pred: [], - }, - { - obj: "2@01234567", - action: "set", - elemId: "_head", - insert: true, - value: "a", - pred: [], - }, - ], - }, - ]) + const changes12 = Automerge.getAllChanges(s2).map(decodeChange) + assert.deepStrictEqual(changes12, [{ + hash: changes12[0].hash, actor: '01234567', seq: 1, startOp: 1, + time: changes12[0].time, message: '', deps: [], ops: [ + {obj: '_root', action: 'makeList', key: 'list', insert: false, pred: []}, + {obj: listId, action: 'makeText', elemId: '_head', insert: true, pred: []}, + {obj: "2@01234567", action: 'set', elemId: '_head', insert: true, value: 'a', pred: []} + ] + }]) const s3 = Automerge.change(s2, doc => doc.list.deleteAt(0)) - const s4 = Automerge.load(Automerge.save(s3), "01234567") - const s5 = Automerge.change(s4, doc => doc.list.push("b")) - const changes45 = Automerge.getAllChanges(s5).map(Automerge.decodeChange) - assert.deepStrictEqual(s5, { list: ["b"] }) + const s4 = Automerge.load(Automerge.save(s3), '01234567') + const s5 = Automerge.change(s4, doc => doc.list.push('b')) + const changes45 = Automerge.getAllChanges(s5).map(decodeChange) + assert.deepStrictEqual(s5, {list: ['b']}) assert.deepStrictEqual(changes45[2], { - hash: changes45[2].hash, - actor: "01234567", - seq: 3, - startOp: 5, - time: changes45[2].time, - message: null, - deps: [changes45[1].hash], - ops: [ - { - obj: listId, - action: "makeText", - elemId: "_head", - insert: true, - pred: [], - }, - { - obj: "5@01234567", - action: "set", - elemId: "_head", - insert: true, - value: "b", - pred: [], - }, - ], + hash: changes45[2].hash, actor: '01234567', seq: 3, startOp: 5, + time: changes45[2].time, message: '', deps: [changes45[1].hash], ops: [ + {obj: listId, action: 'makeText', elemId: '_head', insert: true, pred: []}, + {obj: "5@01234567", action: 'set', elemId: '_head', insert: true, value: 'b', pred: []} + ] }) }) - it("should allow a reloaded list to be mutated", () => { - let doc = Automerge.change(Automerge.init(), doc => (doc.foo = [])) + it('should allow a reloaded list to be mutated', () => { + let doc = Automerge.change(Automerge.init(), doc => doc.foo = []) doc = Automerge.load(Automerge.save(doc)) - doc = Automerge.change(doc, "add", doc => doc.foo.push(1)) + doc = Automerge.change(doc, 'add', doc => doc.foo.push(1)) doc = Automerge.load(Automerge.save(doc)) assert.deepStrictEqual(doc.foo, [1]) }) - it("should reload a document containing deflated columns", () => { + it('should reload a document containing deflated columns', () => { // In this test, the keyCtr column is long enough for deflate compression to kick in, but the // keyStr column is short. Thus, the deflate bit gets set for keyCtr but not for keyStr. // When checking whether the columns appear in ascending order, we must ignore the deflate bit. - let doc = Automerge.change(Automerge.init(), doc => { + let doc = Automerge.change(Automerge.init(), doc => { doc.list = [] - for (let i = 0; i < 200; i++) - doc.list.insertAt(Math.floor(Math.random() * i), "a") + for (let i = 0; i < 200; i++) doc.list.insertAt(Math.floor(Math.random() * i), 'a') }) - Automerge.load(Automerge.save(doc)) - let expected: Array = [] - for (let i = 0; i < 200; i++) expected.push("a") - assert.deepStrictEqual(doc, { list: expected }) + Automerge.load(Automerge.save(doc)) + let expected = [] + for (let i = 0; i < 200; i++) expected.push('a') + assert.deepStrictEqual(doc, {list: expected}) }) - it.skip("should call patchCallback if supplied to load", () => { - const s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Goldfinch"]) - ) - const s2 = Automerge.change(s1, doc => doc.birds.push("Chaffinch")) - const callbacks: Array = [], - actor = Automerge.getActorId(s1) - const reloaded = Automerge.load(Automerge.save(s2), { - patchCallback(patch, before, after) { - callbacks.push({ patch, before, after }) - }, + it.skip('should call patchCallback if supplied to load', () => { + const s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Goldfinch']) + const s2 = Automerge.change(s1, doc => doc.birds.push('Chaffinch')) + const callbacks = [], actor = Automerge.getActorId(s1) + const reloaded = Automerge.load(Automerge.save(s2), { + patchCallback(patch, before, after, local) { + callbacks.push({patch, before, after, local}) + } }) assert.strictEqual(callbacks.length, 1) assert.deepStrictEqual(callbacks[0].patch, { - maxOp: 3, - deps: [decodeChange(Automerge.getAllChanges(s2)[1]).hash], - clock: { [actor]: 2 }, - pendingChanges: 0, - diffs: { - objectId: "_root", - type: "map", - props: { - birds: { - [`1@${actor}`]: { - objectId: `1@${actor}`, - type: "list", - edits: [ - { - action: "multi-insert", - index: 0, - elemId: `2@${actor}`, - values: ["Goldfinch", "Chaffinch"], - }, - ], - }, - }, - }, - }, + maxOp: 3, deps: [decodeChange(Automerge.getAllChanges(s2)[1]).hash], clock: {[actor]: 2}, pendingChanges: 0, + diffs: {objectId: '_root', type: 'map', props: {birds: {[`1@${actor}`]: { + objectId: `1@${actor}`, type: 'list', edits: [ + {action: 'multi-insert', index: 0, elemId: `2@${actor}`, values: ['Goldfinch', 'Chaffinch']} + ] + }}}} }) assert.deepStrictEqual(callbacks[0].before, {}) assert.strictEqual(callbacks[0].after, reloaded) @@ -1616,155 +1225,99 @@ describe("Automerge", () => { }) }) - describe("history API", () => { - it("should return an empty history for an empty document", () => { + describe('history API', () => { + it('should return an empty history for an empty document', () => { assert.deepStrictEqual(Automerge.getHistory(Automerge.init()), []) }) - it("should make past document states accessible", () => { - let s = Automerge.init() - s = Automerge.change(s, doc => (doc.config = { background: "blue" })) - s = Automerge.change(s, doc => (doc.birds = ["mallard"])) - s = Automerge.change(s, doc => doc.birds.unshift("oystercatcher")) - assert.deepStrictEqual( - Automerge.getHistory(s).map(state => state.snapshot), - [ - { config: { background: "blue" } }, - { config: { background: "blue" }, birds: ["mallard"] }, - { - config: { background: "blue" }, - birds: ["oystercatcher", "mallard"], - }, - ] - ) + it('should make past document states accessible', () => { + let s = Automerge.init() + s = Automerge.change(s, doc => doc.config = {background: 'blue'}) + s = Automerge.change(s, doc => doc.birds = ['mallard']) + s = Automerge.change(s, doc => doc.birds.unshift('oystercatcher')) + assert.deepStrictEqual(Automerge.getHistory(s).map(state => state.snapshot), [ + {config: {background: 'blue'}}, + {config: {background: 'blue'}, birds: ['mallard']}, + {config: {background: 'blue'}, birds: ['oystercatcher', 'mallard']} + ]) }) - it("should make change messages accessible", () => { - let s = Automerge.init() - s = Automerge.change(s, "Empty Bookshelf", doc => (doc.books = [])) - s = Automerge.change(s, "Add Orwell", doc => - doc.books.push("Nineteen Eighty-Four") - ) - s = Automerge.change(s, "Add Huxley", doc => - doc.books.push("Brave New World") - ) - assert.deepStrictEqual(s.books, [ - "Nineteen Eighty-Four", - "Brave New World", - ]) - assert.deepStrictEqual( - Automerge.getHistory(s).map(state => state.change.message), - ["Empty Bookshelf", "Add Orwell", "Add Huxley"] - ) + it('should make change messages accessible', () => { + let s = Automerge.init() + s = Automerge.change(s, 'Empty Bookshelf', doc => doc.books = []) + s = Automerge.change(s, 'Add Orwell', doc => doc.books.push('Nineteen Eighty-Four')) + s = Automerge.change(s, 'Add Huxley', doc => doc.books.push('Brave New World')) + assert.deepStrictEqual(s.books, ['Nineteen Eighty-Four', 'Brave New World']) + assert.deepStrictEqual(Automerge.getHistory(s).map(state => state.change.message), + ['Empty Bookshelf', 'Add Orwell', 'Add Huxley']) }) }) - describe("changes API", () => { - it("should return an empty list on an empty document", () => { + describe('changes API', () => { + it('should return an empty list on an empty document', () => { let changes = Automerge.getAllChanges(Automerge.init()) assert.deepStrictEqual(changes, []) }) - it("should return an empty list when nothing changed", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Chaffinch"]) - ) + it('should return an empty list when nothing changed', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Chaffinch']) assert.deepStrictEqual(Automerge.getChanges(s1, s1), []) }) - it("should do nothing when applying an empty list of changes", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Chaffinch"]) - ) + it('should do nothing when applying an empty list of changes', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Chaffinch']) assert.deepStrictEqual(Automerge.applyChanges(s1, [])[0], s1) }) - it("should return all changes when compared to an empty document", () => { - let s1 = Automerge.change( - Automerge.init(), - "Add Chaffinch", - doc => (doc.birds = ["Chaffinch"]) - ) - let s2 = Automerge.change(s1, "Add Bullfinch", doc => - doc.birds.push("Bullfinch") - ) + it('should return all changes when compared to an empty document', () => { + let s1 = Automerge.change(Automerge.init(), 'Add Chaffinch', doc => doc.birds = ['Chaffinch']) + let s2 = Automerge.change(s1, 'Add Bullfinch', doc => doc.birds.push('Bullfinch')) let changes = Automerge.getChanges(Automerge.init(), s2) assert.strictEqual(changes.length, 2) }) - it("should allow a document copy to be reconstructed from scratch", () => { - let s1 = Automerge.change( - Automerge.init(), - "Add Chaffinch", - doc => (doc.birds = ["Chaffinch"]) - ) - let s2 = Automerge.change(s1, "Add Bullfinch", doc => - doc.birds.push("Bullfinch") - ) + it('should allow a document copy to be reconstructed from scratch', () => { + let s1 = Automerge.change(Automerge.init(), 'Add Chaffinch', doc => doc.birds = ['Chaffinch']) + let s2 = Automerge.change(s1, 'Add Bullfinch', doc => doc.birds.push('Bullfinch')) let changes = Automerge.getAllChanges(s2) - let [s3] = Automerge.applyChanges(Automerge.init(), changes) - assert.deepStrictEqual(s3.birds, ["Chaffinch", "Bullfinch"]) + let [s3] = Automerge.applyChanges(Automerge.init(), changes) + assert.deepStrictEqual(s3.birds, ['Chaffinch', 'Bullfinch']) }) - it("should return changes since the last given version", () => { - let s1 = Automerge.change( - Automerge.init(), - "Add Chaffinch", - doc => (doc.birds = ["Chaffinch"]) - ) + it('should return changes since the last given version', () => { + let s1 = Automerge.change(Automerge.init(), 'Add Chaffinch', doc => doc.birds = ['Chaffinch']) let changes1 = Automerge.getAllChanges(s1) - let s2 = Automerge.change(s1, "Add Bullfinch", doc => - doc.birds.push("Bullfinch") - ) + let s2 = Automerge.change(s1, 'Add Bullfinch', doc => doc.birds.push('Bullfinch')) let changes2 = Automerge.getChanges(s1, s2) assert.strictEqual(changes1.length, 1) // Add Chaffinch assert.strictEqual(changes2.length, 1) // Add Bullfinch }) - it("should incrementally apply changes since the last given version", () => { - let s1 = Automerge.change( - Automerge.init(), - "Add Chaffinch", - doc => (doc.birds = ["Chaffinch"]) - ) + it('should incrementally apply changes since the last given version', () => { + let s1 = Automerge.change(Automerge.init(), 'Add Chaffinch', doc => doc.birds = ['Chaffinch']) let changes1 = Automerge.getAllChanges(s1) - let s2 = Automerge.change(s1, "Add Bullfinch", doc => - doc.birds.push("Bullfinch") - ) + let s2 = Automerge.change(s1, 'Add Bullfinch', doc => doc.birds.push('Bullfinch')) let changes2 = Automerge.getChanges(s1, s2) - let [s3] = Automerge.applyChanges(Automerge.init(), changes1) + let [s3] = Automerge.applyChanges(Automerge.init(), changes1) let [s4] = Automerge.applyChanges(s3, changes2) - assert.deepStrictEqual(s3.birds, ["Chaffinch"]) - assert.deepStrictEqual(s4.birds, ["Chaffinch", "Bullfinch"]) + assert.deepStrictEqual(s3.birds, ['Chaffinch']) + assert.deepStrictEqual(s4.birds, ['Chaffinch', 'Bullfinch']) }) - it("should handle updates to a list element", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Chaffinch", "Bullfinch"]) - ) - let s2 = Automerge.change(s1, doc => (doc.birds[0] = "Goldfinch")) - let [s3] = Automerge.applyChanges( - Automerge.init(), - Automerge.getAllChanges(s2) - ) - assert.deepStrictEqual(s3.birds, ["Goldfinch", "Bullfinch"]) + it('should handle updates to a list element', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Chaffinch', 'Bullfinch']) + let s2 = Automerge.change(s1, doc => doc.birds[0] = 'Goldfinch') + let [s3] = Automerge.applyChanges(Automerge.init(), Automerge.getAllChanges(s2)) + assert.deepStrictEqual(s3.birds, ['Goldfinch', 'Bullfinch']) assert.strictEqual(Automerge.getConflicts(s3.birds, 0), undefined) }) // TEXT - it("should handle updates to a text object", () => { - let s1 = Automerge.change(Automerge.init(), doc => (doc.text = "ab")) - let s2 = Automerge.change(s1, doc => - Automerge.splice(doc, "text", 0, 1, "A") - ) - let [s3] = Automerge.applyChanges( - Automerge.init(), - Automerge.getAllChanges(s2) - ) - assert.deepStrictEqual([...s3.text], ["A", "b"]) + it('should handle updates to a text object', () => { + let s1 = Automerge.change(Automerge.init(), doc => doc.text = 'ab') + let s2 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 0, 1, "A")) + let [s3] = Automerge.applyChanges(Automerge.init(), Automerge.getAllChanges(s2)) + assert.deepStrictEqual([...s3.text], ['A', 'b']) }) /* @@ -1785,89 +1338,60 @@ describe("Automerge", () => { }) */ - it("should report missing dependencies with out-of-order applyChanges", () => { - let s0 = Automerge.init() - let s1 = Automerge.change(s0, doc => (doc.test = ["a"])) + it('should report missing dependencies with out-of-order applyChanges', () => { + let s0 = Automerge.init() + let s1 = Automerge.change(s0, doc => doc.test = ['a']) let changes01 = Automerge.getAllChanges(s1) - let s2 = Automerge.change(s1, doc => (doc.test = ["b"])) + let s2 = Automerge.change(s1, doc => doc.test = ['b']) let changes12 = Automerge.getChanges(s1, s2) - let s3 = Automerge.change(s2, doc => (doc.test = ["c"])) + let s3 = Automerge.change(s2, doc => doc.test = ['c']) let changes23 = Automerge.getChanges(s2, s3) let s4 = Automerge.init() let [s5] = Automerge.applyChanges(s4, changes23) let [s6] = Automerge.applyChanges(s5, changes12) - assert.deepStrictEqual(Automerge.getMissingDeps(s6, []), [ - decodeChange(changes01[0]).hash, - ]) + assert.deepStrictEqual(Automerge.getMissingDeps(s6), [decodeChange(changes01[0]).hash]) }) - it("should call patchCallback if supplied when applying changes", () => { - const s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Goldfinch"]) - ) - const callbacks: Array = [] + it('should call patchCallback if supplied when applying changes', () => { + const s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Goldfinch']) + const callbacks = [], actor = Automerge.getActorId(s1) const before = Automerge.init() - const [after] = Automerge.applyChanges( - before, - Automerge.getAllChanges(s1), - { - patchCallback(patch, before, after) { - callbacks.push({ patch, before, after }) - }, + const [after, patch] = Automerge.applyChanges(before, Automerge.getAllChanges(s1), { + patchCallback(patch, before, after) { + callbacks.push({patch, before, after}) } - ) + }) assert.strictEqual(callbacks.length, 1) - assert.deepStrictEqual(callbacks[0].patch[0], { - action: "put", - path: ["birds"], - value: [], - }) - assert.deepStrictEqual(callbacks[0].patch[1], { - action: "insert", - path: ["birds", 0], - values: [""], - }) - assert.deepStrictEqual(callbacks[0].patch[2], { - action: "splice", - path: ["birds", 0, 0], - value: "Goldfinch", - }) + assert.deepStrictEqual(callbacks[0].patch[0], { action: 'put', path: ["birds"], value: [] }) + assert.deepStrictEqual(callbacks[0].patch[1], { action: 'insert', path: ["birds",0], values: [""] }) + assert.deepStrictEqual(callbacks[0].patch[2], { action: 'splice', path: ["birds",0,0], value: "Goldfinch" }) assert.strictEqual(callbacks[0].before, before) assert.strictEqual(callbacks[0].after, after) }) - it("should merge multiple applied changes into one patch", () => { - const s1 = Automerge.change( - Automerge.init(), - doc => (doc.birds = ["Goldfinch"]) - ) - const s2 = Automerge.change(s1, doc => doc.birds.push("Chaffinch")) - const patches: Array = [] - Automerge.applyChanges(Automerge.init(), Automerge.getAllChanges(s2), { - patchCallback: p => patches.push(...p), - }) + it('should merge multiple applied changes into one patch', () => { + const s1 = Automerge.change(Automerge.init(), doc => doc.birds = ['Goldfinch']) + const s2 = Automerge.change(s1, doc => doc.birds.push('Chaffinch')) + const patches = [], actor = Automerge.getActorId(s2) + Automerge.applyChanges(Automerge.init(), Automerge.getAllChanges(s2), + {patchCallback: p => patches.push(... p)}) assert.deepStrictEqual(patches, [ - { action: "put", path: ["birds"], value: [] }, - { action: "insert", path: ["birds", 0], values: ["", ""] }, - { action: "splice", path: ["birds", 0, 0], value: "Goldfinch" }, - { action: "splice", path: ["birds", 1, 0], value: "Chaffinch" }, + { action: 'put', path: [ 'birds' ], value: [] }, + { action: "insert", path: [ "birds", 0 ], values: [ "" ] }, + { action: "splice", path: [ "birds", 0, 0 ], value: "Goldfinch" }, + { action: "insert", path: [ "birds", 1 ], values: [ "" ] }, + { action: "splice", path: [ "birds", 1, 0 ], value: "Chaffinch" } ]) }) - it("should call a patchCallback registered on doc initialisation", () => { - const s1 = Automerge.change( - Automerge.init(), - doc => (doc.bird = "Goldfinch") - ) - const patches: Array = [] - const before = Automerge.init({ - patchCallback: p => patches.push(...p), - }) + it('should call a patchCallback registered on doc initialisation', () => { + const s1 = Automerge.change(Automerge.init(), doc => doc.bird = 'Goldfinch') + const patches = [], actor = Automerge.getActorId(s1) + const before = Automerge.init({patchCallback: p => patches.push(... p)}) Automerge.applyChanges(before, Automerge.getAllChanges(s1)) assert.deepStrictEqual(patches, [ - { action: "put", path: ["bird"], value: "" }, - { action: "splice", path: ["bird", 0], value: "Goldfinch" }, + { action: "put", path: [ "bird" ], value: "" }, + { action: "splice", path: [ "bird", 0 ], value: "Goldfinch" } ]) }) }) diff --git a/javascript/test/stable_unstable_interop.ts b/javascript/test/stable_unstable_interop.ts deleted file mode 100644 index dc57f338..00000000 --- a/javascript/test/stable_unstable_interop.ts +++ /dev/null @@ -1,99 +0,0 @@ -import * as assert from "assert" -import * as stable from "../src" -import { unstable } from "../src" - -describe("stable/unstable interop", () => { - it("should allow reading Text from stable as strings in unstable", () => { - let stableDoc = stable.from({ - text: new stable.Text("abc"), - }) - let unstableDoc = unstable.init() - unstableDoc = unstable.merge(unstableDoc, stableDoc) - assert.deepStrictEqual(unstableDoc.text, "abc") - }) - - it("should allow string from stable as Text in unstable", () => { - let unstableDoc = unstable.from({ - text: "abc", - }) - let stableDoc = stable.init() - stableDoc = unstable.merge(stableDoc, unstableDoc) - assert.deepStrictEqual(stableDoc.text, new stable.Text("abc")) - }) - - it("should allow reading strings from stable as RawString in unstable", () => { - let stableDoc = stable.from({ - text: "abc", - }) - let unstableDoc = unstable.init() - unstableDoc = unstable.merge(unstableDoc, stableDoc) - assert.deepStrictEqual(unstableDoc.text, new unstable.RawString("abc")) - }) - - it("should allow reading RawString from unstable as string in stable", () => { - let unstableDoc = unstable.from({ - text: new unstable.RawString("abc"), - }) - let stableDoc = stable.init() - stableDoc = unstable.merge(stableDoc, unstableDoc) - assert.deepStrictEqual(stableDoc.text, "abc") - }) - - it("should show conflicts on text objects", () => { - let doc1 = stable.from({ text: new stable.Text("abc") }, "bb") - let doc2 = stable.from({ text: new stable.Text("def") }, "aa") - doc1 = stable.merge(doc1, doc2) - let conflicts = stable.getConflicts(doc1, "text")! - assert.equal(conflicts["1@bb"]!.toString(), "abc") - assert.equal(conflicts["1@aa"]!.toString(), "def") - - let unstableDoc = unstable.init() - unstableDoc = unstable.merge(unstableDoc, doc1) - let conflicts2 = unstable.getConflicts(unstableDoc, "text")! - assert.equal(conflicts2["1@bb"]!.toString(), "abc") - assert.equal(conflicts2["1@aa"]!.toString(), "def") - }) - - it("should allow filling a list with text in stable", () => { - let doc = stable.from<{ list: Array }>({ - list: [null, null, null], - }) - doc = stable.change(doc, doc => { - doc.list.fill(new stable.Text("abc"), 0, 3) - }) - assert.deepStrictEqual(doc.list, [ - new stable.Text("abc"), - new stable.Text("abc"), - new stable.Text("abc"), - ]) - }) - - it("should allow filling a list with text in unstable", () => { - let doc = unstable.from<{ list: Array }>({ - list: [null, null, null], - }) - doc = stable.change(doc, doc => { - doc.list.fill("abc", 0, 3) - }) - assert.deepStrictEqual(doc.list, ["abc", "abc", "abc"]) - }) - - it("should allow splicing text into a list on stable", () => { - let doc = stable.from<{ list: Array }>({ list: [] }) - doc = stable.change(doc, doc => { - doc.list.splice(0, 0, new stable.Text("abc"), new stable.Text("def")) - }) - assert.deepStrictEqual(doc.list, [ - new stable.Text("abc"), - new stable.Text("def"), - ]) - }) - - it("should allow splicing text into a list on unstable", () => { - let doc = unstable.from<{ list: Array }>({ list: [] }) - doc = unstable.change(doc, doc => { - doc.list.splice(0, 0, "abc", "def") - }) - assert.deepStrictEqual(doc.list, ["abc", "def"]) - }) -}) diff --git a/javascript/test/sync_test.ts b/javascript/test/sync_test.ts index 5724985c..56b4bd87 100644 --- a/javascript/test/sync_test.ts +++ b/javascript/test/sync_test.ts @@ -1,57 +1,48 @@ -import * as assert from "assert" -import * as Automerge from "../src" -import { BloomFilter } from "./legacy/sync" -import { - decodeSyncMessage, - encodeSyncMessage, - decodeSyncState, - encodeSyncState, - initSyncState, -} from "../src" +import * as assert from 'assert' +import * as Automerge from '../src' +import { BloomFilter } from './legacy/sync' +import { decodeChangeMeta } from './legacy/columnar' +import { decodeSyncMessage, encodeSyncMessage, decodeSyncState, encodeSyncState, initSyncState } from "../src" + +function inspect(a) { + const util = require("util"); + return util.inspect(a,false,null,true) +} function getHeads(doc) { return Automerge.getHeads(doc) } function getMissingDeps(doc) { - return Automerge.getMissingDeps(doc, []) + return Automerge.getMissingDeps(doc) } -function sync( - a, - b, - aSyncState = initSyncState(), - bSyncState = initSyncState() -) { +function sync(a, b, aSyncState = initSyncState(), bSyncState = initSyncState()) { const MAX_ITER = 10 - let aToBmsg: Automerge.SyncMessage | null = null, - bToAmsg: Automerge.SyncMessage | null = null, - i = 0 + let aToBmsg = null, bToAmsg = null, i = 0 do { - ;[aSyncState, aToBmsg] = Automerge.generateSyncMessage(a, aSyncState) + [aSyncState, aToBmsg] = Automerge.generateSyncMessage(a, aSyncState) ;[bSyncState, bToAmsg] = Automerge.generateSyncMessage(b, bSyncState) if (aToBmsg) { - ;[b, bSyncState] = Automerge.receiveSyncMessage(b, bSyncState, aToBmsg) + [b, bSyncState] = Automerge.receiveSyncMessage(b, bSyncState, aToBmsg) } if (bToAmsg) { - ;[a, aSyncState] = Automerge.receiveSyncMessage(a, aSyncState, bToAmsg) + [a, aSyncState] = Automerge.receiveSyncMessage(a, aSyncState, bToAmsg) } if (i++ > MAX_ITER) { - throw new Error( - `Did not synchronize within ${MAX_ITER} iterations. Do you have a bug causing an infinite loop?` - ) + throw new Error(`Did not synchronize within ${MAX_ITER} iterations. Do you have a bug causing an infinite loop?`) } } while (aToBmsg || bToAmsg) return [a, b, aSyncState, bSyncState] } -describe("Data sync protocol", () => { - describe("with docs already in sync", () => { - describe("an empty local doc", () => { - it("should send a sync message implying no local data", () => { +describe('Data sync protocol', () => { + describe('with docs already in sync', () => { + describe('an empty local doc', () => { + it('should send a sync message implying no local data', () => { let n1 = Automerge.init() let s1 = initSyncState() let m1 @@ -65,35 +56,26 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(message.changes, []) }) - it("should not reply if we have no data as well", () => { - let n1 = Automerge.init(), - n2 = Automerge.init() - let s1 = initSyncState(), - s2 = initSyncState() - let m1: Automerge.SyncMessage | null = null, - m2: Automerge.SyncMessage | null = null + it('should not reply if we have no data as well', () => { + let n1 = Automerge.init(), n2 = Automerge.init() + let s1 = initSyncState(), s2 = initSyncState() + let m1 = null, m2 = null ;[s1, m1] = Automerge.generateSyncMessage(n1, s1) - if (m1 != null) { - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, m1) - } + ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, m1) ;[s2, m2] = Automerge.generateSyncMessage(n2, s2) assert.deepStrictEqual(m2, null) }) }) - describe("documents with data", () => { - it("repos with equal heads do not need a reply message", () => { - let n1 = Automerge.init(), - n2 = Automerge.init() - let s1 = initSyncState(), - s2 = initSyncState() - let m1: Automerge.SyncMessage | null = null, - m2: Automerge.SyncMessage | null = null + describe('documents with data', () => { + it('repos with equal heads do not need a reply message', () => { + let n1 = Automerge.init(), n2 = Automerge.init() + let s1 = initSyncState(), s2 = initSyncState() + let m1 = null, m2 = null // make two nodes with the same changes - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.n = [])) - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.n.push(i)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.n = []) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.n.push(i)) ;[n2] = Automerge.applyChanges(n2, Automerge.getAllChanges(n1)) assert.deepStrictEqual(n1, n2) @@ -102,96 +84,82 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(s1.lastSentHeads, getHeads(n1)) // heads are equal so this message should be null - if (m1 != null) { - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, m1) - } + ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, m1) ;[s2, m2] = Automerge.generateSyncMessage(n2, s2) assert.strictEqual(m2, null) }) - it("n1 should offer all changes to n2 when starting from nothing", () => { - let n1 = Automerge.init(), - n2 = Automerge.init() + it('n1 should offer all changes to n2 when starting from nothing', () => { + let n1 = Automerge.init(), n2 = Automerge.init() // make changes for n1 that n2 should request - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.n = [])) - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.n.push(i)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.n = []) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.n.push(i)) assert.notDeepStrictEqual(n1, n2) const [after1, after2] = sync(n1, n2) assert.deepStrictEqual(after1, after2) }) - it("should sync peers where one has commits the other does not", () => { - let n1 = Automerge.init(), - n2 = Automerge.init() + it('should sync peers where one has commits the other does not', () => { + let n1 = Automerge.init(), n2 = Automerge.init() // make changes for n1 that n2 should request - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.n = [])) - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.n.push(i)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.n = []) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.n.push(i)) assert.notDeepStrictEqual(n1, n2) ;[n1, n2] = sync(n1, n2) assert.deepStrictEqual(n1, n2) }) - it("should work with prior sync state", () => { + it('should work with prior sync state', () => { // create & synchronize two nodes - let n1 = Automerge.init(), - n2 = Automerge.init() - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init(), n2 = Automerge.init() + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2) // modify the first node further - for (let i = 5; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 5; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) assert.notDeepStrictEqual(n1, n2) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) assert.deepStrictEqual(n1, n2) }) - it("should not generate messages once synced", () => { + it('should not generate messages once synced', () => { // create & synchronize two nodes - let n1 = Automerge.init("abc123"), - n2 = Automerge.init("def456") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('abc123'), n2 = Automerge.init('def456') + let s1 = initSyncState(), s2 = initSyncState() - let message - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) - for (let i = 0; i < 5; i++) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.y = i)) + let message, patch + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + for (let i = 0; i < 5; i++) n2 = Automerge.change(n2, {time: 0}, doc => doc.y = i) - // n1 reports what it has - ;[s1, message] = Automerge.generateSyncMessage(n1, s1) + // n1 reports what it has + ;[s1, message] = Automerge.generateSyncMessage(n1, s1, n1) // n2 receives that message and sends changes along with what it has - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, message) + ;[n2, s2, patch] = Automerge.receiveSyncMessage(n2, s2, message) ;[s2, message] = Automerge.generateSyncMessage(n2, s2) assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 5) //assert.deepStrictEqual(patch, null) // no changes arrived // n1 receives the changes and replies with the changes it now knows n2 needs - ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, message) + ;[n1, s1, patch] = Automerge.receiveSyncMessage(n1, s1, message) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 5) //assert.deepStrictEqual(patch.diffs.props, {y: {'5@def456': {type: 'value', value: 4, datatype: 'int'}}}) // changes arrived // n2 applies the changes and sends confirmation ending the exchange - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, message) + ;[n2, s2, patch] = Automerge.receiveSyncMessage(n2, s2, message) ;[s2, message] = Automerge.generateSyncMessage(n2, s2) //assert.deepStrictEqual(patch.diffs.props, {x: {'5@abc123': {type: 'value', value: 4, datatype: 'int'}}}) // changes arrived // n1 receives the message and has nothing more to say - ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, message) + ;[n1, s1, patch] = Automerge.receiveSyncMessage(n1, s1, message) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) assert.deepStrictEqual(message, null) //assert.deepStrictEqual(patch, null) // no changes arrived @@ -201,38 +169,28 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(message, null) }) - it("should allow simultaneous messages during synchronization", () => { + it('should allow simultaneous messages during synchronization', () => { // create & synchronize two nodes - let n1 = Automerge.init("abc123"), - n2 = Automerge.init("def456") - let s1 = initSyncState(), - s2 = initSyncState() - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) - for (let i = 0; i < 5; i++) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.y = i)) - const head1 = getHeads(n1)[0], - head2 = getHeads(n2)[0] + let n1 = Automerge.init('abc123'), n2 = Automerge.init('def456') + let s1 = initSyncState(), s2 = initSyncState() + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + for (let i = 0; i < 5; i++) n2 = Automerge.change(n2, {time: 0}, doc => doc.y = i) + const head1 = getHeads(n1)[0], head2 = getHeads(n2)[0] // both sides report what they have but have no shared peer state let msg1to2, msg2to1 ;[s1, msg1to2] = Automerge.generateSyncMessage(n1, s1) ;[s2, msg2to1] = Automerge.generateSyncMessage(n2, s2) assert.deepStrictEqual(decodeSyncMessage(msg1to2).changes.length, 0) - assert.deepStrictEqual( - decodeSyncMessage(msg1to2).have[0].lastSync.length, - 0 - ) + assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync.length, 0) assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 0) - assert.deepStrictEqual( - decodeSyncMessage(msg2to1).have[0].lastSync.length, - 0 - ) + assert.deepStrictEqual(decodeSyncMessage(msg2to1).have[0].lastSync.length, 0) // n1 and n2 receives that message and update sync state but make no patch - ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) + let patch1, patch2 + ;[n1, s1, patch1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) //assert.deepStrictEqual(patch1, null) // no changes arrived, so no patch - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) + ;[n2, s2, patch2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) //assert.deepStrictEqual(patch2, null) // no changes arrived, so no patch // now both reply with their local changes the other lacks @@ -243,14 +201,15 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 5) // both should now apply the changes and update the frontend - ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) + ;[n1, s1, patch1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) assert.deepStrictEqual(getMissingDeps(n1), []) //assert.notDeepStrictEqual(patch1, null) - assert.deepStrictEqual(n1, { x: 4, y: 4 }) - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) + assert.deepStrictEqual(n1, {x: 4, y: 4}) + + ;[n2, s2, patch2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) assert.deepStrictEqual(getMissingDeps(n2), []) //assert.notDeepStrictEqual(patch2, null) - assert.deepStrictEqual(n2, { x: 4, y: 4 }) + assert.deepStrictEqual(n2, {x: 4, y: 4}) // The response acknowledges the changes received, and sends no further changes ;[s1, msg1to2] = Automerge.generateSyncMessage(n1, s1) @@ -259,8 +218,8 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 0) // After receiving acknowledgements, their shared heads should be equal - ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) + ;[n1, s1, patch1] = Automerge.receiveSyncMessage(n1, s1, msg2to1) + ;[n2, s2, patch2] = Automerge.receiveSyncMessage(n2, s2, msg1to2) assert.deepStrictEqual(s1.sharedHeads, [head1, head2].sort()) assert.deepStrictEqual(s2.sharedHeads, [head1, head2].sort()) //assert.deepStrictEqual(patch1, null) @@ -273,56 +232,42 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(msg2to1, null) // If we make one more change, and start another sync, its lastSync should be updated - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 5)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 5) ;[s1, msg1to2] = Automerge.generateSyncMessage(n1, s1) - assert.deepStrictEqual( - decodeSyncMessage(msg1to2).have[0].lastSync, - [head1, head2].sort() - ) + assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync, [head1, head2].sort()) }) - it("should assume sent changes were recieved until we hear otherwise", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - message: Automerge.SyncMessage | null = null + it('should assume sent changes were recieved until we hear otherwise', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), message = null + let s2 - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.items = [])) - ;[n1, n2, s1] = sync(n1, n2) + n1 = Automerge.change(n1, {time: 0}, doc => doc.items = []) + ;[n1, n2, s1, s2 ] = sync(n1, n2) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.items.push("x")) + n1 = Automerge.change(n1, {time: 0}, doc => doc.items.push('x')) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) - if (message != null) { - assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) - } + assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.items.push("y")) + n1 = Automerge.change(n1, {time: 0}, doc => doc.items.push('y')) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) - if (message != null) { - assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) - } + assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) - n1 = Automerge.change(n1, { time: 0 }, doc => doc.items.push("z")) + n1 = Automerge.change(n1, {time: 0}, doc => doc.items.push('z')) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) - if (message != null) { - assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) - } + assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) }) - it("should work regardless of who initiates the exchange", () => { + it('should work regardless of who initiates the exchange', () => { // create & synchronize two nodes - let n1 = Automerge.init(), - n2 = Automerge.init() - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init(), n2 = Automerge.init() + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) // modify the first node further - for (let i = 5; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 5; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) assert.notDeepStrictEqual(n1, n2) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) @@ -331,24 +276,21 @@ describe("Data sync protocol", () => { }) }) - describe("with diverged documents", () => { - it("should work without prior sync state", () => { + describe('with diverged documents', () => { + it('should work without prior sync state', () => { // Scenario: ,-- c10 <-- c11 <-- c12 <-- c13 <-- c14 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ // `-- c15 <-- c16 <-- c17 // lastSync is undefined. // create two peers both with divergent commits - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + ;[n1, n2] = sync(n1, n2) - for (let i = 10; i < 15; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) - for (let i = 15; i < 18; i++) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = i)) + for (let i = 10; i < 15; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + for (let i = 15; i < 18; i++) n2 = Automerge.change(n2, {time: 0}, doc => doc.x = i) assert.notDeepStrictEqual(n1, n2) ;[n1, n2] = sync(n1, n2) @@ -356,26 +298,21 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(n1, n2) }) - it("should work with prior sync state", () => { + it('should work with prior sync state', () => { // Scenario: ,-- c10 <-- c11 <-- c12 <-- c13 <-- c14 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ // `-- c15 <-- c16 <-- c17 // lastSync is c9. // create two peers both with divergent commits - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) - for (let i = 10; i < 15; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) - for (let i = 15; i < 18; i++) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = i)) + for (let i = 10; i < 15; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + for (let i = 15; i < 18; i++) n2 = Automerge.change(n2, {time: 0}, doc => doc.x = i) s1 = decodeSyncState(encodeSyncState(s1)) s2 = decodeSyncState(encodeSyncState(s2)) @@ -385,33 +322,27 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(n1, n2) }) - it("should ensure non-empty state after sync", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + it('should ensure non-empty state after sync', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) assert.deepStrictEqual(s1.sharedHeads, getHeads(n1)) assert.deepStrictEqual(s2.sharedHeads, getHeads(n1)) }) - it("should re-sync after one node crashed with data loss", () => { + it('should re-sync after one node crashed with data loss', () => { // Scenario: (r) (n2) (n1) // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 // n2 has changes {c0, c1, c2}, n1's lastSync is c5, and n2's lastSync is c2. // we want to successfully sync (n1) with (r), even though (n1) believes it's talking to (n2) - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() // n1 makes three changes, which we sync to n2 - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) // save a copy of n2 as "r" to simulate recovering from crash @@ -419,43 +350,38 @@ describe("Data sync protocol", () => { ;[r, rSyncState] = [Automerge.clone(n2), s2] // sync another few commits - for (let i = 3; i < 6; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 3; i < 6; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) // everyone should be on the same page here assert.deepStrictEqual(getHeads(n1), getHeads(n2)) assert.deepStrictEqual(n1, n2) // now make a few more changes, then attempt to sync the fully-up-to-date n1 with the confused r - for (let i = 6; i < 9; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 6; i < 9; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) s1 = decodeSyncState(encodeSyncState(s1)) rSyncState = decodeSyncState(encodeSyncState(rSyncState)) assert.notDeepStrictEqual(getHeads(n1), getHeads(r)) assert.notDeepStrictEqual(n1, r) - assert.deepStrictEqual(n1, { x: 8 }) - assert.deepStrictEqual(r, { x: 2 }) + assert.deepStrictEqual(n1, {x: 8}) + assert.deepStrictEqual(r, {x: 2}) ;[n1, r, s1, rSyncState] = sync(n1, r, s1, rSyncState) assert.deepStrictEqual(getHeads(n1), getHeads(r)) assert.deepStrictEqual(n1, r) }) - it("should resync after one node experiences data loss without disconnecting", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + it('should resync after one node experiences data loss without disconnecting', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() // n1 makes three changes, which we sync to n2 - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) assert.deepStrictEqual(getHeads(n1), getHeads(n2)) assert.deepStrictEqual(n1, n2) - let n2AfterDataLoss = Automerge.init("89abcdef") + let n2AfterDataLoss = Automerge.init('89abcdef') // "n2" now has no data, but n1 still thinks it does. Note we don't do // decodeSyncState(encodeSyncState(s1)) in order to simulate data loss without disconnecting @@ -464,35 +390,29 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(n1, n2) }) - it("should handle changes concurrent to the last sync heads", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef"), - n3 = Automerge.init("fedcba98") - let s12 = initSyncState(), - s21 = initSyncState(), - s23 = initSyncState(), - s32 = initSyncState() + it('should handle changes concurrent to the last sync heads', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef'), n3 = Automerge.init('fedcba98') + let s12 = initSyncState(), s21 = initSyncState(), s23 = initSyncState(), s32 = initSyncState() // Change 1 is known to all three nodes - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 1)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 1) ;[n1, n2, s12, s21] = sync(n1, n2, s12, s21) ;[n2, n3, s23, s32] = sync(n2, n3, s23, s32) // Change 2 is known to n1 and n2 - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 2)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 2) ;[n1, n2, s12, s21] = sync(n1, n2, s12, s21) // Each of the three nodes makes one change (changes 3, 4, 5) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 3)) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = 4)) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = 5)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 3) + n2 = Automerge.change(n2, {time: 0}, doc => doc.x = 4) + n3 = Automerge.change(n3, {time: 0}, doc => doc.x = 5) // Apply n3's latest change to n2. If running in Node, turn the Uint8Array into a Buffer, to // simulate transmission over a network (see https://github.com/automerge/automerge/pull/362) let change = Automerge.getLastLocalChange(n3) - if (typeof Buffer === "function" && change != null) - change = Buffer.from(change) - ;[n2] = (change && Automerge.applyChanges(n2, [change])) || [n2] + if (typeof Buffer === 'function') change = Buffer.from(change) + ;[n2] = Automerge.applyChanges(n2, [change]) // Now sync n1 and n2. n3's change is concurrent to n1 and n2's last sync heads ;[n1, n2, s12, s21] = sync(n1, n2, s12, s21) @@ -500,14 +420,12 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(n1, n2) }) - it("should handle histories with lots of branching and merging", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef"), - n3 = Automerge.init("fedcba98") - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 0)) - ;[n2] = Automerge.applyChanges(n2, [Automerge.getLastLocalChange(n1)!]) - ;[n3] = Automerge.applyChanges(n3, [Automerge.getLastLocalChange(n1)!]) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = 1)) + it('should handle histories with lots of branching and merging', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef'), n3 = Automerge.init('fedcba98') + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 0) + ;[n2] = Automerge.applyChanges(n2, [Automerge.getLastLocalChange(n1)]) + ;[n3] = Automerge.applyChanges(n3, [Automerge.getLastLocalChange(n1)]) + n3 = Automerge.change(n3, {time: 0}, doc => doc.x = 1) // - n1c1 <------ n1c2 <------ n1c3 <-- etc. <-- n1c20 <------ n1c21 // / \/ \/ \/ @@ -516,29 +434,29 @@ describe("Data sync protocol", () => { // \ / // ---------------------------------------------- n3c1 <----- for (let i = 1; i < 20; i++) { - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.n1 = i)) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.n2 = i)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.n1 = i) + n2 = Automerge.change(n2, {time: 0}, doc => doc.n2 = i) const change1 = Automerge.getLastLocalChange(n1) const change2 = Automerge.getLastLocalChange(n2) - ;[n1] = Automerge.applyChanges(n1, [change2!]) - ;[n2] = Automerge.applyChanges(n2, [change1!]) + ;[n1] = Automerge.applyChanges(n1, [change2]) + ;[n2] = Automerge.applyChanges(n2, [change1]) } - let s1 = initSyncState(), - s2 = initSyncState() + let s1 = initSyncState(), s2 = initSyncState() ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) // Having n3's last change concurrent to the last sync heads forces us into the slower code path - ;[n2] = Automerge.applyChanges(n2, [Automerge.getLastLocalChange(n3)!]) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.n1 = "final")) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.n2 = "final")) + ;[n2] = Automerge.applyChanges(n2, [Automerge.getLastLocalChange(n3)]) + n1 = Automerge.change(n1, {time: 0}, doc => doc.n1 = 'final') + n2 = Automerge.change(n2, {time: 0}, doc => doc.n2 = 'final') + ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) assert.deepStrictEqual(getHeads(n1), getHeads(n2)) assert.deepStrictEqual(n1, n2) }) }) - describe("with false positives", () => { + describe('with false positives', () => { // NOTE: the following tests use brute force to search for Bloom filter false positives. The // tests make change hashes deterministic by fixing the actorId and change timestamp to be // constants. The loop that searches for false positives is then initialised such that it finds @@ -547,36 +465,22 @@ describe("Data sync protocol", () => { // then the false positive will no longer be the first loop iteration. The tests should still // pass because the loop will run until a false positive is found, but they will be slower. - it("should handle a false-positive head", () => { + it('should handle a false-positive head', () => { // Scenario: ,-- n1 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ // `-- n2 // where n2 is a false positive in the Bloom filter containing {n1}. // lastSync is c9. - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2) - for (let i = 1; ; i++) { - // search for false positive; see comment above - const n1up = Automerge.change( - Automerge.clone(n1, { actor: "01234567" }), - { time: 0 }, - doc => (doc.x = `${i} @ n1`) - ) - const n2up = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - doc => (doc.x = `${i} @ n2`) - ) + for (let i = 1; ; i++) { // search for false positive; see comment above + const n1up = Automerge.change(Automerge.clone(n1, {actorId: '01234567'}), {time: 0}, doc => doc.x = `${i} @ n1`) + const n2up = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} @ n2`) if (new BloomFilter(getHeads(n1up)).containsHash(getHeads(n2up)[0])) { - n1 = n1up - n2 = n2up - break + n1 = n1up; n2 = n2up; break } } const allHeads = [...getHeads(n1), ...getHeads(n2)].sort() @@ -587,7 +491,7 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(getHeads(n2), allHeads) }) - describe("with a false-positive dependency", () => { + describe('with a false-positive dependency', () => { let n1, n2, s1, s2, n1hash2, n2hash2 beforeEach(() => { @@ -596,57 +500,35 @@ describe("Data sync protocol", () => { // `-- n2c1 <-- n2c2 // where n2c1 is a false positive in the Bloom filter containing {n1c1, n1c2}. // lastSync is c9. - n1 = Automerge.init("01234567") - n2 = Automerge.init("89abcdef") + n1 = Automerge.init('01234567') + n2 = Automerge.init('89abcdef') s1 = initSyncState() s2 = initSyncState() - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, (doc: any) => (doc.x = i)) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2) let n1hash1, n2hash1 - for (let i = 29; ; i++) { - // search for false positive; see comment above - const n1us1 = Automerge.change( - Automerge.clone(n1, { actor: "01234567" }), - { time: 0 }, - (doc: any) => (doc.x = `${i} @ n1`) - ) - const n2us1 = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - (doc: any) => (doc.x = `${i} @ n2`) - ) - n1hash1 = getHeads(n1us1)[0] - n2hash1 = getHeads(n2us1)[0] - const n1us2 = Automerge.change( - n1us1, - { time: 0 }, - (doc: any) => (doc.x = "final @ n1") - ) - const n2us2 = Automerge.change( - n2us1, - { time: 0 }, - (doc: any) => (doc.x = "final @ n2") - ) - n1hash2 = getHeads(n1us2)[0] - n2hash2 = getHeads(n2us2)[0] + for (let i = 29; ; i++) { // search for false positive; see comment above + const n1us1 = Automerge.change(Automerge.clone(n1, {actorId: '01234567'}), {time: 0}, doc => doc.x = `${i} @ n1`) + const n2us1 = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} @ n2`) + n1hash1 = getHeads(n1us1)[0]; n2hash1 = getHeads(n2us1)[0] + const n1us2 = Automerge.change(n1us1, {time: 0}, doc => doc.x = 'final @ n1') + const n2us2 = Automerge.change(n2us1, {time: 0}, doc => doc.x = 'final @ n2') + n1hash2 = getHeads(n1us2)[0]; n2hash2 = getHeads(n2us2)[0] if (new BloomFilter([n1hash1, n1hash2]).containsHash(n2hash1)) { - n1 = n1us2 - n2 = n2us2 - break + n1 = n1us2; n2 = n2us2; break } } }) - it("should sync two nodes without connection reset", () => { - ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) + it('should sync two nodes without connection reset', () => { + [n1, n2, s1, s2] = sync(n1, n2, s1, s2) assert.deepStrictEqual(getHeads(n1), [n1hash2, n2hash2].sort()) assert.deepStrictEqual(getHeads(n2), [n1hash2, n2hash2].sort()) }) // FIXME - this has a periodic failure - it("should sync two nodes with connection reset", () => { + it('should sync two nodes with connection reset', () => { s1 = decodeSyncState(encodeSyncState(s1)) s2 = decodeSyncState(encodeSyncState(s2)) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) @@ -654,7 +536,7 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(getHeads(n2), [n1hash2, n2hash2].sort()) }) - it.skip("should sync three nodes", () => { + it.skip('should sync three nodes', () => { s1 = decodeSyncState(encodeSyncState(s1)) s2 = decodeSyncState(encodeSyncState(s2)) @@ -674,73 +556,37 @@ describe("Data sync protocol", () => { assert.strictEqual(decodeSyncMessage(m2).changes.length, 1) // only n2c2; change n2c1 is not sent // n3 is a node that doesn't have the missing change. Nevertheless n1 is going to ask n3 for it - let n3 = Automerge.init("fedcba98"), - s13 = initSyncState(), - s31 = initSyncState() + let n3 = Automerge.init('fedcba98'), s13 = initSyncState(), s31 = initSyncState() ;[n1, n3, s13, s31] = sync(n1, n3, s13, s31) assert.deepStrictEqual(getHeads(n1), [n1hash2]) assert.deepStrictEqual(getHeads(n3), [n1hash2]) }) }) - it("should not require an additional request when a false-positive depends on a true-negative", () => { + it('should not require an additional request when a false-positive depends on a true-negative', () => { // Scenario: ,-- n1c1 <-- n1c2 <-- n1c3 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-+ // `-- n2c1 <-- n2c2 <-- n2c3 // where n2c2 is a false positive in the Bloom filter containing {n1c1, n1c2, n1c3}. // lastSync is c4. - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() let n1hash3, n2hash3 - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2) - for (let i = 86; ; i++) { - // search for false positive; see comment above - const n1us1 = Automerge.change( - Automerge.clone(n1, { actor: "01234567" }), - { time: 0 }, - doc => (doc.x = `${i} @ n1`) - ) - const n2us1 = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - doc => (doc.x = `${i} @ n2`) - ) + for (let i = 86; ; i++) { // search for false positive; see comment above + const n1us1 = Automerge.change(Automerge.clone(n1, {actorId: '01234567'}), {time: 0}, doc => doc.x = `${i} @ n1`) + const n2us1 = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} @ n2`) const n1hash1 = getHeads(n1us1)[0] - const n1us2 = Automerge.change( - n1us1, - { time: 0 }, - doc => (doc.x = `${i + 1} @ n1`) - ) - const n2us2 = Automerge.change( - n2us1, - { time: 0 }, - doc => (doc.x = `${i + 1} @ n2`) - ) - const n1hash2 = getHeads(n1us2)[0], - n2hash2 = getHeads(n2us2)[0] - const n1up3 = Automerge.change( - n1us2, - { time: 0 }, - doc => (doc.x = "final @ n1") - ) - const n2up3 = Automerge.change( - n2us2, - { time: 0 }, - doc => (doc.x = "final @ n2") - ) - n1hash3 = getHeads(n1up3)[0] - n2hash3 = getHeads(n2up3)[0] - if ( - new BloomFilter([n1hash1, n1hash2, n1hash3]).containsHash(n2hash2) - ) { - n1 = n1up3 - n2 = n2up3 - break + const n1us2 = Automerge.change(n1us1, {time: 0}, doc => doc.x = `${i + 1} @ n1`) + const n2us2 = Automerge.change(n2us1, {time: 0}, doc => doc.x = `${i + 1} @ n2`) + const n1hash2 = getHeads(n1us2)[0], n2hash2 = getHeads(n2us2)[0] + const n1up3 = Automerge.change(n1us2, {time: 0}, doc => doc.x = 'final @ n1') + const n2up3 = Automerge.change(n2us2, {time: 0}, doc => doc.x = 'final @ n2') + n1hash3 = getHeads(n1up3)[0]; n2hash3 = getHeads(n2up3)[0] + if (new BloomFilter([n1hash1, n1hash2, n1hash3]).containsHash(n2hash2)) { + n1 = n1up3; n2 = n2up3; break } } const bothHeads = [n1hash3, n2hash3].sort() @@ -751,46 +597,31 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(getHeads(n2), bothHeads) }) - it("should handle chains of false-positives", () => { + it('should handle chains of false-positives', () => { // Scenario: ,-- c5 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-+ // `-- n2c1 <-- n2c2 <-- n2c3 // where n2c1 and n2c2 are both false positives in the Bloom filter containing {c5}. // lastSync is c4. - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() - for (let i = 0; i < 5; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 5; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2, s1, s2) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 5)) - for (let i = 2; ; i++) { - // search for false positive; see comment above - const n2us1 = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - doc => (doc.x = `${i} @ n2`) - ) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 5) + for (let i = 2; ; i++) { // search for false positive; see comment above + const n2us1 = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} @ n2`) if (new BloomFilter(getHeads(n1)).containsHash(getHeads(n2us1)[0])) { - n2 = n2us1 - break + n2 = n2us1; break } } - for (let i = 141; ; i++) { - // search for false positive; see comment above - const n2us2 = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - doc => (doc.x = `${i} again`) - ) + for (let i = 141; ; i++) { // search for false positive; see comment above + const n2us2 = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} again`) if (new BloomFilter(getHeads(n1)).containsHash(getHeads(n2us2)[0])) { - n2 = n2us2 - break + n2 = n2us2; break } } - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = "final @ n2")) + n2 = Automerge.change(n2, {time: 0}, doc => doc.x = 'final @ n2') const allHeads = [...getHeads(n1), ...getHeads(n2)].sort() s1 = decodeSyncState(encodeSyncState(s1)) @@ -800,46 +631,32 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(getHeads(n2), allHeads) }) - it("should allow the false-positive hash to be explicitly requested", () => { + it('should allow the false-positive hash to be explicitly requested', () => { // Scenario: ,-- n1 // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ // `-- n2 // where n2 causes a false positive in the Bloom filter containing {n1}. - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() let message - for (let i = 0; i < 10; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 10; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n1, n2, s1, s2] = sync(n1, n2) s1 = decodeSyncState(encodeSyncState(s1)) s2 = decodeSyncState(encodeSyncState(s2)) - for (let i = 1; ; i++) { - // brute-force search for false positive; see comment above - const n1up = Automerge.change( - Automerge.clone(n1, { actor: "01234567" }), - { time: 0 }, - doc => (doc.x = `${i} @ n1`) - ) - const n2up = Automerge.change( - Automerge.clone(n2, { actor: "89abcdef" }), - { time: 0 }, - doc => (doc.x = `${i} @ n2`) - ) + for (let i = 1; ; i++) { // brute-force search for false positive; see comment above + const n1up = Automerge.change(Automerge.clone(n1, {actorId: '01234567'}), {time: 0}, doc => doc.x = `${i} @ n1`) + const n2up = Automerge.change(Automerge.clone(n2, {actorId: '89abcdef'}), {time: 0}, doc => doc.x = `${i} @ n2`) // check if the bloom filter on n2 will believe n1 already has a particular hash // this will mean n2 won't offer that data to n2 by receiving a sync message from n1 if (new BloomFilter(getHeads(n1up)).containsHash(getHeads(n2up)[0])) { - n1 = n1up - n2 = n2up - break + n1 = n1up; n2 = n2up; break } } // n1 creates a sync message for n2 with an ill-fated bloom - ;[s1, message] = Automerge.generateSyncMessage(n1, s1) + [s1, message] = Automerge.generateSyncMessage(n1, s1) assert.strictEqual(decodeSyncMessage(message).changes.length, 0) // n2 receives it and DOESN'T send a change back @@ -863,42 +680,32 @@ describe("Data sync protocol", () => { }) }) - describe("protocol features", () => { - it("should allow multiple Bloom filters", () => { + describe('protocol features', () => { + it('should allow multiple Bloom filters', () => { // Scenario: ,-- n1c1 <-- n1c2 <-- n1c3 // c0 <-- c1 <-- c2 <-+--- n2c1 <-- n2c2 <-- n2c3 // `-- n3c1 <-- n3c2 <-- n3c3 // n1 has {c0, c1, c2, n1c1, n1c2, n1c3, n2c1, n2c2}; // n2 has {c0, c1, c2, n1c1, n1c2, n2c1, n2c2, n2c3}; // n3 has {c0, c1, c2, n3c1, n3c2, n3c3}. - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef"), - n3 = Automerge.init("76543210") - let s13 = initSyncState() - let s32 = initSyncState(), - s31 = initSyncState(), - s23 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef'), n3 = Automerge.init('76543210') + let s13 = initSyncState(), s12 = initSyncState(), s21 = initSyncState() + let s32 = initSyncState(), s31 = initSyncState(), s23 = initSyncState() let message1, message2, message3 - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) - // sync all 3 nodes - ;[n1, n2, ,] = sync(n1, n2) // eslint-disable-line no-unused-vars -- kept for consistency + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + // sync all 3 nodes + ;[n1, n2, s12, s21] = sync(n1, n2) // eslint-disable-line no-unused-vars -- kept for consistency ;[n1, n3, s13, s31] = sync(n1, n3) ;[n3, n2, s32, s23] = sync(n3, n2) - for (let i = 0; i < 2; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = `${i} @ n1`)) - for (let i = 0; i < 2; i++) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = `${i} @ n2`)) + for (let i = 0; i < 2; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = `${i} @ n1`) + for (let i = 0; i < 2; i++) n2 = Automerge.change(n2, {time: 0}, doc => doc.x = `${i} @ n2`) ;[n1] = Automerge.applyChanges(n1, Automerge.getAllChanges(n2)) ;[n2] = Automerge.applyChanges(n2, Automerge.getAllChanges(n1)) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = `3 @ n1`)) - n2 = Automerge.change(n2, { time: 0 }, doc => (doc.x = `3 @ n2`)) - for (let i = 0; i < 3; i++) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = `${i} @ n3`)) - const n1c3 = getHeads(n1)[0], - n2c3 = getHeads(n2)[0], - n3c3 = getHeads(n3)[0] + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = `3 @ n1`) + n2 = Automerge.change(n2, {time: 0}, doc => doc.x = `3 @ n2`) + for (let i = 0; i < 3; i++) n3 = Automerge.change(n3, {time: 0}, doc => doc.x = `${i} @ n3`) + const n1c3 = getHeads(n1)[0], n2c3 = getHeads(n2)[0], n3c3 = getHeads(n3)[0] s13 = decodeSyncState(encodeSyncState(s13)) s31 = decodeSyncState(encodeSyncState(s31)) s23 = decodeSyncState(encodeSyncState(s23)) @@ -920,11 +727,7 @@ describe("Data sync protocol", () => { const modifiedMessage = decodeSyncMessage(message3) modifiedMessage.have.push(decodeSyncMessage(message1).have[0]) assert.strictEqual(modifiedMessage.changes.length, 0) - ;[n2, s23] = Automerge.receiveSyncMessage( - n2, - s23, - encodeSyncMessage(modifiedMessage) - ) + ;[n2, s23] = Automerge.receiveSyncMessage(n2, s23, encodeSyncMessage(modifiedMessage)) // n2 replies to n3, sending only n2c3 (the one change that n2 has but n1 doesn't) ;[s23, message2] = Automerge.generateSyncMessage(n2, s23) @@ -938,76 +741,53 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(getHeads(n3), [n1c3, n2c3, n3c3].sort()) }) - it("should allow any change to be requested", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() - let message: Automerge.SyncMessage | null = null + it('should allow any change to be requested', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() + let message = null - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) const lastSync = getHeads(n1) - for (let i = 3; i < 6; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 3; i < 6; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) + ;[n1, n2, s1, s2] = sync(n1, n2) s1.lastSentHeads = [] // force generateSyncMessage to return a message even though nothing changed ;[s1, message] = Automerge.generateSyncMessage(n1, s1) - const modMsg = decodeSyncMessage(message!) + const modMsg = decodeSyncMessage(message) modMsg.need = lastSync // re-request change 2 - ;[n2, s2] = Automerge.receiveSyncMessage( - n2, - s2, - encodeSyncMessage(modMsg) - ) + ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, encodeSyncMessage(modMsg)) ;[s1, message] = Automerge.generateSyncMessage(n2, s2) - assert.strictEqual(decodeSyncMessage(message!).changes.length, 1) - assert.strictEqual( - Automerge.decodeChange(decodeSyncMessage(message!).changes[0]).hash, - lastSync[0] - ) + assert.strictEqual(decodeSyncMessage(message).changes.length, 1) + assert.strictEqual(Automerge.decodeChange(decodeSyncMessage(message).changes[0]).hash, lastSync[0]) }) - it("should ignore requests for a nonexistent change", () => { - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef") - let s1 = initSyncState(), - s2 = initSyncState() - let message: Automerge.SyncMessage | null = null + it('should ignore requests for a nonexistent change', () => { + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef') + let s1 = initSyncState(), s2 = initSyncState() + let message = null - for (let i = 0; i < 3; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) + for (let i = 0; i < 3; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) ;[n2] = Automerge.applyChanges(n2, Automerge.getAllChanges(n1)) ;[s1, message] = Automerge.generateSyncMessage(n1, s1) - const decoded = Automerge.decodeSyncMessage(message!) - decoded.need = [ - "0000000000000000000000000000000000000000000000000000000000000000", - ] - message = Automerge.encodeSyncMessage(decoded) - ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, message!) + message.need = ['0000000000000000000000000000000000000000000000000000000000000000'] + ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, message) ;[s2, message] = Automerge.generateSyncMessage(n2, s2) assert.strictEqual(message, null) }) - it("should allow a subset of changes to be sent", () => { + it('should allow a subset of changes to be sent', () => { // ,-- c1 <-- c2 // c0 <-+ // `-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 - let n1 = Automerge.init("01234567"), - n2 = Automerge.init("89abcdef"), - n3 = Automerge.init("76543210") - let s1 = initSyncState(), - s2 = initSyncState() + let n1 = Automerge.init('01234567'), n2 = Automerge.init('89abcdef'), n3 = Automerge.init('76543210') + let s1 = initSyncState(), s2 = initSyncState() let msg, decodedMsg - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = 0)) + n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 0) n3 = Automerge.merge(n3, n1) - for (let i = 1; i <= 2; i++) - n1 = Automerge.change(n1, { time: 0 }, doc => (doc.x = i)) // n1 has {c0, c1, c2} - for (let i = 3; i <= 4; i++) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = i)) // n3 has {c0, c3, c4} - const c2 = getHeads(n1)[0], - c4 = getHeads(n3)[0] + for (let i = 1; i <= 2; i++) n1 = Automerge.change(n1, {time: 0}, doc => doc.x = i) // n1 has {c0, c1, c2} + for (let i = 3; i <= 4; i++) n3 = Automerge.change(n3, {time: 0}, doc => doc.x = i) // n3 has {c0, c3, c4} + const c2 = getHeads(n1)[0], c4 = getHeads(n3)[0] n2 = Automerge.merge(n2, n3) // n2 has {c0, c3, c4} // Sync n1 and n2, so their shared heads are {c2, c4} @@ -1018,13 +798,11 @@ describe("Data sync protocol", () => { assert.deepStrictEqual(s2.sharedHeads, [c2, c4].sort()) // n2 and n3 apply {c5, c6, c7, c8} - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = 5)) + n3 = Automerge.change(n3, {time: 0}, doc => doc.x = 5) const change5 = Automerge.getLastLocalChange(n3) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = 6)) - const change6 = Automerge.getLastLocalChange(n3), - c6 = getHeads(n3)[0] - for (let i = 7; i <= 8; i++) - n3 = Automerge.change(n3, { time: 0 }, doc => (doc.x = i)) + n3 = Automerge.change(n3, {time: 0}, doc => doc.x = 6) + const change6 = Automerge.getLastLocalChange(n3), c6 = getHeads(n3)[0] + for (let i = 7; i <= 8; i++) n3 = Automerge.change(n3, {time: 0}, doc => doc.x = i) const c8 = getHeads(n3)[0] n2 = Automerge.merge(n2, n3) @@ -1035,10 +813,9 @@ describe("Data sync protocol", () => { decodedMsg = decodeSyncMessage(msg) decodedMsg.changes = [change5, change6] msg = encodeSyncMessage(decodedMsg) - const sentHashes = [ - Automerge.decodeChange(change5!).hash, - Automerge.decodeChange(change6!).hash, - ] + const sentHashes = {} + sentHashes[decodeChangeMeta(change5, true).hash] = true + sentHashes[decodeChangeMeta(change6, true).hash] = true s2.sentHashes = sentHashes ;[n1, s1] = Automerge.receiveSyncMessage(n1, s1, msg) assert.deepStrictEqual(s1.sharedHeads, [c2, c6].sort()) @@ -1047,10 +824,7 @@ describe("Data sync protocol", () => { ;[s1, msg] = Automerge.generateSyncMessage(n1, s1) ;[n2, s2] = Automerge.receiveSyncMessage(n2, s2, msg) assert.deepStrictEqual(decodeSyncMessage(msg).need, [c8]) - assert.deepStrictEqual( - decodeSyncMessage(msg).have[0].lastSync, - [c2, c6].sort() - ) + assert.deepStrictEqual(decodeSyncMessage(msg).have[0].lastSync, [c2, c6].sort()) assert.deepStrictEqual(s1.sharedHeads, [c2, c6].sort()) assert.deepStrictEqual(s2.sharedHeads, [c2, c6].sort()) diff --git a/javascript/test/text_test.ts b/javascript/test/text_test.ts index 518c7d2b..3893059c 100644 --- a/javascript/test/text_test.ts +++ b/javascript/test/text_test.ts @@ -1,34 +1,221 @@ -import * as assert from "assert" -import { unstable as Automerge } from "../src" -import { assertEqualsOneOf } from "./helpers" +import * as assert from 'assert' +import * as Automerge from '../src' +import { assertEqualsOneOf } from './helpers' -type DocType = { - text: string - [key: string]: any +function attributeStateToAttributes(accumulatedAttributes) { + const attributes = {} + Object.entries(accumulatedAttributes).forEach(([key, values]) => { + if (values.length && values[0] !== null) { + attributes[key] = values[0] + } + }) + return attributes } -describe("Automerge.Text", () => { - let s1: Automerge.Doc, s2: Automerge.Doc - beforeEach(() => { - s1 = Automerge.change(Automerge.init(), doc => (doc.text = "")) - s2 = Automerge.merge(Automerge.init(), s1) +function isEquivalent(a, b) { + const aProps = Object.getOwnPropertyNames(a) + const bProps = Object.getOwnPropertyNames(b) + + if (aProps.length != bProps.length) { + return false + } + + for (let i = 0; i < aProps.length; i++) { + const propName = aProps[i] + if (a[propName] !== b[propName]) { + return false + } + } + + return true +} + +function isControlMarker(pseudoCharacter) { + return typeof pseudoCharacter === 'object' && pseudoCharacter.attributes +} + +function opFrom(text, attributes) { + let op = { insert: text } + if (Object.keys(attributes).length > 0) { + op.attributes = attributes + } + return op +} + +function accumulateAttributes(span, accumulatedAttributes) { + Object.entries(span).forEach(([key, value]) => { + if (!accumulatedAttributes[key]) { + accumulatedAttributes[key] = [] + } + if (value === null) { + if (accumulatedAttributes[key].length === 0 || accumulatedAttributes[key] === null) { + accumulatedAttributes[key].unshift(null) + } else { + accumulatedAttributes[key].shift() + } + } else { + if (accumulatedAttributes[key][0] === null) { + accumulatedAttributes[key].shift() + } else { + accumulatedAttributes[key].unshift(value) + } + } + }) + return accumulatedAttributes +} + +function automergeTextToDeltaDoc(text) { + let ops = [] + let controlState = {} + let currentString = "" + let attributes = {} + text.toSpans().forEach((span) => { + if (isControlMarker(span)) { + controlState = accumulateAttributes(span.attributes, controlState) + } else { + let next = attributeStateToAttributes(controlState) + + // if the next span has the same calculated attributes as the current span + // don't bother outputting it as a separate span, just let it ride + if (typeof span === 'string' && isEquivalent(next, attributes)) { + currentString = currentString + span + return + } + + if (currentString) { + ops.push(opFrom(currentString, attributes)) + } + + // If we've got a string, we might be able to concatenate it to another + // same-attributed-string, so remember it and go to the next iteration. + if (typeof span === 'string') { + currentString = span + attributes = next + } else { + // otherwise we have an embed "character" and should output it immediately. + // embeds are always one-"character" in length. + ops.push(opFrom(span, next)) + currentString = '' + attributes = {} + } + } }) - it("should support insertion", () => { + // at the end, flush any accumulated string out + if (currentString) { + ops.push(opFrom(currentString, attributes)) + } + + return ops +} + +function inverseAttributes(attributes) { + let invertedAttributes = {} + Object.keys(attributes).forEach((key) => { + invertedAttributes[key] = null + }) + return invertedAttributes +} + +function applyDeleteOp(text, offset, op) { + let length = op.delete + while (length > 0) { + if (isControlMarker(text.get(offset))) { + offset += 1 + } else { + // we need to not delete control characters, but we do delete embed characters + text.deleteAt(offset, 1) + length -= 1 + } + } + return [text, offset] +} + +function applyRetainOp(text, offset, op) { + let length = op.retain + + if (op.attributes) { + text.insertAt(offset, { attributes: op.attributes }) + offset += 1 + } + + while (length > 0) { + const char = text.get(offset) + offset += 1 + if (!isControlMarker(char)) { + length -= 1 + } + } + + if (op.attributes) { + text.insertAt(offset, { attributes: inverseAttributes(op.attributes) }) + offset += 1 + } + + return [text, offset] +} + + +function applyInsertOp(text, offset, op) { + let originalOffset = offset + + if (typeof op.insert === 'string') { + text.insertAt(offset, ...op.insert.split('')) + offset += op.insert.length + } else { + // we have an embed or something similar + text.insertAt(offset, op.insert) + offset += 1 + } + + if (op.attributes) { + text.insertAt(originalOffset, { attributes: op.attributes }) + offset += 1 + } + if (op.attributes) { + text.insertAt(offset, { attributes: inverseAttributes(op.attributes) }) + offset += 1 + } + return [text, offset] +} + +// XXX: uhhhhh, why can't I pass in text? +function applyDeltaDocToAutomergeText(delta, doc) { + let offset = 0 + + delta.forEach(op => { + if (op.retain) { + [, offset] = applyRetainOp(doc.text, offset, op) + } else if (op.delete) { + [, offset] = applyDeleteOp(doc.text, offset, op) + } else if (op.insert) { + [, offset] = applyInsertOp(doc.text, offset, op) + } + }) +} + +describe('Automerge.Text', () => { + let s1, s2 + beforeEach(() => { + s1 = Automerge.change(Automerge.init(), doc => doc.text = "") + s2 = Automerge.merge(Automerge.init(), s1) + }) + + it('should support insertion', () => { s1 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 0, 0, "a")) assert.strictEqual(s1.text.length, 1) - assert.strictEqual(s1.text[0], "a") - assert.strictEqual(s1.text, "a") + assert.strictEqual(s1.text[0], 'a') + assert.strictEqual(s1.text, 'a') //assert.strictEqual(s1.text.getElemId(0), `2@${Automerge.getActorId(s1)}`) }) - it("should support deletion", () => { + it('should support deletion', () => { s1 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 0, 0, "abc")) s1 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 1, 1)) assert.strictEqual(s1.text.length, 2) - assert.strictEqual(s1.text[0], "a") - assert.strictEqual(s1.text[1], "c") - assert.strictEqual(s1.text, "ac") + assert.strictEqual(s1.text[0], 'a') + assert.strictEqual(s1.text[1], 'c') + assert.strictEqual(s1.text, 'ac') }) it("should support implicit and explicit deletion", () => { @@ -41,71 +228,71 @@ describe("Automerge.Text", () => { assert.strictEqual(s1.text, "ac") }) - it("should handle concurrent insertion", () => { + it('should handle concurrent insertion', () => { s1 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 0, 0, "abc")) s2 = Automerge.change(s2, doc => Automerge.splice(doc, "text", 0, 0, "xyz")) s1 = Automerge.merge(s1, s2) assert.strictEqual(s1.text.length, 6) - assertEqualsOneOf(s1.text, "abcxyz", "xyzabc") + assertEqualsOneOf(s1.text, 'abcxyz', 'xyzabc') }) - it("should handle text and other ops in the same change", () => { + it('should handle text and other ops in the same change', () => { s1 = Automerge.change(s1, doc => { - doc.foo = "bar" - Automerge.splice(doc, "text", 0, 0, "a") + doc.foo = 'bar' + Automerge.splice(doc, "text", 0, 0, 'a') }) - assert.strictEqual(s1.foo, "bar") - assert.strictEqual(s1.text, "a") - assert.strictEqual(s1.text, "a") + assert.strictEqual(s1.foo, 'bar') + assert.strictEqual(s1.text, 'a') + assert.strictEqual(s1.text, 'a') }) - it("should serialize to JSON as a simple string", () => { + it('should serialize to JSON as a simple string', () => { s1 = Automerge.change(s1, doc => Automerge.splice(doc, "text", 0, 0, 'a"b')) assert.strictEqual(JSON.stringify(s1), '{"text":"a\\"b"}') }) - it("should allow modification after an object is assigned to a document", () => { + it('should allow modification after an object is assigned to a document', () => { s1 = Automerge.change(Automerge.init(), doc => { doc.text = "" - Automerge.splice(doc, "text", 0, 0, "abcd") - Automerge.splice(doc, "text", 2, 1) - assert.strictEqual(doc.text, "abd") + Automerge.splice(doc ,"text", 0, 0, 'abcd') + Automerge.splice(doc ,"text", 2, 1) + assert.strictEqual(doc.text, 'abd') }) - assert.strictEqual(s1.text, "abd") + assert.strictEqual(s1.text, 'abd') }) - it("should not allow modification outside of a change callback", () => { - assert.throws( - () => Automerge.splice(s1, "text", 0, 0, "a"), - /object cannot be modified outside of a change block/ - ) + it('should not allow modification outside of a change callback', () => { + assert.throws(() => Automerge.splice(s1 ,"text", 0, 0, 'a'), /object cannot be modified outside of a change block/) }) - describe("with initial value", () => { - it("should initialize text in Automerge.from()", () => { - let s1 = Automerge.from({ text: "init" }) + describe('with initial value', () => { + + it('should initialize text in Automerge.from()', () => { + let s1 = Automerge.from({text: 'init'}) assert.strictEqual(s1.text.length, 4) - assert.strictEqual(s1.text[0], "i") - assert.strictEqual(s1.text[1], "n") - assert.strictEqual(s1.text[2], "i") - assert.strictEqual(s1.text[3], "t") - assert.strictEqual(s1.text, "init") + assert.strictEqual(s1.text[0], 'i') + assert.strictEqual(s1.text[1], 'n') + assert.strictEqual(s1.text[2], 'i') + assert.strictEqual(s1.text[3], 't') + assert.strictEqual(s1.text, 'init') }) - it("should encode the initial value as a change", () => { - const s1 = Automerge.from({ text: "init" }) + it('should encode the initial value as a change', () => { + const s1 = Automerge.from({text: 'init'}) const changes = Automerge.getAllChanges(s1) assert.strictEqual(changes.length, 1) - const [s2] = Automerge.applyChanges(Automerge.init(), changes) - assert.strictEqual(s2.text, "init") - assert.strictEqual(s2.text, "init") + const [s2] = Automerge.applyChanges(Automerge.init(), changes) + assert.strictEqual(s2.text, 'init') + assert.strictEqual(s2.text, 'init') }) + }) - it("should support unicode when creating text", () => { + it('should support unicode when creating text', () => { s1 = Automerge.from({ - text: "🐦", + text: '🐦' }) - assert.strictEqual(s1.text, "🐦") + // TODO utf16 indexing + assert.strictEqual(s1.text, '🐦') }) }) diff --git a/javascript/test/text_v1.ts b/javascript/test/text_v1.ts deleted file mode 100644 index b111530f..00000000 --- a/javascript/test/text_v1.ts +++ /dev/null @@ -1,281 +0,0 @@ -import * as assert from "assert" -import * as Automerge from "../src" -import { assertEqualsOneOf } from "./helpers" - -type DocType = { text: Automerge.Text; [key: string]: any } - -describe("Automerge.Text", () => { - let s1: Automerge.Doc, s2: Automerge.Doc - beforeEach(() => { - s1 = Automerge.change( - Automerge.init(), - doc => (doc.text = new Automerge.Text()) - ) - s2 = Automerge.merge(Automerge.init(), s1) - }) - - it("should support insertion", () => { - s1 = Automerge.change(s1, doc => doc.text.insertAt(0, "a")) - assert.strictEqual(s1.text.length, 1) - assert.strictEqual(s1.text.get(0), "a") - assert.strictEqual(s1.text.toString(), "a") - //assert.strictEqual(s1.text.getElemId(0), `2@${Automerge.getActorId(s1)}`) - }) - - it("should support deletion", () => { - s1 = Automerge.change(s1, doc => doc.text.insertAt(0, "a", "b", "c")) - s1 = Automerge.change(s1, doc => doc.text.deleteAt(1, 1)) - assert.strictEqual(s1.text.length, 2) - assert.strictEqual(s1.text.get(0), "a") - assert.strictEqual(s1.text.get(1), "c") - assert.strictEqual(s1.text.toString(), "ac") - }) - - it("should support implicit and explicit deletion", () => { - s1 = Automerge.change(s1, doc => doc.text.insertAt(0, "a", "b", "c")) - s1 = Automerge.change(s1, doc => doc.text.deleteAt(1)) - s1 = Automerge.change(s1, doc => doc.text.deleteAt(1, 0)) - assert.strictEqual(s1.text.length, 2) - assert.strictEqual(s1.text.get(0), "a") - assert.strictEqual(s1.text.get(1), "c") - assert.strictEqual(s1.text.toString(), "ac") - }) - - it("should handle concurrent insertion", () => { - s1 = Automerge.change(s1, doc => doc.text.insertAt(0, "a", "b", "c")) - s2 = Automerge.change(s2, doc => doc.text.insertAt(0, "x", "y", "z")) - s1 = Automerge.merge(s1, s2) - assert.strictEqual(s1.text.length, 6) - assertEqualsOneOf(s1.text.toString(), "abcxyz", "xyzabc") - assertEqualsOneOf(s1.text.join(""), "abcxyz", "xyzabc") - }) - - it("should handle text and other ops in the same change", () => { - s1 = Automerge.change(s1, doc => { - doc.foo = "bar" - doc.text.insertAt(0, "a") - }) - assert.strictEqual(s1.foo, "bar") - assert.strictEqual(s1.text.toString(), "a") - assert.strictEqual(s1.text.join(""), "a") - }) - - it("should serialize to JSON as a simple string", () => { - s1 = Automerge.change(s1, doc => doc.text.insertAt(0, "a", '"', "b")) - assert.strictEqual(JSON.stringify(s1), '{"text":"a\\"b"}') - }) - - it("should allow modification before an object is assigned to a document", () => { - s1 = Automerge.change(Automerge.init(), doc => { - const text = new Automerge.Text() - text.insertAt(0, "a", "b", "c", "d") - text.deleteAt(2) - doc.text = text - assert.strictEqual(doc.text.toString(), "abd") - assert.strictEqual(doc.text.join(""), "abd") - }) - assert.strictEqual(s1.text.toString(), "abd") - assert.strictEqual(s1.text.join(""), "abd") - }) - - it("should allow modification after an object is assigned to a document", () => { - s1 = Automerge.change(Automerge.init(), doc => { - const text = new Automerge.Text() - doc.text = text - doc.text.insertAt(0, "a", "b", "c", "d") - doc.text.deleteAt(2) - assert.strictEqual(doc.text.toString(), "abd") - assert.strictEqual(doc.text.join(""), "abd") - }) - assert.strictEqual(s1.text.join(""), "abd") - }) - - it("should not allow modification outside of a change callback", () => { - assert.throws( - () => s1.text.insertAt(0, "a"), - /object cannot be modified outside of a change block/ - ) - }) - - describe("with initial value", () => { - it("should accept a string as initial value", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.text = new Automerge.Text("init")) - ) - assert.strictEqual(s1.text.length, 4) - assert.strictEqual(s1.text.get(0), "i") - assert.strictEqual(s1.text.get(1), "n") - assert.strictEqual(s1.text.get(2), "i") - assert.strictEqual(s1.text.get(3), "t") - assert.strictEqual(s1.text.toString(), "init") - }) - - it("should accept an array as initial value", () => { - let s1 = Automerge.change( - Automerge.init(), - doc => (doc.text = new Automerge.Text(["i", "n", "i", "t"])) - ) - assert.strictEqual(s1.text.length, 4) - assert.strictEqual(s1.text.get(0), "i") - assert.strictEqual(s1.text.get(1), "n") - assert.strictEqual(s1.text.get(2), "i") - assert.strictEqual(s1.text.get(3), "t") - assert.strictEqual(s1.text.toString(), "init") - }) - - it("should initialize text in Automerge.from()", () => { - let s1 = Automerge.from({ text: new Automerge.Text("init") }) - assert.strictEqual(s1.text.length, 4) - assert.strictEqual(s1.text.get(0), "i") - assert.strictEqual(s1.text.get(1), "n") - assert.strictEqual(s1.text.get(2), "i") - assert.strictEqual(s1.text.get(3), "t") - assert.strictEqual(s1.text.toString(), "init") - }) - - it("should encode the initial value as a change", () => { - const s1 = Automerge.from({ text: new Automerge.Text("init") }) - const changes = Automerge.getAllChanges(s1) - assert.strictEqual(changes.length, 1) - const [s2] = Automerge.applyChanges(Automerge.init(), changes) - assert.strictEqual(s2.text instanceof Automerge.Text, true) - assert.strictEqual(s2.text.toString(), "init") - assert.strictEqual(s2.text.join(""), "init") - }) - - it("should allow immediate access to the value", () => { - Automerge.change(Automerge.init(), doc => { - const text = new Automerge.Text("init") - assert.strictEqual(text.length, 4) - assert.strictEqual(text.get(0), "i") - assert.strictEqual(text.toString(), "init") - doc.text = text - assert.strictEqual(doc.text.length, 4) - assert.strictEqual(doc.text.get(0), "i") - assert.strictEqual(doc.text.toString(), "init") - }) - }) - - it("should allow pre-assignment modification of the initial value", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - const text = new Automerge.Text("init") - text.deleteAt(3) - assert.strictEqual(text.join(""), "ini") - doc.text = text - assert.strictEqual(doc.text.join(""), "ini") - assert.strictEqual(doc.text.toString(), "ini") - }) - assert.strictEqual(s1.text.toString(), "ini") - assert.strictEqual(s1.text.join(""), "ini") - }) - - it("should allow post-assignment modification of the initial value", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - const text = new Automerge.Text("init") - doc.text = text - doc.text.deleteAt(0) - doc.text.insertAt(0, "I") - assert.strictEqual(doc.text.join(""), "Init") - assert.strictEqual(doc.text.toString(), "Init") - }) - assert.strictEqual(s1.text.join(""), "Init") - assert.strictEqual(s1.text.toString(), "Init") - }) - }) - - describe("non-textual control characters", () => { - let s1: Automerge.Doc - beforeEach(() => { - s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text() - doc.text.insertAt(0, "a") - doc.text.insertAt(1, { attribute: "bold" }) - }) - }) - - it("should allow fetching non-textual characters", () => { - assert.deepEqual(s1.text.get(1), { attribute: "bold" }) - //assert.strictEqual(s1.text.getElemId(1), `3@${Automerge.getActorId(s1)}`) - }) - - it("should include control characters in string length", () => { - assert.strictEqual(s1.text.length, 2) - assert.strictEqual(s1.text.get(0), "a") - }) - - it("should replace control characters from toString()", () => { - assert.strictEqual(s1.text.toString(), "a\uFFFC") - }) - - it("should allow control characters to be updated", () => { - const s2 = Automerge.change( - s1, - doc => (doc.text.get(1)!.attribute = "italic") - ) - const s3 = Automerge.load(Automerge.save(s2)) - assert.strictEqual(s1.text.get(1).attribute, "bold") - assert.strictEqual(s2.text.get(1).attribute, "italic") - assert.strictEqual(s3.text.get(1).attribute, "italic") - }) - - describe("spans interface to Text", () => { - it("should return a simple string as a single span", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text("hello world") - }) - assert.deepEqual(s1.text.toSpans(), ["hello world"]) - }) - it("should return an empty string as an empty array", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text() - }) - assert.deepEqual(s1.text.toSpans(), []) - }) - it("should split a span at a control character", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text("hello world") - doc.text.insertAt(5, { attributes: { bold: true } }) - }) - assert.deepEqual(s1.text.toSpans(), [ - "hello", - { attributes: { bold: true } }, - " world", - ]) - }) - it("should allow consecutive control characters", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text("hello world") - doc.text.insertAt(5, { attributes: { bold: true } }) - doc.text.insertAt(6, { attributes: { italic: true } }) - }) - assert.deepEqual(s1.text.toSpans(), [ - "hello", - { attributes: { bold: true } }, - { attributes: { italic: true } }, - " world", - ]) - }) - it("should allow non-consecutive control characters", () => { - let s1 = Automerge.change(Automerge.init(), doc => { - doc.text = new Automerge.Text("hello world") - doc.text.insertAt(5, { attributes: { bold: true } }) - doc.text.insertAt(12, { attributes: { italic: true } }) - }) - assert.deepEqual(s1.text.toSpans(), [ - "hello", - { attributes: { bold: true } }, - " world", - { attributes: { italic: true } }, - ]) - }) - }) - }) - - it("should support unicode when creating text", () => { - s1 = Automerge.from({ - text: new Automerge.Text("🐦"), - }) - assert.strictEqual(s1.text.get(0), "🐦") - }) -}) diff --git a/javascript/test/uuid_test.ts b/javascript/test/uuid_test.ts index f6a0bde4..4182a8c4 100644 --- a/javascript/test/uuid_test.ts +++ b/javascript/test/uuid_test.ts @@ -1,20 +1,20 @@ -import * as assert from "assert" -import * as Automerge from "../src" +import * as assert from 'assert' +import * as Automerge from '../src' const uuid = Automerge.uuid -describe("uuid", () => { +describe('uuid', () => { afterEach(() => { uuid.reset() }) - describe("default implementation", () => { - it("generates unique values", () => { + describe('default implementation', () => { + it('generates unique values', () => { assert.notEqual(uuid(), uuid()) }) }) - describe("custom implementation", () => { + describe('custom implementation', () => { let counter function customUuid() { @@ -22,11 +22,11 @@ describe("uuid", () => { } before(() => uuid.setFactory(customUuid)) - beforeEach(() => (counter = 0)) + beforeEach(() => counter = 0) - it("invokes the custom factory", () => { - assert.equal(uuid(), "custom-uuid-0") - assert.equal(uuid(), "custom-uuid-1") + it('invokes the custom factory', () => { + assert.equal(uuid(), 'custom-uuid-0') + assert.equal(uuid(), 'custom-uuid-1') }) }) }) diff --git a/javascript/tsconfig.json b/javascript/tsconfig.json index 628aea8e..80dd7c76 100644 --- a/javascript/tsconfig.json +++ b/javascript/tsconfig.json @@ -1,19 +1,22 @@ { - "compilerOptions": { - "target": "es2016", - "sourceMap": false, - "declaration": true, - "resolveJsonModule": true, - "module": "commonjs", - "moduleResolution": "node", - "noImplicitAny": false, - "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, - "strict": true, - "noFallthroughCasesInSwitch": true, - "skipLibCheck": true, - "outDir": "./dist" - }, - "include": ["src/**/*", "test/**/*"], - "exclude": ["./dist/**/*", "./node_modules", "./src/**/*.deno.ts"] + "compilerOptions": { + "target": "es2016", + "sourceMap": false, + "declaration": true, + "resolveJsonModule": true, + "module": "commonjs", + "moduleResolution": "node", + "noImplicitAny": false, + "allowSyntheticDefaultImports": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "outDir": "./dist" + }, + "include": [ "src/**/*" ], + "exclude": [ + "./dist/**/*", + "./node_modules" + ] } diff --git a/javascript/typedoc-readme.md b/javascript/typedoc-readme.md new file mode 100644 index 00000000..05025ac1 --- /dev/null +++ b/javascript/typedoc-readme.md @@ -0,0 +1,220 @@ +# Automerge + +This library provides the core automerge data structure and sync algorithms. +Other libraries can be built on top of this one which provide IO and +persistence. + +An automerge document can be though of an immutable POJO (plain old javascript +object) which `automerge` tracks the history of, allowing it to be merged with +any other automerge document. + +## Creating and modifying a document + +You can create a document with {@link init} or {@link from} and then make +changes to it with {@link change}, you can merge two documents with {@link +merge}. + +```javascript +import * as automerge from "@automerge/automerge" + +type DocType = {ideas: Array} + +let doc1 = automerge.init() +doc1 = automerge.change(doc1, d => { + d.ideas = [new automerge.Text("an immutable document")] +}) + +let doc2 = automerge.init() +doc2 = automerge.merge(doc2, automerge.clone(doc1)) +doc2 = automerge.change(doc2, d => { + d.ideas.push(new automerge.Text("which records it's history")) +}) + +// Note the `automerge.clone` call, see the "cloning" section of this readme for +// more detail +doc1 = automerge.merge(doc1, automerge.clone(doc2)) +doc1 = automerge.change(doc1, d => { + d.ideas[0].deleteAt(13, 8) + d.ideas[0].insertAt(13, "object") +}) + +let doc3 = automerge.merge(doc1, doc2) +// doc3 is now {ideas: ["an immutable object", "which records it's history"]} +``` + +## Applying changes from another document + +You can get a representation of the result of the last {@link change} you made +to a document with {@link getLastLocalChange} and you can apply that change to +another document using {@link applyChanges}. + +If you need to get just the changes which are in one document but not in another +you can use {@link getHeads} to get the heads of the document without the +changes and then {@link getMissingDeps}, passing the result of {@link getHeads} +on the document with the changes. + +## Saving and loading documents + +You can {@link save} a document to generate a compresed binary representation of +the document which can be loaded with {@link load}. If you have a document which +you have recently made changes to you can generate recent changes with {@link +saveIncremental}, this will generate all the changes since you last called +`saveIncremental`, the changes generated can be applied to another document with +{@link loadIncremental}. + +## Viewing different versions of a document + +Occasionally you may wish to explicitly step to a different point in a document +history. One common reason to do this is if you need to obtain a set of changes +which take the document from one state to another in order to send those changes +to another peer (or to save them somewhere). You can use {@link view} to do this. + +```javascript +import * as automerge from "@automerge/automerge" +import * as assert from "assert" + +let doc = automerge.from({ + "key1": "value1" +}) + +// Make a clone of the document at this point, maybe this is actually on another +// peer. +let doc2 = automerge.clone(doc) + +let heads = automerge.getHeads(doc) + +doc = automerge.change(doc, d => { + d.key2 = "value2" +}) + +doc = automerge.change(doc, d => { + d.key3 = "value3" +}) + +// At this point we've generated two separate changes, now we want to send +// just those changes to someone else + +// view is a cheap reference based copy of a document at a given set of heads +let before = automerge.view(doc, heads) + +// This view doesn't show the last two changes in the document state +assert.deepEqual(before, { + key1: "value1" +}) + +// Get the changes to send to doc2 +let changes = automerge.getChanges(before, doc) + +// Apply the changes at doc2 +doc2 = automerge.applyChanges(doc2, changes)[0] +assert.deepEqual(doc2, { + key1: "value1", + key2: "value2", + key3: "value3" +}) +``` + +If you have a {@link view} of a document which you want to make changes to you +can {@link clone} the viewed document. + +## Syncing + +The sync protocol is stateful. This means that we start by creating a {@link +SyncState} for each peer we are communicating with using {@link initSyncState}. +Then we generate a message to send to the peer by calling {@link +generateSyncMessage}. When we receive a message from the peer we call {@link +receiveSyncMessage}. Here's a simple example of a loop which just keeps two +peers in sync. + + +```javascript +let sync1 = automerge.initSyncState() +let msg: Uint8Array | null +[sync1, msg] = automerge.generateSyncMessage(doc1, sync1) + +while (true) { + if (msg != null) { + network.send(msg) + } + let resp: Uint8Array = network.receive() + [doc1, sync1, _ignore] = automerge.receiveSyncMessage(doc1, sync1, resp) + [sync1, msg] = automerge.generateSyncMessage(doc1, sync1) +} +``` + + +## Conflicts + +The only time conflicts occur in automerge documents is in concurrent +assignments to the same key in an object. In this case automerge +deterministically chooses an arbitrary value to present to the application but +you can examine the conflicts using {@link getConflicts}. + +``` +import * as automerge from "@automerge/automerge" + +type Profile = { + pets: Array<{name: string, type: string}> +} + +let doc1 = automerge.init("aaaa") +doc1 = automerge.change(doc1, d => { + d.pets = [{name: "Lassie", type: "dog"}] +}) +let doc2 = automerge.init("bbbb") +doc2 = automerge.merge(doc2, automerge.clone(doc1)) + +doc2 = automerge.change(doc2, d => { + d.pets[0].name = "Beethoven" +}) + +doc1 = automerge.change(doc1, d => { + d.pets[0].name = "Babe" +}) + +const doc3 = automerge.merge(doc1, doc2) + +// Note that here we pass `doc3.pets`, not `doc3` +let conflicts = automerge.getConflicts(doc3.pets[0], "name") + +// The two conflicting values are the keys of the conflicts object +assert.deepEqual(Object.values(conflicts), ["Babe", Beethoven"]) +``` + +## Actor IDs + +By default automerge will generate a random actor ID for you, but most methods +for creating a document allow you to set the actor ID. You can get the actor ID +associated with the document by calling {@link getActorId}. Actor IDs must not +be used in concurrent threads of executiong - all changes by a given actor ID +are expected to be sequential. + + +## Listening to patches + +Sometimes you want to respond to changes made to an automerge document. In this +case you can use the {@link PatchCallback} type to receive notifications when +changes have been made. + +## Cloning + +Currently you cannot make mutating changes (i.e. call {@link change}) to a +document which you have two pointers to. For example, in this code: + +```javascript +let doc1 = automerge.init() +let doc2 = automerge.change(doc1, d => d.key = "value") +``` + +`doc1` and `doc2` are both pointers to the same state. Any attempt to call +mutating methods on `doc1` will now result in an error like + + Attempting to change an out of date document + +If you encounter this you need to clone the original document, the above sample +would work as: + +```javascript +let doc1 = automerge.init() +let doc2 = automerge.change(automerge.clone(doc1), d => d.key = "value") +``` diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 5d29fc9f..938100cf 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -10,8 +10,13 @@ members = [ resolver = "2" [profile.release] +debug = true lto = true -codegen-units = 1 +opt-level = 3 [profile.bench] -debug = true \ No newline at end of file +debug = true + +[profile.release.package.automerge-wasm] +debug = false +opt-level = 3 diff --git a/rust/automerge-c/.clang-format b/rust/automerge-c/.clang-format deleted file mode 100644 index dbf16c21..00000000 --- a/rust/automerge-c/.clang-format +++ /dev/null @@ -1,250 +0,0 @@ ---- -Language: Cpp -# BasedOnStyle: Chromium -AccessModifierOffset: -1 -AlignAfterOpenBracket: Align -AlignArrayOfStructures: None -AlignConsecutiveAssignments: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - PadOperators: true -AlignConsecutiveBitFields: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - PadOperators: false -AlignConsecutiveDeclarations: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - PadOperators: false -AlignConsecutiveMacros: - Enabled: false - AcrossEmptyLines: false - AcrossComments: false - AlignCompound: false - PadOperators: false -AlignEscapedNewlines: Left -AlignOperands: Align -AlignTrailingComments: true -AllowAllArgumentsOnNextLine: true -AllowAllParametersOfDeclarationOnNextLine: false -AllowShortEnumsOnASingleLine: true -AllowShortBlocksOnASingleLine: Never -AllowShortCaseLabelsOnASingleLine: false -AllowShortFunctionsOnASingleLine: Inline -AllowShortLambdasOnASingleLine: All -AllowShortIfStatementsOnASingleLine: Never -AllowShortLoopsOnASingleLine: false -AlwaysBreakAfterDefinitionReturnType: None -AlwaysBreakAfterReturnType: None -AlwaysBreakBeforeMultilineStrings: true -AlwaysBreakTemplateDeclarations: Yes -AttributeMacros: - - __capability -BinPackArguments: true -BinPackParameters: false -BraceWrapping: - AfterCaseLabel: false - AfterClass: false - AfterControlStatement: Never - AfterEnum: false - AfterFunction: false - AfterNamespace: false - AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false - AfterExternBlock: false - BeforeCatch: false - BeforeElse: false - BeforeLambdaBody: false - BeforeWhile: false - IndentBraces: false - SplitEmptyFunction: true - SplitEmptyRecord: true - SplitEmptyNamespace: true -BreakBeforeBinaryOperators: None -BreakBeforeConceptDeclarations: Always -BreakBeforeBraces: Attach -BreakBeforeInheritanceComma: false -BreakInheritanceList: BeforeColon -BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false -BreakConstructorInitializers: BeforeColon -BreakAfterJavaFieldAnnotations: false -BreakStringLiterals: true -ColumnLimit: 120 -CommentPragmas: '^ IWYU pragma:' -QualifierAlignment: Leave -CompactNamespaces: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 -Cpp11BracedListStyle: true -DeriveLineEnding: true -DerivePointerAlignment: false -DisableFormat: false -EmptyLineAfterAccessModifier: Never -EmptyLineBeforeAccessModifier: LogicalBlock -ExperimentalAutoDetectBinPacking: false -PackConstructorInitializers: NextLine -BasedOnStyle: '' -ConstructorInitializerAllOnOneLineOrOnePerLine: false -AllowAllConstructorInitializersOnNextLine: true -FixNamespaceComments: true -ForEachMacros: - - foreach - - Q_FOREACH - - BOOST_FOREACH -IfMacros: - - KJ_IF_MAYBE -IncludeBlocks: Preserve -IncludeCategories: - - Regex: '^' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*\.h>' - Priority: 1 - SortPriority: 0 - CaseSensitive: false - - Regex: '^<.*' - Priority: 2 - SortPriority: 0 - CaseSensitive: false - - Regex: '.*' - Priority: 3 - SortPriority: 0 - CaseSensitive: false -IncludeIsMainRegex: '([-_](test|unittest))?$' -IncludeIsMainSourceRegex: '' -IndentAccessModifiers: false -IndentCaseLabels: true -IndentCaseBlocks: false -IndentGotoLabels: true -IndentPPDirectives: None -IndentExternBlock: AfterExternBlock -IndentRequiresClause: true -IndentWidth: 4 -IndentWrappedFunctionNames: false -InsertBraces: false -InsertTrailingCommas: None -JavaScriptQuotes: Leave -JavaScriptWrapImports: true -KeepEmptyLinesAtTheStartOfBlocks: false -LambdaBodyIndentation: Signature -MacroBlockBegin: '' -MacroBlockEnd: '' -MaxEmptyLinesToKeep: 1 -NamespaceIndentation: None -ObjCBinPackProtocolList: Never -ObjCBlockIndentWidth: 2 -ObjCBreakBeforeNestedBlockParam: true -ObjCSpaceAfterProperty: false -ObjCSpaceBeforeProtocolList: true -PenaltyBreakAssignment: 2 -PenaltyBreakBeforeFirstCallParameter: 1 -PenaltyBreakComment: 300 -PenaltyBreakFirstLessLess: 120 -PenaltyBreakOpenParenthesis: 0 -PenaltyBreakString: 1000 -PenaltyBreakTemplateDeclaration: 10 -PenaltyExcessCharacter: 1000000 -PenaltyReturnTypeOnItsOwnLine: 200 -PenaltyIndentedWhitespace: 0 -PointerAlignment: Left -PPIndentWidth: -1 -RawStringFormats: - - Language: Cpp - Delimiters: - - cc - - CC - - cpp - - Cpp - - CPP - - 'c++' - - 'C++' - CanonicalDelimiter: '' - BasedOnStyle: google - - Language: TextProto - Delimiters: - - pb - - PB - - proto - - PROTO - EnclosingFunctions: - - EqualsProto - - EquivToProto - - PARSE_PARTIAL_TEXT_PROTO - - PARSE_TEST_PROTO - - PARSE_TEXT_PROTO - - ParseTextOrDie - - ParseTextProtoOrDie - - ParseTestProto - - ParsePartialTestProto - CanonicalDelimiter: pb - BasedOnStyle: google -ReferenceAlignment: Pointer -ReflowComments: true -RemoveBracesLLVM: false -RequiresClausePosition: OwnLine -SeparateDefinitionBlocks: Leave -ShortNamespaceLines: 1 -SortIncludes: CaseSensitive -SortJavaStaticImport: Before -SortUsingDeclarations: true -SpaceAfterCStyleCast: false -SpaceAfterLogicalNot: false -SpaceAfterTemplateKeyword: true -SpaceBeforeAssignmentOperators: true -SpaceBeforeCaseColon: false -SpaceBeforeCpp11BracedList: false -SpaceBeforeCtorInitializerColon: true -SpaceBeforeInheritanceColon: true -SpaceBeforeParens: ControlStatements -SpaceBeforeParensOptions: - AfterControlStatements: true - AfterForeachMacros: true - AfterFunctionDefinitionName: false - AfterFunctionDeclarationName: false - AfterIfMacros: true - AfterOverloadedOperator: false - AfterRequiresInClause: false - AfterRequiresInExpression: false - BeforeNonEmptyParentheses: false -SpaceAroundPointerQualifiers: Default -SpaceBeforeRangeBasedForLoopColon: true -SpaceInEmptyBlock: false -SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 2 -SpacesInAngles: Never -SpacesInConditionalStatement: false -SpacesInContainerLiterals: true -SpacesInCStyleCastParentheses: false -SpacesInLineCommentPrefix: - Minimum: 1 - Maximum: -1 -SpacesInParentheses: false -SpacesInSquareBrackets: false -SpaceBeforeSquareBrackets: false -BitFieldColonSpacing: Both -Standard: Auto -StatementAttributeLikeMacros: - - Q_EMIT -StatementMacros: - - Q_UNUSED - - QT_REQUIRE_VERSION -TabWidth: 8 -UseCRLF: false -UseTab: Never -WhitespaceSensitiveMacros: - - STRINGIZE - - PP_STRINGIZE - - BOOST_PP_STRINGIZE - - NS_SWIFT_NAME - - CF_SWIFT_NAME -... - diff --git a/rust/automerge-c/.gitignore b/rust/automerge-c/.gitignore index 14d74973..f04de582 100644 --- a/rust/automerge-c/.gitignore +++ b/rust/automerge-c/.gitignore @@ -1,10 +1,10 @@ automerge automerge.h automerge.o -build/ -CMakeCache.txt +*.cmake CMakeFiles -CMakePresets.json Makefile DartConfiguration.tcl -out/ +config.h +CMakeCache.txt +Cargo diff --git a/rust/automerge-c/CMakeLists.txt b/rust/automerge-c/CMakeLists.txt index 0c35eebd..1b68669a 100644 --- a/rust/automerge-c/CMakeLists.txt +++ b/rust/automerge-c/CMakeLists.txt @@ -1,297 +1,97 @@ -cmake_minimum_required(VERSION 3.23 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) -project(automerge-c VERSION 0.1.0 - LANGUAGES C - DESCRIPTION "C bindings for the Automerge Rust library.") +set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -set(LIBRARY_NAME "automerge") +# Parse the library name, project name and project version out of Cargo's TOML file. +set(CARGO_LIB_SECTION OFF) -set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +set(LIBRARY_NAME "") -option(BUILD_SHARED_LIBS "Enable the choice of a shared or static library.") +set(CARGO_PKG_SECTION OFF) + +set(CARGO_PKG_NAME "") + +set(CARGO_PKG_VERSION "") + +file(READ Cargo.toml TOML_STRING) + +string(REPLACE ";" "\\\\;" TOML_STRING "${TOML_STRING}") + +string(REPLACE "\n" ";" TOML_LINES "${TOML_STRING}") + +foreach(TOML_LINE IN ITEMS ${TOML_LINES}) + string(REGEX MATCH "^\\[(lib|package)\\]$" _ ${TOML_LINE}) + + if(CMAKE_MATCH_1 STREQUAL "lib") + set(CARGO_LIB_SECTION ON) + + set(CARGO_PKG_SECTION OFF) + elseif(CMAKE_MATCH_1 STREQUAL "package") + set(CARGO_LIB_SECTION OFF) + + set(CARGO_PKG_SECTION ON) + endif() + + string(REGEX MATCH "^name += +\"([^\"]+)\"$" _ ${TOML_LINE}) + + if(CMAKE_MATCH_1 AND (CARGO_LIB_SECTION AND NOT CARGO_PKG_SECTION)) + set(LIBRARY_NAME "${CMAKE_MATCH_1}") + elseif(CMAKE_MATCH_1 AND (NOT CARGO_LIB_SECTION AND CARGO_PKG_SECTION)) + set(CARGO_PKG_NAME "${CMAKE_MATCH_1}") + endif() + + string(REGEX MATCH "^version += +\"([^\"]+)\"$" _ ${TOML_LINE}) + + if(CMAKE_MATCH_1 AND CARGO_PKG_SECTION) + set(CARGO_PKG_VERSION "${CMAKE_MATCH_1}") + endif() + + if(LIBRARY_NAME AND (CARGO_PKG_NAME AND CARGO_PKG_VERSION)) + break() + endif() +endforeach() + +project(${CARGO_PKG_NAME} VERSION 0.0.1 LANGUAGES C DESCRIPTION "C bindings for the Automerge Rust backend.") include(CTest) +option(BUILD_SHARED_LIBS "Enable the choice of a shared or static library.") + include(CMakePackageConfigHelpers) include(GNUInstallDirs) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") - string(MAKE_C_IDENTIFIER ${PROJECT_NAME} SYMBOL_PREFIX) string(TOUPPER ${SYMBOL_PREFIX} SYMBOL_PREFIX) -set(CARGO_TARGET_DIR "${CMAKE_BINARY_DIR}/Cargo/target") +set(CARGO_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/Cargo/target") -set(CBINDGEN_INCLUDEDIR "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}") +set(CBINDGEN_INCLUDEDIR "${CARGO_TARGET_DIR}/${CMAKE_INSTALL_INCLUDEDIR}") set(CBINDGEN_TARGET_DIR "${CBINDGEN_INCLUDEDIR}/${PROJECT_NAME}") -find_program ( - CARGO_CMD - "cargo" - PATHS "$ENV{CARGO_HOME}/bin" - DOC "The Cargo command" -) +add_subdirectory(src) -if(NOT CARGO_CMD) - message(FATAL_ERROR "Cargo (Rust package manager) not found! " - "Please install it and/or set the CARGO_HOME " - "environment variable to its path.") -endif() - -string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER) - -# In order to build with -Z build-std, we need to pass target explicitly. -# https://doc.rust-lang.org/cargo/reference/unstable.html#build-std -execute_process ( - COMMAND rustc -vV - OUTPUT_VARIABLE RUSTC_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE -) -string(REGEX REPLACE ".*host: ([^ \n]*).*" "\\1" - CARGO_TARGET - ${RUSTC_VERSION} -) - -if(BUILD_TYPE_LOWER STREQUAL debug) - set(CARGO_BUILD_TYPE "debug") - - set(CARGO_FLAG --target=${CARGO_TARGET}) -else() - set(CARGO_BUILD_TYPE "release") - - if (NOT RUSTC_VERSION MATCHES "nightly") - set(RUSTUP_TOOLCHAIN nightly) - endif() - - set(RUSTFLAGS -C\ panic=abort) - - set(CARGO_FLAG -Z build-std=std,panic_abort --release --target=${CARGO_TARGET}) -endif() - -set(CARGO_FEATURES "") - -set(CARGO_BINARY_DIR "${CARGO_TARGET_DIR}/${CARGO_TARGET}/${CARGO_BUILD_TYPE}") - -set(BINDINGS_NAME "${LIBRARY_NAME}_core") - -configure_file( - ${CMAKE_MODULE_PATH}/Cargo.toml.in - ${CMAKE_SOURCE_DIR}/Cargo.toml - @ONLY - NEWLINE_STYLE LF -) - -set(INCLUDE_GUARD_PREFIX "${SYMBOL_PREFIX}") - -configure_file( - ${CMAKE_MODULE_PATH}/cbindgen.toml.in - ${CMAKE_SOURCE_DIR}/cbindgen.toml - @ONLY - NEWLINE_STYLE LF -) - -set(CARGO_OUTPUT - ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h - ${CARGO_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${BINDINGS_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} -) - -# \note cbindgen's naming behavior isn't fully configurable and it ignores -# `const fn` calls (https://github.com/eqrion/cbindgen/issues/252). -add_custom_command( - OUTPUT - ${CARGO_OUTPUT} - COMMAND - # \note cbindgen won't regenerate its output header file after it's been removed but it will after its - # configuration file has been updated. - ${CMAKE_COMMAND} -DCONDITION=NOT_EXISTS -P ${CMAKE_SOURCE_DIR}/cmake/file-touch.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h ${CMAKE_SOURCE_DIR}/cbindgen.toml - COMMAND - ${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${CARGO_TARGET_DIR} CBINDGEN_TARGET_DIR=${CBINDGEN_TARGET_DIR} RUSTUP_TOOLCHAIN=${RUSTUP_TOOLCHAIN} RUSTFLAGS=${RUSTFLAGS} ${CARGO_CMD} build ${CARGO_FLAG} ${CARGO_FEATURES} - COMMAND - # Compensate for cbindgen's translation of consecutive uppercase letters to "ScreamingSnakeCase". - ${CMAKE_COMMAND} -DMATCH_REGEX=A_M\([^_]+\)_ -DREPLACE_EXPR=AM_\\1_ -P ${CMAKE_SOURCE_DIR}/cmake/file-regex-replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h - COMMAND - # Compensate for cbindgen ignoring `std:mem::size_of()` calls. - ${CMAKE_COMMAND} -DMATCH_REGEX=USIZE_ -DREPLACE_EXPR=\+${CMAKE_SIZEOF_VOID_P} -P ${CMAKE_SOURCE_DIR}/cmake/file-regex-replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h - MAIN_DEPENDENCY - src/lib.rs - DEPENDS - src/actor_id.rs - src/byte_span.rs - src/change.rs - src/doc.rs - src/doc/list.rs - src/doc/map.rs - src/doc/utils.rs - src/index.rs - src/item.rs - src/items.rs - src/obj.rs - src/result.rs - src/sync.rs - src/sync/have.rs - src/sync/message.rs - src/sync/state.rs - ${CMAKE_SOURCE_DIR}/build.rs - ${CMAKE_MODULE_PATH}/Cargo.toml.in - ${CMAKE_MODULE_PATH}/cbindgen.toml.in - WORKING_DIRECTORY - ${CMAKE_SOURCE_DIR} - COMMENT - "Producing the bindings' artifacts with Cargo..." - VERBATIM -) - -add_custom_target(${BINDINGS_NAME}_artifacts ALL - DEPENDS ${CARGO_OUTPUT} -) - -add_library(${BINDINGS_NAME} STATIC IMPORTED GLOBAL) - -target_include_directories(${BINDINGS_NAME} INTERFACE "${CBINDGEN_INCLUDEDIR}") - -set_target_properties( - ${BINDINGS_NAME} - PROPERTIES - # \note Cargo writes a debug build into a nested directory instead of - # decorating its name. - DEBUG_POSTFIX "" - DEFINE_SYMBOL "" - IMPORTED_IMPLIB "" - IMPORTED_LOCATION "${CARGO_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${BINDINGS_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}" - IMPORTED_NO_SONAME "TRUE" - IMPORTED_SONAME "" - LINKER_LANGUAGE C - PUBLIC_HEADER "${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h" - SOVERSION "${PROJECT_VERSION_MAJOR}" - VERSION "${PROJECT_VERSION}" - # \note Cargo exports all of the symbols automatically. - WINDOWS_EXPORT_ALL_SYMBOLS "TRUE" -) - -target_compile_definitions(${BINDINGS_NAME} INTERFACE $) - -set(UTILS_SUBDIR "utils") - -add_custom_command( - OUTPUT - ${CBINDGEN_TARGET_DIR}/${UTILS_SUBDIR}/enum_string.h - ${CMAKE_BINARY_DIR}/src/${UTILS_SUBDIR}/enum_string.c - COMMAND - ${CMAKE_COMMAND} -DPROJECT_NAME=${PROJECT_NAME} -DLIBRARY_NAME=${LIBRARY_NAME} -DSUBDIR=${UTILS_SUBDIR} -P ${CMAKE_SOURCE_DIR}/cmake/enum-string-functions-gen.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h ${CBINDGEN_TARGET_DIR}/${UTILS_SUBDIR}/enum_string.h ${CMAKE_BINARY_DIR}/src/${UTILS_SUBDIR}/enum_string.c - MAIN_DEPENDENCY - ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h - DEPENDS - ${CMAKE_SOURCE_DIR}/cmake/enum-string-functions-gen.cmake - WORKING_DIRECTORY - ${CMAKE_SOURCE_DIR} - COMMENT - "Generating the enum string functions with CMake..." - VERBATIM -) - -add_custom_target(${LIBRARY_NAME}_utilities - DEPENDS ${CBINDGEN_TARGET_DIR}/${UTILS_SUBDIR}/enum_string.h - ${CMAKE_BINARY_DIR}/src/${UTILS_SUBDIR}/enum_string.c -) - -add_library(${LIBRARY_NAME}) - -target_compile_features(${LIBRARY_NAME} PRIVATE c_std_99) - -set(CMAKE_THREAD_PREFER_PTHREAD TRUE) - -set(THREADS_PREFER_PTHREAD_FLAG TRUE) - -find_package(Threads REQUIRED) - -set(LIBRARY_DEPENDENCIES Threads::Threads ${CMAKE_DL_LIBS}) - -if(WIN32) - list(APPEND LIBRARY_DEPENDENCIES Bcrypt userenv ws2_32) -else() - list(APPEND LIBRARY_DEPENDENCIES m) -endif() - -target_link_libraries(${LIBRARY_NAME} - PUBLIC ${BINDINGS_NAME} - ${LIBRARY_DEPENDENCIES} -) - -# \note An imported library's INTERFACE_INCLUDE_DIRECTORIES property can't -# contain a non-existent path so its build-time include directory -# must be specified for all of its dependent targets instead. -target_include_directories(${LIBRARY_NAME} - PUBLIC "$" - "$" -) - -add_dependencies(${LIBRARY_NAME} ${BINDINGS_NAME}_artifacts) - -# Generate the configuration header. +# Generate and install the configuration header. math(EXPR INTEGER_PROJECT_VERSION_MAJOR "${PROJECT_VERSION_MAJOR} * 100000") math(EXPR INTEGER_PROJECT_VERSION_MINOR "${PROJECT_VERSION_MINOR} * 100") math(EXPR INTEGER_PROJECT_VERSION_PATCH "${PROJECT_VERSION_PATCH}") -math(EXPR INTEGER_PROJECT_VERSION "${INTEGER_PROJECT_VERSION_MAJOR} + \ - ${INTEGER_PROJECT_VERSION_MINOR} + \ - ${INTEGER_PROJECT_VERSION_PATCH}") +math(EXPR INTEGER_PROJECT_VERSION "${INTEGER_PROJECT_VERSION_MAJOR} + ${INTEGER_PROJECT_VERSION_MINOR} + ${INTEGER_PROJECT_VERSION_PATCH}") configure_file( ${CMAKE_MODULE_PATH}/config.h.in - ${CBINDGEN_TARGET_DIR}/config.h + config.h @ONLY NEWLINE_STYLE LF ) -target_sources(${LIBRARY_NAME} - PRIVATE - src/${UTILS_SUBDIR}/result.c - src/${UTILS_SUBDIR}/stack_callback_data.c - src/${UTILS_SUBDIR}/stack.c - src/${UTILS_SUBDIR}/string.c - ${CMAKE_BINARY_DIR}/src/${UTILS_SUBDIR}/enum_string.c - PUBLIC - FILE_SET api TYPE HEADERS - BASE_DIRS - ${CBINDGEN_INCLUDEDIR} - ${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR} - FILES - ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h - ${CBINDGEN_TARGET_DIR}/${UTILS_SUBDIR}/enum_string.h - ${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/result.h - ${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/stack_callback_data.h - ${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/stack.h - ${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/string.h - INTERFACE - FILE_SET config TYPE HEADERS - BASE_DIRS - ${CBINDGEN_INCLUDEDIR} - FILES - ${CBINDGEN_TARGET_DIR}/config.h -) - install( - TARGETS ${LIBRARY_NAME} - EXPORT ${PROJECT_NAME}-config - FILE_SET api - FILE_SET config -) - -# \note Install the Cargo-built core bindings to enable direct linkage. -install( - FILES $ - DESTINATION ${CMAKE_INSTALL_LIBDIR} -) - -install(EXPORT ${PROJECT_NAME}-config - FILE ${PROJECT_NAME}-config.cmake - NAMESPACE "${PROJECT_NAME}::" - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${LIB} + FILES ${CMAKE_BINARY_DIR}/config.h + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} ) if(BUILD_TESTING) @@ -300,6 +100,42 @@ if(BUILD_TESTING) enable_testing() endif() -add_subdirectory(docs) - add_subdirectory(examples EXCLUDE_FROM_ALL) + +# Generate and install .cmake files +set(PROJECT_CONFIG_NAME "${PROJECT_NAME}-config") + +set(PROJECT_CONFIG_VERSION_NAME "${PROJECT_CONFIG_NAME}-version") + +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CONFIG_VERSION_NAME}.cmake + VERSION ${PROJECT_VERSION} + COMPATIBILITY ExactVersion +) + +# The namespace label starts with the title-cased library name. +string(SUBSTRING ${LIBRARY_NAME} 0 1 NS_FIRST) + +string(SUBSTRING ${LIBRARY_NAME} 1 -1 NS_REST) + +string(TOUPPER ${NS_FIRST} NS_FIRST) + +string(TOLOWER ${NS_REST} NS_REST) + +string(CONCAT NAMESPACE ${NS_FIRST} ${NS_REST} "::") + +# \note CMake doesn't automate the exporting of an imported library's targets +# so the package configuration script must do it. +configure_package_config_file( + ${CMAKE_MODULE_PATH}/${PROJECT_CONFIG_NAME}.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CONFIG_NAME}.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} +) + +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CONFIG_NAME}.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_CONFIG_VERSION_NAME}.cmake + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} +) diff --git a/rust/automerge-c/Cargo.toml b/rust/automerge-c/Cargo.toml index 95a3a29c..851a3470 100644 --- a/rust/automerge-c/Cargo.toml +++ b/rust/automerge-c/Cargo.toml @@ -7,8 +7,8 @@ license = "MIT" rust-version = "1.57.0" [lib] -name = "automerge_core" -crate-type = ["staticlib"] +name = "automerge" +crate-type = ["cdylib", "staticlib"] bench = false doc = false @@ -19,4 +19,4 @@ libc = "^0.2" smol_str = "^0.1.21" [build-dependencies] -cbindgen = "^0.24" +cbindgen = "^0.20" diff --git a/rust/automerge-c/README.md b/rust/automerge-c/README.md index 1fbca3df..1b0e618d 100644 --- a/rust/automerge-c/README.md +++ b/rust/automerge-c/README.md @@ -1,207 +1,97 @@ -# Overview -automerge-c exposes a C API that can either be used directly or as the basis -for other language bindings that have good support for calling C functions. +## Methods we need to support -# Installing +### Basic management -See the main README for instructions on getting your environment set up and then -you can build the automerge-c library and install its constituent files within -a root directory of your choosing (e.g. "/usr/local") like so: -```shell -cmake -E make_directory automerge-c/build -cmake -S automerge-c -B automerge-c/build -cmake --build automerge-c/build -cmake --install automerge-c/build --prefix "/usr/local" -``` -Installation is important because the name, location and structure of CMake's -out-of-source build subdirectory is subject to change based on the platform and -the release version; generated headers like `automerge-c/config.h` and -`automerge-c/utils/enum_string.h` are only sure to be found within their -installed locations. + 1. `AMcreate()` + 1. `AMclone(doc)` + 1. `AMfree(doc)` + 1. `AMconfig(doc, key, val)` // set actor + 1. `actor = get_actor(doc)` -It's not obvious because they are versioned but the `Cargo.toml` and -`cbindgen.toml` configuration files are also generated in order to ensure that -the project name, project version and library name that they contain match those -specified within the top-level `CMakeLists.txt` file. +### Transactions -If you'd like to cross compile the library for different platforms you can do so -using [cross](https://github.com/cross-rs/cross). For example: + 1. `AMpendingOps(doc)` + 1. `AMcommit(doc, message, time)` + 1. `AMrollback(doc)` -- `cross build --manifest-path rust/automerge-c/Cargo.toml -r --target aarch64-unknown-linux-gnu` +### Write -This will output a shared library in the directory `rust/target/aarch64-unknown-linux-gnu/release/`. + 1. `AMset{Map|List}(doc, obj, prop, value)` + 1. `AMinsert(doc, obj, index, value)` + 1. `AMpush(doc, obj, value)` + 1. `AMdel{Map|List}(doc, obj, prop)` + 1. `AMinc{Map|List}(doc, obj, prop, value)` + 1. `AMspliceText(doc, obj, start, num_del, text)` -You can replace `aarch64-unknown-linux-gnu` with any -[cross supported targets](https://github.com/cross-rs/cross#supported-targets). -The targets below are known to work, though other targets are expected to work -too: +### Read (the heads argument is optional and can be on an `at` variant) -- `x86_64-apple-darwin` -- `aarch64-apple-darwin` -- `x86_64-unknown-linux-gnu` -- `aarch64-unknown-linux-gnu` + 1. `AMkeys(doc, obj, heads)` + 1. `AMlength(doc, obj, heads)` + 1. `AMlistRange(doc, obj, heads)` + 1. `AMmapRange(doc, obj, heads)` + 1. `AMvalues(doc, obj, heads)` + 1. `AMtext(doc, obj, heads)` -As a caveat, CMake generates the `automerge.h` header file in terms of the -processor architecture of the computer on which it was built so, for example, -don't use a header generated for a 64-bit processor if your target is a 32-bit -processor. +### Sync -# Usage + 1. `AMgenerateSyncMessage(doc, state)` + 1. `AMreceiveSyncMessage(doc, state, message)` + 1. `AMinitSyncState()` -You can build and view the C API's HTML reference documentation like so: -```shell -cmake -E make_directory automerge-c/build -cmake -S automerge-c -B automerge-c/build -cmake --build automerge-c/build --target automerge_docs -firefox automerge-c/build/src/html/index.html -``` +### Save / Load -To get started quickly, look at the -[examples](https://github.com/automerge/automerge-rs/tree/main/rust/automerge-c/examples). + 1. `AMload(data)` + 1. `AMloadIncremental(doc, data)` + 1. `AMsave(doc)` + 1. `AMsaveIncremental(doc)` -Almost all operations in automerge-c act on an Automerge document -(`AMdoc` struct) which is structurally similar to a JSON document. +### Low Level Access -You can get a document by calling either `AMcreate()` or `AMload()`. Operations -on a given document are not thread-safe so you must use a mutex or similar to -avoid calling more than one function on the same one concurrently. + 1. `AMapplyChanges(doc, changes)` + 1. `AMgetChanges(doc, deps)` + 1. `AMgetChangesAdded(doc1, doc2)` + 1. `AMgetHeads(doc)` + 1. `AMgetLastLocalChange(doc)` + 1. `AMgetMissingDeps(doc, heads)` -A C API function that could succeed or fail returns a result (`AMresult` struct) -containing a status code (`AMstatus` enum) and either a sequence of at least one -item (`AMitem` struct) or a read-only view onto a UTF-8 error message string -(`AMbyteSpan` struct). -An item contains up to three components: an index within its parent object -(`AMbyteSpan` struct or `size_t`), a unique identifier (`AMobjId` struct) and a -value. -The result of a successful function call that doesn't produce any values will -contain a single item that is void (`AM_VAL_TYPE_VOID`). -A returned result **must** be passed to `AMresultFree()` once the item(s) or -error message it contains is no longer needed in order to avoid a memory leak. -``` -#include -#include -#include -#include +### Encode/Decode -int main(int argc, char** argv) { - AMresult *docResult = AMcreate(NULL); + 1. `AMencodeChange(change)` + 1. `AMdecodeChange(change)` + 1. `AMencodeSyncMessage(change)` + 1. `AMdecodeSyncMessage(change)` + 1. `AMencodeSyncState(change)` + 1. `AMdecodeSyncState(change)` - if (AMresultStatus(docResult) != AM_STATUS_OK) { - char* const err_msg = AMstrdup(AMresultError(docResult), NULL); - printf("failed to create doc: %s", err_msg); - free(err_msg); - goto cleanup; - } +## Open Question - Memory management - AMdoc *doc; - AMitemToDoc(AMresultItem(docResult), &doc); +Most of these calls return one or more items of arbitrary length. Doing memory management in C is tricky. This is my proposed solution... - // useful code goes here! +### -cleanup: - AMresultFree(docResult); -} -``` + ``` + // returns 1 or zero opids + n = automerge_set(doc, "_root", "hello", datatype, value); + if (n) { + automerge_pop(doc, &obj, len); + } -If you are writing an application in C, the `AMstackItem()`, `AMstackItems()` -and `AMstackResult()` functions enable the lifetimes of anonymous results to be -centrally managed and allow the same validation logic to be reused without -relying upon the `goto` statement (see examples/quickstart.c). + // returns n values + n = automerge_values(doc, "_root", "hello"); + for (i = 0; i -#include -#include -#include - -int main(int argc, char** argv) { - // ...previous example... - AMdoc *doc; - AMitemToDoc(AMresultItem(docResult), &doc); - - AMresult *putResult = AMmapPutStr(doc, AM_ROOT, AMstr("key"), AMstr("value")); - if (AMresultStatus(putResult) != AM_STATUS_OK) { - char* const err_msg = AMstrdup(AMresultError(putResult), NULL); - printf("failed to put: %s", err_msg); - free(err_msg); - goto cleanup; - } - - AMresult *getResult = AMmapGet(doc, AM_ROOT, AMstr("key"), NULL); - if (AMresultStatus(getResult) != AM_STATUS_OK) { - char* const err_msg = AMstrdup(AMresultError(putResult), NULL); - printf("failed to get: %s", err_msg); - free(err_msg); - goto cleanup; - } - - AMbyteSpan got; - if (AMitemToStr(AMresultItem(getResult), &got)) { - char* const c_str = AMstrdup(got, NULL); - printf("Got %zu-character string \"%s\"", got.count, c_str); - free(c_str); - } else { - printf("expected to read a string!"); - goto cleanup; - } + There would be one pop method per object type. Users allocs and frees the buffers. Multiple return values would result in multiple pops. Too small buffers would error and allow retry. -cleanup: - AMresultFree(getResult); - AMresultFree(putResult); - AMresultFree(docResult); -} -``` +### Formats -Functions that do not return an `AMresult` (for example `AMitemKey()`) do -not allocate memory but rather reference memory that was previously -allocated. It's therefore important to keep the original `AMresult` alive (in -this case the one returned by `AMmapRange()`) until after you are finished with -the items that it contains. However, the memory for an individual `AMitem` can -be shared with a new `AMresult` by calling `AMitemResult()` on it. In other -words, a select group of items can be filtered out of a collection and only each -one's corresponding `AMresult` must be kept alive from that point forward; the -originating collection's `AMresult` can be safely freed. +Actors - We could do (bytes,len) or a hex encoded string?. +ObjIds - We could do flat bytes of the ExId struct but lets do human readable strings for now - the struct would be faster but opque +Heads - Might as well make it a flat buffer `(n, hash, hash, ...)` +Changes - Put them all in a flat concatenated buffer +Encode/Decode - to json strings? -Beyond that, good luck! diff --git a/rust/automerge-c/build.rs b/rust/automerge-c/build.rs index bf12a105..00fd0f87 100644 --- a/rust/automerge-c/build.rs +++ b/rust/automerge-c/build.rs @@ -10,7 +10,7 @@ fn main() { let config = cbindgen::Config::from_file("cbindgen.toml") .expect("Unable to find cbindgen.toml configuration file"); - if let Ok(writer) = cbindgen::generate_with_config(crate_dir, config) { + if let Ok(writer) = cbindgen::generate_with_config(&crate_dir, config) { // \note CMake sets this environment variable before invoking Cargo so // that it can direct the generated header file into its // out-of-source build directory for post-processing. diff --git a/rust/automerge-c/cbindgen.toml b/rust/automerge-c/cbindgen.toml index 21eaaadd..ada7f48d 100644 --- a/rust/automerge-c/cbindgen.toml +++ b/rust/automerge-c/cbindgen.toml @@ -1,7 +1,7 @@ after_includes = """\n /** * \\defgroup enumerations Public Enumerations - * Symbolic names for integer constants. + Symbolic names for integer constants. */ /** @@ -12,23 +12,21 @@ after_includes = """\n #define AM_ROOT NULL /** - * \\memberof AMdoc + * \\memberof AMchangeHash * \\def AM_CHANGE_HASH_SIZE * \\brief The count of bytes in a change hash. */ #define AM_CHANGE_HASH_SIZE 32 """ -autogen_warning = """ -/** - * \\file - * \\brief All constants, functions and types in the core Automerge C API. - * - * \\warning This file is auto-generated by cbindgen. - */ -""" +autogen_warning = "/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */" documentation = true documentation_style = "doxy" -include_guard = "AUTOMERGE_C_H" +header = """ +/** \\file + * All constants, functions and types in the Automerge library's C API. + */ + """ +include_guard = "AUTOMERGE_H" includes = [] language = "C" line_length = 140 diff --git a/rust/automerge-c/cmake/Cargo.toml.in b/rust/automerge-c/cmake/Cargo.toml.in deleted file mode 100644 index 781e2fef..00000000 --- a/rust/automerge-c/cmake/Cargo.toml.in +++ /dev/null @@ -1,22 +0,0 @@ -[package] -name = "@PROJECT_NAME@" -version = "@PROJECT_VERSION@" -authors = ["Orion Henry ", "Jason Kankiewicz "] -edition = "2021" -license = "MIT" -rust-version = "1.57.0" - -[lib] -name = "@BINDINGS_NAME@" -crate-type = ["staticlib"] -bench = false -doc = false - -[dependencies] -@LIBRARY_NAME@ = { path = "../@LIBRARY_NAME@" } -hex = "^0.4.3" -libc = "^0.2" -smol_str = "^0.1.21" - -[build-dependencies] -cbindgen = "^0.24" diff --git a/rust/automerge-c/cmake/cbindgen.toml.in b/rust/automerge-c/cmake/cbindgen.toml.in deleted file mode 100644 index 5122b75c..00000000 --- a/rust/automerge-c/cmake/cbindgen.toml.in +++ /dev/null @@ -1,48 +0,0 @@ -after_includes = """\n -/** - * \\defgroup enumerations Public Enumerations - * Symbolic names for integer constants. - */ - -/** - * \\memberof AMdoc - * \\def AM_ROOT - * \\brief The root object of a document. - */ -#define AM_ROOT NULL - -/** - * \\memberof AMdoc - * \\def AM_CHANGE_HASH_SIZE - * \\brief The count of bytes in a change hash. - */ -#define AM_CHANGE_HASH_SIZE 32 -""" -autogen_warning = """ -/** - * \\file - * \\brief All constants, functions and types in the core Automerge C API. - * - * \\warning This file is auto-generated by cbindgen. - */ -""" -documentation = true -documentation_style = "doxy" -include_guard = "@INCLUDE_GUARD_PREFIX@_H" -includes = [] -language = "C" -line_length = 140 -no_includes = true -style = "both" -sys_includes = ["stdbool.h", "stddef.h", "stdint.h", "time.h"] -usize_is_size_t = true - -[enum] -derive_const_casts = true -enum_class = true -must_use = "MUST_USE_ENUM" -prefix_with_name = true -rename_variants = "ScreamingSnakeCase" - -[export] -item_types = ["constants", "enums", "functions", "opaque", "structs", "typedefs"] diff --git a/rust/automerge-c/cmake/config.h.in b/rust/automerge-c/cmake/config.h.in index 40482cb9..44ba5213 100644 --- a/rust/automerge-c/cmake/config.h.in +++ b/rust/automerge-c/cmake/config.h.in @@ -1,35 +1,14 @@ -#ifndef @INCLUDE_GUARD_PREFIX@_CONFIG_H -#define @INCLUDE_GUARD_PREFIX@_CONFIG_H -/** - * \file - * \brief Configuration pararameters defined by the build system. - * - * \warning This file is auto-generated by CMake. - */ +#ifndef @SYMBOL_PREFIX@_CONFIG_H +#define @SYMBOL_PREFIX@_CONFIG_H + +/* This header is auto-generated by CMake. */ -/** - * \def @SYMBOL_PREFIX@_VERSION - * \brief Denotes a semantic version of the form {MAJOR}{MINOR}{PATCH} as three, - * two-digit decimal numbers without leading zeros (e.g. 100 is 0.1.0). - */ #define @SYMBOL_PREFIX@_VERSION @INTEGER_PROJECT_VERSION@ -/** - * \def @SYMBOL_PREFIX@_MAJOR_VERSION - * \brief Denotes a semantic major version as a decimal number. - */ #define @SYMBOL_PREFIX@_MAJOR_VERSION (@SYMBOL_PREFIX@_VERSION / 100000) -/** - * \def @SYMBOL_PREFIX@_MINOR_VERSION - * \brief Denotes a semantic minor version as a decimal number. - */ #define @SYMBOL_PREFIX@_MINOR_VERSION ((@SYMBOL_PREFIX@_VERSION / 100) % 1000) -/** - * \def @SYMBOL_PREFIX@_PATCH_VERSION - * \brief Denotes a semantic patch version as a decimal number. - */ #define @SYMBOL_PREFIX@_PATCH_VERSION (@SYMBOL_PREFIX@_VERSION % 100) -#endif /* @INCLUDE_GUARD_PREFIX@_CONFIG_H */ +#endif /* @SYMBOL_PREFIX@_CONFIG_H */ diff --git a/rust/automerge-c/cmake/enum-string-functions-gen.cmake b/rust/automerge-c/cmake/enum-string-functions-gen.cmake deleted file mode 100644 index 77080e8d..00000000 --- a/rust/automerge-c/cmake/enum-string-functions-gen.cmake +++ /dev/null @@ -1,183 +0,0 @@ -# This CMake script is used to generate a header and a source file for utility -# functions that convert the tags of generated enum types into strings and -# strings into the tags of generated enum types. -cmake_minimum_required(VERSION 3.23 FATAL_ERROR) - -# Seeks the starting line of the source enum's declaration. -macro(seek_enum_mode) - if (line MATCHES "^(typedef[ \t]+)?enum ") - string(REGEX REPLACE "^enum ([0-9a-zA-Z_]+).*$" "\\1" enum_name "${line}") - set(mode "read_tags") - endif() -endmacro() - -# Scans the input for the current enum's tags. -macro(read_tags_mode) - if(line MATCHES "^}") - set(mode "generate") - elseif(line MATCHES "^[A-Z0-9_]+.*$") - string(REGEX REPLACE "^([A-Za-z0-9_]+).*$" "\\1" tmp "${line}") - list(APPEND enum_tags "${tmp}") - endif() -endmacro() - -macro(write_header_file) - # Generate a to-string function declaration. - list(APPEND header_body - "/**\n" - " * \\ingroup enumerations\n" - " * \\brief Gets the string representation of an `${enum_name}` enum tag.\n" - " *\n" - " * \\param[in] tag An `${enum_name}` enum tag.\n" - " * \\return A null-terminated byte string.\n" - " */\n" - "char const* ${enum_name}ToString(${enum_name} const tag)\;\n" - "\n") - # Generate a from-string function declaration. - list(APPEND header_body - "/**\n" - " * \\ingroup enumerations\n" - " * \\brief Gets an `${enum_name}` enum tag from its string representation.\n" - " *\n" - " * \\param[out] dest An `${enum_name}` enum tag pointer.\n" - " * \\param[in] src A null-terminated byte string.\n" - " * \\return `true` if \\p src matches the string representation of an\n" - " * `${enum_name}` enum tag, `false` otherwise.\n" - " */\n" - "bool ${enum_name}FromString(${enum_name}* dest, char const* const src)\;\n" - "\n") -endmacro() - -macro(write_source_file) - # Generate a to-string function implementation. - list(APPEND source_body - "char const* ${enum_name}ToString(${enum_name} const tag) {\n" - " switch (tag) {\n" - " default:\n" - " return \"???\"\;\n") - foreach(label IN LISTS enum_tags) - list(APPEND source_body - " case ${label}:\n" - " return \"${label}\"\;\n") - endforeach() - list(APPEND source_body - " }\n" - "}\n" - "\n") - # Generate a from-string function implementation. - list(APPEND source_body - "bool ${enum_name}FromString(${enum_name}* dest, char const* const src) {\n") - foreach(label IN LISTS enum_tags) - list(APPEND source_body - " if (!strcmp(src, \"${label}\")) {\n" - " *dest = ${label}\;\n" - " return true\;\n" - " }\n") - endforeach() - list(APPEND source_body - " return false\;\n" - "}\n" - "\n") -endmacro() - -function(main) - set(header_body "") - # File header and includes. - list(APPEND header_body - "#ifndef ${include_guard}\n" - "#define ${include_guard}\n" - "/**\n" - " * \\file\n" - " * \\brief Utility functions for converting enum tags into null-terminated\n" - " * byte strings and vice versa.\n" - " *\n" - " * \\warning This file is auto-generated by CMake.\n" - " */\n" - "\n" - "#include \n" - "\n" - "#include <${library_include}>\n" - "\n") - set(source_body "") - # File includes. - list(APPEND source_body - "/** \\warning This file is auto-generated by CMake. */\n" - "\n" - "#include \"stdio.h\"\n" - "#include \"string.h\"\n" - "\n" - "#include <${header_include}>\n" - "\n") - set(enum_name "") - set(enum_tags "") - set(mode "seek_enum") - file(STRINGS "${input_path}" lines) - foreach(line IN LISTS lines) - string(REGEX REPLACE "^(.+)(//.*)?" "\\1" line "${line}") - string(STRIP "${line}" line) - if(mode STREQUAL "seek_enum") - seek_enum_mode() - elseif(mode STREQUAL "read_tags") - read_tags_mode() - else() - # The end of the enum declaration was reached. - if(NOT enum_name) - # The end of the file was reached. - return() - endif() - if(NOT enum_tags) - message(FATAL_ERROR "No tags found for `${enum_name}`.") - endif() - string(TOLOWER "${enum_name}" output_stem_prefix) - string(CONCAT output_stem "${output_stem_prefix}" "_string") - cmake_path(REPLACE_EXTENSION output_stem "h" OUTPUT_VARIABLE output_header_basename) - write_header_file() - write_source_file() - set(enum_name "") - set(enum_tags "") - set(mode "seek_enum") - endif() - endforeach() - # File footer. - list(APPEND header_body - "#endif /* ${include_guard} */\n") - message(STATUS "Generating header file \"${output_header_path}\"...") - file(WRITE "${output_header_path}" ${header_body}) - message(STATUS "Generating source file \"${output_source_path}\"...") - file(WRITE "${output_source_path}" ${source_body}) -endfunction() - -if(NOT DEFINED PROJECT_NAME) - message(FATAL_ERROR "Variable PROJECT_NAME is not defined.") -elseif(NOT DEFINED LIBRARY_NAME) - message(FATAL_ERROR "Variable LIBRARY_NAME is not defined.") -elseif(NOT DEFINED SUBDIR) - message(FATAL_ERROR "Variable SUBDIR is not defined.") -elseif(${CMAKE_ARGC} LESS 9) - message(FATAL_ERROR "Too few arguments.") -elseif(${CMAKE_ARGC} GREATER 10) - message(FATAL_ERROR "Too many arguments.") -elseif(NOT EXISTS ${CMAKE_ARGV5}) - message(FATAL_ERROR "Input header \"${CMAKE_ARGV7}\" not found.") -endif() -cmake_path(CONVERT "${CMAKE_ARGV7}" TO_CMAKE_PATH_LIST input_path NORMALIZE) -cmake_path(CONVERT "${CMAKE_ARGV8}" TO_CMAKE_PATH_LIST output_header_path NORMALIZE) -cmake_path(CONVERT "${CMAKE_ARGV9}" TO_CMAKE_PATH_LIST output_source_path NORMALIZE) -string(TOLOWER "${PROJECT_NAME}" project_root) -cmake_path(CONVERT "${SUBDIR}" TO_CMAKE_PATH_LIST project_subdir NORMALIZE) -string(TOLOWER "${project_subdir}" project_subdir) -string(TOLOWER "${LIBRARY_NAME}" library_stem) -cmake_path(REPLACE_EXTENSION library_stem "h" OUTPUT_VARIABLE library_basename) -string(JOIN "/" library_include "${project_root}" "${library_basename}") -string(TOUPPER "${PROJECT_NAME}" project_name_upper) -string(TOUPPER "${project_subdir}" include_guard_infix) -string(REGEX REPLACE "/" "_" include_guard_infix "${include_guard_infix}") -string(REGEX REPLACE "-" "_" include_guard_prefix "${project_name_upper}") -string(JOIN "_" include_guard_prefix "${include_guard_prefix}" "${include_guard_infix}") -string(JOIN "/" output_header_prefix "${project_root}" "${project_subdir}") -cmake_path(GET output_header_path STEM output_header_stem) -string(TOUPPER "${output_header_stem}" include_guard_stem) -string(JOIN "_" include_guard "${include_guard_prefix}" "${include_guard_stem}" "H") -cmake_path(GET output_header_path FILENAME output_header_basename) -string(JOIN "/" header_include "${output_header_prefix}" "${output_header_basename}") -main() diff --git a/rust/automerge-c/cmake/file-regex-replace.cmake b/rust/automerge-c/cmake/file_regex_replace.cmake similarity index 87% rename from rust/automerge-c/cmake/file-regex-replace.cmake rename to rust/automerge-c/cmake/file_regex_replace.cmake index 09005bc2..27306458 100644 --- a/rust/automerge-c/cmake/file-regex-replace.cmake +++ b/rust/automerge-c/cmake/file_regex_replace.cmake @@ -1,6 +1,4 @@ -# This CMake script is used to perform string substitutions within a generated -# file. -cmake_minimum_required(VERSION 3.23 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) if(NOT DEFINED MATCH_REGEX) message(FATAL_ERROR "Variable \"MATCH_REGEX\" is not defined.") diff --git a/rust/automerge-c/cmake/file-touch.cmake b/rust/automerge-c/cmake/file_touch.cmake similarity index 82% rename from rust/automerge-c/cmake/file-touch.cmake rename to rust/automerge-c/cmake/file_touch.cmake index 2c196755..087d59b6 100644 --- a/rust/automerge-c/cmake/file-touch.cmake +++ b/rust/automerge-c/cmake/file_touch.cmake @@ -1,6 +1,4 @@ -# This CMake script is used to force Cargo to regenerate the header file for the -# core bindings after the out-of-source build directory has been cleaned. -cmake_minimum_required(VERSION 3.23 FATAL_ERROR) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) if(NOT DEFINED CONDITION) message(FATAL_ERROR "Variable \"CONDITION\" is not defined.") diff --git a/rust/automerge-c/docs/CMakeLists.txt b/rust/automerge-c/docs/CMakeLists.txt deleted file mode 100644 index 1d94c872..00000000 --- a/rust/automerge-c/docs/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -find_package(Doxygen OPTIONAL_COMPONENTS dot) - -if(DOXYGEN_FOUND) - set(DOXYGEN_ALIASES "installed_headerfile=\\headerfile ${LIBRARY_NAME}.h <${PROJECT_NAME}/${LIBRARY_NAME}.h>") - - set(DOXYGEN_GENERATE_LATEX YES) - - set(DOXYGEN_PDF_HYPERLINKS YES) - - set(DOXYGEN_PROJECT_LOGO "${CMAKE_CURRENT_SOURCE_DIR}/img/brandmark.png") - - set(DOXYGEN_SORT_BRIEF_DOCS YES) - - set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md") - - doxygen_add_docs( - ${LIBRARY_NAME}_docs - "${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h" - "${CBINDGEN_TARGET_DIR}/config.h" - "${CBINDGEN_TARGET_DIR}/${UTILS_SUBDIR}/enum_string.h" - "${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/result.h" - "${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/stack_callback_data.h" - "${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/stack.h" - "${CMAKE_SOURCE_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${UTILS_SUBDIR}/string.h" - "${CMAKE_SOURCE_DIR}/README.md" - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - COMMENT "Producing documentation with Doxygen..." - ) - - # \note A Doxygen input file isn't a file-level dependency so the Doxygen - # command must instead depend upon a target that either outputs the - # file or depends upon it also or it will just output an error message - # when it can't be found. - add_dependencies(${LIBRARY_NAME}_docs ${BINDINGS_NAME}_artifacts ${LIBRARY_NAME}_utilities) -endif() diff --git a/rust/automerge-c/examples/CMakeLists.txt b/rust/automerge-c/examples/CMakeLists.txt index f080237b..3395124c 100644 --- a/rust/automerge-c/examples/CMakeLists.txt +++ b/rust/automerge-c/examples/CMakeLists.txt @@ -1,39 +1,41 @@ +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) + add_executable( - ${LIBRARY_NAME}_quickstart + example_quickstart quickstart.c ) -set_target_properties(${LIBRARY_NAME}_quickstart PROPERTIES LINKER_LANGUAGE C) +set_target_properties(example_quickstart PROPERTIES LINKER_LANGUAGE C) # \note An imported library's INTERFACE_INCLUDE_DIRECTORIES property can't # contain a non-existent path so its build-time include directory # must be specified for all of its dependent targets instead. target_include_directories( - ${LIBRARY_NAME}_quickstart + example_quickstart PRIVATE "$" ) -target_link_libraries(${LIBRARY_NAME}_quickstart PRIVATE ${LIBRARY_NAME}) +target_link_libraries(example_quickstart PRIVATE ${LIBRARY_NAME}) -add_dependencies(${LIBRARY_NAME}_quickstart ${BINDINGS_NAME}_artifacts) +add_dependencies(example_quickstart ${LIBRARY_NAME}_artifacts) if(BUILD_SHARED_LIBS AND WIN32) add_custom_command( - TARGET ${LIBRARY_NAME}_quickstart + TARGET example_quickstart POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_${CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} - ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Copying the DLL built by Cargo into the examples directory..." VERBATIM ) endif() add_custom_command( - TARGET ${LIBRARY_NAME}_quickstart + TARGET example_quickstart POST_BUILD COMMAND - ${LIBRARY_NAME}_quickstart + example_quickstart COMMENT "Running the example quickstart..." VERBATIM diff --git a/rust/automerge-c/examples/README.md b/rust/automerge-c/examples/README.md index 17e69412..17aa2227 100644 --- a/rust/automerge-c/examples/README.md +++ b/rust/automerge-c/examples/README.md @@ -5,5 +5,5 @@ ```shell cmake -E make_directory automerge-c/build cmake -S automerge-c -B automerge-c/build -cmake --build automerge-c/build --target automerge_quickstart +cmake --build automerge-c/build --target example_quickstart ``` diff --git a/rust/automerge-c/examples/quickstart.c b/rust/automerge-c/examples/quickstart.c index ab6769ef..bc418511 100644 --- a/rust/automerge-c/examples/quickstart.c +++ b/rust/automerge-c/examples/quickstart.c @@ -3,127 +3,152 @@ #include #include -#include -#include -#include -#include -static bool abort_cb(AMstack**, void*); +static void abort_cb(AMresultStack**, uint8_t); /** * \brief Based on https://automerge.github.io/docs/quickstart */ int main(int argc, char** argv) { - AMstack* stack = NULL; - AMdoc* doc1; - AMitemToDoc(AMstackItem(&stack, AMcreate(NULL), abort_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1); - AMobjId const* const cards = - AMitemObjId(AMstackItem(&stack, AMmapPutObject(doc1, AM_ROOT, AMstr("cards"), AM_OBJ_TYPE_LIST), abort_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMobjId const* const card1 = - AMitemObjId(AMstackItem(&stack, AMlistPutObject(doc1, cards, SIZE_MAX, true, AM_OBJ_TYPE_MAP), abort_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMmapPutStr(doc1, card1, AMstr("title"), AMstr("Rewrite everything in Clojure")), abort_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutBool(doc1, card1, AMstr("done"), false), abort_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMobjId const* const card2 = - AMitemObjId(AMstackItem(&stack, AMlistPutObject(doc1, cards, SIZE_MAX, true, AM_OBJ_TYPE_MAP), abort_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMmapPutStr(doc1, card2, AMstr("title"), AMstr("Rewrite everything in Haskell")), abort_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutBool(doc1, card2, AMstr("done"), false), abort_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr("Add card"), NULL), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMresultStack* stack = NULL; + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, abort_cb).doc; + AMobjId const* const cards = AMpush(&stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("cards"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + abort_cb).obj_id; + AMobjId const* const card1 = AMpush(&stack, + AMlistPutObject(doc1, cards, SIZE_MAX, true, AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + abort_cb).obj_id; + AMfree(AMmapPutStr(doc1, card1, AMstr("title"), AMstr("Rewrite everything in Clojure"))); + AMfree(AMmapPutBool(doc1, card1, AMstr("done"), false)); + AMobjId const* const card2 = AMpush(&stack, + AMlistPutObject(doc1, cards, SIZE_MAX, true, AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + abort_cb).obj_id; + AMfree(AMmapPutStr(doc1, card2, AMstr("title"), AMstr("Rewrite everything in Haskell"))); + AMfree(AMmapPutBool(doc1, card2, AMstr("done"), false)); + AMfree(AMcommit(doc1, AMstr("Add card"), NULL)); - AMdoc* doc2; - AMitemToDoc(AMstackItem(&stack, AMcreate(NULL), abort_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2); - AMstackItem(NULL, AMmerge(doc2, doc1), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMdoc* doc2 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, abort_cb).doc; + AMfree(AMmerge(doc2, doc1)); - AMbyteSpan binary; - AMitemToBytes(AMstackItem(&stack, AMsave(doc1), abort_cb, AMexpect(AM_VAL_TYPE_BYTES)), &binary); - AMitemToDoc(AMstackItem(&stack, AMload(binary.src, binary.count), abort_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2); + AMbyteSpan const binary = AMpush(&stack, AMsave(doc1), AM_VALUE_BYTES, abort_cb).bytes; + doc2 = AMpush(&stack, AMload(binary.src, binary.count), AM_VALUE_DOC, abort_cb).doc; - AMstackItem(NULL, AMmapPutBool(doc1, card1, AMstr("done"), true), abort_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr("Mark card as done"), NULL), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutBool(doc1, card1, AMstr("done"), true)); + AMfree(AMcommit(doc1, AMstr("Mark card as done"), NULL)); - AMstackItem(NULL, AMlistDelete(doc2, cards, 0), abort_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc2, AMstr("Delete card"), NULL), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMlistDelete(doc2, cards, 0)); + AMfree(AMcommit(doc2, AMstr("Delete card"), NULL)); - AMstackItem(NULL, AMmerge(doc1, doc2), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(doc1, doc2)); - AMitems changes = AMstackItems(&stack, AMgetChanges(doc1, NULL), abort_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMitem* item = NULL; - while ((item = AMitemsNext(&changes, 1)) != NULL) { - AMchange const* change; - AMitemToChange(item, &change); - AMitems const heads = AMstackItems(&stack, AMitemFromChangeHash(AMchangeHash(change)), abort_cb, - AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - char* const c_msg = AMstrdup(AMchangeMessage(change), NULL); - printf("%s %zu\n", c_msg, AMobjSize(doc1, cards, &heads)); + AMchanges changes = AMpush(&stack, AMgetChanges(doc1, NULL), AM_VALUE_CHANGES, abort_cb).changes; + AMchange const* change = NULL; + while ((change = AMchangesNext(&changes, 1)) != NULL) { + AMbyteSpan const change_hash = AMchangeHash(change); + AMchangeHashes const heads = AMpush(&stack, + AMchangeHashesInit(&change_hash, 1), + AM_VALUE_CHANGE_HASHES, + abort_cb).change_hashes; + AMbyteSpan const msg = AMchangeMessage(change); + char* const c_msg = calloc(1, msg.count + 1); + strncpy(c_msg, msg.src, msg.count); + printf("%s %ld\n", c_msg, AMobjSize(doc1, cards, &heads)); free(c_msg); } - AMstackFree(&stack); + AMfreeStack(&stack); } +static char const* discriminant_suffix(AMvalueVariant const); + /** - * \brief Examines the result at the top of the given stack and, if it's - * invalid, prints an error message to `stderr`, deallocates all results - * in the stack and exits. + * \brief Prints an error message to `stderr`, deallocates all results in the + * given stack and exits. * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] data A pointer to an owned `AMstackCallbackData` struct or `NULL`. - * \return `true` if the top `AMresult` in \p stack is valid, `false` otherwise. - * \pre \p stack `!= NULL`. + * \param[in,out] stack A pointer to a pointer to an `AMresultStack` struct. + * \param[in] discriminant An `AMvalueVariant` enum tag. + * \pre \p stack` != NULL`. + * \post `*stack == NULL`. */ -static bool abort_cb(AMstack** stack, void* data) { +static void abort_cb(AMresultStack** stack, uint8_t discriminant) { static char buffer[512] = {0}; char const* suffix = NULL; if (!stack) { suffix = "Stack*"; - } else if (!*stack) { + } + else if (!*stack) { suffix = "Stack"; - } else if (!(*stack)->result) { + } + else if (!(*stack)->result) { suffix = ""; } if (suffix) { - fprintf(stderr, "Null `AMresult%s*`.\n", suffix); - AMstackFree(stack); + fprintf(stderr, "Null `AMresult%s*`.", suffix); + AMfreeStack(stack); exit(EXIT_FAILURE); - return false; + return; } AMstatus const status = AMresultStatus((*stack)->result); switch (status) { - case AM_STATUS_ERROR: - strcpy(buffer, "Error"); - break; - case AM_STATUS_INVALID_RESULT: - strcpy(buffer, "Invalid result"); - break; - case AM_STATUS_OK: - break; - default: - sprintf(buffer, "Unknown `AMstatus` tag %d", status); + case AM_STATUS_ERROR: strcpy(buffer, "Error"); break; + case AM_STATUS_INVALID_RESULT: strcpy(buffer, "Invalid result"); break; + case AM_STATUS_OK: break; + default: sprintf(buffer, "Unknown `AMstatus` tag %d", status); } if (buffer[0]) { - char* const c_msg = AMstrdup(AMresultError((*stack)->result), NULL); - fprintf(stderr, "%s; %s.\n", buffer, c_msg); + AMbyteSpan const msg = AMerrorMessage((*stack)->result); + char* const c_msg = calloc(1, msg.count + 1); + strncpy(c_msg, msg.src, msg.count); + fprintf(stderr, "%s; %s.", buffer, c_msg); free(c_msg); - AMstackFree(stack); + AMfreeStack(stack); exit(EXIT_FAILURE); - return false; + return; } - if (data) { - AMstackCallbackData* sc_data = (AMstackCallbackData*)data; - AMvalType const tag = AMitemValType(AMresultItem((*stack)->result)); - if (tag != sc_data->bitmask) { - fprintf(stderr, "Unexpected tag `%s` (%d) instead of `%s` at %s:%d.\n", AMvalTypeToString(tag), tag, - AMvalTypeToString(sc_data->bitmask), sc_data->file, sc_data->line); - free(sc_data); - AMstackFree(stack); - exit(EXIT_FAILURE); - return false; - } - } - free(data); - return true; + AMvalue const value = AMresultValue((*stack)->result); + fprintf(stderr, "Unexpected tag `AM_VALUE_%s` (%d); expected `AM_VALUE_%s`.", + discriminant_suffix(value.tag), + value.tag, + discriminant_suffix(discriminant)); + AMfreeStack(stack); + exit(EXIT_FAILURE); +} + +/** + * \brief Gets the suffix for a discriminant's corresponding string + * representation. + * + * \param[in] discriminant An `AMvalueVariant` enum tag. + * \return A UTF-8 string. + */ +static char const* discriminant_suffix(AMvalueVariant const discriminant) { + char const* suffix = NULL; + switch (discriminant) { + case AM_VALUE_ACTOR_ID: suffix = "ACTOR_ID"; break; + case AM_VALUE_BOOLEAN: suffix = "BOOLEAN"; break; + case AM_VALUE_BYTES: suffix = "BYTES"; break; + case AM_VALUE_CHANGE_HASHES: suffix = "CHANGE_HASHES"; break; + case AM_VALUE_CHANGES: suffix = "CHANGES"; break; + case AM_VALUE_COUNTER: suffix = "COUNTER"; break; + case AM_VALUE_DOC: suffix = "DOC"; break; + case AM_VALUE_F64: suffix = "F64"; break; + case AM_VALUE_INT: suffix = "INT"; break; + case AM_VALUE_LIST_ITEMS: suffix = "LIST_ITEMS"; break; + case AM_VALUE_MAP_ITEMS: suffix = "MAP_ITEMS"; break; + case AM_VALUE_NULL: suffix = "NULL"; break; + case AM_VALUE_OBJ_ID: suffix = "OBJ_ID"; break; + case AM_VALUE_OBJ_ITEMS: suffix = "OBJ_ITEMS"; break; + case AM_VALUE_STR: suffix = "STR"; break; + case AM_VALUE_STRS: suffix = "STRINGS"; break; + case AM_VALUE_SYNC_MESSAGE: suffix = "SYNC_MESSAGE"; break; + case AM_VALUE_SYNC_STATE: suffix = "SYNC_STATE"; break; + case AM_VALUE_TIMESTAMP: suffix = "TIMESTAMP"; break; + case AM_VALUE_UINT: suffix = "UINT"; break; + case AM_VALUE_VOID: suffix = "VOID"; break; + default: suffix = "..."; + } + return suffix; } diff --git a/rust/automerge-c/docs/img/brandmark.png b/rust/automerge-c/img/brandmark.png similarity index 100% rename from rust/automerge-c/docs/img/brandmark.png rename to rust/automerge-c/img/brandmark.png diff --git a/rust/automerge-c/include/automerge-c/utils/result.h b/rust/automerge-c/include/automerge-c/utils/result.h deleted file mode 100644 index ab8a2f93..00000000 --- a/rust/automerge-c/include/automerge-c/utils/result.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef AUTOMERGE_C_UTILS_RESULT_H -#define AUTOMERGE_C_UTILS_RESULT_H -/** - * \file - * \brief Utility functions for use with `AMresult` structs. - */ - -#include - -#include - -/** - * \brief Transfers the items within an arbitrary list of results into a - * new result in their order of specification. - * \param[in] count The count of subsequent arguments. - * \param[in] ... A \p count list of arguments, each of which is a pointer to - * an `AMresult` struct whose items will be transferred out of it - * and which is subsequently freed. - * \return A pointer to an `AMresult` struct or `NULL`. - * \pre `∀𝑥 ∈` \p ... `, AMresultStatus(𝑥) == AM_STATUS_OK` - * \post `(∃𝑥 ∈` \p ... `, AMresultStatus(𝑥) != AM_STATUS_OK) -> NULL` - * \attention All `AMresult` struct pointer arguments are passed to - * `AMresultFree()` regardless of success; use `AMresultCat()` - * instead if you wish to pass them to `AMresultFree()` yourself. - * \warning The returned `AMresult` struct pointer must be passed to - * `AMresultFree()` in order to avoid a memory leak. - */ -AMresult* AMresultFrom(int count, ...); - -#endif /* AUTOMERGE_C_UTILS_RESULT_H */ diff --git a/rust/automerge-c/include/automerge-c/utils/stack.h b/rust/automerge-c/include/automerge-c/utils/stack.h deleted file mode 100644 index a8e9fd08..00000000 --- a/rust/automerge-c/include/automerge-c/utils/stack.h +++ /dev/null @@ -1,130 +0,0 @@ -#ifndef AUTOMERGE_C_UTILS_STACK_H -#define AUTOMERGE_C_UTILS_STACK_H -/** - * \file - * \brief Utility data structures and functions for hiding `AMresult` structs, - * managing their lifetimes, and automatically applying custom - * validation logic to the `AMitem` structs that they contain. - * - * \note The `AMstack` struct and its related functions drastically reduce the - * need for boilerplate code and/or `goto` statement usage within a C - * application but a higher-level programming language offers even better - * ways to do the same things. - */ - -#include - -/** - * \struct AMstack - * \brief A node in a singly-linked list of result pointers. - */ -typedef struct AMstack { - /** A result to be deallocated. */ - AMresult* result; - /** The previous node in the singly-linked list or `NULL`. */ - struct AMstack* prev; -} AMstack; - -/** - * \memberof AMstack - * \brief The prototype of a function that examines the result at the top of - * the given stack in terms of some arbitrary data. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] data A pointer to arbitrary data or `NULL`. - * \return `true` if the top `AMresult` struct in \p stack is valid, `false` - * otherwise. - * \pre \p stack `!= NULL`. - */ -typedef bool (*AMstackCallback)(AMstack** stack, void* data); - -/** - * \memberof AMstack - * \brief Deallocates the storage for a stack of results. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \pre \p stack `!= NULL` - * \post `*stack == NULL` - */ -void AMstackFree(AMstack** stack); - -/** - * \memberof AMstack - * \brief Gets a result from the stack after removing it. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] result A pointer to the `AMresult` to be popped or `NULL` to - * select the top result in \p stack. - * \return A pointer to an `AMresult` struct or `NULL`. - * \pre \p stack `!= NULL` - * \warning The returned `AMresult` struct pointer must be passed to - * `AMresultFree()` in order to avoid a memory leak. - */ -AMresult* AMstackPop(AMstack** stack, AMresult const* result); - -/** - * \memberof AMstack - * \brief Pushes the given result onto the given stack, calls the given - * callback with the given data to validate it and then either gets the - * result if it's valid or gets `NULL` instead. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] result A pointer to an `AMresult` struct. - * \param[in] callback A pointer to a function with the same signature as - * `AMstackCallback()` or `NULL`. - * \param[in] data A pointer to arbitrary data or `NULL` which is passed to - * \p callback. - * \return \p result or `NULL`. - * \warning If \p stack `== NULL` then \p result is deallocated in order to - * avoid a memory leak. - */ -AMresult* AMstackResult(AMstack** stack, AMresult* result, AMstackCallback callback, void* data); - -/** - * \memberof AMstack - * \brief Pushes the given result onto the given stack, calls the given - * callback with the given data to validate it and then either gets the - * first item in the sequence of items within that result if it's valid - * or gets `NULL` instead. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] result A pointer to an `AMresult` struct. - * \param[in] callback A pointer to a function with the same signature as - * `AMstackCallback()` or `NULL`. - * \param[in] data A pointer to arbitrary data or `NULL` which is passed to - * \p callback. - * \return A pointer to an `AMitem` struct or `NULL`. - * \warning If \p stack `== NULL` then \p result is deallocated in order to - * avoid a memory leak. - */ -AMitem* AMstackItem(AMstack** stack, AMresult* result, AMstackCallback callback, void* data); - -/** - * \memberof AMstack - * \brief Pushes the given result onto the given stack, calls the given - * callback with the given data to validate it and then either gets an - * `AMitems` struct over the sequence of items within that result if it's - * valid or gets an empty `AMitems` instead. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] result A pointer to an `AMresult` struct. - * \param[in] callback A pointer to a function with the same signature as - * `AMstackCallback()` or `NULL`. - * \param[in] data A pointer to arbitrary data or `NULL` which is passed to - * \p callback. - * \return An `AMitems` struct. - * \warning If \p stack `== NULL` then \p result is deallocated immediately - * in order to avoid a memory leak. - */ -AMitems AMstackItems(AMstack** stack, AMresult* result, AMstackCallback callback, void* data); - -/** - * \memberof AMstack - * \brief Gets the count of results that have been pushed onto the stack. - * - * \param[in,out] stack A pointer to an `AMstack` struct. - * \return A 64-bit unsigned integer. - */ -size_t AMstackSize(AMstack const* const stack); - -#endif /* AUTOMERGE_C_UTILS_STACK_H */ diff --git a/rust/automerge-c/include/automerge-c/utils/stack_callback_data.h b/rust/automerge-c/include/automerge-c/utils/stack_callback_data.h deleted file mode 100644 index 6f9f1edb..00000000 --- a/rust/automerge-c/include/automerge-c/utils/stack_callback_data.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef AUTOMERGE_C_UTILS_PUSH_CALLBACK_DATA_H -#define AUTOMERGE_C_UTILS_PUSH_CALLBACK_DATA_H -/** - * \file - * \brief Utility data structures, functions and macros for supplying - * parameters to the custom validation logic applied to `AMitem` - * structs. - */ - -#include - -/** - * \struct AMstackCallbackData - * \brief A data structure for passing the parameters of an item value test - * to an implementation of the `AMstackCallback` function prototype. - */ -typedef struct { - /** A bitmask of `AMvalType` tags. */ - AMvalType bitmask; - /** A null-terminated file path string. */ - char const* file; - /** The ordinal number of a line within a file. */ - int line; -} AMstackCallbackData; - -/** - * \memberof AMstackCallbackData - * \brief Allocates a new `AMstackCallbackData` struct and initializes its - * members from their corresponding arguments. - * - * \param[in] bitmask A bitmask of `AMvalType` tags. - * \param[in] file A null-terminated file path string. - * \param[in] line The ordinal number of a line within a file. - * \return A pointer to a disowned `AMstackCallbackData` struct. - * \warning The returned pointer must be passed to `free()` to avoid a memory - * leak. - */ -AMstackCallbackData* AMstackCallbackDataInit(AMvalType const bitmask, char const* const file, int const line); - -/** - * \memberof AMstackCallbackData - * \def AMexpect - * \brief Allocates a new `AMstackCallbackData` struct and initializes it from - * an `AMvalueType` bitmask. - * - * \param[in] bitmask A bitmask of `AMvalType` tags. - * \return A pointer to a disowned `AMstackCallbackData` struct. - * \warning The returned pointer must be passed to `free()` to avoid a memory - * leak. - */ -#define AMexpect(bitmask) AMstackCallbackDataInit(bitmask, __FILE__, __LINE__) - -#endif /* AUTOMERGE_C_UTILS_PUSH_CALLBACK_DATA_H */ diff --git a/rust/automerge-c/include/automerge-c/utils/string.h b/rust/automerge-c/include/automerge-c/utils/string.h deleted file mode 100644 index 4d61c2e9..00000000 --- a/rust/automerge-c/include/automerge-c/utils/string.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef AUTOMERGE_C_UTILS_STRING_H -#define AUTOMERGE_C_UTILS_STRING_H -/** - * \file - * \brief Utility functions for use with `AMbyteSpan` structs that provide - * UTF-8 string views. - */ - -#include - -/** - * \memberof AMbyteSpan - * \brief Returns a pointer to a null-terminated byte string which is a - * duplicate of the given UTF-8 string view except for the substitution - * of its NUL (0) characters with the specified null-terminated byte - * string. - * - * \param[in] str A UTF-8 string view as an `AMbyteSpan` struct. - * \param[in] nul A null-terminated byte string to substitute for NUL characters - * or `NULL` to substitute `"\\0"` for NUL characters. - * \return A disowned null-terminated byte string. - * \pre \p str.src `!= NULL` - * \pre \p str.count `<= sizeof(`\p str.src `)` - * \warning The returned pointer must be passed to `free()` to avoid a memory - * leak. - */ -char* AMstrdup(AMbyteSpan const str, char const* nul); - -#endif /* AUTOMERGE_C_UTILS_STRING_H */ diff --git a/rust/automerge-c/src/CMakeLists.txt b/rust/automerge-c/src/CMakeLists.txt new file mode 100644 index 00000000..e02c0a96 --- /dev/null +++ b/rust/automerge-c/src/CMakeLists.txt @@ -0,0 +1,250 @@ +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) + +find_program ( + CARGO_CMD + "cargo" + PATHS "$ENV{CARGO_HOME}/bin" + DOC "The Cargo command" +) + +if(NOT CARGO_CMD) + message(FATAL_ERROR "Cargo (Rust package manager) not found! Install it and/or set the CARGO_HOME environment variable.") +endif() + +string(TOLOWER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_LOWER) + +if(BUILD_TYPE_LOWER STREQUAL debug) + set(CARGO_BUILD_TYPE "debug") + + set(CARGO_FLAG "") +else() + set(CARGO_BUILD_TYPE "release") + + set(CARGO_FLAG "--release") +endif() + +set(CARGO_FEATURES "") + +set(CARGO_CURRENT_BINARY_DIR "${CARGO_TARGET_DIR}/${CARGO_BUILD_TYPE}") + +set( + CARGO_OUTPUT + ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h + ${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CARGO_CURRENT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX} +) + +if(WIN32) + # \note The basename of an import library output by Cargo is the filename + # of its corresponding shared library. + list(APPEND CARGO_OUTPUT ${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}) +endif() + +add_custom_command( + OUTPUT + ${CARGO_OUTPUT} + COMMAND + # \note cbindgen won't regenerate its output header file after it's + # been removed but it will after its configuration file has been + # updated. + ${CMAKE_COMMAND} -DCONDITION=NOT_EXISTS -P ${CMAKE_SOURCE_DIR}/cmake/file_touch.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h ${CMAKE_SOURCE_DIR}/cbindgen.toml + COMMAND + ${CMAKE_COMMAND} -E env CARGO_TARGET_DIR=${CARGO_TARGET_DIR} CBINDGEN_TARGET_DIR=${CBINDGEN_TARGET_DIR} ${CARGO_CMD} build ${CARGO_FLAG} ${CARGO_FEATURES} + MAIN_DEPENDENCY + lib.rs + DEPENDS + actor_id.rs + byte_span.rs + change_hashes.rs + change.rs + changes.rs + doc.rs + doc/list.rs + doc/list/item.rs + doc/list/items.rs + doc/map.rs + doc/map/item.rs + doc/map/items.rs + doc/utils.rs + obj.rs + obj/item.rs + obj/items.rs + result.rs + result_stack.rs + strs.rs + sync.rs + sync/have.rs + sync/haves.rs + sync/message.rs + sync/state.rs + ${CMAKE_SOURCE_DIR}/build.rs + ${CMAKE_SOURCE_DIR}/Cargo.toml + ${CMAKE_SOURCE_DIR}/cbindgen.toml + WORKING_DIRECTORY + ${CMAKE_SOURCE_DIR} + COMMENT + "Producing the library artifacts with Cargo..." + VERBATIM +) + +add_custom_target( + ${LIBRARY_NAME}_artifacts ALL + DEPENDS ${CARGO_OUTPUT} +) + +# \note cbindgen's naming behavior isn't fully configurable and it ignores +# `const fn` calls (https://github.com/eqrion/cbindgen/issues/252). +add_custom_command( + TARGET ${LIBRARY_NAME}_artifacts + POST_BUILD + COMMAND + # Compensate for cbindgen's variant struct naming. + ${CMAKE_COMMAND} -DMATCH_REGEX=AM\([^_]+_[^_]+\)_Body -DREPLACE_EXPR=AM\\1 -P ${CMAKE_SOURCE_DIR}/cmake/file_regex_replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h + COMMAND + # Compensate for cbindgen's union tag enum type naming. + ${CMAKE_COMMAND} -DMATCH_REGEX=AM\([^_]+\)_Tag -DREPLACE_EXPR=AM\\1Variant -P ${CMAKE_SOURCE_DIR}/cmake/file_regex_replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h + COMMAND + # Compensate for cbindgen's translation of consecutive uppercase letters to "ScreamingSnakeCase". + ${CMAKE_COMMAND} -DMATCH_REGEX=A_M\([^_]+\)_ -DREPLACE_EXPR=AM_\\1_ -P ${CMAKE_SOURCE_DIR}/cmake/file_regex_replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h + COMMAND + # Compensate for cbindgen ignoring `std:mem::size_of()` calls. + ${CMAKE_COMMAND} -DMATCH_REGEX=USIZE_ -DREPLACE_EXPR=\+${CMAKE_SIZEOF_VOID_P} -P ${CMAKE_SOURCE_DIR}/cmake/file_regex_replace.cmake -- ${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h + WORKING_DIRECTORY + ${CMAKE_SOURCE_DIR} + COMMENT + "Compensating for cbindgen deficits..." + VERBATIM +) + +if(BUILD_SHARED_LIBS) + if(WIN32) + set(LIBRARY_DESTINATION "${CMAKE_INSTALL_BINDIR}") + else() + set(LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}") + endif() + + set(LIBRARY_DEFINE_SYMBOL "${SYMBOL_PREFIX}_EXPORTS") + + # \note The basename of an import library output by Cargo is the filename + # of its corresponding shared library. + set(LIBRARY_IMPLIB "${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") + + set(LIBRARY_LOCATION "${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}") + + set(LIBRARY_NO_SONAME "${WIN32}") + + set(LIBRARY_SONAME "${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_${CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}") + + set(LIBRARY_TYPE "SHARED") +else() + set(LIBRARY_DEFINE_SYMBOL "") + + set(LIBRARY_DESTINATION "${CMAKE_INSTALL_LIBDIR}") + + set(LIBRARY_IMPLIB "") + + set(LIBRARY_LOCATION "${CARGO_CURRENT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}") + + set(LIBRARY_NO_SONAME "TRUE") + + set(LIBRARY_SONAME "") + + set(LIBRARY_TYPE "STATIC") +endif() + +add_library(${LIBRARY_NAME} ${LIBRARY_TYPE} IMPORTED GLOBAL) + +set_target_properties( + ${LIBRARY_NAME} + PROPERTIES + # \note Cargo writes a debug build into a nested directory instead of + # decorating its name. + DEBUG_POSTFIX "" + DEFINE_SYMBOL "${LIBRARY_DEFINE_SYMBOL}" + IMPORTED_IMPLIB "${LIBRARY_IMPLIB}" + IMPORTED_LOCATION "${LIBRARY_LOCATION}" + IMPORTED_NO_SONAME "${LIBRARY_NO_SONAME}" + IMPORTED_SONAME "${LIBRARY_SONAME}" + LINKER_LANGUAGE C + PUBLIC_HEADER "${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h" + SOVERSION "${PROJECT_VERSION_MAJOR}" + VERSION "${PROJECT_VERSION}" + # \note Cargo exports all of the symbols automatically. + WINDOWS_EXPORT_ALL_SYMBOLS "TRUE" +) + +target_compile_definitions(${LIBRARY_NAME} INTERFACE $) + +target_include_directories( + ${LIBRARY_NAME} + INTERFACE + "$" +) + +set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + +set(THREADS_PREFER_PTHREAD_FLAG TRUE) + +find_package(Threads REQUIRED) + +set(LIBRARY_DEPENDENCIES Threads::Threads ${CMAKE_DL_LIBS}) + +if(WIN32) + list(APPEND LIBRARY_DEPENDENCIES Bcrypt userenv ws2_32) +else() + list(APPEND LIBRARY_DEPENDENCIES m) +endif() + +target_link_libraries(${LIBRARY_NAME} INTERFACE ${LIBRARY_DEPENDENCIES}) + +install( + FILES $ + TYPE LIB + # \note The basename of an import library output by Cargo is the filename + # of its corresponding shared library. + RENAME "${CMAKE_STATIC_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_${CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" + OPTIONAL +) + +set(LIBRARY_FILE_NAME "${CMAKE_${LIBRARY_TYPE}_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_${CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_${LIBRARY_TYPE}_LIBRARY_SUFFIX}") + +install( + FILES $ + RENAME "${LIBRARY_FILE_NAME}" + DESTINATION ${LIBRARY_DESTINATION} +) + +install( + FILES $ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} +) + +find_package(Doxygen OPTIONAL_COMPONENTS dot) + +if(DOXYGEN_FOUND) + set(DOXYGEN_ALIASES "installed_headerfile=\\headerfile ${LIBRARY_NAME}.h <${PROJECT_NAME}/${LIBRARY_NAME}.h>") + + set(DOXYGEN_GENERATE_LATEX YES) + + set(DOXYGEN_PDF_HYPERLINKS YES) + + set(DOXYGEN_PROJECT_LOGO "${CMAKE_SOURCE_DIR}/img/brandmark.png") + + set(DOXYGEN_SORT_BRIEF_DOCS YES) + + set(DOXYGEN_USE_MDFILE_AS_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md") + + doxygen_add_docs( + ${LIBRARY_NAME}_docs + "${CBINDGEN_TARGET_DIR}/${LIBRARY_NAME}.h" + "${CMAKE_SOURCE_DIR}/README.md" + USE_STAMP_FILE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMENT "Producing documentation with Doxygen..." + ) + + # \note A Doxygen input file isn't a file-level dependency so the Doxygen + # command must instead depend upon a target that outputs the file or + # it will just output an error message when it can't be found. + add_dependencies(${LIBRARY_NAME}_docs ${LIBRARY_NAME}_artifacts) +endif() diff --git a/rust/automerge-c/src/actor_id.rs b/rust/automerge-c/src/actor_id.rs index 5a28959e..bc86d5ef 100644 --- a/rust/automerge-c/src/actor_id.rs +++ b/rust/automerge-c/src/actor_id.rs @@ -1,5 +1,4 @@ use automerge as am; -use libc::c_int; use std::cell::RefCell; use std::cmp::Ordering; use std::str::FromStr; @@ -12,7 +11,7 @@ macro_rules! to_actor_id { let handle = $handle.as_ref(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMactorId*`").into(), + None => return AMresult::err("Invalid AMactorId pointer").into(), } }}; } @@ -58,11 +57,11 @@ impl AsRef for AMactorId { } /// \memberof AMactorId -/// \brief Gets the value of an actor identifier as an array of bytes. +/// \brief Gets the value of an actor identifier as a sequence of bytes. /// /// \param[in] actor_id A pointer to an `AMactorId` struct. -/// \return An `AMbyteSpan` struct for an array of bytes. -/// \pre \p actor_id `!= NULL` +/// \pre \p actor_id `!= NULL`. +/// \return An `AMbyteSpan` struct. /// \internal /// /// # Safety @@ -83,8 +82,8 @@ pub unsafe extern "C" fn AMactorIdBytes(actor_id: *const AMactorId) -> AMbyteSpa /// \return `-1` if \p actor_id1 `<` \p actor_id2, `0` if /// \p actor_id1 `==` \p actor_id2 and `1` if /// \p actor_id1 `>` \p actor_id2. -/// \pre \p actor_id1 `!= NULL` -/// \pre \p actor_id2 `!= NULL` +/// \pre \p actor_id1 `!= NULL`. +/// \pre \p actor_id2 `!= NULL`. /// \internal /// /// #Safety @@ -94,7 +93,7 @@ pub unsafe extern "C" fn AMactorIdBytes(actor_id: *const AMactorId) -> AMbyteSpa pub unsafe extern "C" fn AMactorIdCmp( actor_id1: *const AMactorId, actor_id2: *const AMactorId, -) -> c_int { +) -> isize { match (actor_id1.as_ref(), actor_id2.as_ref()) { (Some(actor_id1), Some(actor_id2)) => match actor_id1.as_ref().cmp(actor_id2.as_ref()) { Ordering::Less => -1, @@ -102,69 +101,65 @@ pub unsafe extern "C" fn AMactorIdCmp( Ordering::Greater => 1, }, (None, Some(_)) => -1, - (None, None) => 0, (Some(_), None) => 1, + (None, None) => 0, } } /// \memberof AMactorId -/// \brief Allocates a new actor identifier and initializes it from a random -/// UUID value. +/// \brief Allocates a new actor identifier and initializes it with a random +/// UUID. /// -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_ACTOR_ID` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMactorId` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. #[no_mangle] pub unsafe extern "C" fn AMactorIdInit() -> *mut AMresult { to_result(Ok::(am::ActorId::random())) } /// \memberof AMactorId -/// \brief Allocates a new actor identifier and initializes it from an array of -/// bytes value. +/// \brief Allocates a new actor identifier and initializes it from a sequence +/// of bytes. /// -/// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to copy from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_ACTOR_ID` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] src A pointer to a contiguous sequence of bytes. +/// \param[in] count The number of bytes to copy from \p src. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMactorId` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] -pub unsafe extern "C" fn AMactorIdFromBytes(src: *const u8, count: usize) -> *mut AMresult { - if !src.is_null() { - let value = std::slice::from_raw_parts(src, count); - to_result(Ok::(am::ActorId::from( - value, - ))) - } else { - AMresult::error("Invalid uint8_t*").into() - } +pub unsafe extern "C" fn AMactorIdInitBytes(src: *const u8, count: usize) -> *mut AMresult { + let slice = std::slice::from_raw_parts(src, count); + to_result(Ok::(am::ActorId::from( + slice, + ))) } /// \memberof AMactorId /// \brief Allocates a new actor identifier and initializes it from a -/// hexadecimal UTF-8 string view value. +/// hexadecimal string. /// -/// \param[in] value A UTF-8 string view as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_ACTOR_ID` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] hex_str A UTF-8 string view as an `AMbyteSpan` struct. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMactorId` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// hex_str must be a valid pointer to an AMbyteSpan #[no_mangle] -pub unsafe extern "C" fn AMactorIdFromStr(value: AMbyteSpan) -> *mut AMresult { +pub unsafe extern "C" fn AMactorIdInitStr(hex_str: AMbyteSpan) -> *mut AMresult { use am::AutomergeError::InvalidActorId; - to_result(match (&value).try_into() { + to_result(match (&hex_str).try_into() { Ok(s) => match am::ActorId::from_str(s) { Ok(actor_id) => Ok(actor_id), Err(_) => Err(InvalidActorId(String::from(s))), @@ -174,12 +169,11 @@ pub unsafe extern "C" fn AMactorIdFromStr(value: AMbyteSpan) -> *mut AMresult { } /// \memberof AMactorId -/// \brief Gets the value of an actor identifier as a UTF-8 hexadecimal string -/// view. +/// \brief Gets the value of an actor identifier as a hexadecimal string. /// /// \param[in] actor_id A pointer to an `AMactorId` struct. +/// \pre \p actor_id `!= NULL`. /// \return A UTF-8 string view as an `AMbyteSpan` struct. -/// \pre \p actor_id `!= NULL` /// \internal /// /// # Safety diff --git a/rust/automerge-c/src/byte_span.rs b/rust/automerge-c/src/byte_span.rs index 5855cfc7..a846cf58 100644 --- a/rust/automerge-c/src/byte_span.rs +++ b/rust/automerge-c/src/byte_span.rs @@ -1,17 +1,14 @@ use automerge as am; -use std::cmp::Ordering; +use libc::strlen; use std::convert::TryFrom; use std::os::raw::c_char; -use libc::{c_int, strlen}; -use smol_str::SmolStr; - macro_rules! to_str { - ($byte_span:expr) => {{ - let result: Result<&str, am::AutomergeError> = (&$byte_span).try_into(); + ($span:expr) => {{ + let result: Result<&str, am::AutomergeError> = (&$span).try_into(); match result { Ok(s) => s, - Err(e) => return AMresult::error(&e.to_string()).into(), + Err(e) => return AMresult::err(&e.to_string()).into(), } }}; } @@ -20,17 +17,16 @@ pub(crate) use to_str; /// \struct AMbyteSpan /// \installed_headerfile -/// \brief A view onto an array of bytes. +/// \brief A view onto a contiguous sequence of bytes. #[repr(C)] pub struct AMbyteSpan { - /// A pointer to the first byte of an array of bytes. - /// \warning \p src is only valid until the array of bytes to which it - /// points is freed. - /// \note If the `AMbyteSpan` came from within an `AMitem` struct then - /// \p src will be freed when the pointer to the `AMresult` struct - /// containing the `AMitem` struct is passed to `AMresultFree()`. + /// A pointer to an array of bytes. + /// \attention NEVER CALL `free()` ON \p src! + /// \warning \p src is only valid until the `AMfree()` function is called + /// on the `AMresult` struct that stores the array of bytes to + /// which it points. pub src: *const u8, - /// The count of bytes in the array. + /// The number of bytes in the array. pub count: usize, } @@ -56,7 +52,9 @@ impl PartialEq for AMbyteSpan { } else if self.src == other.src { return true; } - <&[u8]>::from(self) == <&[u8]>::from(other) + let slice = unsafe { std::slice::from_raw_parts(self.src, self.count) }; + let other_slice = unsafe { std::slice::from_raw_parts(other.src, other.count) }; + slice == other_slice } } @@ -74,15 +72,10 @@ impl From<&am::ActorId> for AMbyteSpan { impl From<&mut am::ActorId> for AMbyteSpan { fn from(actor: &mut am::ActorId) -> Self { - actor.as_ref().into() - } -} - -impl From<&am::ChangeHash> for AMbyteSpan { - fn from(change_hash: &am::ChangeHash) -> Self { + let slice = actor.to_bytes(); Self { - src: change_hash.0.as_ptr(), - count: change_hash.0.len(), + src: slice.as_ptr(), + count: slice.len(), } } } @@ -100,9 +93,12 @@ impl From<*const c_char> for AMbyteSpan { } } -impl From<&SmolStr> for AMbyteSpan { - fn from(smol_str: &SmolStr) -> Self { - smol_str.as_bytes().into() +impl From<&am::ChangeHash> for AMbyteSpan { + fn from(change_hash: &am::ChangeHash) -> Self { + Self { + src: change_hash.0.as_ptr(), + count: change_hash.0.len(), + } } } @@ -115,109 +111,16 @@ impl From<&[u8]> for AMbyteSpan { } } -impl From<&AMbyteSpan> for &[u8] { - fn from(byte_span: &AMbyteSpan) -> Self { - unsafe { std::slice::from_raw_parts(byte_span.src, byte_span.count) } - } -} - -impl From<&AMbyteSpan> for Vec { - fn from(byte_span: &AMbyteSpan) -> Self { - <&[u8]>::from(byte_span).to_vec() - } -} - -impl TryFrom<&AMbyteSpan> for am::ChangeHash { - type Error = am::AutomergeError; - - fn try_from(byte_span: &AMbyteSpan) -> Result { - use am::AutomergeError::InvalidChangeHashBytes; - - let slice: &[u8] = byte_span.into(); - match slice.try_into() { - Ok(change_hash) => Ok(change_hash), - Err(e) => Err(InvalidChangeHashBytes(e)), - } - } -} - impl TryFrom<&AMbyteSpan> for &str { type Error = am::AutomergeError; - fn try_from(byte_span: &AMbyteSpan) -> Result { + fn try_from(span: &AMbyteSpan) -> Result { use am::AutomergeError::InvalidCharacter; - let slice = byte_span.into(); + let slice = unsafe { std::slice::from_raw_parts(span.src, span.count) }; match std::str::from_utf8(slice) { Ok(str_) => Ok(str_), Err(e) => Err(InvalidCharacter(e.valid_up_to())), } } } - -/// \memberof AMbyteSpan -/// \brief Creates a view onto an array of bytes. -/// -/// \param[in] src A pointer to an array of bytes or `NULL`. -/// \param[in] count The count of bytes to view from the array pointed to by -/// \p src. -/// \return An `AMbyteSpan` struct. -/// \pre \p count `<= sizeof(`\p src `)` -/// \post `(`\p src `== NULL) -> (AMbyteSpan){NULL, 0}` -/// \internal -/// -/// #Safety -/// src must be a byte array of length `>= count` or `std::ptr::null()` -#[no_mangle] -pub unsafe extern "C" fn AMbytes(src: *const u8, count: usize) -> AMbyteSpan { - AMbyteSpan { - src, - count: if src.is_null() { 0 } else { count }, - } -} - -/// \memberof AMbyteSpan -/// \brief Creates a view onto a C string. -/// -/// \param[in] c_str A null-terminated byte string or `NULL`. -/// \return An `AMbyteSpan` struct. -/// \pre Each byte in \p c_str encodes one UTF-8 character. -/// \internal -/// -/// #Safety -/// c_str must be a null-terminated array of `std::os::raw::c_char` or `std::ptr::null()`. -#[no_mangle] -pub unsafe extern "C" fn AMstr(c_str: *const c_char) -> AMbyteSpan { - c_str.into() -} - -/// \memberof AMbyteSpan -/// \brief Compares two UTF-8 string views lexicographically. -/// -/// \param[in] lhs A UTF-8 string view as an `AMbyteSpan` struct. -/// \param[in] rhs A UTF-8 string view as an `AMbyteSpan` struct. -/// \return Negative value if \p lhs appears before \p rhs in lexicographical order. -/// Zero if \p lhs and \p rhs compare equal. -/// Positive value if \p lhs appears after \p rhs in lexicographical order. -/// \pre \p lhs.src `!= NULL` -/// \pre \p lhs.count `<= sizeof(`\p lhs.src `)` -/// \pre \p rhs.src `!= NULL` -/// \pre \p rhs.count `<= sizeof(`\p rhs.src `)` -/// \internal -/// -/// #Safety -/// lhs.src must be a byte array of length >= lhs.count -/// rhs.src must be a a byte array of length >= rhs.count -#[no_mangle] -pub unsafe extern "C" fn AMstrCmp(lhs: AMbyteSpan, rhs: AMbyteSpan) -> c_int { - match (<&str>::try_from(&lhs), <&str>::try_from(&rhs)) { - (Ok(lhs), Ok(rhs)) => match lhs.cmp(rhs) { - Ordering::Less => -1, - Ordering::Equal => 0, - Ordering::Greater => 1, - }, - (Err(_), Ok(_)) => -1, - (Err(_), Err(_)) => 0, - (Ok(_), Err(_)) => 1, - } -} diff --git a/rust/automerge-c/src/change.rs b/rust/automerge-c/src/change.rs index 8529ed94..d64a2635 100644 --- a/rust/automerge-c/src/change.rs +++ b/rust/automerge-c/src/change.rs @@ -2,6 +2,7 @@ use automerge as am; use std::cell::RefCell; use crate::byte_span::AMbyteSpan; +use crate::change_hashes::AMchangeHashes; use crate::result::{to_result, AMresult}; macro_rules! to_change { @@ -9,7 +10,7 @@ macro_rules! to_change { let handle = $handle.as_ref(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMchange*`").into(), + None => return AMresult::err("Invalid AMchange pointer").into(), } }}; } @@ -20,14 +21,14 @@ macro_rules! to_change { #[derive(Eq, PartialEq)] pub struct AMchange { body: *mut am::Change, - change_hash: RefCell>, + changehash: RefCell>, } impl AMchange { pub fn new(change: &mut am::Change) -> Self { Self { body: change, - change_hash: Default::default(), + changehash: Default::default(), } } @@ -39,12 +40,12 @@ impl AMchange { } pub fn hash(&self) -> AMbyteSpan { - let mut change_hash = self.change_hash.borrow_mut(); - if let Some(change_hash) = change_hash.as_ref() { - change_hash.into() + let mut changehash = self.changehash.borrow_mut(); + if let Some(changehash) = changehash.as_ref() { + changehash.into() } else { let hash = unsafe { (*self.body).hash() }; - let ptr = change_hash.insert(hash); + let ptr = changehash.insert(hash); AMbyteSpan { src: ptr.0.as_ptr(), count: hash.as_ref().len(), @@ -69,10 +70,11 @@ impl AsRef for AMchange { /// \brief Gets the first referenced actor identifier in a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_ACTOR_ID` item. -/// \pre \p change `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \pre \p change `!= NULL`. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMactorId` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -88,8 +90,8 @@ pub unsafe extern "C" fn AMchangeActorId(change: *const AMchange) -> *mut AMresu /// \memberof AMchange /// \brief Compresses the raw bytes of a change. /// -/// \param[in] change A pointer to an `AMchange` struct. -/// \pre \p change `!= NULL` +/// \param[in,out] change A pointer to an `AMchange` struct. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -105,20 +107,18 @@ pub unsafe extern "C" fn AMchangeCompress(change: *mut AMchange) { /// \brief Gets the dependencies of a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p change `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMchangeHashes` struct or `NULL`. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety /// change must be a valid pointer to an AMchange #[no_mangle] -pub unsafe extern "C" fn AMchangeDeps(change: *const AMchange) -> *mut AMresult { - to_result(match change.as_ref() { - Some(change) => change.as_ref().deps(), +pub unsafe extern "C" fn AMchangeDeps(change: *const AMchange) -> AMchangeHashes { + match change.as_ref() { + Some(change) => AMchangeHashes::new(change.as_ref().deps()), None => Default::default(), - }) + } } /// \memberof AMchange @@ -126,7 +126,7 @@ pub unsafe extern "C" fn AMchangeDeps(change: *const AMchange) -> *mut AMresult /// /// \param[in] change A pointer to an `AMchange` struct. /// \return An `AMbyteSpan` struct. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -141,33 +141,32 @@ pub unsafe extern "C" fn AMchangeExtraBytes(change: *const AMchange) -> AMbyteSp } /// \memberof AMchange -/// \brief Allocates a new change and initializes it from an array of bytes value. +/// \brief Loads a sequence of bytes into a change. /// /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to load from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_CHANGE` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src to load. +/// \return A pointer to an `AMresult` struct containing an `AMchange` struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMchangeFromBytes(src: *const u8, count: usize) -> *mut AMresult { - let data = std::slice::from_raw_parts(src, count); - to_result(am::Change::from_bytes(data.to_vec())) + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(am::Change::from_bytes(data)) } /// \memberof AMchange /// \brief Gets the hash of a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return An `AMbyteSpan` struct for a change hash. -/// \pre \p change `!= NULL` +/// \return A change hash as an `AMbyteSpan` struct. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -184,8 +183,8 @@ pub unsafe extern "C" fn AMchangeHash(change: *const AMchange) -> AMbyteSpan { /// \brief Tests the emptiness of a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return `true` if \p change is empty, `false` otherwise. -/// \pre \p change `!= NULL` +/// \return A boolean. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -199,37 +198,12 @@ pub unsafe extern "C" fn AMchangeIsEmpty(change: *const AMchange) -> bool { } } -/// \memberof AMchange -/// \brief Loads a document into a sequence of changes. -/// -/// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to load from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE` items. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// src must be a byte array of length `>= count` -#[no_mangle] -pub unsafe extern "C" fn AMchangeLoadDocument(src: *const u8, count: usize) -> *mut AMresult { - let data = std::slice::from_raw_parts(src, count); - to_result::, _>>( - am::Automerge::load(data) - .and_then(|d| d.get_changes(&[]).map(|c| c.into_iter().cloned().collect())), - ) -} - /// \memberof AMchange /// \brief Gets the maximum operation index of a change. /// /// \param[in] change A pointer to an `AMchange` struct. /// \return A 64-bit unsigned integer. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -247,8 +221,8 @@ pub unsafe extern "C" fn AMchangeMaxOp(change: *const AMchange) -> u64 { /// \brief Gets the message of a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return An `AMbyteSpan` struct for a UTF-8 string. -/// \pre \p change `!= NULL` +/// \return A UTF-8 string view as an `AMbyteSpan` struct. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -266,7 +240,7 @@ pub unsafe extern "C" fn AMchangeMessage(change: *const AMchange) -> AMbyteSpan /// /// \param[in] change A pointer to an `AMchange` struct. /// \return A 64-bit unsigned integer. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -285,7 +259,7 @@ pub unsafe extern "C" fn AMchangeSeq(change: *const AMchange) -> u64 { /// /// \param[in] change A pointer to an `AMchange` struct. /// \return A 64-bit unsigned integer. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -293,9 +267,10 @@ pub unsafe extern "C" fn AMchangeSeq(change: *const AMchange) -> u64 { #[no_mangle] pub unsafe extern "C" fn AMchangeSize(change: *const AMchange) -> usize { if let Some(change) = change.as_ref() { - return change.as_ref().len(); + change.as_ref().len() + } else { + 0 } - 0 } /// \memberof AMchange @@ -303,7 +278,7 @@ pub unsafe extern "C" fn AMchangeSize(change: *const AMchange) -> usize { /// /// \param[in] change A pointer to an `AMchange` struct. /// \return A 64-bit unsigned integer. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -322,7 +297,7 @@ pub unsafe extern "C" fn AMchangeStartOp(change: *const AMchange) -> u64 { /// /// \param[in] change A pointer to an `AMchange` struct. /// \return A 64-bit signed integer. -/// \pre \p change `!= NULL` +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -340,8 +315,8 @@ pub unsafe extern "C" fn AMchangeTime(change: *const AMchange) -> i64 { /// \brief Gets the raw bytes of a change. /// /// \param[in] change A pointer to an `AMchange` struct. -/// \return An `AMbyteSpan` struct for an array of bytes. -/// \pre \p change `!= NULL` +/// \return An `AMbyteSpan` struct. +/// \pre \p change `!= NULL`. /// \internal /// /// # Safety @@ -354,3 +329,28 @@ pub unsafe extern "C" fn AMchangeRawBytes(change: *const AMchange) -> AMbyteSpan Default::default() } } + +/// \memberof AMchange +/// \brief Loads a document into a sequence of changes. +/// +/// \param[in] src A pointer to an array of bytes. +/// \param[in] count The number of bytes in \p src to load. +/// \return A pointer to an `AMresult` struct containing a sequence of +/// `AMchange` structs. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. +/// \internal +/// +/// # Safety +/// src must be a byte array of size `>= count` +#[no_mangle] +pub unsafe extern "C" fn AMchangeLoadDocument(src: *const u8, count: usize) -> *mut AMresult { + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result::, _>>( + am::Automerge::load(&data) + .and_then(|d| d.get_changes(&[]).map(|c| c.into_iter().cloned().collect())), + ) +} diff --git a/rust/automerge-c/src/change_hashes.rs b/rust/automerge-c/src/change_hashes.rs new file mode 100644 index 00000000..029612e9 --- /dev/null +++ b/rust/automerge-c/src/change_hashes.rs @@ -0,0 +1,400 @@ +use automerge as am; +use std::cmp::Ordering; +use std::ffi::c_void; +use std::mem::size_of; + +use crate::byte_span::AMbyteSpan; +use crate::result::{to_result, AMresult}; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(change_hashes: &[am::ChangeHash], offset: isize) -> Self { + Self { + len: change_hashes.len(), + offset, + ptr: change_hashes.as_ptr() as *const c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<&am::ChangeHash> { + if self.is_stopped() { + return None; + } + let slice: &[am::ChangeHash] = + unsafe { std::slice::from_raw_parts(self.ptr as *const am::ChangeHash, self.len) }; + let value = &slice[self.get_index()]; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<&am::ChangeHash> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[am::ChangeHash] = + unsafe { std::slice::from_raw_parts(self.ptr as *const am::ChangeHash, self.len) }; + Some(&slice[self.get_index()]) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) + .try_into() + .unwrap() + } + } +} + +/// \struct AMchangeHashes +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of change hashes. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMchangeHashes { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_], +} + +impl AMchangeHashes { + pub fn new(change_hashes: &[am::ChangeHash]) -> Self { + Self { + detail: Detail::new(change_hashes, 0).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<&am::ChangeHash> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<&am::ChangeHash> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[am::ChangeHash]> for AMchangeHashes { + fn as_ref(&self) -> &[am::ChangeHash] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const am::ChangeHash, detail.len) } + } +} + +impl Default for AMchangeHashes { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMchangeHashes +/// \brief Advances an iterator over a sequence of change hashes by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] change_hashes A pointer to an `AMchangeHashes` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesAdvance(change_hashes: *mut AMchangeHashes, n: isize) { + if let Some(change_hashes) = change_hashes.as_mut() { + change_hashes.advance(n); + }; +} + +/// \memberof AMchangeHashes +/// \brief Compares the sequences of change hashes underlying a pair of +/// iterators. +/// +/// \param[in] change_hashes1 A pointer to an `AMchangeHashes` struct. +/// \param[in] change_hashes2 A pointer to an `AMchangeHashes` struct. +/// \return `-1` if \p change_hashes1 `<` \p change_hashes2, `0` if +/// \p change_hashes1 `==` \p change_hashes2 and `1` if +/// \p change_hashes1 `>` \p change_hashes2. +/// \pre \p change_hashes1 `!= NULL`. +/// \pre \p change_hashes2 `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes1 must be a valid pointer to an AMchangeHashes +/// change_hashes2 must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesCmp( + change_hashes1: *const AMchangeHashes, + change_hashes2: *const AMchangeHashes, +) -> isize { + match (change_hashes1.as_ref(), change_hashes2.as_ref()) { + (Some(change_hashes1), Some(change_hashes2)) => { + match change_hashes1.as_ref().cmp(change_hashes2.as_ref()) { + Ordering::Less => -1, + Ordering::Equal => 0, + Ordering::Greater => 1, + } + } + (None, Some(_)) => -1, + (Some(_), None) => 1, + (None, None) => 0, + } +} + +/// \memberof AMchangeHashes +/// \brief Allocates an iterator over a sequence of change hashes and +/// initializes it from a sequence of byte spans. +/// +/// \param[in] src A pointer to an array of `AMbyteSpan` structs. +/// \param[in] count The number of `AMbyteSpan` structs to copy from \p src. +/// \return A pointer to an `AMresult` struct containing an `AMchangeHashes` +/// struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`) / sizeof(AMbyteSpan)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. +/// \internal +/// +/// # Safety +/// src must be an AMbyteSpan array of size `>= count` +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesInit(src: *const AMbyteSpan, count: usize) -> *mut AMresult { + let mut change_hashes = Vec::::new(); + for n in 0..count { + let byte_span = &*src.add(n); + let slice = std::slice::from_raw_parts(byte_span.src, byte_span.count); + match slice.try_into() { + Ok(change_hash) => { + change_hashes.push(change_hash); + } + Err(e) => { + return to_result(Err(e)); + } + } + } + to_result(Ok::, am::InvalidChangeHashSlice>( + change_hashes, + )) +} + +/// \memberof AMchangeHashes +/// \brief Gets the change hash at the current position of an iterator over a +/// sequence of change hashes and then advances it by at most \p |n| +/// positions where the sign of \p n is relative to the iterator's +/// direction. +/// +/// \param[in,out] change_hashes A pointer to an `AMchangeHashes` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return An `AMbyteSpan` struct with `.src == NULL` when \p change_hashes +/// was previously advanced past its forward/reverse limit. +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesNext( + change_hashes: *mut AMchangeHashes, + n: isize, +) -> AMbyteSpan { + if let Some(change_hashes) = change_hashes.as_mut() { + if let Some(change_hash) = change_hashes.next(n) { + return change_hash.into(); + } + } + Default::default() +} + +/// \memberof AMchangeHashes +/// \brief Advances an iterator over a sequence of change hashes by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the change hash at its new +/// position. +/// +/// \param[in,out] change_hashes A pointer to an `AMchangeHashes` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return An `AMbyteSpan` struct with `.src == NULL` when \p change_hashes is +/// presently advanced past its forward/reverse limit. +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesPrev( + change_hashes: *mut AMchangeHashes, + n: isize, +) -> AMbyteSpan { + if let Some(change_hashes) = change_hashes.as_mut() { + if let Some(change_hash) = change_hashes.prev(n) { + return change_hash.into(); + } + } + Default::default() +} + +/// \memberof AMchangeHashes +/// \brief Gets the size of the sequence of change hashes underlying an +/// iterator. +/// +/// \param[in] change_hashes A pointer to an `AMchangeHashes` struct. +/// \return The count of values in \p change_hashes. +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesSize(change_hashes: *const AMchangeHashes) -> usize { + if let Some(change_hashes) = change_hashes.as_ref() { + change_hashes.len() + } else { + 0 + } +} + +/// \memberof AMchangeHashes +/// \brief Creates an iterator over the same sequence of change hashes as the +/// given one but with the opposite position and direction. +/// +/// \param[in] change_hashes A pointer to an `AMchangeHashes` struct. +/// \return An `AMchangeHashes` struct +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesReversed( + change_hashes: *const AMchangeHashes, +) -> AMchangeHashes { + if let Some(change_hashes) = change_hashes.as_ref() { + change_hashes.reversed() + } else { + Default::default() + } +} + +/// \memberof AMchangeHashes +/// \brief Creates an iterator at the starting position over the same sequence +/// of change hashes as the given one. +/// +/// \param[in] change_hashes A pointer to an `AMchangeHashes` struct. +/// \return An `AMchangeHashes` struct +/// \pre \p change_hashes `!= NULL`. +/// \internal +/// +/// #Safety +/// change_hashes must be a valid pointer to an AMchangeHashes +#[no_mangle] +pub unsafe extern "C" fn AMchangeHashesRewound( + change_hashes: *const AMchangeHashes, +) -> AMchangeHashes { + if let Some(change_hashes) = change_hashes.as_ref() { + change_hashes.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/changes.rs b/rust/automerge-c/src/changes.rs new file mode 100644 index 00000000..1bff35c8 --- /dev/null +++ b/rust/automerge-c/src/changes.rs @@ -0,0 +1,399 @@ +use automerge as am; +use std::collections::BTreeMap; +use std::ffi::c_void; +use std::mem::size_of; + +use crate::byte_span::AMbyteSpan; +use crate::change::AMchange; +use crate::result::{to_result, AMresult}; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, + storage: *mut c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(changes: &[am::Change], offset: isize, storage: &mut BTreeMap) -> Self { + let storage: *mut BTreeMap = storage; + Self { + len: changes.len(), + offset, + ptr: changes.as_ptr() as *const c_void, + storage: storage as *mut c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<*const AMchange> { + if self.is_stopped() { + return None; + } + let slice: &mut [am::Change] = + unsafe { std::slice::from_raw_parts_mut(self.ptr as *mut am::Change, self.len) }; + let storage = unsafe { &mut *(self.storage as *mut BTreeMap) }; + let index = self.get_index(); + let value = match storage.get_mut(&index) { + Some(value) => value, + None => { + storage.insert(index, AMchange::new(&mut slice[index])); + storage.get_mut(&index).unwrap() + } + }; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<*const AMchange> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &mut [am::Change] = + unsafe { std::slice::from_raw_parts_mut(self.ptr as *mut am::Change, self.len) }; + let storage = unsafe { &mut *(self.storage as *mut BTreeMap) }; + let index = self.get_index(); + Some(match storage.get_mut(&index) { + Some(value) => value, + None => { + storage.insert(index, AMchange::new(&mut slice[index])); + storage.get_mut(&index).unwrap() + } + }) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + storage: self.storage, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + storage: self.storage, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts( + (&detail as *const Detail) as *const u8, + USIZE_USIZE_USIZE_USIZE_, + ) + .try_into() + .unwrap() + } + } +} + +/// \struct AMchanges +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of changes. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMchanges { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_USIZE_], +} + +impl AMchanges { + pub fn new(changes: &[am::Change], storage: &mut BTreeMap) -> Self { + Self { + detail: Detail::new(changes, 0, &mut *storage).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<*const AMchange> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<*const AMchange> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[am::Change]> for AMchanges { + fn as_ref(&self) -> &[am::Change] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const am::Change, detail.len) } + } +} + +impl Default for AMchanges { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMchanges +/// \brief Advances an iterator over a sequence of changes by at most \p |n| +/// positions where the sign of \p n is relative to the iterator's +/// direction. +/// +/// \param[in,out] changes A pointer to an `AMchanges` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesAdvance(changes: *mut AMchanges, n: isize) { + if let Some(changes) = changes.as_mut() { + changes.advance(n); + }; +} + +/// \memberof AMchanges +/// \brief Tests the equality of two sequences of changes underlying a pair of +/// iterators. +/// +/// \param[in] changes1 A pointer to an `AMchanges` struct. +/// \param[in] changes2 A pointer to an `AMchanges` struct. +/// \return `true` if \p changes1 `==` \p changes2 and `false` otherwise. +/// \pre \p changes1 `!= NULL`. +/// \pre \p changes2 `!= NULL`. +/// \internal +/// +/// #Safety +/// changes1 must be a valid pointer to an AMchanges +/// changes2 must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesEqual( + changes1: *const AMchanges, + changes2: *const AMchanges, +) -> bool { + match (changes1.as_ref(), changes2.as_ref()) { + (Some(changes1), Some(changes2)) => changes1.as_ref() == changes2.as_ref(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} + +/// \memberof AMchanges +/// \brief Allocates an iterator over a sequence of changes and initializes it +/// from a sequence of byte spans. +/// +/// \param[in] src A pointer to an array of `AMbyteSpan` structs. +/// \param[in] count The number of `AMbyteSpan` structs to copy from \p src. +/// \return A pointer to an `AMresult` struct containing an `AMchanges` struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`) / sizeof(AMbyteSpan)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. +/// \internal +/// +/// # Safety +/// src must be an AMbyteSpan array of size `>= count` +#[no_mangle] +pub unsafe extern "C" fn AMchangesInit(src: *const AMbyteSpan, count: usize) -> *mut AMresult { + let mut changes = Vec::::new(); + for n in 0..count { + let byte_span = &*src.add(n); + let slice = std::slice::from_raw_parts(byte_span.src, byte_span.count); + match slice.try_into() { + Ok(change) => { + changes.push(change); + } + Err(e) => { + return to_result(Err::, am::LoadChangeError>(e)); + } + } + } + to_result(Ok::, am::LoadChangeError>(changes)) +} + +/// \memberof AMchanges +/// \brief Gets the change at the current position of an iterator over a +/// sequence of changes and then advances it by at most \p |n| positions +/// where the sign of \p n is relative to the iterator's direction. +/// +/// \param[in,out] changes A pointer to an `AMchanges` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMchange` struct that's `NULL` when \p changes was +/// previously advanced past its forward/reverse limit. +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesNext(changes: *mut AMchanges, n: isize) -> *const AMchange { + if let Some(changes) = changes.as_mut() { + if let Some(change) = changes.next(n) { + return change; + } + } + std::ptr::null() +} + +/// \memberof AMchanges +/// \brief Advances an iterator over a sequence of changes by at most \p |n| +/// positions where the sign of \p n is relative to the iterator's +/// direction and then gets the change at its new position. +/// +/// \param[in,out] changes A pointer to an `AMchanges` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMchange` struct that's `NULL` when \p changes is +/// presently advanced past its forward/reverse limit. +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesPrev(changes: *mut AMchanges, n: isize) -> *const AMchange { + if let Some(changes) = changes.as_mut() { + if let Some(change) = changes.prev(n) { + return change; + } + } + std::ptr::null() +} + +/// \memberof AMchanges +/// \brief Gets the size of the sequence of changes underlying an iterator. +/// +/// \param[in] changes A pointer to an `AMchanges` struct. +/// \return The count of values in \p changes. +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesSize(changes: *const AMchanges) -> usize { + if let Some(changes) = changes.as_ref() { + changes.len() + } else { + 0 + } +} + +/// \memberof AMchanges +/// \brief Creates an iterator over the same sequence of changes as the given +/// one but with the opposite position and direction. +/// +/// \param[in] changes A pointer to an `AMchanges` struct. +/// \return An `AMchanges` struct. +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesReversed(changes: *const AMchanges) -> AMchanges { + if let Some(changes) = changes.as_ref() { + changes.reversed() + } else { + Default::default() + } +} + +/// \memberof AMchanges +/// \brief Creates an iterator at the starting position over the same sequence +/// of changes as the given one. +/// +/// \param[in] changes A pointer to an `AMchanges` struct. +/// \return An `AMchanges` struct +/// \pre \p changes `!= NULL`. +/// \internal +/// +/// #Safety +/// changes must be a valid pointer to an AMchanges +#[no_mangle] +pub unsafe extern "C" fn AMchangesRewound(changes: *const AMchanges) -> AMchanges { + if let Some(changes) = changes.as_ref() { + changes.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/doc.rs b/rust/automerge-c/src/doc.rs index 82f52bf7..e9b6457c 100644 --- a/rust/automerge-c/src/doc.rs +++ b/rust/automerge-c/src/doc.rs @@ -1,28 +1,46 @@ use automerge as am; -use automerge::sync::SyncDoc; use automerge::transaction::{CommitOptions, Transactable}; -use automerge::ReadDoc; use std::ops::{Deref, DerefMut}; use crate::actor_id::{to_actor_id, AMactorId}; use crate::byte_span::{to_str, AMbyteSpan}; -use crate::items::AMitems; +use crate::change_hashes::AMchangeHashes; use crate::obj::{to_obj_id, AMobjId, AMobjType}; -use crate::result::{to_result, AMresult}; +use crate::result::{to_result, AMresult, AMvalue}; use crate::sync::{to_sync_message, AMsyncMessage, AMsyncState}; pub mod list; pub mod map; pub mod utils; -use crate::doc::utils::{clamp, to_doc, to_doc_mut, to_items}; +use crate::changes::AMchanges; +use crate::doc::utils::{to_doc, to_doc_mut}; + +macro_rules! to_changes { + ($handle:expr) => {{ + let handle = $handle.as_ref(); + match handle { + Some(b) => b, + None => return AMresult::err("Invalid AMchanges pointer").into(), + } + }}; +} + +macro_rules! to_index { + ($index:expr, $len:expr, $param_name:expr) => {{ + if $index > $len && $index != usize::MAX { + return AMresult::err(&format!("Invalid {} {}", $param_name, $index)).into(); + } + std::cmp::min($index, $len) + }}; +} macro_rules! to_sync_state_mut { ($handle:expr) => {{ let handle = $handle.as_mut(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMsyncState*`").into(), + None => return AMresult::err("Invalid AMsyncState pointer").into(), } }}; } @@ -37,10 +55,6 @@ impl AMdoc { pub fn new(auto_commit: am::AutoCommit) -> Self { Self(auto_commit) } - - pub fn is_equal_to(&mut self, other: &mut Self) -> bool { - self.document().get_heads() == other.document().get_heads() - } } impl AsRef for AMdoc { @@ -66,38 +80,38 @@ impl DerefMut for AMdoc { /// \memberof AMdoc /// \brief Applies a sequence of changes to a document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] items A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE` -/// items. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p items `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in] changes A pointer to an `AMchanges` struct. +/// \pre \p doc `!= NULL`. +/// \pre \p changes `!= NULL`. +/// \return A pointer to an `AMresult` struct containing a void. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc -/// items must be a valid pointer to an AMitems. +/// changes must be a valid pointer to an AMchanges. #[no_mangle] -pub unsafe extern "C" fn AMapplyChanges(doc: *mut AMdoc, items: *const AMitems) -> *mut AMresult { +pub unsafe extern "C" fn AMapplyChanges( + doc: *mut AMdoc, + changes: *const AMchanges, +) -> *mut AMresult { let doc = to_doc_mut!(doc); - let items = to_items!(items); - match Vec::::try_from(items) { - Ok(changes) => to_result(doc.apply_changes(changes)), - Err(e) => AMresult::error(&e.to_string()).into(), - } + let changes = to_changes!(changes); + to_result(doc.apply_changes(changes.as_ref().to_vec())) } /// \memberof AMdoc /// \brief Allocates storage for a document and initializes it by duplicating /// the given document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_DOC` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMdoc` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -113,9 +127,10 @@ pub unsafe extern "C" fn AMclone(doc: *const AMdoc) -> *mut AMresult { /// /// \param[in] actor_id A pointer to an `AMactorId` struct or `NULL` for a /// random one. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_DOC` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMdoc` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -132,15 +147,14 @@ pub unsafe extern "C" fn AMcreate(actor_id: *const AMactorId) -> *mut AMresult { /// \brief Commits the current operations on a document with an optional /// message and/or *nix timestamp (milliseconds). /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] message A UTF-8 string view as an `AMbyteSpan` struct. /// \param[in] timestamp A pointer to a 64-bit integer or `NULL`. -/// \return A pointer to an `AMresult` struct with one `AM_VAL_TYPE_CHANGE_HASH` -/// item if there were operations to commit or an `AM_VAL_TYPE_VOID` item -/// if there were no operations to commit. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing an `AMchangeHashes` +/// with one element. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -162,58 +176,15 @@ pub unsafe extern "C" fn AMcommit( to_result(doc.commit_with(options)) } -/// \memberof AMdoc -/// \brief Creates an empty change with an optional message and/or *nix -/// timestamp (milliseconds). -/// -/// \details This is useful if you wish to create a "merge commit" which has as -/// its dependents the current heads of the document but you don't have -/// any operations to add to the document. -/// -/// \note If there are outstanding uncommitted changes to the document -/// then two changes will be created: one for creating the outstanding -/// changes and one for the empty change. The empty change will always be -/// the latest change in the document after this call and the returned -/// hash will be the hash of that empty change. -/// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] message A UTF-8 string view as an `AMbyteSpan` struct. -/// \param[in] timestamp A pointer to a 64-bit integer or `NULL`. -/// \return A pointer to an `AMresult` struct with one `AM_VAL_TYPE_CHANGE_HASH` -/// item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// doc must be a valid pointer to an AMdoc -#[no_mangle] -pub unsafe extern "C" fn AMemptyChange( - doc: *mut AMdoc, - message: AMbyteSpan, - timestamp: *const i64, -) -> *mut AMresult { - let doc = to_doc_mut!(doc); - let mut options = CommitOptions::default(); - if !message.is_null() { - options.set_message(to_str!(message)); - } - if let Some(timestamp) = timestamp.as_ref() { - options.set_time(*timestamp); - } - to_result(doc.empty_change(options)) -} - /// \memberof AMdoc /// \brief Tests the equality of two documents after closing their respective /// transactions. /// -/// \param[in] doc1 A pointer to an `AMdoc` struct. -/// \param[in] doc2 A pointer to an `AMdoc` struct. +/// \param[in,out] doc1 An `AMdoc` struct. +/// \param[in,out] doc2 An `AMdoc` struct. /// \return `true` if \p doc1 `==` \p doc2 and `false` otherwise. -/// \pre \p doc1 `!= NULL` -/// \pre \p doc2 `!= NULL` +/// \pre \p doc1 `!= NULL`. +/// \pre \p doc2 `!= NULL`. /// \internal /// /// #Safety @@ -222,36 +193,33 @@ pub unsafe extern "C" fn AMemptyChange( #[no_mangle] pub unsafe extern "C" fn AMequal(doc1: *mut AMdoc, doc2: *mut AMdoc) -> bool { match (doc1.as_mut(), doc2.as_mut()) { - (Some(doc1), Some(doc2)) => doc1.is_equal_to(doc2), - (None, None) | (None, Some(_)) | (Some(_), None) => false, + (Some(doc1), Some(doc2)) => doc1.document().get_heads() == doc2.document().get_heads(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, } } /// \memberof AMdoc -/// \brief Forks this document at its current or a historical point for use by +/// \brief Forks this document at the current or a historical point for use by /// a different actor. -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical point or `NULL` to select its -/// current point. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for a historical +/// point or `NULL` for the current point. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMdoc` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] -pub unsafe extern "C" fn AMfork(doc: *mut AMdoc, heads: *const AMitems) -> *mut AMresult { +pub unsafe extern "C" fn AMfork(doc: *mut AMdoc, heads: *const AMchangeHashes) -> *mut AMresult { let doc = to_doc_mut!(doc); match heads.as_ref() { None => to_result(doc.fork()), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.fork_at(&heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.fork_at(heads.as_ref())), } } @@ -259,14 +227,14 @@ pub unsafe extern "C" fn AMfork(doc: *mut AMdoc, heads: *const AMitems) -> *mut /// \brief Generates a synchronization message for a peer based upon the given /// synchronization state. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] sync_state A pointer to an `AMsyncState` struct. -/// \return A pointer to an `AMresult` struct with either an -/// `AM_VAL_TYPE_SYNC_MESSAGE` or `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p sync_state `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in,out] sync_state A pointer to an `AMsyncState` struct. +/// \return A pointer to an `AMresult` struct containing either a pointer to an +/// `AMsyncMessage` struct or a void. +/// \pre \p doc `!= NULL`. +/// \pre \p sync_state `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -279,17 +247,18 @@ pub unsafe extern "C" fn AMgenerateSyncMessage( ) -> *mut AMresult { let doc = to_doc_mut!(doc); let sync_state = to_sync_state_mut!(sync_state); - to_result(doc.sync().generate_sync_message(sync_state.as_mut())) + to_result(doc.generate_sync_message(sync_state.as_mut())) } /// \memberof AMdoc /// \brief Gets a document's actor identifier. /// /// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_ACTOR_ID` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMactorId` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -305,22 +274,20 @@ pub unsafe extern "C" fn AMgetActorId(doc: *const AMdoc) -> *mut AMresult { /// \memberof AMdoc /// \brief Gets the change added to a document by its respective hash. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to copy from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_CHANGE` item. -/// \pre \p doc `!= NULL` -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src') >= AM_CHANGE_HASH_SIZE` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src. +/// \return A pointer to an `AMresult` struct containing an `AMchanges` struct. +/// \pre \p doc `!= NULL`. +/// \pre \p src `!= NULL`. +/// \pre \p count `>= AM_CHANGE_HASH_SIZE`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc -/// src must be a byte array of length `>= automerge::types::HASH_SIZE` +/// src must be a byte array of size `>= automerge::types::HASH_SIZE` #[no_mangle] pub unsafe extern "C" fn AMgetChangeByHash( doc: *mut AMdoc, @@ -331,48 +298,48 @@ pub unsafe extern "C" fn AMgetChangeByHash( let slice = std::slice::from_raw_parts(src, count); match slice.try_into() { Ok(change_hash) => to_result(doc.get_change_by_hash(&change_hash)), - Err(e) => AMresult::error(&e.to_string()).into(), + Err(e) => AMresult::err(&e.to_string()).into(), } } /// \memberof AMdoc /// \brief Gets the changes added to a document by their respective hashes. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] have_deps A pointer to an `AMitems` struct with -/// `AM_VAL_TYPE_CHANGE_HASH` items or `NULL`. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE` items. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in] have_deps A pointer to an `AMchangeHashes` struct or `NULL`. +/// \return A pointer to an `AMresult` struct containing an `AMchanges` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc #[no_mangle] -pub unsafe extern "C" fn AMgetChanges(doc: *mut AMdoc, have_deps: *const AMitems) -> *mut AMresult { +pub unsafe extern "C" fn AMgetChanges( + doc: *mut AMdoc, + have_deps: *const AMchangeHashes, +) -> *mut AMresult { let doc = to_doc_mut!(doc); + let empty_deps = Vec::::new(); let have_deps = match have_deps.as_ref() { - Some(have_deps) => match Vec::::try_from(have_deps) { - Ok(change_hashes) => change_hashes, - Err(e) => return AMresult::error(&e.to_string()).into(), - }, - None => Vec::::new(), + Some(have_deps) => have_deps.as_ref(), + None => &empty_deps, }; - to_result(doc.get_changes(&have_deps)) + to_result(doc.get_changes(have_deps)) } /// \memberof AMdoc /// \brief Gets the changes added to a second document that weren't added to /// a first document. /// -/// \param[in] doc1 A pointer to an `AMdoc` struct. -/// \param[in] doc2 A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE` items. -/// \pre \p doc1 `!= NULL` -/// \pre \p doc2 `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc1 An `AMdoc` struct. +/// \param[in,out] doc2 An `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing an `AMchanges` struct. +/// \pre \p doc1 `!= NULL`. +/// \pre \p doc2 `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -388,11 +355,12 @@ pub unsafe extern "C" fn AMgetChangesAdded(doc1: *mut AMdoc, doc2: *mut AMdoc) - /// \memberof AMdoc /// \brief Gets the current heads of a document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing an `AMchangeHashes` +/// struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -409,42 +377,41 @@ pub unsafe extern "C" fn AMgetHeads(doc: *mut AMdoc) -> *mut AMresult { /// \brief Gets the hashes of the changes in a document that aren't transitive /// dependencies of the given hashes of changes. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items or `NULL`. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in] heads A pointer to an `AMchangeHashes` struct or `NULL`. +/// \return A pointer to an `AMresult` struct containing an `AMchangeHashes` +/// struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] -pub unsafe extern "C" fn AMgetMissingDeps(doc: *mut AMdoc, heads: *const AMitems) -> *mut AMresult { +pub unsafe extern "C" fn AMgetMissingDeps( + doc: *mut AMdoc, + heads: *const AMchangeHashes, +) -> *mut AMresult { let doc = to_doc_mut!(doc); + let empty_heads = Vec::::new(); let heads = match heads.as_ref() { - None => Vec::::new(), - Some(heads) => match >::try_from(heads) { - Ok(heads) => heads, - Err(e) => { - return AMresult::error(&e.to_string()).into(); - } - }, + Some(heads) => heads.as_ref(), + None => &empty_heads, }; - to_result(doc.get_missing_deps(heads.as_slice())) + to_result(doc.get_missing_deps(heads)) } /// \memberof AMdoc /// \brief Gets the last change made to a document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct containing either an -/// `AM_VAL_TYPE_CHANGE` or `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing either an `AMchange` +/// struct or a void. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -460,33 +427,29 @@ pub unsafe extern "C" fn AMgetLastLocalChange(doc: *mut AMdoc) -> *mut AMresult /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select historical keys or `NULL` to select current -/// keys. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_STR` items. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// keys or `NULL` for current keys. +/// \return A pointer to an `AMresult` struct containing an `AMstrs` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMkeys( doc: *const AMdoc, obj_id: *const AMobjId, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); match heads.as_ref() { None => to_result(doc.keys(obj_id)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.keys_at(obj_id, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.keys_at(obj_id, heads.as_ref())), } } @@ -495,43 +458,42 @@ pub unsafe extern "C" fn AMkeys( /// form of an incremental save. /// /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to load from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_DOC` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src to load. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMdoc` struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMload(src: *const u8, count: usize) -> *mut AMresult { - let data = std::slice::from_raw_parts(src, count); - to_result(am::AutoCommit::load(data)) + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(am::AutoCommit::load(&data)) } /// \memberof AMdoc /// \brief Loads the compact form of an incremental save into a document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to load from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_UINT` item. -/// \pre \p doc `!= NULL` -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src to load. +/// \return A pointer to an `AMresult` struct containing the number of +/// operations loaded from \p src. +/// \pre \p doc `!= NULL`. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMloadIncremental( doc: *mut AMdoc, @@ -539,21 +501,23 @@ pub unsafe extern "C" fn AMloadIncremental( count: usize, ) -> *mut AMresult { let doc = to_doc_mut!(doc); - let data = std::slice::from_raw_parts(src, count); - to_result(doc.load_incremental(data)) + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(doc.load_incremental(&data)) } /// \memberof AMdoc /// \brief Applies all of the changes in \p src which are not in \p dest to /// \p dest. /// -/// \param[in] dest A pointer to an `AMdoc` struct. -/// \param[in] src A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p dest `!= NULL` -/// \pre \p src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] dest A pointer to an `AMdoc` struct. +/// \param[in,out] src A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing an `AMchangeHashes` +/// struct. +/// \pre \p dest `!= NULL`. +/// \pre \p src `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -570,37 +534,31 @@ pub unsafe extern "C" fn AMmerge(dest: *mut AMdoc, src: *mut AMdoc) -> *mut AMre /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical size or `NULL` to select its -/// current size. -/// \return The count of items in the object identified by \p obj_id. -/// \pre \p doc `!= NULL` +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// size or `NULL` for current size. +/// \return A 64-bit unsigned integer. +/// \pre \p doc `!= NULL`. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMobjSize( doc: *const AMdoc, obj_id: *const AMobjId, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> usize { if let Some(doc) = doc.as_ref() { let obj_id = to_obj_id!(obj_id); match heads.as_ref() { - None => { - return doc.length(obj_id); - } - Some(heads) => { - if let Ok(heads) = >::try_from(heads) { - return doc.length_at(obj_id, &heads); - } - } + None => doc.length(obj_id), + Some(heads) => doc.length_at(obj_id, heads.as_ref()), } + } else { + 0 } - 0 } /// \memberof AMdoc @@ -608,9 +566,8 @@ pub unsafe extern "C" fn AMobjSize( /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \return An `AMobjType` tag or `0`. -/// \pre \p doc `!= NULL` -/// \pre \p obj_id `!= NULL` +/// \return An `AMobjType`. +/// \pre \p doc `!= NULL`. /// \internal /// /// # Safety @@ -620,45 +577,44 @@ pub unsafe extern "C" fn AMobjSize( pub unsafe extern "C" fn AMobjObjType(doc: *const AMdoc, obj_id: *const AMobjId) -> AMobjType { if let Some(doc) = doc.as_ref() { let obj_id = to_obj_id!(obj_id); - if let Ok(obj_type) = doc.object_type(obj_id) { - return (&obj_type).into(); + match doc.object_type(obj_id) { + None => AMobjType::Void, + Some(obj_type) => obj_type.into(), } + } else { + AMobjType::Void } - Default::default() } /// \memberof AMdoc -/// \brief Gets the current or historical items of an entire object. +/// \brief Gets the current or historical values of an object within its entire +/// range. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select its historical items or `NULL` to select -/// its current items. -/// \return A pointer to an `AMresult` struct with an `AMitems` struct. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// items or `NULL` for current items. +/// \return A pointer to an `AMresult` struct containing an `AMobjItems` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] -pub unsafe extern "C" fn AMobjItems( +pub unsafe extern "C" fn AMobjValues( doc: *const AMdoc, obj_id: *const AMobjId, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); match heads.as_ref() { None => to_result(doc.values(obj_id)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.values_at(obj_id, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.values_at(obj_id, heads.as_ref())), } } @@ -668,7 +624,7 @@ pub unsafe extern "C" fn AMobjItems( /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \return The count of pending operations for \p doc. -/// \pre \p doc `!= NULL` +/// \pre \p doc `!= NULL`. /// \internal /// /// # Safety @@ -676,22 +632,23 @@ pub unsafe extern "C" fn AMobjItems( #[no_mangle] pub unsafe extern "C" fn AMpendingOps(doc: *const AMdoc) -> usize { if let Some(doc) = doc.as_ref() { - return doc.pending_ops(); + doc.pending_ops() + } else { + 0 } - 0 } /// \memberof AMdoc /// \brief Receives a synchronization message from a peer based upon a given /// synchronization state. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \param[in] sync_state A pointer to an `AMsyncState` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \param[in,out] sync_state A pointer to an `AMsyncState` struct. /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p sync_state `!= NULL` -/// \pre \p sync_message `!= NULL` +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p sync_state `!= NULL`. +/// \pre \p sync_message `!= NULL`. /// \internal /// /// # Safety @@ -707,19 +664,16 @@ pub unsafe extern "C" fn AMreceiveSyncMessage( let doc = to_doc_mut!(doc); let sync_state = to_sync_state_mut!(sync_state); let sync_message = to_sync_message!(sync_message); - to_result( - doc.sync() - .receive_sync_message(sync_state.as_mut(), sync_message.as_ref().clone()), - ) + to_result(doc.receive_sync_message(sync_state.as_mut(), sync_message.as_ref().clone())) } /// \memberof AMdoc /// \brief Cancels the pending operations added during a document's current /// transaction and gets the number of cancellations. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \return The count of pending operations for \p doc that were cancelled. -/// \pre \p doc `!= NULL` +/// \pre \p doc `!= NULL`. /// \internal /// /// # Safety @@ -727,19 +681,21 @@ pub unsafe extern "C" fn AMreceiveSyncMessage( #[no_mangle] pub unsafe extern "C" fn AMrollback(doc: *mut AMdoc) -> usize { if let Some(doc) = doc.as_mut() { - return doc.rollback(); + doc.rollback() + } else { + 0 } - 0 } /// \memberof AMdoc /// \brief Saves the entirety of a document into a compact form. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BYTES` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing an array of bytes as +/// an `AMbyteSpan` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -754,11 +710,12 @@ pub unsafe extern "C" fn AMsave(doc: *mut AMdoc) -> *mut AMresult { /// \brief Saves the changes to a document since its last save into a compact /// form. /// -/// \param[in] doc A pointer to an `AMdoc` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BYTES` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in,out] doc A pointer to an `AMdoc` struct. +/// \return A pointer to an `AMresult` struct containing an array of bytes as +/// an `AMbyteSpan` struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -772,13 +729,13 @@ pub unsafe extern "C" fn AMsaveIncremental(doc: *mut AMdoc) -> *mut AMresult { /// \memberof AMdoc /// \brief Puts the actor identifier of a document. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] actor_id A pointer to an `AMactorId` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p actor_id `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p actor_id `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -799,65 +756,76 @@ pub unsafe extern "C" fn AMsetActorId( /// \brief Splices values into and/or removes values from the identified object /// at a given position within it. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] pos A position in the object identified by \p obj_id or /// `SIZE_MAX` to indicate one past its end. -/// \param[in] del The number of values to delete or `SIZE_MAX` to indicate +/// \param[in] del The number of characters to delete or `SIZE_MAX` to indicate /// all of them. -/// \param[in] values A copy of an `AMitems` struct from which values will be -/// spliced starting at its current position; call -/// `AMitemsRewound()` on a used `AMitems` first to ensure -/// that all of its values are spliced in. Pass `(AMitems){0}` -/// when zero values should be spliced in. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \pre `0 <=` \p del `<= AMobjSize(`\p obj_id `)` or \p del `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] src A pointer to an array of `AMvalue` structs. +/// \param[in] count The number of `AMvalue` structs in \p src to load. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id`)` or \p pos `== SIZE_MAX`. +/// \pre `0 <=` \p del `<= AMobjSize(`\p obj_id`)` or \p del `== SIZE_MAX`. +/// \pre `(`\p src `!= NULL and 1 <=` \p count `<= sizeof(`\p src`)/ +/// sizeof(AMvalue)) or `\p src `== NULL or `\p count `== 0`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// values must be a valid pointer to an AMitems or std::ptr::null() +/// src must be an AMvalue array of size `>= count` or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMsplice( doc: *mut AMdoc, obj_id: *const AMobjId, pos: usize, del: usize, - values: AMitems, + src: *const AMvalue, + count: usize, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); let len = doc.length(obj_id); - let pos = clamp!(pos, len, "pos"); - let del = clamp!(del, len, "del"); - match Vec::::try_from(&values) { - Ok(vals) => to_result(doc.splice(obj_id, pos, del, vals)), - Err(e) => AMresult::error(&e.to_string()).into(), + let pos = to_index!(pos, len, "pos"); + let del = to_index!(del, len, "del"); + let mut vals: Vec = vec![]; + if !(src.is_null() || count == 0) { + let c_vals = std::slice::from_raw_parts(src, count); + for c_val in c_vals { + match c_val.try_into() { + Ok(s) => { + vals.push(s); + } + Err(e) => { + return AMresult::err(&e.to_string()).into(); + } + } + } } + to_result(doc.splice(obj_id, pos, del, vals)) } /// \memberof AMdoc /// \brief Splices characters into and/or removes characters from the /// identified object at a given position within it. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] pos A position in the text object identified by \p obj_id or /// `SIZE_MAX` to indicate one past its end. /// \param[in] del The number of characters to delete or `SIZE_MAX` to indicate /// all of them. /// \param[in] text A UTF-8 string view as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \pre `0 <=` \p del `<= AMobjSize(`\p obj_id `)` or \p del `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id`)` or \p pos `== SIZE_MAX`. +/// \pre `0 <=` \p del `<= AMobjSize(`\p obj_id`)` or \p del `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -874,8 +842,8 @@ pub unsafe extern "C" fn AMspliceText( let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); let len = doc.length(obj_id); - let pos = clamp!(pos, len, "pos"); - let del = clamp!(del, len, "del"); + let pos = to_index!(pos, len, "pos"); + let del = to_index!(del, len, "del"); to_result(doc.splice_text(obj_id, pos, del, to_str!(text))) } @@ -884,32 +852,28 @@ pub unsafe extern "C" fn AMspliceText( /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] heads A pointer to an `AMitems` struct containing -/// `AM_VAL_TYPE_CHANGE_HASH` items to select a historical string -/// or `NULL` to select the current string. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_STR` item. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// keys or `NULL` for current keys. +/// \return A pointer to an `AMresult` struct containing a UTF-8 string. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMtext( doc: *const AMdoc, obj_id: *const AMobjId, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); match heads.as_ref() { None => to_result(doc.text(obj_id)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.text_at(obj_id, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.text_at(obj_id, heads.as_ref())), } } diff --git a/rust/automerge-c/src/doc/list.rs b/rust/automerge-c/src/doc/list.rs index c4503322..82c62952 100644 --- a/rust/automerge-c/src/doc/list.rs +++ b/rust/automerge-c/src/doc/list.rs @@ -1,46 +1,48 @@ use automerge as am; use automerge::transaction::Transactable; -use automerge::ReadDoc; use crate::byte_span::{to_str, AMbyteSpan}; -use crate::doc::{to_doc, to_doc_mut, AMdoc}; -use crate::items::AMitems; -use crate::obj::{to_obj_id, to_obj_type, AMobjId, AMobjType}; +use crate::change_hashes::AMchangeHashes; +use crate::doc::{to_doc, to_doc_mut, to_obj_id, AMdoc}; +use crate::obj::{to_obj_type, AMobjId, AMobjType}; use crate::result::{to_result, AMresult}; +pub mod item; +pub mod items; + macro_rules! adjust { - ($pos:expr, $insert:expr, $len:expr) => {{ + ($index:expr, $insert:expr, $len:expr) => {{ // An empty object can only be inserted into. let insert = $insert || $len == 0; let end = if insert { $len } else { $len - 1 }; - if $pos > end && $pos != usize::MAX { - return AMresult::error(&format!("Invalid pos {}", $pos)).into(); + if $index > end && $index != usize::MAX { + return AMresult::err(&format!("Invalid index {}", $index)).into(); } - (std::cmp::min($pos, end), insert) + (std::cmp::min($index, end), insert) }}; } macro_rules! to_range { ($begin:expr, $end:expr) => {{ if $begin > $end { - return AMresult::error(&format!("Invalid range [{}-{})", $begin, $end)).into(); + return AMresult::err(&format!("Invalid range [{}-{})", $begin, $end)).into(); }; ($begin..$end) }}; } /// \memberof AMdoc -/// \brief Deletes an item from a list object. +/// \brief Deletes an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -50,109 +52,101 @@ macro_rules! to_range { pub unsafe extern "C" fn AMlistDelete( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, _) = adjust!(pos, false, doc.length(obj_id)); - to_result(doc.delete(obj_id, pos)) + let (index, _) = adjust!(index, false, doc.length(obj_id)); + to_result(doc.delete(obj_id, index)) } /// \memberof AMdoc -/// \brief Gets a current or historical item within a list object. +/// \brief Gets the current or historical value at an index in a list object. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical item at \p pos or `NULL` -/// to select the current item at \p pos. -/// \return A pointer to an `AMresult` struct with an `AMitem` struct. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for a historical +/// value or `NULL` for the current value. +/// \return A pointer to an `AMresult` struct that doesn't contain a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMlistGet( doc: *const AMdoc, obj_id: *const AMobjId, - pos: usize, - heads: *const AMitems, + index: usize, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, _) = adjust!(pos, false, doc.length(obj_id)); - match heads.as_ref() { - None => to_result(doc.get(obj_id, pos)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.get_at(obj_id, pos, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, - } + let (index, _) = adjust!(index, false, doc.length(obj_id)); + to_result(match heads.as_ref() { + None => doc.get(obj_id, index), + Some(heads) => doc.get_at(obj_id, index, heads.as_ref()), + }) } /// \memberof AMdoc -/// \brief Gets all of the historical items at a position within a list object -/// until its current one or a specific one. +/// \brief Gets all of the historical values at an index in a list object until +/// its current one or a specific one. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical last item or `NULL` to select -/// the current last item. -/// \return A pointer to an `AMresult` struct with an `AMitems` struct. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for a historical +/// last value or `NULL` for the current last value. +/// \return A pointer to an `AMresult` struct containing an `AMobjItems` struct. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMlistGetAll( doc: *const AMdoc, obj_id: *const AMobjId, - pos: usize, - heads: *const AMitems, + index: usize, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, _) = adjust!(pos, false, doc.length(obj_id)); + let (index, _) = adjust!(index, false, doc.length(obj_id)); match heads.as_ref() { - None => to_result(doc.get_all(obj_id, pos)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.get_all_at(obj_id, pos, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + None => to_result(doc.get_all(obj_id, index)), + Some(heads) => to_result(doc.get_all_at(obj_id, index, heads.as_ref())), } } /// \memberof AMdoc -/// \brief Increments a counter value in an item within a list object by the -/// given value. +/// \brief Increments a counter at an index in a list object by the given +/// value. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -162,33 +156,32 @@ pub unsafe extern "C" fn AMlistGetAll( pub unsafe extern "C" fn AMlistIncrement( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, value: i64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, _) = adjust!(pos, false, doc.length(obj_id)); - to_result(doc.increment(obj_id, pos, value)) + let (index, _) = adjust!(index, false, doc.length(obj_id)); + to_result(doc.increment(obj_id, index, value)) } /// \memberof AMdoc -/// \brief Puts a boolean value into an item within a list object. +/// \brief Puts a boolean as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A boolean. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -198,85 +191,85 @@ pub unsafe extern "C" fn AMlistIncrement( pub unsafe extern "C" fn AMlistPutBool( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: bool, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); let value = am::ScalarValue::Boolean(value); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts an array of bytes value at a position within a list object. +/// \brief Puts a sequence of bytes as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. -/// \param[in] value A view onto the array of bytes to copy from as an -/// `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \pre \p value.src `!= NULL` -/// \pre `0 <` \p value.count `<= sizeof(`\p value.src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p src before \p index instead of +/// writing \p src over \p index. +/// \param[in] src A pointer to an array of bytes. +/// \param[in] count The number of bytes to copy from \p src. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// value.src must be a byte array of length >= value.count +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMlistPutBytes( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, - value: AMbyteSpan, + src: *const u8, + count: usize, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); - let value: Vec = (&value).into(); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); + let mut value = Vec::new(); + value.extend_from_slice(std::slice::from_raw_parts(src, count)); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts a CRDT counter value into an item within a list object. +/// \brief Puts a CRDT counter as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -286,39 +279,38 @@ pub unsafe extern "C" fn AMlistPutBytes( pub unsafe extern "C" fn AMlistPutCounter( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: i64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); let value = am::ScalarValue::Counter(value.into()); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts a float value into an item within a list object. +/// \brief Puts a float as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A 64-bit float. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -328,38 +320,37 @@ pub unsafe extern "C" fn AMlistPutCounter( pub unsafe extern "C" fn AMlistPutF64( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: f64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts a signed integer value into an item within a list object. +/// \brief Puts a signed integer as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -369,37 +360,36 @@ pub unsafe extern "C" fn AMlistPutF64( pub unsafe extern "C" fn AMlistPutInt( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: i64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts a null value into an item within a list object. +/// \brief Puts null as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -409,37 +399,38 @@ pub unsafe extern "C" fn AMlistPutInt( pub unsafe extern "C" fn AMlistPutNull( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); to_result(if insert { - doc.insert(obj_id, pos, ()) + doc.insert(obj_id, index, ()) } else { - doc.put(obj_id, pos, ()) + doc.put(obj_id, index, ()) }) } /// \memberof AMdoc -/// \brief Puts an empty object value into an item within a list object. +/// \brief Puts an empty object as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] obj_type An `AMobjIdType` enum tag. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_OBJ_TYPE` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMobjId` struct. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \pre \p obj_type != `AM_OBJ_TYPE_VOID`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -449,85 +440,82 @@ pub unsafe extern "C" fn AMlistPutNull( pub unsafe extern "C" fn AMlistPutObject( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, obj_type: AMobjType, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); - let obj_type = to_obj_type!(obj_type); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); + let object = to_obj_type!(obj_type); to_result(if insert { - (doc.insert_object(obj_id, pos, obj_type), obj_type) + doc.insert_object(obj_id, index, object) } else { - (doc.put_object(obj_id, pos, obj_type), obj_type) + doc.put_object(obj_id, index, object) }) } /// \memberof AMdoc -/// \brief Puts a UTF-8 string value into an item within a list object. +/// \brief Puts a UTF-8 string as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A UTF-8 string view as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \pre \p value.src `!= NULL` -/// \pre `0 <` \p value.count `<= sizeof(`\p value.src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \pre \p value `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// value.src must be a byte array of length >= value.count +/// value must be a null-terminated array of `c_char` #[no_mangle] pub unsafe extern "C" fn AMlistPutStr( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: AMbyteSpan, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); let value = to_str!(value); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts a *nix timestamp (milliseconds) value into an item within a +/// \brief Puts a *nix timestamp (milliseconds) as the value at an index in a /// list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -537,39 +525,38 @@ pub unsafe extern "C" fn AMlistPutStr( pub unsafe extern "C" fn AMlistPutTimestamp( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: i64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); let value = am::ScalarValue::Timestamp(value); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Puts an unsigned integer value into an item within a list object. +/// \brief Puts an unsigned integer as the value at an index in a list object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] pos The position of an item within the list object identified by -/// \p obj_id or `SIZE_MAX` to indicate its last item if -/// \p insert `== false` or one past its last item if -/// \p insert `== true`. -/// \param[in] insert A flag for inserting a new item for \p value before -/// \p pos instead of putting \p value into the item at -/// \p pos. +/// \param[in] index An index in the list object identified by \p obj_id or +/// `SIZE_MAX` to indicate its last index if \p insert +/// `== false` or one past its last index if \p insert +/// `== true`. +/// \param[in] insert A flag to insert \p value before \p index instead of +/// writing \p value over \p index. /// \param[in] value A 64-bit unsigned integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre `0 <=` \p pos `<= AMobjSize(`\p obj_id `)` or \p pos `== SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre `0 <=` \p index `<= AMobjSize(`\p obj_id`)` or \p index `== SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -579,58 +566,56 @@ pub unsafe extern "C" fn AMlistPutTimestamp( pub unsafe extern "C" fn AMlistPutUint( doc: *mut AMdoc, obj_id: *const AMobjId, - pos: usize, + index: usize, insert: bool, value: u64, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let obj_id = to_obj_id!(obj_id); - let (pos, insert) = adjust!(pos, insert, doc.length(obj_id)); + let (index, insert) = adjust!(index, insert, doc.length(obj_id)); to_result(if insert { - doc.insert(obj_id, pos, value) + doc.insert(obj_id, index, value) } else { - doc.put(obj_id, pos, value) + doc.put(obj_id, index, value) }) } /// \memberof AMdoc -/// \brief Gets the current or historical items in the list object within the -/// given range. +/// \brief Gets the current or historical indices and values of the list object +/// within the given range. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] begin The first pos in a range of indices. -/// \param[in] end At least one past the last pos in a range of indices. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select historical items or `NULL` to select -/// current items. -/// \return A pointer to an `AMresult` struct with an `AMitems` struct. -/// \pre \p doc `!= NULL` -/// \pre \p begin `<=` \p end `<= SIZE_MAX` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] begin The first index in a range of indices. +/// \param[in] end At least one past the last index in a range of indices. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// indices and values or `NULL` for current indices and +/// values. +/// \return A pointer to an `AMresult` struct containing an `AMlistItems` +/// struct. +/// \pre \p doc `!= NULL`. +/// \pre \p begin `<=` \p end `<= SIZE_MAX`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMlistRange( doc: *const AMdoc, obj_id: *const AMobjId, begin: usize, end: usize, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); let range = to_range!(begin, end); match heads.as_ref() { None => to_result(doc.list_range(obj_id, range)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.list_range_at(obj_id, range, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.list_range_at(obj_id, range, heads.as_ref())), } } diff --git a/rust/automerge-c/src/doc/list/item.rs b/rust/automerge-c/src/doc/list/item.rs new file mode 100644 index 00000000..7a3869f3 --- /dev/null +++ b/rust/automerge-c/src/doc/list/item.rs @@ -0,0 +1,97 @@ +use automerge as am; + +use crate::obj::AMobjId; +use crate::result::AMvalue; + +/// \struct AMlistItem +/// \installed_headerfile +/// \brief An item in a list object. +pub struct AMlistItem { + /// The index of an item in a list object. + index: usize, + /// The object identifier of an item in a list object. + obj_id: AMobjId, + /// The value of an item in a list object. + value: am::Value<'static>, +} + +impl AMlistItem { + pub fn new(index: usize, value: am::Value<'static>, obj_id: am::ObjId) -> Self { + Self { + index, + obj_id: AMobjId::new(obj_id), + value, + } + } +} + +impl PartialEq for AMlistItem { + fn eq(&self, other: &Self) -> bool { + self.index == other.index && self.obj_id == other.obj_id && self.value == other.value + } +} + +/* +impl From<&AMlistItem> for (usize, am::Value<'static>, am::ObjId) { + fn from(list_item: &AMlistItem) -> Self { + (list_item.index, list_item.value.0.clone(), list_item.obj_id.as_ref().clone()) + } +} +*/ + +/// \memberof AMlistItem +/// \brief Gets the index of an item in a list object. +/// +/// \param[in] list_item A pointer to an `AMlistItem` struct. +/// \return A 64-bit unsigned integer. +/// \pre \p list_item `!= NULL`. +/// \internal +/// +/// # Safety +/// list_item must be a valid pointer to an AMlistItem +#[no_mangle] +pub unsafe extern "C" fn AMlistItemIndex(list_item: *const AMlistItem) -> usize { + if let Some(list_item) = list_item.as_ref() { + list_item.index + } else { + usize::MAX + } +} + +/// \memberof AMlistItem +/// \brief Gets the object identifier of an item in a list object. +/// +/// \param[in] list_item A pointer to an `AMlistItem` struct. +/// \return A pointer to an `AMobjId` struct. +/// \pre \p list_item `!= NULL`. +/// \internal +/// +/// # Safety +/// list_item must be a valid pointer to an AMlistItem +#[no_mangle] +pub unsafe extern "C" fn AMlistItemObjId(list_item: *const AMlistItem) -> *const AMobjId { + if let Some(list_item) = list_item.as_ref() { + &list_item.obj_id + } else { + std::ptr::null() + } +} + +/// \memberof AMlistItem +/// \brief Gets the value of an item in a list object. +/// +/// \param[in] list_item A pointer to an `AMlistItem` struct. +/// \return An `AMvalue` struct. +/// \pre \p list_item `!= NULL`. +/// \internal +/// +/// # Safety +/// list_item must be a valid pointer to an AMlistItem +#[no_mangle] +pub unsafe extern "C" fn AMlistItemValue<'a>(list_item: *const AMlistItem) -> AMvalue<'a> { + if let Some(list_item) = list_item.as_ref() { + (&list_item.value).into() + } else { + AMvalue::Void + } +} diff --git a/rust/automerge-c/src/doc/list/items.rs b/rust/automerge-c/src/doc/list/items.rs new file mode 100644 index 00000000..5b4a11fd --- /dev/null +++ b/rust/automerge-c/src/doc/list/items.rs @@ -0,0 +1,348 @@ +use std::ffi::c_void; +use std::mem::size_of; + +use crate::doc::list::item::AMlistItem; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(list_items: &[AMlistItem], offset: isize) -> Self { + Self { + len: list_items.len(), + offset, + ptr: list_items.as_ptr() as *const c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<&AMlistItem> { + if self.is_stopped() { + return None; + } + let slice: &[AMlistItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMlistItem, self.len) }; + let value = &slice[self.get_index()]; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<&AMlistItem> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[AMlistItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMlistItem, self.len) }; + Some(&slice[self.get_index()]) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) + .try_into() + .unwrap() + } + } +} + +/// \struct AMlistItems +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of list object items. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMlistItems { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_], +} + +impl AMlistItems { + pub fn new(list_items: &[AMlistItem]) -> Self { + Self { + detail: Detail::new(list_items, 0).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<&AMlistItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<&AMlistItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[AMlistItem]> for AMlistItems { + fn as_ref(&self) -> &[AMlistItem] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const AMlistItem, detail.len) } + } +} + +impl Default for AMlistItems { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMlistItems +/// \brief Advances an iterator over a sequence of list object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] list_items A pointer to an `AMlistItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsAdvance(list_items: *mut AMlistItems, n: isize) { + if let Some(list_items) = list_items.as_mut() { + list_items.advance(n); + }; +} + +/// \memberof AMlistItems +/// \brief Tests the equality of two sequences of list object items underlying +/// a pair of iterators. +/// +/// \param[in] list_items1 A pointer to an `AMlistItems` struct. +/// \param[in] list_items2 A pointer to an `AMlistItems` struct. +/// \return `true` if \p list_items1 `==` \p list_items2 and `false` otherwise. +/// \pre \p list_items1 `!= NULL`. +/// \pre \p list_items2 `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items1 must be a valid pointer to an AMlistItems +/// list_items2 must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsEqual( + list_items1: *const AMlistItems, + list_items2: *const AMlistItems, +) -> bool { + match (list_items1.as_ref(), list_items2.as_ref()) { + (Some(list_items1), Some(list_items2)) => list_items1.as_ref() == list_items2.as_ref(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} + +/// \memberof AMlistItems +/// \brief Gets the list object item at the current position of an iterator +/// over a sequence of list object items and then advances it by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] list_items A pointer to an `AMlistItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMlistItem` struct that's `NULL` when +/// \p list_items was previously advanced past its forward/reverse +/// limit. +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsNext( + list_items: *mut AMlistItems, + n: isize, +) -> *const AMlistItem { + if let Some(list_items) = list_items.as_mut() { + if let Some(list_item) = list_items.next(n) { + return list_item; + } + } + std::ptr::null() +} + +/// \memberof AMlistItems +/// \brief Advances an iterator over a sequence of list object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the list object item at its new +/// position. +/// +/// \param[in,out] list_items A pointer to an `AMlistItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMlistItem` struct that's `NULL` when +/// \p list_items is presently advanced past its forward/reverse limit. +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsPrev( + list_items: *mut AMlistItems, + n: isize, +) -> *const AMlistItem { + if let Some(list_items) = list_items.as_mut() { + if let Some(list_item) = list_items.prev(n) { + return list_item; + } + } + std::ptr::null() +} + +/// \memberof AMlistItems +/// \brief Gets the size of the sequence of list object items underlying an +/// iterator. +/// +/// \param[in] list_items A pointer to an `AMlistItems` struct. +/// \return The count of values in \p list_items. +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsSize(list_items: *const AMlistItems) -> usize { + if let Some(list_items) = list_items.as_ref() { + list_items.len() + } else { + 0 + } +} + +/// \memberof AMlistItems +/// \brief Creates an iterator over the same sequence of list object items as +/// the given one but with the opposite position and direction. +/// +/// \param[in] list_items A pointer to an `AMlistItems` struct. +/// \return An `AMlistItems` struct +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsReversed(list_items: *const AMlistItems) -> AMlistItems { + if let Some(list_items) = list_items.as_ref() { + list_items.reversed() + } else { + Default::default() + } +} + +/// \memberof AMlistItems +/// \brief Creates an iterator at the starting position over the same sequence +/// of list object items as the given one. +/// +/// \param[in] list_items A pointer to an `AMlistItems` struct. +/// \return An `AMlistItems` struct +/// \pre \p list_items `!= NULL`. +/// \internal +/// +/// #Safety +/// list_items must be a valid pointer to an AMlistItems +#[no_mangle] +pub unsafe extern "C" fn AMlistItemsRewound(list_items: *const AMlistItems) -> AMlistItems { + if let Some(list_items) = list_items.as_ref() { + list_items.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/doc/map.rs b/rust/automerge-c/src/doc/map.rs index b2f7db02..dbf4d61f 100644 --- a/rust/automerge-c/src/doc/map.rs +++ b/rust/automerge-c/src/doc/map.rs @@ -1,31 +1,32 @@ use automerge as am; use automerge::transaction::Transactable; -use automerge::ReadDoc; use crate::byte_span::{to_str, AMbyteSpan}; -use crate::doc::{to_doc, to_doc_mut, AMdoc}; -use crate::items::AMitems; -use crate::obj::{to_obj_id, to_obj_type, AMobjId, AMobjType}; +use crate::change_hashes::AMchangeHashes; +use crate::doc::{to_doc, to_doc_mut, to_obj_id, AMdoc}; +use crate::obj::{to_obj_type, AMobjId, AMobjType}; use crate::result::{to_result, AMresult}; +pub mod item; +pub mod items; + /// \memberof AMdoc -/// \brief Deletes an item from a map object. +/// \brief Deletes a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapDelete( doc: *mut AMdoc, @@ -38,107 +39,96 @@ pub unsafe extern "C" fn AMmapDelete( } /// \memberof AMdoc -/// \brief Gets a current or historical item within a map object. +/// \brief Gets the current or historical value for a key in a map object. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical item at \p key or `NULL` -/// to select the current item at \p key. -/// \return A pointer to an `AMresult` struct with an `AMitem` struct. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for a historical +/// value or `NULL` for the current value. +/// \return A pointer to an `AMresult` struct that doesn't contain a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMmapGet( doc: *const AMdoc, obj_id: *const AMobjId, key: AMbyteSpan, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); let key = to_str!(key); match heads.as_ref() { None => to_result(doc.get(obj_id, key)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.get_at(obj_id, key, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.get_at(obj_id, key, heads.as_ref())), } } /// \memberof AMdoc -/// \brief Gets all of the historical items at a key within a map object until +/// \brief Gets all of the historical values for a key in a map object until /// its current one or a specific one. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select a historical last item or `NULL` to -/// select the current last item. -/// \return A pointer to an `AMresult` struct with an `AMItems` struct. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for a historical +/// last value or `NULL` for the current last value. +/// \return A pointer to an `AMresult` struct containing an `AMobjItems` struct. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMmapGetAll( doc: *const AMdoc, obj_id: *const AMobjId, key: AMbyteSpan, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); let key = to_str!(key); match heads.as_ref() { None => to_result(doc.get_all(obj_id, key)), - Some(heads) => match >::try_from(heads) { - Ok(heads) => to_result(doc.get_all_at(obj_id, key, &heads)), - Err(e) => AMresult::error(&e.to_string()).into(), - }, + Some(heads) => to_result(doc.get_all_at(obj_id, key, heads.as_ref())), } } /// \memberof AMdoc -/// \brief Increments a counter at a key in a map object by the given value. +/// \brief Increments a counter for a key in a map object by the given value. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapIncrement( doc: *mut AMdoc, @@ -154,22 +144,21 @@ pub unsafe extern "C" fn AMmapIncrement( /// \memberof AMdoc /// \brief Puts a boolean as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A boolean. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutBool( doc: *mut AMdoc, @@ -183,58 +172,60 @@ pub unsafe extern "C" fn AMmapPutBool( } /// \memberof AMdoc -/// \brief Puts an array of bytes value at a key in a map object. +/// \brief Puts a sequence of bytes as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. -/// \param[in] key The UTF-8 string view key of an item within the map object -/// identified by \p obj_id as an `AMbyteSpan` struct. -/// \param[in] value A view onto an array of bytes as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \pre \p value.src `!= NULL` -/// \pre `0 <` \p value.count `<= sizeof(`\p value.src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] key A UTF-8 string view key for the map object identified by +/// \p obj_id as an `AMbyteSpan` struct. +/// \param[in] src A pointer to an array of bytes. +/// \param[in] count The number of bytes to copy from \p src. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count -/// value.src must be a byte array of length >= value.count +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMmapPutBytes( doc: *mut AMdoc, obj_id: *const AMobjId, key: AMbyteSpan, - value: AMbyteSpan, + src: *const u8, + count: usize, ) -> *mut AMresult { let doc = to_doc_mut!(doc); let key = to_str!(key); - to_result(doc.put(to_obj_id!(obj_id), key, Vec::::from(&value))) + let mut vec = Vec::new(); + vec.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(doc.put(to_obj_id!(obj_id), key, vec)) } /// \memberof AMdoc /// \brief Puts a CRDT counter as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutCounter( doc: *mut AMdoc, @@ -254,21 +245,20 @@ pub unsafe extern "C" fn AMmapPutCounter( /// \memberof AMdoc /// \brief Puts null as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutNull( doc: *mut AMdoc, @@ -283,22 +273,23 @@ pub unsafe extern "C" fn AMmapPutNull( /// \memberof AMdoc /// \brief Puts an empty object as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] obj_type An `AMobjIdType` enum tag. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_OBJ_TYPE` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMobjId` struct. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \pre \p obj_type != `AM_OBJ_TYPE_VOID`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutObject( doc: *mut AMdoc, @@ -308,29 +299,27 @@ pub unsafe extern "C" fn AMmapPutObject( ) -> *mut AMresult { let doc = to_doc_mut!(doc); let key = to_str!(key); - let obj_type = to_obj_type!(obj_type); - to_result((doc.put_object(to_obj_id!(obj_id), key, obj_type), obj_type)) + to_result(doc.put_object(to_obj_id!(obj_id), key, to_obj_type!(obj_type))) } /// \memberof AMdoc /// \brief Puts a float as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit float. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutF64( doc: *mut AMdoc, @@ -346,22 +335,21 @@ pub unsafe extern "C" fn AMmapPutF64( /// \memberof AMdoc /// \brief Puts a signed integer as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutInt( doc: *mut AMdoc, @@ -377,22 +365,21 @@ pub unsafe extern "C" fn AMmapPutInt( /// \memberof AMdoc /// \brief Puts a UTF-8 string as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A UTF-8 string view as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutStr( doc: *mut AMdoc, @@ -408,22 +395,21 @@ pub unsafe extern "C" fn AMmapPutStr( /// \brief Puts a *nix timestamp (milliseconds) as the value of a key in a map /// object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutTimestamp( doc: *mut AMdoc, @@ -439,22 +425,21 @@ pub unsafe extern "C" fn AMmapPutTimestamp( /// \memberof AMdoc /// \brief Puts an unsigned integer as the value of a key in a map object. /// -/// \param[in] doc A pointer to an `AMdoc` struct. +/// \param[in,out] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] key A UTF-8 string view key for the map object identified by /// \p obj_id as an `AMbyteSpan` struct. /// \param[in] value A 64-bit unsigned integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_VOID` item. -/// \pre \p doc `!= NULL` -/// \pre \p key.src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a void. +/// \pre \p doc `!= NULL`. +/// \pre \p key `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// key.src must be a byte array of length >= key.count #[no_mangle] pub unsafe extern "C" fn AMmapPutUint( doc: *mut AMdoc, @@ -468,82 +453,71 @@ pub unsafe extern "C" fn AMmapPutUint( } /// \memberof AMdoc -/// \brief Gets the current or historical items of the map object within the -/// given range. +/// \brief Gets the current or historical keys and values of the map object +/// within the given range. /// /// \param[in] doc A pointer to an `AMdoc` struct. /// \param[in] obj_id A pointer to an `AMobjId` struct or `AM_ROOT`. /// \param[in] begin The first key in a subrange or `AMstr(NULL)` to indicate the /// absolute first key. -/// \param[in] end The key one past the last key in a subrange or `AMstr(NULL)` -/// to indicate one past the absolute last key. -/// \param[in] heads A pointer to an `AMitems` struct with `AM_VAL_TYPE_CHANGE_HASH` -/// items to select historical items or `NULL` to select -/// current items. -/// \return A pointer to an `AMresult` struct with an `AMitems` struct. -/// \pre \p doc `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] end The key one past the last key in a subrange or `AMstr(NULL)` to +/// indicate one past the absolute last key. +/// \param[in] heads A pointer to an `AMchangeHashes` struct for historical +/// keys and values or `NULL` for current keys and values. +/// \return A pointer to an `AMresult` struct containing an `AMmapItems` +/// struct. +/// \pre \p doc `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety /// doc must be a valid pointer to an AMdoc /// obj_id must be a valid pointer to an AMobjId or std::ptr::null() -/// begin.src must be a byte array of length >= begin.count or std::ptr::null() -/// end.src must be a byte array of length >= end.count or std::ptr::null() -/// heads must be a valid pointer to an AMitems or std::ptr::null() +/// heads must be a valid pointer to an AMchangeHashes or std::ptr::null() #[no_mangle] pub unsafe extern "C" fn AMmapRange( doc: *const AMdoc, obj_id: *const AMobjId, begin: AMbyteSpan, end: AMbyteSpan, - heads: *const AMitems, + heads: *const AMchangeHashes, ) -> *mut AMresult { let doc = to_doc!(doc); let obj_id = to_obj_id!(obj_id); - let heads = match heads.as_ref() { - None => None, - Some(heads) => match >::try_from(heads) { - Ok(heads) => Some(heads), - Err(e) => { - return AMresult::error(&e.to_string()).into(); - } - }, - }; match (begin.is_null(), end.is_null()) { (false, false) => { let (begin, end) = (to_str!(begin).to_string(), to_str!(end).to_string()); if begin > end { - return AMresult::error(&format!("Invalid range [{}-{})", begin, end)).into(); + return AMresult::err(&format!("Invalid range [{}-{})", begin, end)).into(); }; let bounds = begin..end; - if let Some(heads) = heads { - to_result(doc.map_range_at(obj_id, bounds, &heads)) + if let Some(heads) = heads.as_ref() { + to_result(doc.map_range_at(obj_id, bounds, heads.as_ref())) } else { to_result(doc.map_range(obj_id, bounds)) } } (false, true) => { let bounds = to_str!(begin).to_string()..; - if let Some(heads) = heads { - to_result(doc.map_range_at(obj_id, bounds, &heads)) + if let Some(heads) = heads.as_ref() { + to_result(doc.map_range_at(obj_id, bounds, heads.as_ref())) } else { to_result(doc.map_range(obj_id, bounds)) } } (true, false) => { let bounds = ..to_str!(end).to_string(); - if let Some(heads) = heads { - to_result(doc.map_range_at(obj_id, bounds, &heads)) + if let Some(heads) = heads.as_ref() { + to_result(doc.map_range_at(obj_id, bounds, heads.as_ref())) } else { to_result(doc.map_range(obj_id, bounds)) } } (true, true) => { let bounds = ..; - if let Some(heads) = heads { - to_result(doc.map_range_at(obj_id, bounds, &heads)) + if let Some(heads) = heads.as_ref() { + to_result(doc.map_range_at(obj_id, bounds, heads.as_ref())) } else { to_result(doc.map_range(obj_id, bounds)) } diff --git a/rust/automerge-c/src/doc/map/item.rs b/rust/automerge-c/src/doc/map/item.rs new file mode 100644 index 00000000..7914fdc4 --- /dev/null +++ b/rust/automerge-c/src/doc/map/item.rs @@ -0,0 +1,98 @@ +use automerge as am; + +use crate::byte_span::AMbyteSpan; +use crate::obj::AMobjId; +use crate::result::AMvalue; + +/// \struct AMmapItem +/// \installed_headerfile +/// \brief An item in a map object. +pub struct AMmapItem { + /// The key of an item in a map object. + key: String, + /// The object identifier of an item in a map object. + obj_id: AMobjId, + /// The value of an item in a map object. + value: am::Value<'static>, +} + +impl AMmapItem { + pub fn new(key: &'static str, value: am::Value<'static>, obj_id: am::ObjId) -> Self { + Self { + key: key.to_string(), + obj_id: AMobjId::new(obj_id), + value, + } + } +} + +impl PartialEq for AMmapItem { + fn eq(&self, other: &Self) -> bool { + self.key == other.key && self.obj_id == other.obj_id && self.value == other.value + } +} + +/* +impl From<&AMmapItem> for (String, am::Value<'static>, am::ObjId) { + fn from(map_item: &AMmapItem) -> Self { + (map_item.key.into_string().unwrap(), map_item.value.0.clone(), map_item.obj_id.as_ref().clone()) + } +} +*/ + +/// \memberof AMmapItem +/// \brief Gets the key of an item in a map object. +/// +/// \param[in] map_item A pointer to an `AMmapItem` struct. +/// \return An `AMbyteSpan` view of a UTF-8 string. +/// \pre \p map_item `!= NULL`. +/// \internal +/// +/// # Safety +/// map_item must be a valid pointer to an AMmapItem +#[no_mangle] +pub unsafe extern "C" fn AMmapItemKey(map_item: *const AMmapItem) -> AMbyteSpan { + if let Some(map_item) = map_item.as_ref() { + map_item.key.as_bytes().into() + } else { + Default::default() + } +} + +/// \memberof AMmapItem +/// \brief Gets the object identifier of an item in a map object. +/// +/// \param[in] map_item A pointer to an `AMmapItem` struct. +/// \return A pointer to an `AMobjId` struct. +/// \pre \p map_item `!= NULL`. +/// \internal +/// +/// # Safety +/// map_item must be a valid pointer to an AMmapItem +#[no_mangle] +pub unsafe extern "C" fn AMmapItemObjId(map_item: *const AMmapItem) -> *const AMobjId { + if let Some(map_item) = map_item.as_ref() { + &map_item.obj_id + } else { + std::ptr::null() + } +} + +/// \memberof AMmapItem +/// \brief Gets the value of an item in a map object. +/// +/// \param[in] map_item A pointer to an `AMmapItem` struct. +/// \return An `AMvalue` struct. +/// \pre \p map_item `!= NULL`. +/// \internal +/// +/// # Safety +/// map_item must be a valid pointer to an AMmapItem +#[no_mangle] +pub unsafe extern "C" fn AMmapItemValue<'a>(map_item: *const AMmapItem) -> AMvalue<'a> { + if let Some(map_item) = map_item.as_ref() { + (&map_item.value).into() + } else { + AMvalue::Void + } +} diff --git a/rust/automerge-c/src/doc/map/items.rs b/rust/automerge-c/src/doc/map/items.rs new file mode 100644 index 00000000..cd305971 --- /dev/null +++ b/rust/automerge-c/src/doc/map/items.rs @@ -0,0 +1,340 @@ +use std::ffi::c_void; +use std::mem::size_of; + +use crate::doc::map::item::AMmapItem; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(map_items: &[AMmapItem], offset: isize) -> Self { + Self { + len: map_items.len(), + offset, + ptr: map_items.as_ptr() as *const c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<&AMmapItem> { + if self.is_stopped() { + return None; + } + let slice: &[AMmapItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMmapItem, self.len) }; + let value = &slice[self.get_index()]; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<&AMmapItem> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[AMmapItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMmapItem, self.len) }; + Some(&slice[self.get_index()]) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) + .try_into() + .unwrap() + } + } +} + +/// \struct AMmapItems +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of map object items. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMmapItems { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_], +} + +impl AMmapItems { + pub fn new(map_items: &[AMmapItem]) -> Self { + Self { + detail: Detail::new(map_items, 0).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<&AMmapItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<&AMmapItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[AMmapItem]> for AMmapItems { + fn as_ref(&self) -> &[AMmapItem] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const AMmapItem, detail.len) } + } +} + +impl Default for AMmapItems { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMmapItems +/// \brief Advances an iterator over a sequence of map object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] map_items A pointer to an `AMmapItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsAdvance(map_items: *mut AMmapItems, n: isize) { + if let Some(map_items) = map_items.as_mut() { + map_items.advance(n); + }; +} + +/// \memberof AMmapItems +/// \brief Tests the equality of two sequences of map object items underlying +/// a pair of iterators. +/// +/// \param[in] map_items1 A pointer to an `AMmapItems` struct. +/// \param[in] map_items2 A pointer to an `AMmapItems` struct. +/// \return `true` if \p map_items1 `==` \p map_items2 and `false` otherwise. +/// \pre \p map_items1 `!= NULL`. +/// \pre \p map_items2 `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items1 must be a valid pointer to an AMmapItems +/// map_items2 must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsEqual( + map_items1: *const AMmapItems, + map_items2: *const AMmapItems, +) -> bool { + match (map_items1.as_ref(), map_items2.as_ref()) { + (Some(map_items1), Some(map_items2)) => map_items1.as_ref() == map_items2.as_ref(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} + +/// \memberof AMmapItems +/// \brief Gets the map object item at the current position of an iterator +/// over a sequence of map object items and then advances it by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] map_items A pointer to an `AMmapItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMmapItem` struct that's `NULL` when \p map_items +/// was previously advanced past its forward/reverse limit. +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsNext(map_items: *mut AMmapItems, n: isize) -> *const AMmapItem { + if let Some(map_items) = map_items.as_mut() { + if let Some(map_item) = map_items.next(n) { + return map_item; + } + } + std::ptr::null() +} + +/// \memberof AMmapItems +/// \brief Advances an iterator over a sequence of map object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the map object item at its new +/// position. +/// +/// \param[in,out] map_items A pointer to an `AMmapItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMmapItem` struct that's `NULL` when \p map_items +/// is presently advanced past its forward/reverse limit. +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsPrev(map_items: *mut AMmapItems, n: isize) -> *const AMmapItem { + if let Some(map_items) = map_items.as_mut() { + if let Some(map_item) = map_items.prev(n) { + return map_item; + } + } + std::ptr::null() +} + +/// \memberof AMmapItems +/// \brief Gets the size of the sequence of map object items underlying an +/// iterator. +/// +/// \param[in] map_items A pointer to an `AMmapItems` struct. +/// \return The count of values in \p map_items. +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsSize(map_items: *const AMmapItems) -> usize { + if let Some(map_items) = map_items.as_ref() { + map_items.len() + } else { + 0 + } +} + +/// \memberof AMmapItems +/// \brief Creates an iterator over the same sequence of map object items as +/// the given one but with the opposite position and direction. +/// +/// \param[in] map_items A pointer to an `AMmapItems` struct. +/// \return An `AMmapItems` struct +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsReversed(map_items: *const AMmapItems) -> AMmapItems { + if let Some(map_items) = map_items.as_ref() { + map_items.reversed() + } else { + Default::default() + } +} + +/// \memberof AMmapItems +/// \brief Creates an iterator at the starting position over the same sequence of map object items as the given one. +/// +/// \param[in] map_items A pointer to an `AMmapItems` struct. +/// \return An `AMmapItems` struct +/// \pre \p map_items `!= NULL`. +/// \internal +/// +/// #Safety +/// map_items must be a valid pointer to an AMmapItems +#[no_mangle] +pub unsafe extern "C" fn AMmapItemsRewound(map_items: *const AMmapItems) -> AMmapItems { + if let Some(map_items) = map_items.as_ref() { + map_items.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/doc/utils.rs b/rust/automerge-c/src/doc/utils.rs index ce465b84..d98a9a8b 100644 --- a/rust/automerge-c/src/doc/utils.rs +++ b/rust/automerge-c/src/doc/utils.rs @@ -1,20 +1,9 @@ -macro_rules! clamp { - ($index:expr, $len:expr, $param_name:expr) => {{ - if $index > $len && $index != usize::MAX { - return AMresult::error(&format!("Invalid {} {}", $param_name, $index)).into(); - } - std::cmp::min($index, $len) - }}; -} - -pub(crate) use clamp; - macro_rules! to_doc { ($handle:expr) => {{ let handle = $handle.as_ref(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMdoc*`").into(), + None => return AMresult::err("Invalid AMdoc pointer").into(), } }}; } @@ -26,21 +15,9 @@ macro_rules! to_doc_mut { let handle = $handle.as_mut(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMdoc*`").into(), + None => return AMresult::err("Invalid AMdoc pointer").into(), } }}; } pub(crate) use to_doc_mut; - -macro_rules! to_items { - ($handle:expr) => {{ - let handle = $handle.as_ref(); - match handle { - Some(b) => b, - None => return AMresult::error("Invalid `AMitems*`").into(), - } - }}; -} - -pub(crate) use to_items; diff --git a/rust/automerge-c/src/index.rs b/rust/automerge-c/src/index.rs deleted file mode 100644 index f1ea153b..00000000 --- a/rust/automerge-c/src/index.rs +++ /dev/null @@ -1,84 +0,0 @@ -use automerge as am; - -use std::any::type_name; - -use smol_str::SmolStr; - -use crate::byte_span::AMbyteSpan; - -/// \struct AMindex -/// \installed_headerfile -/// \brief An item index. -#[derive(PartialEq)] -pub enum AMindex { - /// A UTF-8 string key variant. - Key(SmolStr), - /// A 64-bit unsigned integer position variant. - Pos(usize), -} - -impl TryFrom<&AMindex> for AMbyteSpan { - type Error = am::AutomergeError; - - fn try_from(item: &AMindex) -> Result { - use am::AutomergeError::InvalidValueType; - use AMindex::*; - - if let Key(key) = item { - return Ok(key.into()); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl TryFrom<&AMindex> for usize { - type Error = am::AutomergeError; - - fn try_from(item: &AMindex) -> Result { - use am::AutomergeError::InvalidValueType; - use AMindex::*; - - if let Pos(pos) = item { - return Ok(*pos); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -/// \ingroup enumerations -/// \enum AMidxType -/// \installed_headerfile -/// \brief The type of an item's index. -#[derive(PartialEq, Eq)] -#[repr(u8)] -pub enum AMidxType { - /// The default tag, not a type signifier. - Default = 0, - /// A UTF-8 string view key. - Key, - /// A 64-bit unsigned integer position. - Pos, -} - -impl Default for AMidxType { - fn default() -> Self { - Self::Default - } -} - -impl From<&AMindex> for AMidxType { - fn from(index: &AMindex) -> Self { - use AMindex::*; - - match index { - Key(_) => Self::Key, - Pos(_) => Self::Pos, - } - } -} diff --git a/rust/automerge-c/src/item.rs b/rust/automerge-c/src/item.rs deleted file mode 100644 index 94735464..00000000 --- a/rust/automerge-c/src/item.rs +++ /dev/null @@ -1,1963 +0,0 @@ -use automerge as am; - -use std::any::type_name; -use std::borrow::Cow; -use std::cell::{RefCell, UnsafeCell}; -use std::rc::Rc; - -use crate::actor_id::AMactorId; -use crate::byte_span::{to_str, AMbyteSpan}; -use crate::change::AMchange; -use crate::doc::AMdoc; -use crate::index::{AMidxType, AMindex}; -use crate::obj::AMobjId; -use crate::result::{to_result, AMresult}; -use crate::sync::{AMsyncHave, AMsyncMessage, AMsyncState}; - -/// \struct AMunknownValue -/// \installed_headerfile -/// \brief A value (typically for a `set` operation) whose type is unknown. -#[derive(Default, Eq, PartialEq)] -#[repr(C)] -pub struct AMunknownValue { - /// The value's raw bytes. - bytes: AMbyteSpan, - /// The value's encoded type identifier. - type_code: u8, -} - -pub enum Value { - ActorId(am::ActorId, UnsafeCell>), - Change(Box, UnsafeCell>), - ChangeHash(am::ChangeHash), - Doc(RefCell), - SyncHave(AMsyncHave), - SyncMessage(AMsyncMessage), - SyncState(RefCell), - Value(am::Value<'static>), -} - -impl Value { - pub fn try_into_bytes(&self) -> Result { - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Self::Value(Scalar(scalar)) = &self { - if let Bytes(vector) = scalar.as_ref() { - return Ok(vector.as_slice().into()); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } - - pub fn try_into_change_hash(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Self::ChangeHash(change_hash) = &self { - return Ok(change_hash.into()); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } - - pub fn try_into_counter(&self) -> Result { - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Self::Value(Scalar(scalar)) = &self { - if let Counter(counter) = scalar.as_ref() { - return Ok(counter.into()); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } - - pub fn try_into_int(&self) -> Result { - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Self::Value(Scalar(scalar)) = &self { - if let Int(int) = scalar.as_ref() { - return Ok(*int); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } - - pub fn try_into_str(&self) -> Result { - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Self::Value(Scalar(scalar)) = &self { - if let Str(smol_str) = scalar.as_ref() { - return Ok(smol_str.into()); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } - - pub fn try_into_timestamp(&self) -> Result { - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Self::Value(Scalar(scalar)) = &self { - if let Timestamp(timestamp) = scalar.as_ref() { - return Ok(*timestamp); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl From for Value { - fn from(actor_id: am::ActorId) -> Self { - Self::ActorId(actor_id, Default::default()) - } -} - -impl From for Value { - fn from(auto_commit: am::AutoCommit) -> Self { - Self::Doc(RefCell::new(AMdoc::new(auto_commit))) - } -} - -impl From for Value { - fn from(change: am::Change) -> Self { - Self::Change(Box::new(change), Default::default()) - } -} - -impl From for Value { - fn from(change_hash: am::ChangeHash) -> Self { - Self::ChangeHash(change_hash) - } -} - -impl From for Value { - fn from(have: am::sync::Have) -> Self { - Self::SyncHave(AMsyncHave::new(have)) - } -} - -impl From for Value { - fn from(message: am::sync::Message) -> Self { - Self::SyncMessage(AMsyncMessage::new(message)) - } -} - -impl From for Value { - fn from(state: am::sync::State) -> Self { - Self::SyncState(RefCell::new(AMsyncState::new(state))) - } -} - -impl From> for Value { - fn from(value: am::Value<'static>) -> Self { - Self::Value(value) - } -} - -impl From for Value { - fn from(string: String) -> Self { - Self::Value(am::Value::Scalar(Cow::Owned(am::ScalarValue::Str( - string.into(), - )))) - } -} - -impl<'a> TryFrom<&'a Value> for &'a am::Change { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - Change(change, _) => Ok(change), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a Value> for &'a am::ChangeHash { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - ChangeHash(change_hash) => Ok(change_hash), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a Value> for &'a am::ScalarValue { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - use am::Value::*; - - if let Value(Scalar(scalar)) = value { - return Ok(scalar.as_ref()); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl<'a> TryFrom<&'a Value> for &'a AMactorId { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - ActorId(actor_id, c_actor_id) => unsafe { - Ok((*c_actor_id.get()).get_or_insert(AMactorId::new(actor_id))) - }, - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a mut Value> for &'a mut AMchange { - type Error = am::AutomergeError; - - fn try_from(value: &'a mut Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - Change(change, c_change) => unsafe { - Ok((*c_change.get()).get_or_insert(AMchange::new(change))) - }, - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a mut Value> for &'a mut AMdoc { - type Error = am::AutomergeError; - - fn try_from(value: &'a mut Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - Doc(doc) => Ok(doc.get_mut()), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a Value> for &'a AMsyncHave { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - SyncHave(sync_have) => Ok(sync_have), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a Value> for &'a AMsyncMessage { - type Error = am::AutomergeError; - - fn try_from(value: &'a Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - SyncMessage(sync_message) => Ok(sync_message), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl<'a> TryFrom<&'a mut Value> for &'a mut AMsyncState { - type Error = am::AutomergeError; - - fn try_from(value: &'a mut Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - - match value { - SyncState(sync_state) => Ok(sync_state.get_mut()), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), - } - } -} - -impl TryFrom<&Value> for bool { - type Error = am::AutomergeError; - - fn try_from(value: &Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Value(Scalar(scalar)) = value { - if let Boolean(boolean) = scalar.as_ref() { - return Ok(*boolean); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl TryFrom<&Value> for f64 { - type Error = am::AutomergeError; - - fn try_from(value: &Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Value(Scalar(scalar)) = value { - if let F64(float) = scalar.as_ref() { - return Ok(*float); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl TryFrom<&Value> for u64 { - type Error = am::AutomergeError; - - fn try_from(value: &Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Value(Scalar(scalar)) = value { - if let Uint(uint) = scalar.as_ref() { - return Ok(*uint); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl TryFrom<&Value> for AMunknownValue { - type Error = am::AutomergeError; - - fn try_from(value: &Value) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidValueType; - use am::ScalarValue::*; - use am::Value::*; - - if let Value(Scalar(scalar)) = value { - if let Unknown { bytes, type_code } = scalar.as_ref() { - return Ok(Self { - bytes: bytes.as_slice().into(), - type_code: *type_code, - }); - } - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }) - } -} - -impl PartialEq for Value { - fn eq(&self, other: &Self) -> bool { - use self::Value::*; - - match (self, other) { - (ActorId(lhs, _), ActorId(rhs, _)) => *lhs == *rhs, - (Change(lhs, _), Change(rhs, _)) => lhs == rhs, - (ChangeHash(lhs), ChangeHash(rhs)) => lhs == rhs, - (Doc(lhs), Doc(rhs)) => lhs.as_ptr() == rhs.as_ptr(), - (SyncMessage(lhs), SyncMessage(rhs)) => *lhs == *rhs, - (SyncState(lhs), SyncState(rhs)) => *lhs == *rhs, - (Value(lhs), Value(rhs)) => lhs == rhs, - _ => false, - } - } -} - -#[derive(Default)] -pub struct Item { - /// The item's index. - index: Option, - /// The item's identifier. - obj_id: Option, - /// The item's value. - value: Option, -} - -impl Item { - pub fn try_into_bytes(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_bytes(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - - pub fn try_into_change_hash(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_change_hash(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - - pub fn try_into_counter(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_counter(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - - pub fn try_into_int(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_int(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - - pub fn try_into_str(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_str(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - - pub fn try_into_timestamp(&self) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &self.value { - return value.try_into_timestamp(); - } - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } -} - -impl From for Item { - fn from(actor_id: am::ActorId) -> Self { - Value::from(actor_id).into() - } -} - -impl From for Item { - fn from(auto_commit: am::AutoCommit) -> Self { - Value::from(auto_commit).into() - } -} - -impl From for Item { - fn from(change: am::Change) -> Self { - Value::from(change).into() - } -} - -impl From for Item { - fn from(change_hash: am::ChangeHash) -> Self { - Value::from(change_hash).into() - } -} - -impl From<(am::ObjId, am::ObjType)> for Item { - fn from((obj_id, obj_type): (am::ObjId, am::ObjType)) -> Self { - Self { - index: None, - obj_id: Some(AMobjId::new(obj_id)), - value: Some(am::Value::Object(obj_type).into()), - } - } -} - -impl From for Item { - fn from(have: am::sync::Have) -> Self { - Value::from(have).into() - } -} - -impl From for Item { - fn from(message: am::sync::Message) -> Self { - Value::from(message).into() - } -} - -impl From for Item { - fn from(state: am::sync::State) -> Self { - Value::from(state).into() - } -} - -impl From> for Item { - fn from(value: am::Value<'static>) -> Self { - Value::from(value).into() - } -} - -impl From for Item { - fn from(string: String) -> Self { - Value::from(string).into() - } -} - -impl From for Item { - fn from(value: Value) -> Self { - Self { - index: None, - obj_id: None, - value: Some(value), - } - } -} - -impl PartialEq for Item { - fn eq(&self, other: &Self) -> bool { - self.index == other.index && self.obj_id == other.obj_id && self.value == other.value - } -} - -impl<'a> TryFrom<&'a Item> for &'a am::Change { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a Item> for &'a am::ChangeHash { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a Item> for &'a am::ScalarValue { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a Item> for &'a AMactorId { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a mut Item> for &'a mut AMchange { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &mut item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a mut Item> for &'a mut AMdoc { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &mut item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl From<&Item> for AMidxType { - fn from(item: &Item) -> Self { - if let Some(index) = &item.index { - return index.into(); - } - Default::default() - } -} - -impl<'a> TryFrom<&'a Item> for &'a AMsyncHave { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a Item> for &'a AMsyncMessage { - type Error = am::AutomergeError; - - fn try_from(item: &'a Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl<'a> TryFrom<&'a mut Item> for &'a mut AMsyncState { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &mut item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl TryFrom<&Item> for bool { - type Error = am::AutomergeError; - - fn try_from(item: &Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl TryFrom<&Item> for f64 { - type Error = am::AutomergeError; - - fn try_from(item: &Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl TryFrom<&Item> for u64 { - type Error = am::AutomergeError; - - fn try_from(item: &Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl TryFrom<&Item> for AMunknownValue { - type Error = am::AutomergeError; - - fn try_from(item: &Item) -> Result { - use am::AutomergeError::InvalidValueType; - - if let Some(value) = &item.value { - value.try_into() - } else { - Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::>().to_string(), - }) - } - } -} - -impl TryFrom<&Item> for (am::Value<'static>, am::ObjId) { - type Error = am::AutomergeError; - - fn try_from(item: &Item) -> Result { - use self::Value::*; - use am::AutomergeError::InvalidObjId; - use am::AutomergeError::InvalidValueType; - - let expected = type_name::().to_string(); - match (&item.obj_id, &item.value) { - (None, None) | (None, Some(_)) => Err(InvalidObjId("".to_string())), - (Some(_), None) => Err(InvalidValueType { - expected, - unexpected: type_name::>().to_string(), - }), - (Some(obj_id), Some(value)) => match value { - ActorId(_, _) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - ChangeHash(_) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - Change(_, _) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - Doc(_) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - SyncHave(_) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - SyncMessage(_) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - SyncState(_) => Err(InvalidValueType { - expected, - unexpected: type_name::().to_string(), - }), - Value(v) => Ok((v.clone(), obj_id.as_ref().clone())), - }, - } - } -} - -/// \struct AMitem -/// \installed_headerfile -/// \brief An item within a result. -#[derive(Clone)] -pub struct AMitem(Rc); - -impl AMitem { - pub fn exact(obj_id: am::ObjId, value: Value) -> Self { - Self(Rc::new(Item { - index: None, - obj_id: Some(AMobjId::new(obj_id)), - value: Some(value), - })) - } - - pub fn indexed(index: AMindex, obj_id: am::ObjId, value: Value) -> Self { - Self(Rc::new(Item { - index: Some(index), - obj_id: Some(AMobjId::new(obj_id)), - value: Some(value), - })) - } -} - -impl AsRef for AMitem { - fn as_ref(&self) -> &Item { - self.0.as_ref() - } -} - -impl Default for AMitem { - fn default() -> Self { - Self(Rc::new(Item { - index: None, - obj_id: None, - value: None, - })) - } -} - -impl From for AMitem { - fn from(actor_id: am::ActorId) -> Self { - Value::from(actor_id).into() - } -} - -impl From for AMitem { - fn from(auto_commit: am::AutoCommit) -> Self { - Value::from(auto_commit).into() - } -} - -impl From for AMitem { - fn from(change: am::Change) -> Self { - Value::from(change).into() - } -} - -impl From for AMitem { - fn from(change_hash: am::ChangeHash) -> Self { - Value::from(change_hash).into() - } -} - -impl From<(am::ObjId, am::ObjType)> for AMitem { - fn from((obj_id, obj_type): (am::ObjId, am::ObjType)) -> Self { - Self(Rc::new(Item::from((obj_id, obj_type)))) - } -} - -impl From for AMitem { - fn from(have: am::sync::Have) -> Self { - Value::from(have).into() - } -} - -impl From for AMitem { - fn from(message: am::sync::Message) -> Self { - Value::from(message).into() - } -} - -impl From for AMitem { - fn from(state: am::sync::State) -> Self { - Value::from(state).into() - } -} - -impl From> for AMitem { - fn from(value: am::Value<'static>) -> Self { - Value::from(value).into() - } -} - -impl From for AMitem { - fn from(string: String) -> Self { - Value::from(string).into() - } -} - -impl From for AMitem { - fn from(value: Value) -> Self { - Self(Rc::new(Item::from(value))) - } -} - -impl PartialEq for AMitem { - fn eq(&self, other: &Self) -> bool { - self.as_ref() == other.as_ref() - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a am::Change { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a am::ChangeHash { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a am::ScalarValue { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a AMactorId { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a mut AMitem> for &'a mut AMchange { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut AMitem) -> Result { - if let Some(item) = Rc::get_mut(&mut item.0) { - item.try_into() - } else { - Err(Self::Error::Fail) - } - } -} - -impl<'a> TryFrom<&'a mut AMitem> for &'a mut AMdoc { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut AMitem) -> Result { - if let Some(item) = Rc::get_mut(&mut item.0) { - item.try_into() - } else { - Err(Self::Error::Fail) - } - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a AMsyncHave { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a AMitem> for &'a AMsyncMessage { - type Error = am::AutomergeError; - - fn try_from(item: &'a AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl<'a> TryFrom<&'a mut AMitem> for &'a mut AMsyncState { - type Error = am::AutomergeError; - - fn try_from(item: &'a mut AMitem) -> Result { - if let Some(item) = Rc::get_mut(&mut item.0) { - item.try_into() - } else { - Err(Self::Error::Fail) - } - } -} - -impl TryFrom<&AMitem> for bool { - type Error = am::AutomergeError; - - fn try_from(item: &AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl TryFrom<&AMitem> for f64 { - type Error = am::AutomergeError; - - fn try_from(item: &AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl TryFrom<&AMitem> for u64 { - type Error = am::AutomergeError; - - fn try_from(item: &AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl TryFrom<&AMitem> for AMunknownValue { - type Error = am::AutomergeError; - - fn try_from(item: &AMitem) -> Result { - item.as_ref().try_into() - } -} - -impl TryFrom<&AMitem> for (am::Value<'static>, am::ObjId) { - type Error = am::AutomergeError; - - fn try_from(item: &AMitem) -> Result { - item.as_ref().try_into() - } -} - -/// \ingroup enumerations -/// \enum AMvalType -/// \installed_headerfile -/// \brief The type of an item's value. -#[derive(PartialEq, Eq)] -#[repr(u32)] -pub enum AMvalType { - /// An actor identifier value. - ActorId = 1 << 1, - /// A boolean value. - Bool = 1 << 2, - /// A view onto an array of bytes value. - Bytes = 1 << 3, - /// A change value. - Change = 1 << 4, - /// A change hash value. - ChangeHash = 1 << 5, - /// A CRDT counter value. - Counter = 1 << 6, - /// The default tag, not a type signifier. - Default = 0, - /// A document value. - Doc = 1 << 7, - /// A 64-bit float value. - F64 = 1 << 8, - /// A 64-bit signed integer value. - Int = 1 << 9, - /// A null value. - Null = 1 << 10, - /// An object type value. - ObjType = 1 << 11, - /// A UTF-8 string view value. - Str = 1 << 12, - /// A synchronization have value. - SyncHave = 1 << 13, - /// A synchronization message value. - SyncMessage = 1 << 14, - /// A synchronization state value. - SyncState = 1 << 15, - /// A *nix timestamp (milliseconds) value. - Timestamp = 1 << 16, - /// A 64-bit unsigned integer value. - Uint = 1 << 17, - /// An unknown type of value. - Unknown = 1 << 18, - /// A void. - Void = 1 << 0, -} - -impl Default for AMvalType { - fn default() -> Self { - Self::Default - } -} - -impl From<&am::Value<'static>> for AMvalType { - fn from(value: &am::Value<'static>) -> Self { - use am::ScalarValue::*; - use am::Value::*; - - match value { - Object(_) => Self::ObjType, - Scalar(scalar) => match scalar.as_ref() { - Boolean(_) => Self::Bool, - Bytes(_) => Self::Bytes, - Counter(_) => Self::Counter, - F64(_) => Self::F64, - Int(_) => Self::Int, - Null => Self::Null, - Str(_) => Self::Str, - Timestamp(_) => Self::Timestamp, - Uint(_) => Self::Uint, - Unknown { .. } => Self::Unknown, - }, - } - } -} - -impl From<&Value> for AMvalType { - fn from(value: &Value) -> Self { - use self::Value::*; - - match value { - ActorId(_, _) => Self::ActorId, - Change(_, _) => Self::Change, - ChangeHash(_) => Self::ChangeHash, - Doc(_) => Self::Doc, - SyncHave(_) => Self::SyncHave, - SyncMessage(_) => Self::SyncMessage, - SyncState(_) => Self::SyncState, - Value(v) => v.into(), - } - } -} - -impl From<&Item> for AMvalType { - fn from(item: &Item) -> Self { - if let Some(value) = &item.value { - return value.into(); - } - Self::Void - } -} - -/// \memberof AMitem -/// \brief Tests the equality of two items. -/// -/// \param[in] item1 A pointer to an `AMitem` struct. -/// \param[in] item2 A pointer to an `AMitem` struct. -/// \return `true` if \p item1 `==` \p item2 and `false` otherwise. -/// \pre \p item1 `!= NULL` -/// \pre \p item2 `!= NULL` -/// \post `!(`\p item1 `&&` \p item2 `) -> false` -/// \internal -/// -/// #Safety -/// item1 must be a valid AMitem pointer -/// item2 must be a valid AMitem pointer -#[no_mangle] -pub unsafe extern "C" fn AMitemEqual(item1: *const AMitem, item2: *const AMitem) -> bool { - match (item1.as_ref(), item2.as_ref()) { - (Some(item1), Some(item2)) => *item1 == *item2, - (None, None) | (None, Some(_)) | (Some(_), None) => false, - } -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a boolean value. -/// -/// \param[in] value A boolean. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BOOL` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromBool(value: bool) -> *mut AMresult { - AMresult::item(am::Value::from(value).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from an array of bytes value. -/// -/// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to copy from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BYTES` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// value.src must be a byte array of length >= value.count -#[no_mangle] -pub unsafe extern "C" fn AMitemFromBytes(src: *const u8, count: usize) -> *mut AMresult { - let value = std::slice::from_raw_parts(src, count); - AMresult::item(am::Value::bytes(value.to_vec()).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a change hash value. -/// -/// \param[in] value A change hash as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_CHANGE_HASH` item. -/// \pre \p value.src `!= NULL` -/// \pre `0 <` \p value.count `<= sizeof(`\p value.src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// value.src must be a byte array of length >= value.count -#[no_mangle] -pub unsafe extern "C" fn AMitemFromChangeHash(value: AMbyteSpan) -> *mut AMresult { - to_result(am::ChangeHash::try_from(&value)) -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a CRDT counter value. -/// -/// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_COUNTER` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromCounter(value: i64) -> *mut AMresult { - AMresult::item(am::Value::counter(value).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a float value. -/// -/// \param[in] value A 64-bit float. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_F64` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromF64(value: f64) -> *mut AMresult { - AMresult::item(am::Value::f64(value).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a signed integer value. -/// -/// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_INT` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromInt(value: i64) -> *mut AMresult { - AMresult::item(am::Value::int(value).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a null value. -/// -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_NULL` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromNull() -> *mut AMresult { - AMresult::item(am::Value::from(()).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a UTF-8 string value. -/// -/// \param[in] value A UTF-8 string view as an `AMbyteSpan` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_STR` item. -/// \pre \p value.src `!= NULL` -/// \pre `0 <` \p value.count `<= sizeof(`\p value.src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// value.src must be a byte array of length >= value.count -#[no_mangle] -pub unsafe extern "C" fn AMitemFromStr(value: AMbyteSpan) -> *mut AMresult { - AMresult::item(am::Value::str(to_str!(value)).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from a *nix timestamp -/// (milliseconds) value. -/// -/// \param[in] value A 64-bit signed integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_TIMESTAMP` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromTimestamp(value: i64) -> *mut AMresult { - AMresult::item(am::Value::timestamp(value).into()).into() -} - -/// \memberof AMitem -/// \brief Allocates a new item and initializes it from an unsigned integer value. -/// -/// \param[in] value A 64-bit unsigned integer. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_UINT` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -#[no_mangle] -pub unsafe extern "C" fn AMitemFromUint(value: u64) -> *mut AMresult { - AMresult::item(am::Value::uint(value).into()).into() -} - -/// \memberof AMitem -/// \brief Gets the type of an item's index. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \return An `AMidxType` enum tag. -/// \pre \p item `!= NULL` -/// \post `(`\p item `== NULL) -> 0` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemIdxType(item: *const AMitem) -> AMidxType { - if let Some(item) = item.as_ref() { - return item.0.as_ref().into(); - } - Default::default() -} - -/// \memberof AMitem -/// \brief Gets the object identifier of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \return A pointer to an `AMobjId` struct. -/// \pre \p item `!= NULL` -/// \post `(`\p item `== NULL) -> NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemObjId(item: *const AMitem) -> *const AMobjId { - if let Some(item) = item.as_ref() { - if let Some(obj_id) = &item.as_ref().obj_id { - return obj_id; - } - } - std::ptr::null() -} - -/// \memberof AMitem -/// \brief Gets the UTF-8 string view key index of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a UTF-8 string view as an `AMbyteSpan` struct. -/// \return `true` if `AMitemIdxType(`\p item `) == AM_IDX_TYPE_KEY` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemKey(item: *const AMitem, value: *mut AMbyteSpan) -> bool { - if let Some(item) = item.as_ref() { - if let Some(index) = &item.as_ref().index { - if let Ok(key) = index.try_into() { - if !value.is_null() { - *value = key; - return true; - } - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the unsigned integer position index of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a `size_t`. -/// \return `true` if `AMitemIdxType(`\p item `) == AM_IDX_TYPE_POS` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemPos(item: *const AMitem, value: *mut usize) -> bool { - if let Some(item) = item.as_ref() { - if let Some(index) = &item.as_ref().index { - if let Ok(pos) = index.try_into() { - if !value.is_null() { - *value = pos; - return true; - } - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the reference count of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \return A 64-bit unsigned integer. -/// \pre \p item `!= NULL` -/// \post `(`\p item `== NULL) -> 0` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemRefCount(item: *const AMitem) -> usize { - if let Some(item) = item.as_ref() { - return Rc::strong_count(&item.0); - } - 0 -} - -/// \memberof AMitem -/// \brief Gets a new result for an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \return A pointer to an `AMresult` struct. -/// \pre \p item `!= NULL` -/// \post `(`\p item `== NULL) -> NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemResult(item: *const AMitem) -> *mut AMresult { - if let Some(item) = item.as_ref() { - return AMresult::item(item.clone()).into(); - } - std::ptr::null_mut() -} - -/// \memberof AMitem -/// \brief Gets the actor identifier value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMactorId` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_ACTOR_ID` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToActorId( - item: *const AMitem, - value: *mut *const AMactorId, -) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(actor_id) = <&AMactorId>::try_from(item) { - if !value.is_null() { - *value = actor_id; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the boolean value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a boolean. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_BOOL` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToBool(item: *const AMitem, value: *mut bool) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(boolean) = item.try_into() { - if !value.is_null() { - *value = boolean; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the array of bytes value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMbyteSpan` struct. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_BYTES` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToBytes(item: *const AMitem, value: *mut AMbyteSpan) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(bytes) = item.as_ref().try_into_bytes() { - if !value.is_null() { - *value = bytes; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the change value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMchange` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_CHANGE` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToChange(item: *mut AMitem, value: *mut *mut AMchange) -> bool { - if let Some(item) = item.as_mut() { - if let Ok(change) = <&mut AMchange>::try_from(item) { - if !value.is_null() { - *value = change; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the change hash value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMbyteSpan` struct. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_CHANGE_HASH` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToChangeHash(item: *const AMitem, value: *mut AMbyteSpan) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(change_hash) = item.as_ref().try_into_change_hash() { - if !value.is_null() { - *value = change_hash; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the CRDT counter value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a signed 64-bit integer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_COUNTER` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToCounter(item: *const AMitem, value: *mut i64) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(counter) = item.as_ref().try_into_counter() { - if !value.is_null() { - *value = counter; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the document value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMdoc` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_DOC` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToDoc(item: *mut AMitem, value: *mut *const AMdoc) -> bool { - if let Some(item) = item.as_mut() { - if let Ok(doc) = <&mut AMdoc>::try_from(item) { - if !value.is_null() { - *value = doc; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the float value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a 64-bit float. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_F64` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToF64(item: *const AMitem, value: *mut f64) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(float) = item.try_into() { - if !value.is_null() { - *value = float; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the integer value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a signed 64-bit integer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_INT` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToInt(item: *const AMitem, value: *mut i64) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(int) = item.as_ref().try_into_int() { - if !value.is_null() { - *value = int; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the UTF-8 string view value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a UTF-8 string view as an `AMbyteSpan` struct. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_STR` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToStr(item: *const AMitem, value: *mut AMbyteSpan) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(str) = item.as_ref().try_into_str() { - if !value.is_null() { - *value = str; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the synchronization have value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMsyncHave` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_SYNC_HAVE` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToSyncHave( - item: *const AMitem, - value: *mut *const AMsyncHave, -) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(sync_have) = <&AMsyncHave>::try_from(item) { - if !value.is_null() { - *value = sync_have; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the synchronization message value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMsyncMessage` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_SYNC_MESSAGE` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToSyncMessage( - item: *const AMitem, - value: *mut *const AMsyncMessage, -) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(sync_message) = <&AMsyncMessage>::try_from(item) { - if !value.is_null() { - *value = sync_message; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the synchronization state value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMsyncState` struct pointer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_SYNC_STATE` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToSyncState( - item: *mut AMitem, - value: *mut *mut AMsyncState, -) -> bool { - if let Some(item) = item.as_mut() { - if let Ok(sync_state) = <&mut AMsyncState>::try_from(item) { - if !value.is_null() { - *value = sync_state; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the *nix timestamp (milliseconds) value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a signed 64-bit integer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_TIMESTAMP` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToTimestamp(item: *const AMitem, value: *mut i64) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(timestamp) = item.as_ref().try_into_timestamp() { - if !value.is_null() { - *value = timestamp; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the unsigned integer value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to a unsigned 64-bit integer. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_UINT` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToUint(item: *const AMitem, value: *mut u64) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(uint) = item.try_into() { - if !value.is_null() { - *value = uint; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the unknown type of value of an item. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \param[out] value A pointer to an `AMunknownValue` struct. -/// \return `true` if `AMitemValType(`\p item `) == AM_VAL_TYPE_UNKNOWN` and -/// \p *value has been reassigned, `false` otherwise. -/// \pre \p item `!= NULL` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemToUnknown(item: *const AMitem, value: *mut AMunknownValue) -> bool { - if let Some(item) = item.as_ref() { - if let Ok(unknown) = item.try_into() { - if !value.is_null() { - *value = unknown; - return true; - } - } - } - false -} - -/// \memberof AMitem -/// \brief Gets the type of an item's value. -/// -/// \param[in] item A pointer to an `AMitem` struct. -/// \return An `AMvalType` enum tag. -/// \pre \p item `!= NULL` -/// \post `(`\p item `== NULL) -> 0` -/// \internal -/// -/// # Safety -/// item must be a valid pointer to an AMitem -#[no_mangle] -pub unsafe extern "C" fn AMitemValType(item: *const AMitem) -> AMvalType { - if let Some(item) = item.as_ref() { - return item.0.as_ref().into(); - } - Default::default() -} diff --git a/rust/automerge-c/src/items.rs b/rust/automerge-c/src/items.rs deleted file mode 100644 index 361078b3..00000000 --- a/rust/automerge-c/src/items.rs +++ /dev/null @@ -1,401 +0,0 @@ -use automerge as am; - -use std::ffi::c_void; -use std::marker::PhantomData; -use std::mem::size_of; - -use crate::item::AMitem; -use crate::result::AMresult; - -#[repr(C)] -struct Detail { - len: usize, - offset: isize, - ptr: *const c_void, -} - -/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call -/// (https://github.com/eqrion/cbindgen/issues/252) but it will -/// propagate the name of a constant initialized from it so if the -/// constant's name is a symbolic representation of the value it can be -/// converted into a number by post-processing the header it generated. -pub const USIZE_USIZE_USIZE_: usize = size_of::(); - -impl Detail { - fn new(items: &[AMitem], offset: isize) -> Self { - Self { - len: items.len(), - offset, - ptr: items.as_ptr() as *mut c_void, - } - } - - pub fn advance(&mut self, n: isize) { - if n == 0 { - return; - } - let len = self.len as isize; - self.offset = if self.offset < 0 { - // It's reversed. - let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); - if unclipped >= 0 { - // Clip it to the forward stop. - len - } else { - std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) - } - } else { - let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); - if unclipped < 0 { - // Clip it to the reverse stop. - -(len + 1) - } else { - std::cmp::max(0, std::cmp::min(unclipped, len)) - } - } - } - - pub fn get_index(&self) -> usize { - (self.offset - + if self.offset < 0 { - self.len as isize - } else { - 0 - }) as usize - } - - pub fn next(&mut self, n: isize) -> Option<&mut AMitem> { - if self.is_stopped() { - return None; - } - let slice: &mut [AMitem] = - unsafe { std::slice::from_raw_parts_mut(self.ptr as *mut AMitem, self.len) }; - let value = &mut slice[self.get_index()]; - self.advance(n); - Some(value) - } - - pub fn is_stopped(&self) -> bool { - let len = self.len as isize; - self.offset < -len || self.offset == len - } - - pub fn prev(&mut self, n: isize) -> Option<&mut AMitem> { - self.advance(-n); - if self.is_stopped() { - return None; - } - let slice: &mut [AMitem] = - unsafe { std::slice::from_raw_parts_mut(self.ptr as *mut AMitem, self.len) }; - Some(&mut slice[self.get_index()]) - } - - pub fn reversed(&self) -> Self { - Self { - len: self.len, - offset: -(self.offset + 1), - ptr: self.ptr, - } - } - - pub fn rewound(&self) -> Self { - Self { - len: self.len, - offset: if self.offset < 0 { -1 } else { 0 }, - ptr: self.ptr, - } - } -} - -impl From for [u8; USIZE_USIZE_USIZE_] { - fn from(detail: Detail) -> Self { - unsafe { - std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) - .try_into() - .unwrap() - } - } -} - -/// \struct AMitems -/// \installed_headerfile -/// \brief A random-access iterator over a sequence of `AMitem` structs. -#[repr(C)] -#[derive(Eq, PartialEq)] -pub struct AMitems<'a> { - /// An implementation detail that is intentionally opaque. - /// \warning Modifying \p detail will cause undefined behavior. - /// \note The actual size of \p detail will vary by platform, this is just - /// the one for the platform this documentation was built on. - detail: [u8; USIZE_USIZE_USIZE_], - phantom: PhantomData<&'a mut AMresult>, -} - -impl<'a> AMitems<'a> { - pub fn new(items: &[AMitem]) -> Self { - Self { - detail: Detail::new(items, 0).into(), - phantom: PhantomData, - } - } - - pub fn advance(&mut self, n: isize) { - let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; - detail.advance(n); - } - - pub fn len(&self) -> usize { - let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; - detail.len - } - - pub fn next(&mut self, n: isize) -> Option<&mut AMitem> { - let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; - detail.next(n) - } - - pub fn prev(&mut self, n: isize) -> Option<&mut AMitem> { - let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; - detail.prev(n) - } - - pub fn reversed(&self) -> Self { - let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; - Self { - detail: detail.reversed().into(), - phantom: PhantomData, - } - } - - pub fn rewound(&self) -> Self { - let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; - Self { - detail: detail.rewound().into(), - phantom: PhantomData, - } - } -} - -impl<'a> AsRef<[AMitem]> for AMitems<'a> { - fn as_ref(&self) -> &[AMitem] { - let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; - unsafe { std::slice::from_raw_parts(detail.ptr as *const AMitem, detail.len) } - } -} - -impl<'a> Default for AMitems<'a> { - fn default() -> Self { - Self { - detail: [0; USIZE_USIZE_USIZE_], - phantom: PhantomData, - } - } -} - -impl TryFrom<&AMitems<'_>> for Vec { - type Error = am::AutomergeError; - - fn try_from(items: &AMitems<'_>) -> Result { - let mut changes = Vec::::with_capacity(items.len()); - for item in items.as_ref().iter() { - match <&am::Change>::try_from(item.as_ref()) { - Ok(change) => { - changes.push(change.clone()); - } - Err(e) => { - return Err(e); - } - } - } - Ok(changes) - } -} - -impl TryFrom<&AMitems<'_>> for Vec { - type Error = am::AutomergeError; - - fn try_from(items: &AMitems<'_>) -> Result { - let mut change_hashes = Vec::::with_capacity(items.len()); - for item in items.as_ref().iter() { - match <&am::ChangeHash>::try_from(item.as_ref()) { - Ok(change_hash) => { - change_hashes.push(*change_hash); - } - Err(e) => { - return Err(e); - } - } - } - Ok(change_hashes) - } -} - -impl TryFrom<&AMitems<'_>> for Vec { - type Error = am::AutomergeError; - - fn try_from(items: &AMitems<'_>) -> Result { - let mut scalars = Vec::::with_capacity(items.len()); - for item in items.as_ref().iter() { - match <&am::ScalarValue>::try_from(item.as_ref()) { - Ok(scalar) => { - scalars.push(scalar.clone()); - } - Err(e) => { - return Err(e); - } - } - } - Ok(scalars) - } -} - -/// \memberof AMitems -/// \brief Advances an iterator over a sequence of object items by at most -/// \p |n| positions where the sign of \p n is relative to the -/// iterator's direction. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum -/// number of positions to advance. -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsAdvance(items: *mut AMitems, n: isize) { - if let Some(items) = items.as_mut() { - items.advance(n); - }; -} - -/// \memberof AMitems -/// \brief Tests the equality of two sequences of object items underlying a -/// pair of iterators. -/// -/// \param[in] items1 A pointer to an `AMitems` struct. -/// \param[in] items2 A pointer to an `AMitems` struct. -/// \return `true` if \p items1 `==` \p items2 and `false` otherwise. -/// \pre \p items1 `!= NULL` -/// \pre \p items1 `!= NULL` -/// \post `!(`\p items1 `&&` \p items2 `) -> false` -/// \internal -/// -/// #Safety -/// items1 must be a valid pointer to an AMitems -/// items2 must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsEqual(items1: *const AMitems, items2: *const AMitems) -> bool { - match (items1.as_ref(), items2.as_ref()) { - (Some(items1), Some(items2)) => items1.as_ref() == items2.as_ref(), - (None, None) | (None, Some(_)) | (Some(_), None) => false, - } -} - -/// \memberof AMitems -/// \brief Gets the object item at the current position of an iterator over a -/// sequence of object items and then advances it by at most \p |n| -/// positions where the sign of \p n is relative to the iterator's -/// direction. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum -/// number of positions to advance. -/// \return A pointer to an `AMitem` struct that's `NULL` when \p items -/// was previously advanced past its forward/reverse limit. -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsNext(items: *mut AMitems, n: isize) -> *mut AMitem { - if let Some(items) = items.as_mut() { - if let Some(item) = items.next(n) { - return item; - } - } - std::ptr::null_mut() -} - -/// \memberof AMitems -/// \brief Advances an iterator over a sequence of object items by at most -/// \p |n| positions where the sign of \p n is relative to the -/// iterator's direction and then gets the object item at its new -/// position. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum -/// number of positions to advance. -/// \return A pointer to an `AMitem` struct that's `NULL` when \p items -/// is presently advanced past its forward/reverse limit. -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsPrev(items: *mut AMitems, n: isize) -> *mut AMitem { - if let Some(items) = items.as_mut() { - if let Some(obj_item) = items.prev(n) { - return obj_item; - } - } - std::ptr::null_mut() -} - -/// \memberof AMitems -/// \brief Gets the size of the sequence underlying an iterator. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \return The count of items in \p items. -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsSize(items: *const AMitems) -> usize { - if let Some(items) = items.as_ref() { - return items.len(); - } - 0 -} - -/// \memberof AMitems -/// \brief Creates an iterator over the same sequence of items as the -/// given one but with the opposite position and direction. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \return An `AMitems` struct -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsReversed(items: *const AMitems) -> AMitems { - if let Some(items) = items.as_ref() { - return items.reversed(); - } - Default::default() -} - -/// \memberof AMitems -/// \brief Creates an iterator at the starting position over the same sequence -/// of items as the given one. -/// -/// \param[in] items A pointer to an `AMitems` struct. -/// \return An `AMitems` struct -/// \pre \p items `!= NULL` -/// \internal -/// -/// #Safety -/// items must be a valid pointer to an AMitems -#[no_mangle] -pub unsafe extern "C" fn AMitemsRewound(items: *const AMitems) -> AMitems { - if let Some(items) = items.as_ref() { - return items.rewound(); - } - Default::default() -} diff --git a/rust/automerge-c/src/lib.rs b/rust/automerge-c/src/lib.rs index 1ee1a85d..6418bd33 100644 --- a/rust/automerge-c/src/lib.rs +++ b/rust/automerge-c/src/lib.rs @@ -1,12 +1,11 @@ mod actor_id; mod byte_span; mod change; +mod change_hashes; +mod changes; mod doc; -mod index; -mod item; -mod items; mod obj; mod result; +mod result_stack; +mod strs; mod sync; - -// include!(concat!(env!("OUT_DIR"), "/enum_string_functions.rs")); diff --git a/rust/automerge-c/src/obj.rs b/rust/automerge-c/src/obj.rs index 3d52286c..46ff617b 100644 --- a/rust/automerge-c/src/obj.rs +++ b/rust/automerge-c/src/obj.rs @@ -1,10 +1,12 @@ use automerge as am; -use std::any::type_name; use std::cell::RefCell; use std::ops::Deref; use crate::actor_id::AMactorId; +pub mod item; +pub mod items; + macro_rules! to_obj_id { ($handle:expr) => {{ match $handle.as_ref() { @@ -17,11 +19,12 @@ macro_rules! to_obj_id { pub(crate) use to_obj_id; macro_rules! to_obj_type { - ($c_obj_type:expr) => {{ - let result: Result = (&$c_obj_type).try_into(); - match result { - Ok(obj_type) => obj_type, - Err(e) => return AMresult::error(&e.to_string()).into(), + ($am_obj_type:expr) => {{ + match $am_obj_type { + AMobjType::Map => am::ObjType::Map, + AMobjType::List => am::ObjType::List, + AMobjType::Text => am::ObjType::Text, + AMobjType::Void => return AMresult::err("Invalid AMobjType value").into(), } }}; } @@ -76,11 +79,11 @@ impl Deref for AMobjId { } /// \memberof AMobjId -/// \brief Gets the actor identifier component of an object identifier. +/// \brief Gets the actor identifier of an object identifier. /// /// \param[in] obj_id A pointer to an `AMobjId` struct. /// \return A pointer to an `AMactorId` struct or `NULL`. -/// \pre \p obj_id `!= NULL` +/// \pre \p obj_id `!= NULL`. /// \internal /// /// # Safety @@ -94,11 +97,11 @@ pub unsafe extern "C" fn AMobjIdActorId(obj_id: *const AMobjId) -> *const AMacto } /// \memberof AMobjId -/// \brief Gets the counter component of an object identifier. +/// \brief Gets the counter of an object identifier. /// /// \param[in] obj_id A pointer to an `AMobjId` struct. /// \return A 64-bit unsigned integer. -/// \pre \p obj_id `!= NULL` +/// \pre \p obj_id `!= NULL`. /// \internal /// /// # Safety @@ -121,9 +124,8 @@ pub unsafe extern "C" fn AMobjIdCounter(obj_id: *const AMobjId) -> u64 { /// \param[in] obj_id1 A pointer to an `AMobjId` struct. /// \param[in] obj_id2 A pointer to an `AMobjId` struct. /// \return `true` if \p obj_id1 `==` \p obj_id2 and `false` otherwise. -/// \pre \p obj_id1 `!= NULL` -/// \pre \p obj_id1 `!= NULL` -/// \post `!(`\p obj_id1 `&&` \p obj_id2 `) -> false` +/// \pre \p obj_id1 `!= NULL`. +/// \pre \p obj_id2 `!= NULL`. /// \internal /// /// #Safety @@ -133,28 +135,26 @@ pub unsafe extern "C" fn AMobjIdCounter(obj_id: *const AMobjId) -> u64 { pub unsafe extern "C" fn AMobjIdEqual(obj_id1: *const AMobjId, obj_id2: *const AMobjId) -> bool { match (obj_id1.as_ref(), obj_id2.as_ref()) { (Some(obj_id1), Some(obj_id2)) => obj_id1 == obj_id2, - (None, None) | (None, Some(_)) | (Some(_), None) => false, + (None, Some(_)) | (Some(_), None) | (None, None) => false, } } /// \memberof AMobjId -/// \brief Gets the index component of an object identifier. +/// \brief Gets the index of an object identifier. /// /// \param[in] obj_id A pointer to an `AMobjId` struct. /// \return A 64-bit unsigned integer. -/// \pre \p obj_id `!= NULL` +/// \pre \p obj_id `!= NULL`. /// \internal /// /// # Safety /// obj_id must be a valid pointer to an AMobjId #[no_mangle] pub unsafe extern "C" fn AMobjIdIndex(obj_id: *const AMobjId) -> usize { - use am::ObjId::*; - if let Some(obj_id) = obj_id.as_ref() { match obj_id.as_ref() { - Id(_, _, index) => *index, - Root => 0, + am::ObjId::Id(_, _, index) => *index, + am::ObjId::Root => 0, } } else { usize::MAX @@ -163,54 +163,26 @@ pub unsafe extern "C" fn AMobjIdIndex(obj_id: *const AMobjId) -> usize { /// \ingroup enumerations /// \enum AMobjType -/// \installed_headerfile /// \brief The type of an object value. -#[derive(PartialEq, Eq)] #[repr(u8)] pub enum AMobjType { - /// The default tag, not a type signifier. - Default = 0, + /// A void. + /// \note This tag is unalphabetized to evaluate as false. + Void = 0, /// A list. - List = 1, + List, /// A key-value map. Map, /// A list of Unicode graphemes. Text, } -impl Default for AMobjType { - fn default() -> Self { - Self::Default - } -} - -impl From<&am::ObjType> for AMobjType { - fn from(o: &am::ObjType) -> Self { - use am::ObjType::*; - +impl From for AMobjType { + fn from(o: am::ObjType) -> Self { match o { - List => Self::List, - Map | Table => Self::Map, - Text => Self::Text, - } - } -} - -impl TryFrom<&AMobjType> for am::ObjType { - type Error = am::AutomergeError; - - fn try_from(c_obj_type: &AMobjType) -> Result { - use am::AutomergeError::InvalidValueType; - use AMobjType::*; - - match c_obj_type { - List => Ok(Self::List), - Map => Ok(Self::Map), - Text => Ok(Self::Text), - _ => Err(InvalidValueType { - expected: type_name::().to_string(), - unexpected: type_name::().to_string(), - }), + am::ObjType::Map | am::ObjType::Table => AMobjType::Map, + am::ObjType::List => AMobjType::List, + am::ObjType::Text => AMobjType::Text, } } } diff --git a/rust/automerge-c/src/obj/item.rs b/rust/automerge-c/src/obj/item.rs new file mode 100644 index 00000000..a2e99d06 --- /dev/null +++ b/rust/automerge-c/src/obj/item.rs @@ -0,0 +1,73 @@ +use automerge as am; + +use crate::obj::AMobjId; +use crate::result::AMvalue; + +/// \struct AMobjItem +/// \installed_headerfile +/// \brief An item in an object. +pub struct AMobjItem { + /// The object identifier of an item in an object. + obj_id: AMobjId, + /// The value of an item in an object. + value: am::Value<'static>, +} + +impl AMobjItem { + pub fn new(value: am::Value<'static>, obj_id: am::ObjId) -> Self { + Self { + obj_id: AMobjId::new(obj_id), + value, + } + } +} + +impl PartialEq for AMobjItem { + fn eq(&self, other: &Self) -> bool { + self.obj_id == other.obj_id && self.value == other.value + } +} + +impl From<&AMobjItem> for (am::Value<'static>, am::ObjId) { + fn from(obj_item: &AMobjItem) -> Self { + (obj_item.value.clone(), obj_item.obj_id.as_ref().clone()) + } +} + +/// \memberof AMobjItem +/// \brief Gets the object identifier of an item in an object. +/// +/// \param[in] obj_item A pointer to an `AMobjItem` struct. +/// \return A pointer to an `AMobjId` struct. +/// \pre \p obj_item `!= NULL`. +/// \internal +/// +/// # Safety +/// obj_item must be a valid pointer to an AMobjItem +#[no_mangle] +pub unsafe extern "C" fn AMobjItemObjId(obj_item: *const AMobjItem) -> *const AMobjId { + if let Some(obj_item) = obj_item.as_ref() { + &obj_item.obj_id + } else { + std::ptr::null() + } +} + +/// \memberof AMobjItem +/// \brief Gets the value of an item in an object. +/// +/// \param[in] obj_item A pointer to an `AMobjItem` struct. +/// \return An `AMvalue` struct. +/// \pre \p obj_item `!= NULL`. +/// \internal +/// +/// # Safety +/// obj_item must be a valid pointer to an AMobjItem +#[no_mangle] +pub unsafe extern "C" fn AMobjItemValue<'a>(obj_item: *const AMobjItem) -> AMvalue<'a> { + if let Some(obj_item) = obj_item.as_ref() { + (&obj_item.value).into() + } else { + AMvalue::Void + } +} diff --git a/rust/automerge-c/src/obj/items.rs b/rust/automerge-c/src/obj/items.rs new file mode 100644 index 00000000..d6b847cf --- /dev/null +++ b/rust/automerge-c/src/obj/items.rs @@ -0,0 +1,341 @@ +use std::ffi::c_void; +use std::mem::size_of; + +use crate::obj::item::AMobjItem; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(obj_items: &[AMobjItem], offset: isize) -> Self { + Self { + len: obj_items.len(), + offset, + ptr: obj_items.as_ptr() as *const c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<&AMobjItem> { + if self.is_stopped() { + return None; + } + let slice: &[AMobjItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMobjItem, self.len) }; + let value = &slice[self.get_index()]; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<&AMobjItem> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[AMobjItem] = + unsafe { std::slice::from_raw_parts(self.ptr as *const AMobjItem, self.len) }; + Some(&slice[self.get_index()]) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) + .try_into() + .unwrap() + } + } +} + +/// \struct AMobjItems +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of object items. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMobjItems { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_], +} + +impl AMobjItems { + pub fn new(obj_items: &[AMobjItem]) -> Self { + Self { + detail: Detail::new(obj_items, 0).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<&AMobjItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<&AMobjItem> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[AMobjItem]> for AMobjItems { + fn as_ref(&self) -> &[AMobjItem] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const AMobjItem, detail.len) } + } +} + +impl Default for AMobjItems { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMobjItems +/// \brief Advances an iterator over a sequence of object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] obj_items A pointer to an `AMobjItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsAdvance(obj_items: *mut AMobjItems, n: isize) { + if let Some(obj_items) = obj_items.as_mut() { + obj_items.advance(n); + }; +} + +/// \memberof AMobjItems +/// \brief Tests the equality of two sequences of object items underlying a +/// pair of iterators. +/// +/// \param[in] obj_items1 A pointer to an `AMobjItems` struct. +/// \param[in] obj_items2 A pointer to an `AMobjItems` struct. +/// \return `true` if \p obj_items1 `==` \p obj_items2 and `false` otherwise. +/// \pre \p obj_items1 `!= NULL`. +/// \pre \p obj_items2 `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items1 must be a valid pointer to an AMobjItems +/// obj_items2 must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsEqual( + obj_items1: *const AMobjItems, + obj_items2: *const AMobjItems, +) -> bool { + match (obj_items1.as_ref(), obj_items2.as_ref()) { + (Some(obj_items1), Some(obj_items2)) => obj_items1.as_ref() == obj_items2.as_ref(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} + +/// \memberof AMobjItems +/// \brief Gets the object item at the current position of an iterator over a +/// sequence of object items and then advances it by at most \p |n| +/// positions where the sign of \p n is relative to the iterator's +/// direction. +/// +/// \param[in,out] obj_items A pointer to an `AMobjItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMobjItem` struct that's `NULL` when \p obj_items +/// was previously advanced past its forward/reverse limit. +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsNext(obj_items: *mut AMobjItems, n: isize) -> *const AMobjItem { + if let Some(obj_items) = obj_items.as_mut() { + if let Some(obj_item) = obj_items.next(n) { + return obj_item; + } + } + std::ptr::null() +} + +/// \memberof AMobjItems +/// \brief Advances an iterator over a sequence of object items by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the object item at its new +/// position. +/// +/// \param[in,out] obj_items A pointer to an `AMobjItems` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMobjItem` struct that's `NULL` when \p obj_items +/// is presently advanced past its forward/reverse limit. +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsPrev(obj_items: *mut AMobjItems, n: isize) -> *const AMobjItem { + if let Some(obj_items) = obj_items.as_mut() { + if let Some(obj_item) = obj_items.prev(n) { + return obj_item; + } + } + std::ptr::null() +} + +/// \memberof AMobjItems +/// \brief Gets the size of the sequence of object items underlying an +/// iterator. +/// +/// \param[in] obj_items A pointer to an `AMobjItems` struct. +/// \return The count of values in \p obj_items. +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsSize(obj_items: *const AMobjItems) -> usize { + if let Some(obj_items) = obj_items.as_ref() { + obj_items.len() + } else { + 0 + } +} + +/// \memberof AMobjItems +/// \brief Creates an iterator over the same sequence of object items as the +/// given one but with the opposite position and direction. +/// +/// \param[in] obj_items A pointer to an `AMobjItems` struct. +/// \return An `AMobjItems` struct +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsReversed(obj_items: *const AMobjItems) -> AMobjItems { + if let Some(obj_items) = obj_items.as_ref() { + obj_items.reversed() + } else { + Default::default() + } +} + +/// \memberof AMobjItems +/// \brief Creates an iterator at the starting position over the same sequence +/// of object items as the given one. +/// +/// \param[in] obj_items A pointer to an `AMobjItems` struct. +/// \return An `AMobjItems` struct +/// \pre \p obj_items `!= NULL`. +/// \internal +/// +/// #Safety +/// obj_items must be a valid pointer to an AMobjItems +#[no_mangle] +pub unsafe extern "C" fn AMobjItemsRewound(obj_items: *const AMobjItems) -> AMobjItems { + if let Some(obj_items) = obj_items.as_ref() { + obj_items.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/result.rs b/rust/automerge-c/src/result.rs index 2975f38b..d7d6bce8 100644 --- a/rust/automerge-c/src/result.rs +++ b/rust/automerge-c/src/result.rs @@ -1,85 +1,504 @@ use automerge as am; +use smol_str::SmolStr; +use std::any::type_name; +use std::collections::BTreeMap; use std::ops::{Range, RangeFrom, RangeFull, RangeTo}; +use crate::actor_id::AMactorId; use crate::byte_span::AMbyteSpan; -use crate::index::AMindex; -use crate::item::AMitem; -use crate::items::AMitems; +use crate::change::AMchange; +use crate::change_hashes::AMchangeHashes; +use crate::changes::AMchanges; +use crate::doc::list::{item::AMlistItem, items::AMlistItems}; +use crate::doc::map::{item::AMmapItem, items::AMmapItems}; +use crate::doc::AMdoc; +use crate::obj::item::AMobjItem; +use crate::obj::items::AMobjItems; +use crate::obj::AMobjId; +use crate::strs::AMstrs; +use crate::sync::{AMsyncMessage, AMsyncState}; + +/// \struct AMvalue +/// \installed_headerfile +/// \brief A discriminated union of value type variants for a result. +/// +/// \enum AMvalueVariant +/// \brief A value type discriminant. +/// +/// \var AMvalue::actor_id +/// An actor identifier as a pointer to an `AMactorId` struct. +/// +/// \var AMvalue::boolean +/// A boolean. +/// +/// \var AMvalue::bytes +/// A sequence of bytes as an `AMbyteSpan` struct. +/// +/// \var AMvalue::change_hashes +/// A sequence of change hashes as an `AMchangeHashes` struct. +/// +/// \var AMvalue::changes +/// A sequence of changes as an `AMchanges` struct. +/// +/// \var AMvalue::counter +/// A CRDT counter. +/// +/// \var AMvalue::doc +/// A document as a pointer to an `AMdoc` struct. +/// +/// \var AMvalue::f64 +/// A 64-bit float. +/// +/// \var AMvalue::int_ +/// A 64-bit signed integer. +/// +/// \var AMvalue::list_items +/// A sequence of list object items as an `AMlistItems` struct. +/// +/// \var AMvalue::map_items +/// A sequence of map object items as an `AMmapItems` struct. +/// +/// \var AMvalue::obj_id +/// An object identifier as a pointer to an `AMobjId` struct. +/// +/// \var AMvalue::obj_items +/// A sequence of object items as an `AMobjItems` struct. +/// +/// \var AMvalue::str +/// A UTF-8 string view as an `AMbyteSpan` struct. +/// +/// \var AMvalue::strs +/// A sequence of UTF-8 strings as an `AMstrs` struct. +/// +/// \var AMvalue::sync_message +/// A synchronization message as a pointer to an `AMsyncMessage` struct. +/// +/// \var AMvalue::sync_state +/// A synchronization state as a pointer to an `AMsyncState` struct. +/// +/// \var AMvalue::tag +/// The variant discriminator. +/// +/// \var AMvalue::timestamp +/// A *nix timestamp (milliseconds). +/// +/// \var AMvalue::uint +/// A 64-bit unsigned integer. +/// +/// \var AMvalue::unknown +/// A value of unknown type as an `AMunknownValue` struct. +#[repr(u8)] +pub enum AMvalue<'a> { + /// A void variant. + /// \note This tag is unalphabetized so that a zeroed struct will have it. + Void, + /// An actor identifier variant. + ActorId(&'a AMactorId), + /// A boolean variant. + Boolean(bool), + /// A byte array variant. + Bytes(AMbyteSpan), + /// A change hashes variant. + ChangeHashes(AMchangeHashes), + /// A changes variant. + Changes(AMchanges), + /// A CRDT counter variant. + Counter(i64), + /// A document variant. + Doc(*mut AMdoc), + /// A 64-bit float variant. + F64(f64), + /// A 64-bit signed integer variant. + Int(i64), + /// A list items variant. + ListItems(AMlistItems), + /// A map items variant. + MapItems(AMmapItems), + /// A null variant. + Null, + /// An object identifier variant. + ObjId(&'a AMobjId), + /// An object items variant. + ObjItems(AMobjItems), + /// A UTF-8 string view variant. + Str(AMbyteSpan), + /// A UTF-8 string views variant. + Strs(AMstrs), + /// A synchronization message variant. + SyncMessage(&'a AMsyncMessage), + /// A synchronization state variant. + SyncState(&'a mut AMsyncState), + /// A *nix timestamp (milliseconds) variant. + Timestamp(i64), + /// A 64-bit unsigned integer variant. + Uint(u64), + /// An unknown type of scalar value variant. + Unknown(AMunknownValue), +} + +impl<'a> PartialEq for AMvalue<'a> { + fn eq(&self, other: &Self) -> bool { + use AMvalue::*; + + match (self, other) { + (ActorId(lhs), ActorId(rhs)) => *lhs == *rhs, + (Boolean(lhs), Boolean(rhs)) => lhs == rhs, + (Bytes(lhs), Bytes(rhs)) => lhs == rhs, + (ChangeHashes(lhs), ChangeHashes(rhs)) => lhs == rhs, + (Changes(lhs), Changes(rhs)) => lhs == rhs, + (Counter(lhs), Counter(rhs)) => lhs == rhs, + (Doc(lhs), Doc(rhs)) => *lhs == *rhs, + (F64(lhs), F64(rhs)) => lhs == rhs, + (Int(lhs), Int(rhs)) => lhs == rhs, + (ListItems(lhs), ListItems(rhs)) => lhs == rhs, + (MapItems(lhs), MapItems(rhs)) => lhs == rhs, + (ObjId(lhs), ObjId(rhs)) => *lhs == *rhs, + (ObjItems(lhs), ObjItems(rhs)) => lhs == rhs, + (Str(lhs), Str(rhs)) => lhs == rhs, + (Strs(lhs), Strs(rhs)) => lhs == rhs, + (SyncMessage(lhs), SyncMessage(rhs)) => *lhs == *rhs, + (SyncState(lhs), SyncState(rhs)) => *lhs == *rhs, + (Timestamp(lhs), Timestamp(rhs)) => lhs == rhs, + (Uint(lhs), Uint(rhs)) => lhs == rhs, + (Unknown(lhs), Unknown(rhs)) => lhs == rhs, + (Null, Null) | (Void, Void) => true, + _ => false, + } + } +} + +impl From<&am::Value<'_>> for AMvalue<'_> { + fn from(value: &am::Value<'_>) -> Self { + match value { + am::Value::Scalar(scalar) => match scalar.as_ref() { + am::ScalarValue::Boolean(flag) => AMvalue::Boolean(*flag), + am::ScalarValue::Bytes(bytes) => AMvalue::Bytes(bytes.as_slice().into()), + am::ScalarValue::Counter(counter) => AMvalue::Counter(counter.into()), + am::ScalarValue::F64(float) => AMvalue::F64(*float), + am::ScalarValue::Int(int) => AMvalue::Int(*int), + am::ScalarValue::Null => AMvalue::Null, + am::ScalarValue::Str(smol_str) => AMvalue::Str(smol_str.as_bytes().into()), + am::ScalarValue::Timestamp(timestamp) => AMvalue::Timestamp(*timestamp), + am::ScalarValue::Uint(uint) => AMvalue::Uint(*uint), + am::ScalarValue::Unknown { bytes, type_code } => AMvalue::Unknown(AMunknownValue { + bytes: bytes.as_slice().into(), + type_code: *type_code, + }), + }, + // \todo Confirm that an object variant should be ignored + // when there's no object ID variant. + am::Value::Object(_) => AMvalue::Void, + } + } +} + +impl From<&AMvalue<'_>> for u8 { + fn from(value: &AMvalue) -> Self { + use AMvalue::*; + + // \warning These numbers must correspond to the order in which the + // variants of an AMvalue are declared within it. + match value { + ActorId(_) => 1, + Boolean(_) => 2, + Bytes(_) => 3, + ChangeHashes(_) => 4, + Changes(_) => 5, + Counter(_) => 6, + Doc(_) => 7, + F64(_) => 8, + Int(_) => 9, + ListItems(_) => 10, + MapItems(_) => 11, + Null => 12, + ObjId(_) => 13, + ObjItems(_) => 14, + Str(_) => 15, + Strs(_) => 16, + SyncMessage(_) => 17, + SyncState(_) => 18, + Timestamp(_) => 19, + Uint(_) => 20, + Unknown(..) => 21, + Void => 0, + } + } +} + +impl TryFrom<&AMvalue<'_>> for am::ScalarValue { + type Error = am::AutomergeError; + + fn try_from(c_value: &AMvalue) -> Result { + use am::AutomergeError::InvalidValueType; + use AMvalue::*; + + let expected = type_name::().to_string(); + match c_value { + Boolean(b) => Ok(am::ScalarValue::Boolean(*b)), + Bytes(span) => { + let slice = unsafe { std::slice::from_raw_parts(span.src, span.count) }; + Ok(am::ScalarValue::Bytes(slice.to_vec())) + } + Counter(c) => Ok(am::ScalarValue::Counter(c.into())), + F64(f) => Ok(am::ScalarValue::F64(*f)), + Int(i) => Ok(am::ScalarValue::Int(*i)), + Str(span) => { + let result: Result<&str, am::AutomergeError> = span.try_into(); + match result { + Ok(str_) => Ok(am::ScalarValue::Str(SmolStr::new(str_))), + Err(e) => Err(e), + } + } + Timestamp(t) => Ok(am::ScalarValue::Timestamp(*t)), + Uint(u) => Ok(am::ScalarValue::Uint(*u)), + Null => Ok(am::ScalarValue::Null), + Unknown(AMunknownValue { bytes, type_code }) => { + let slice = unsafe { std::slice::from_raw_parts(bytes.src, bytes.count) }; + Ok(am::ScalarValue::Unknown { + bytes: slice.to_vec(), + type_code: *type_code, + }) + } + ActorId(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + ChangeHashes(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + Changes(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + Doc(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + ListItems(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + MapItems(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + ObjId(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + ObjItems(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + Strs(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + SyncMessage(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + SyncState(_) => Err(InvalidValueType { + expected, + unexpected: type_name::().to_string(), + }), + Void => Err(InvalidValueType { + expected, + unexpected: type_name::<()>().to_string(), + }), + } + } +} + +/// \memberof AMvalue +/// \brief Tests the equality of two values. +/// +/// \param[in] value1 A pointer to an `AMvalue` struct. +/// \param[in] value2 A pointer to an `AMvalue` struct. +/// \return `true` if \p value1 `==` \p value2 and `false` otherwise. +/// \pre \p value1 `!= NULL`. +/// \pre \p value2 `!= NULL`. +/// \internal +/// +/// #Safety +/// value1 must be a valid AMvalue pointer +/// value2 must be a valid AMvalue pointer +#[no_mangle] +pub unsafe extern "C" fn AMvalueEqual(value1: *const AMvalue, value2: *const AMvalue) -> bool { + match (value1.as_ref(), value2.as_ref()) { + (Some(value1), Some(value2)) => *value1 == *value2, + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} /// \struct AMresult /// \installed_headerfile /// \brief A discriminated union of result variants. pub enum AMresult { - Items(Vec), + ActorId(am::ActorId, Option), + ChangeHashes(Vec), + Changes(Vec, Option>), + Doc(Box), Error(String), + ListItems(Vec), + MapItems(Vec), + ObjId(AMobjId), + ObjItems(Vec), + String(String), + Strings(Vec), + SyncMessage(AMsyncMessage), + SyncState(Box), + Value(am::Value<'static>), + Void, } impl AMresult { - pub(crate) fn error(s: &str) -> Self { - Self::Error(s.to_string()) - } - - pub(crate) fn item(item: AMitem) -> Self { - Self::Items(vec![item]) - } - - pub(crate) fn items(items: Vec) -> Self { - Self::Items(items) - } -} - -impl Default for AMresult { - fn default() -> Self { - Self::Items(vec![]) + pub(crate) fn err(s: &str) -> Self { + AMresult::Error(s.to_string()) } } impl From for AMresult { fn from(auto_commit: am::AutoCommit) -> Self { - Self::item(AMitem::exact(am::ROOT, auto_commit.into())) - } -} - -impl From for AMresult { - fn from(change: am::Change) -> Self { - Self::item(change.into()) + AMresult::Doc(Box::new(AMdoc::new(auto_commit))) } } impl From for AMresult { fn from(change_hash: am::ChangeHash) -> Self { - Self::item(change_hash.into()) + AMresult::ChangeHashes(vec![change_hash]) } } -impl From> for AMresult { - fn from(maybe: Option) -> Self { - match maybe { - Some(change_hash) => change_hash.into(), - None => Self::item(Default::default()), - } +impl From> for AMresult { + fn from(keys: am::Keys<'_, '_>) -> Self { + AMresult::Strings(keys.collect()) } } -impl From> for AMresult { - fn from(maybe: Result) -> Self { - match maybe { - Ok(change_hash) => change_hash.into(), - Err(e) => Self::error(&e.to_string()), - } +impl From> for AMresult { + fn from(keys: am::KeysAt<'_, '_>) -> Self { + AMresult::Strings(keys.collect()) + } +} + +impl From>> for AMresult { + fn from(list_range: am::ListRange<'static, Range>) -> Self { + AMresult::ListItems( + list_range + .map(|(i, v, o)| AMlistItem::new(i, v.clone(), o)) + .collect(), + ) + } +} + +impl From>> for AMresult { + fn from(list_range: am::ListRangeAt<'static, Range>) -> Self { + AMresult::ListItems( + list_range + .map(|(i, v, o)| AMlistItem::new(i, v.clone(), o)) + .collect(), + ) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRange<'static, Range>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRangeAt<'static, Range>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRange<'static, RangeFrom>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRangeAt<'static, RangeFrom>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From> for AMresult { + fn from(map_range: am::MapRange<'static, RangeFull>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From> for AMresult { + fn from(map_range: am::MapRangeAt<'static, RangeFull>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRange<'static, RangeTo>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) + } +} + +impl From>> for AMresult { + fn from(map_range: am::MapRangeAt<'static, RangeTo>) -> Self { + let map_items: Vec = map_range + .map(|(k, v, o): (&'_ str, am::Value<'_>, am::ObjId)| AMmapItem::new(k, v.clone(), o)) + .collect(); + AMresult::MapItems(map_items) } } impl From for AMresult { fn from(state: am::sync::State) -> Self { - Self::item(state.into()) + AMresult::SyncState(Box::new(AMsyncState::new(state))) } } impl From> for AMresult { fn from(pairs: am::Values<'static>) -> Self { - Self::items(pairs.map(|(v, o)| AMitem::exact(o, v.into())).collect()) + AMresult::ObjItems(pairs.map(|(v, o)| AMobjItem::new(v.clone(), o)).collect()) + } +} + +impl From, am::ObjId)>, am::AutomergeError>> for AMresult { + fn from(maybe: Result, am::ObjId)>, am::AutomergeError>) -> Self { + match maybe { + Ok(pairs) => AMresult::ObjItems( + pairs + .into_iter() + .map(|(v, o)| AMobjItem::new(v, o)) + .collect(), + ), + Err(e) => AMresult::err(&e.to_string()), + } } } @@ -89,150 +508,37 @@ impl From for *mut AMresult { } } -impl From> for AMresult { - fn from(keys: am::Keys<'_, '_>) -> Self { - Self::items(keys.map(|s| s.into()).collect()) - } -} - -impl From> for AMresult { - fn from(keys: am::KeysAt<'_, '_>) -> Self { - Self::items(keys.map(|s| s.into()).collect()) - } -} - -impl From>> for AMresult { - fn from(list_range: am::ListRange<'static, Range>) -> Self { - Self::items( - list_range - .map(|(i, v, o)| AMitem::indexed(AMindex::Pos(i), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(list_range: am::ListRangeAt<'static, Range>) -> Self { - Self::items( - list_range - .map(|(i, v, o)| AMitem::indexed(AMindex::Pos(i), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRange<'static, Range>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRangeAt<'static, Range>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRange<'static, RangeFrom>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRangeAt<'static, RangeFrom>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From> for AMresult { - fn from(map_range: am::MapRange<'static, RangeFull>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From> for AMresult { - fn from(map_range: am::MapRangeAt<'static, RangeFull>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRange<'static, RangeTo>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - -impl From>> for AMresult { - fn from(map_range: am::MapRangeAt<'static, RangeTo>) -> Self { - Self::items( - map_range - .map(|(k, v, o)| AMitem::indexed(AMindex::Key(k.into()), o, v.into())) - .collect(), - ) - } -} - impl From> for AMresult { fn from(maybe: Option<&am::Change>) -> Self { - Self::item(match maybe { - Some(change) => change.clone().into(), - None => Default::default(), - }) + match maybe { + Some(change) => AMresult::Changes(vec![change.clone()], None), + None => AMresult::Void, + } } } impl From> for AMresult { fn from(maybe: Option) -> Self { - Self::item(match maybe { - Some(message) => message.into(), - None => Default::default(), - }) + match maybe { + Some(message) => AMresult::SyncMessage(AMsyncMessage::new(message)), + None => AMresult::Void, + } } } impl From> for AMresult { fn from(maybe: Result<(), am::AutomergeError>) -> Self { match maybe { - Ok(()) => Self::item(Default::default()), - Err(e) => Self::error(&e.to_string()), + Ok(()) => AMresult::Void, + Err(e) => AMresult::err(&e.to_string()), } } } - impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(actor_id) => Self::item(actor_id.into()), - Err(e) => Self::error(&e.to_string()), + Ok(actor_id) => AMresult::ActorId(actor_id, None), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -240,8 +546,8 @@ impl From> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(actor_id) => Self::item(actor_id.into()), - Err(e) => Self::error(&e.to_string()), + Ok(actor_id) => AMresult::ActorId(actor_id, None), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -249,8 +555,8 @@ impl From> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(auto_commit) => Self::item(auto_commit.into()), - Err(e) => Self::error(&e.to_string()), + Ok(auto_commit) => AMresult::Doc(Box::new(AMdoc::new(auto_commit))), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -258,17 +564,17 @@ impl From> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(change) => Self::item(change.into()), - Err(e) => Self::error(&e.to_string()), + Ok(change) => AMresult::Changes(vec![change], None), + Err(e) => AMresult::err(&e.to_string()), } } } -impl From<(Result, am::ObjType)> for AMresult { - fn from(tuple: (Result, am::ObjType)) -> Self { - match tuple { - (Ok(obj_id), obj_type) => Self::item((obj_id, obj_type).into()), - (Err(e), _) => Self::error(&e.to_string()), +impl From> for AMresult { + fn from(maybe: Result) -> Self { + match maybe { + Ok(obj_id) => AMresult::ObjId(AMobjId::new(obj_id)), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -276,8 +582,8 @@ impl From<(Result, am::ObjType)> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(message) => Self::item(message.into()), - Err(e) => Self::error(&e.to_string()), + Ok(message) => AMresult::SyncMessage(AMsyncMessage::new(message)), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -285,8 +591,8 @@ impl From> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(state) => Self::item(state.into()), - Err(e) => Self::error(&e.to_string()), + Ok(state) => AMresult::SyncState(Box::new(AMsyncState::new(state))), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -294,8 +600,8 @@ impl From> for AMresult { impl From, am::AutomergeError>> for AMresult { fn from(maybe: Result, am::AutomergeError>) -> Self { match maybe { - Ok(value) => Self::item(value.into()), - Err(e) => Self::error(&e.to_string()), + Ok(value) => AMresult::Value(value), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -303,9 +609,12 @@ impl From, am::AutomergeError>> for AMresult { impl From, am::ObjId)>, am::AutomergeError>> for AMresult { fn from(maybe: Result, am::ObjId)>, am::AutomergeError>) -> Self { match maybe { - Ok(Some((value, obj_id))) => Self::item(AMitem::exact(obj_id, value.into())), - Ok(None) => Self::item(Default::default()), - Err(e) => Self::error(&e.to_string()), + Ok(Some((value, obj_id))) => match value { + am::Value::Object(_) => AMresult::ObjId(AMobjId::new(obj_id)), + _ => AMresult::Value(value), + }, + Ok(None) => AMresult::Void, + Err(e) => AMresult::err(&e.to_string()), } } } @@ -313,8 +622,8 @@ impl From, am::ObjId)>, am::AutomergeError>> f impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(string) => Self::item(string.into()), - Err(e) => Self::error(&e.to_string()), + Ok(string) => AMresult::String(string), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -322,8 +631,8 @@ impl From> for AMresult { impl From> for AMresult { fn from(maybe: Result) -> Self { match maybe { - Ok(size) => Self::item(am::Value::uint(size as u64).into()), - Err(e) => Self::error(&e.to_string()), + Ok(size) => AMresult::Value(am::Value::uint(size as u64)), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -331,22 +640,8 @@ impl From> for AMresult { impl From, am::AutomergeError>> for AMresult { fn from(maybe: Result, am::AutomergeError>) -> Self { match maybe { - Ok(changes) => Self::items(changes.into_iter().map(|change| change.into()).collect()), - Err(e) => Self::error(&e.to_string()), - } - } -} - -impl From, am::AutomergeError>> for AMresult { - fn from(maybe: Result, am::AutomergeError>) -> Self { - match maybe { - Ok(changes) => Self::items( - changes - .into_iter() - .map(|change| change.clone().into()) - .collect(), - ), - Err(e) => Self::error(&e.to_string()), + Ok(changes) => AMresult::Changes(changes, None), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -354,8 +649,21 @@ impl From, am::AutomergeError>> for AMresult { impl From, am::LoadChangeError>> for AMresult { fn from(maybe: Result, am::LoadChangeError>) -> Self { match maybe { - Ok(changes) => Self::items(changes.into_iter().map(|change| change.into()).collect()), - Err(e) => Self::error(&e.to_string()), + Ok(changes) => AMresult::Changes(changes, None), + Err(e) => AMresult::err(&e.to_string()), + } + } +} + +impl From, am::AutomergeError>> for AMresult { + fn from(maybe: Result, am::AutomergeError>) -> Self { + match maybe { + Ok(changes) => { + let changes: Vec = + changes.iter().map(|&change| change.clone()).collect(); + AMresult::Changes(changes, None) + } + Err(e) => AMresult::err(&e.to_string()), } } } @@ -363,13 +671,8 @@ impl From, am::LoadChangeError>> for AMresult { impl From, am::AutomergeError>> for AMresult { fn from(maybe: Result, am::AutomergeError>) -> Self { match maybe { - Ok(change_hashes) => Self::items( - change_hashes - .into_iter() - .map(|change_hash| change_hash.into()) - .collect(), - ), - Err(e) => Self::error(&e.to_string()), + Ok(change_hashes) => AMresult::ChangeHashes(change_hashes), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -377,27 +680,8 @@ impl From, am::AutomergeError>> for AMresult { impl From, am::InvalidChangeHashSlice>> for AMresult { fn from(maybe: Result, am::InvalidChangeHashSlice>) -> Self { match maybe { - Ok(change_hashes) => Self::items( - change_hashes - .into_iter() - .map(|change_hash| change_hash.into()) - .collect(), - ), - Err(e) => Self::error(&e.to_string()), - } - } -} - -impl From, am::ObjId)>, am::AutomergeError>> for AMresult { - fn from(maybe: Result, am::ObjId)>, am::AutomergeError>) -> Self { - match maybe { - Ok(pairs) => Self::items( - pairs - .into_iter() - .map(|(v, o)| AMitem::exact(o, v.into())) - .collect(), - ), - Err(e) => Self::error(&e.to_string()), + Ok(change_hashes) => AMresult::ChangeHashes(change_hashes), + Err(e) => AMresult::err(&e.to_string()), } } } @@ -405,66 +689,28 @@ impl From, am::ObjId)>, am::AutomergeError>> for impl From, am::AutomergeError>> for AMresult { fn from(maybe: Result, am::AutomergeError>) -> Self { match maybe { - Ok(bytes) => Self::item(am::Value::bytes(bytes).into()), - Err(e) => Self::error(&e.to_string()), + Ok(bytes) => AMresult::Value(am::Value::bytes(bytes)), + Err(e) => AMresult::err(&e.to_string()), } } } -impl From<&[am::Change]> for AMresult { - fn from(changes: &[am::Change]) -> Self { - Self::items(changes.iter().map(|change| change.clone().into()).collect()) - } -} - impl From> for AMresult { fn from(changes: Vec<&am::Change>) -> Self { - Self::items( - changes - .into_iter() - .map(|change| change.clone().into()) - .collect(), - ) - } -} - -impl From<&[am::ChangeHash]> for AMresult { - fn from(change_hashes: &[am::ChangeHash]) -> Self { - Self::items( - change_hashes - .iter() - .map(|change_hash| (*change_hash).into()) - .collect(), - ) - } -} - -impl From<&[am::sync::Have]> for AMresult { - fn from(haves: &[am::sync::Have]) -> Self { - Self::items(haves.iter().map(|have| have.clone().into()).collect()) + let changes: Vec = changes.iter().map(|&change| change.clone()).collect(); + AMresult::Changes(changes, None) } } impl From> for AMresult { fn from(change_hashes: Vec) -> Self { - Self::items( - change_hashes - .into_iter() - .map(|change_hash| change_hash.into()) - .collect(), - ) - } -} - -impl From> for AMresult { - fn from(haves: Vec) -> Self { - Self::items(haves.into_iter().map(|have| have.into()).collect()) + AMresult::ChangeHashes(change_hashes) } } impl From> for AMresult { fn from(bytes: Vec) -> Self { - Self::item(am::Value::bytes(bytes).into()) + AMresult::Value(am::Value::bytes(bytes)) } } @@ -474,9 +720,8 @@ pub fn to_result>(r: R) -> *mut AMresult { /// \ingroup enumerations /// \enum AMstatus -/// \installed_headerfile /// \brief The status of an API call. -#[derive(PartialEq, Eq)] +#[derive(Debug)] #[repr(u8)] pub enum AMstatus { /// Success. @@ -488,80 +733,35 @@ pub enum AMstatus { InvalidResult, } -/// \memberof AMresult -/// \brief Concatenates the items from two results. -/// -/// \param[in] dest A pointer to an `AMresult` struct. -/// \param[in] src A pointer to an `AMresult` struct. -/// \return A pointer to an `AMresult` struct with the items from \p dest in -/// their original order followed by the items from \p src in their -/// original order. -/// \pre \p dest `!= NULL` -/// \pre \p src `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -/// \internal -/// -/// # Safety -/// dest must be a valid pointer to an AMresult -/// src must be a valid pointer to an AMresult -#[no_mangle] -pub unsafe extern "C" fn AMresultCat(dest: *const AMresult, src: *const AMresult) -> *mut AMresult { - use AMresult::*; - - match (dest.as_ref(), src.as_ref()) { - (Some(dest), Some(src)) => match (dest, src) { - (Items(dest_items), Items(src_items)) => { - return AMresult::items( - dest_items - .iter() - .cloned() - .chain(src_items.iter().cloned()) - .collect(), - ) - .into(); - } - (Error(_), Error(_)) | (Error(_), Items(_)) | (Items(_), Error(_)) => { - AMresult::error("Invalid `AMresult`").into() - } - }, - (None, None) | (None, Some(_)) | (Some(_), None) => { - AMresult::error("Invalid `AMresult*`").into() - } - } -} - /// \memberof AMresult /// \brief Gets a result's error message string. /// /// \param[in] result A pointer to an `AMresult` struct. /// \return A UTF-8 string view as an `AMbyteSpan` struct. -/// \pre \p result `!= NULL` +/// \pre \p result `!= NULL`. /// \internal /// /// # Safety /// result must be a valid pointer to an AMresult #[no_mangle] -pub unsafe extern "C" fn AMresultError(result: *const AMresult) -> AMbyteSpan { - use AMresult::*; - - if let Some(Error(message)) = result.as_ref() { - return message.as_bytes().into(); +pub unsafe extern "C" fn AMerrorMessage(result: *const AMresult) -> AMbyteSpan { + match result.as_ref() { + Some(AMresult::Error(s)) => s.as_bytes().into(), + _ => Default::default(), } - Default::default() } /// \memberof AMresult /// \brief Deallocates the storage for a result. /// -/// \param[in] result A pointer to an `AMresult` struct. -/// \pre \p result `!= NULL` +/// \param[in,out] result A pointer to an `AMresult` struct. +/// \pre \p result `!= NULL`. /// \internal /// /// # Safety /// result must be a valid pointer to an AMresult #[no_mangle] -pub unsafe extern "C" fn AMresultFree(result: *mut AMresult) { +pub unsafe extern "C" fn AMfree(result: *mut AMresult) { if !result.is_null() { let result: AMresult = *Box::from_raw(result); drop(result) @@ -569,67 +769,39 @@ pub unsafe extern "C" fn AMresultFree(result: *mut AMresult) { } /// \memberof AMresult -/// \brief Gets a result's first item. +/// \brief Gets the size of a result's value. /// /// \param[in] result A pointer to an `AMresult` struct. -/// \return A pointer to an `AMitem` struct. -/// \pre \p result `!= NULL` -/// \internal -/// -/// # Safety -/// result must be a valid pointer to an AMresult -#[no_mangle] -pub unsafe extern "C" fn AMresultItem(result: *mut AMresult) -> *mut AMitem { - use AMresult::*; - - if let Some(Items(items)) = result.as_mut() { - if !items.is_empty() { - return &mut items[0]; - } - } - std::ptr::null_mut() -} - -/// \memberof AMresult -/// \brief Gets a result's items. -/// -/// \param[in] result A pointer to an `AMresult` struct. -/// \return An `AMitems` struct. -/// \pre \p result `!= NULL` -/// \internal -/// -/// # Safety -/// result must be a valid pointer to an AMresult -#[no_mangle] -pub unsafe extern "C" fn AMresultItems<'a>(result: *mut AMresult) -> AMitems<'a> { - use AMresult::*; - - if let Some(Items(items)) = result.as_mut() { - if !items.is_empty() { - return AMitems::new(items); - } - } - Default::default() -} - -/// \memberof AMresult -/// \brief Gets the size of a result. -/// -/// \param[in] result A pointer to an `AMresult` struct. -/// \return The count of items within \p result. -/// \pre \p result `!= NULL` +/// \return The count of values in \p result. +/// \pre \p result `!= NULL`. /// \internal /// /// # Safety /// result must be a valid pointer to an AMresult #[no_mangle] pub unsafe extern "C" fn AMresultSize(result: *const AMresult) -> usize { - use self::AMresult::*; + if let Some(result) = result.as_ref() { + use AMresult::*; - if let Some(Items(items)) = result.as_ref() { - return items.len(); + match result { + Error(_) | Void => 0, + ActorId(_, _) + | Doc(_) + | ObjId(_) + | String(_) + | SyncMessage(_) + | SyncState(_) + | Value(_) => 1, + ChangeHashes(change_hashes) => change_hashes.len(), + Changes(changes, _) => changes.len(), + ListItems(list_items) => list_items.len(), + MapItems(map_items) => map_items.len(), + ObjItems(obj_items) => obj_items.len(), + Strings(cstrings) => cstrings.len(), + } + } else { + 0 } - 0 } /// \memberof AMresult @@ -637,24 +809,94 @@ pub unsafe extern "C" fn AMresultSize(result: *const AMresult) -> usize { /// /// \param[in] result A pointer to an `AMresult` struct. /// \return An `AMstatus` enum tag. -/// \pre \p result `!= NULL` +/// \pre \p result `!= NULL`. /// \internal /// /// # Safety /// result must be a valid pointer to an AMresult #[no_mangle] pub unsafe extern "C" fn AMresultStatus(result: *const AMresult) -> AMstatus { - use AMresult::*; - - if let Some(result) = result.as_ref() { - match result { - Error(_) => { - return AMstatus::Error; - } - _ => { - return AMstatus::Ok; - } - } + match result.as_ref() { + Some(AMresult::Error(_)) => AMstatus::Error, + None => AMstatus::InvalidResult, + _ => AMstatus::Ok, } - AMstatus::InvalidResult +} + +/// \memberof AMresult +/// \brief Gets a result's value. +/// +/// \param[in] result A pointer to an `AMresult` struct. +/// \return An `AMvalue` struct. +/// \pre \p result `!= NULL`. +/// \internal +/// +/// # Safety +/// result must be a valid pointer to an AMresult +#[no_mangle] +pub unsafe extern "C" fn AMresultValue<'a>(result: *mut AMresult) -> AMvalue<'a> { + let mut content = AMvalue::Void; + if let Some(result) = result.as_mut() { + match result { + AMresult::ActorId(actor_id, c_actor_id) => match c_actor_id { + None => { + content = AMvalue::ActorId(&*c_actor_id.insert(AMactorId::new(&*actor_id))); + } + Some(c_actor_id) => { + content = AMvalue::ActorId(&*c_actor_id); + } + }, + AMresult::ChangeHashes(change_hashes) => { + content = AMvalue::ChangeHashes(AMchangeHashes::new(change_hashes)); + } + AMresult::Changes(changes, storage) => { + content = AMvalue::Changes(AMchanges::new( + changes, + storage.get_or_insert(BTreeMap::new()), + )); + } + AMresult::Doc(doc) => content = AMvalue::Doc(&mut **doc), + AMresult::Error(_) => {} + AMresult::ListItems(list_items) => { + content = AMvalue::ListItems(AMlistItems::new(list_items)); + } + AMresult::MapItems(map_items) => { + content = AMvalue::MapItems(AMmapItems::new(map_items)); + } + AMresult::ObjId(obj_id) => { + content = AMvalue::ObjId(obj_id); + } + AMresult::ObjItems(obj_items) => { + content = AMvalue::ObjItems(AMobjItems::new(obj_items)); + } + AMresult::String(string) => content = AMvalue::Str(string.as_bytes().into()), + AMresult::Strings(strings) => { + content = AMvalue::Strs(AMstrs::new(strings)); + } + AMresult::SyncMessage(sync_message) => { + content = AMvalue::SyncMessage(sync_message); + } + AMresult::SyncState(sync_state) => { + content = AMvalue::SyncState(&mut *sync_state); + } + AMresult::Value(value) => { + content = (&*value).into(); + } + AMresult::Void => {} + } + }; + content +} + +/// \struct AMunknownValue +/// \installed_headerfile +/// \brief A value (typically for a `set` operation) whose type is unknown. +/// +#[derive(Eq, PartialEq)] +#[repr(C)] +pub struct AMunknownValue { + /// The value's raw bytes. + bytes: AMbyteSpan, + /// The value's encoded type identifier. + type_code: u8, } diff --git a/rust/automerge-c/src/result_stack.rs b/rust/automerge-c/src/result_stack.rs new file mode 100644 index 00000000..cfb9c7d2 --- /dev/null +++ b/rust/automerge-c/src/result_stack.rs @@ -0,0 +1,156 @@ +use crate::result::{AMfree, AMresult, AMresultStatus, AMresultValue, AMstatus, AMvalue}; + +/// \struct AMresultStack +/// \installed_headerfile +/// \brief A node in a singly-linked list of result pointers. +/// +/// \note Using this data structure is purely optional because its only purpose +/// is to make memory management tolerable for direct usage of this API +/// in C, C++ and Objective-C. +#[repr(C)] +pub struct AMresultStack { + /// A result to be deallocated. + pub result: *mut AMresult, + /// The next node in the singly-linked list or `NULL`. + pub next: *mut AMresultStack, +} + +impl AMresultStack { + pub fn new(result: *mut AMresult, next: *mut AMresultStack) -> Self { + Self { result, next } + } +} + +/// \memberof AMresultStack +/// \brief Deallocates the storage for a stack of results. +/// +/// \param[in,out] stack A pointer to a pointer to an `AMresultStack` struct. +/// \return The number of `AMresult` structs freed. +/// \pre \p stack `!= NULL`. +/// \post `*stack == NULL`. +/// \note Calling this function is purely optional because its only purpose is +/// to make memory management tolerable for direct usage of this API in +/// C, C++ and Objective-C. +/// \internal +/// +/// # Safety +/// stack must be a valid AMresultStack pointer pointer +#[no_mangle] +pub unsafe extern "C" fn AMfreeStack(stack: *mut *mut AMresultStack) -> usize { + if stack.is_null() { + return 0; + } + let mut count: usize = 0; + while !(*stack).is_null() { + AMfree(AMpop(stack)); + count += 1; + } + count +} + +/// \memberof AMresultStack +/// \brief Gets the topmost result from the stack after removing it. +/// +/// \param[in,out] stack A pointer to a pointer to an `AMresultStack` struct. +/// \return A pointer to an `AMresult` struct or `NULL`. +/// \pre \p stack `!= NULL`. +/// \post `*stack == NULL`. +/// \note Calling this function is purely optional because its only purpose is +/// to make memory management tolerable for direct usage of this API in +/// C, C++ and Objective-C. +/// \internal +/// +/// # Safety +/// stack must be a valid AMresultStack pointer pointer +#[no_mangle] +pub unsafe extern "C" fn AMpop(stack: *mut *mut AMresultStack) -> *mut AMresult { + if stack.is_null() || (*stack).is_null() { + return std::ptr::null_mut(); + } + let top = Box::from_raw(*stack); + *stack = top.next; + let result = top.result; + drop(top); + result +} + +/// \memberof AMresultStack +/// \brief The prototype of a function to be called when a value matching the +/// given discriminant cannot be extracted from the result at the top of +/// the given stack. +/// +/// \note Implementing this function is purely optional because its only purpose +/// is to make memory management tolerable for direct usage of this API +/// in C, C++ and Objective-C. +pub type AMpushCallback = + Option ()>; + +/// \memberof AMresultStack +/// \brief Pushes the given result onto the given stack and then either extracts +/// a value matching the given discriminant from that result or, +/// failing that, calls the given function and gets a void value instead. +/// +/// \param[in,out] stack A pointer to a pointer to an `AMresultStack` struct. +/// \param[in] result A pointer to an `AMresult` struct. +/// \param[in] discriminant An `AMvalue` variant's corresponding enum tag. +/// \param[in] callback A pointer to a function with the same signature as +/// `AMpushCallback()` or `NULL`. +/// \return An `AMvalue` struct. +/// \pre \p stack `!= NULL`. +/// \pre \p result `!= NULL`. +/// \warning If \p stack `== NULL` then \p result is deallocated in order to +/// prevent a memory leak. +/// \note Calling this function is purely optional because its only purpose is +/// to make memory management tolerable for direct usage of this API in +/// C, C++ and Objective-C. +/// \internal +/// +/// # Safety +/// stack must be a valid AMresultStack pointer pointer +/// result must be a valid AMresult pointer +#[no_mangle] +pub unsafe extern "C" fn AMpush<'a>( + stack: *mut *mut AMresultStack, + result: *mut AMresult, + discriminant: u8, + callback: AMpushCallback, +) -> AMvalue<'a> { + if stack.is_null() { + // There's no stack to push the result onto so it has to be freed in + // order to prevent a memory leak. + AMfree(result); + if let Some(callback) = callback { + callback(stack, discriminant); + } + return AMvalue::Void; + } else if result.is_null() { + if let Some(callback) = callback { + callback(stack, discriminant); + } + return AMvalue::Void; + } + // Always push the result onto the stack, even if it's wrong, so that the + // given callback can retrieve it. + let node = Box::new(AMresultStack::new(result, *stack)); + let top = Box::into_raw(node); + *stack = top; + // Test that the result contains a value. + match AMresultStatus(result) { + AMstatus::Ok => {} + _ => { + if let Some(callback) = callback { + callback(stack, discriminant); + } + return AMvalue::Void; + } + } + // Test that the result's value matches the given discriminant. + let value = AMresultValue(result); + if discriminant != u8::from(&value) { + if let Some(callback) = callback { + callback(stack, discriminant); + } + return AMvalue::Void; + } + value +} diff --git a/rust/automerge-c/src/strs.rs b/rust/automerge-c/src/strs.rs new file mode 100644 index 00000000..a36861b7 --- /dev/null +++ b/rust/automerge-c/src/strs.rs @@ -0,0 +1,359 @@ +use std::cmp::Ordering; +use std::ffi::c_void; +use std::mem::size_of; +use std::os::raw::c_char; + +use crate::byte_span::AMbyteSpan; + +/// \brief Creates a string view from a C string. +/// +/// \param[in] c_str A UTF-8 C string. +/// \return A UTF-8 string view as an `AMbyteSpan` struct. +/// \internal +/// +/// #Safety +/// c_str must be a null-terminated array of `c_char` +#[no_mangle] +pub unsafe extern "C" fn AMstr(c_str: *const c_char) -> AMbyteSpan { + c_str.into() +} + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new(strings: &[String], offset: isize) -> Self { + Self { + len: strings.len(), + offset, + ptr: strings.as_ptr() as *const c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option { + if self.is_stopped() { + return None; + } + let slice: &[String] = + unsafe { std::slice::from_raw_parts(self.ptr as *const String, self.len) }; + let value = slice[self.get_index()].as_bytes().into(); + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[String] = + unsafe { std::slice::from_raw_parts(self.ptr as *const String, self.len) }; + Some(slice[self.get_index()].as_bytes().into()) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts((&detail as *const Detail) as *const u8, USIZE_USIZE_USIZE_) + .try_into() + .unwrap() + } + } +} + +/// \struct AMstrs +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of UTF-8 strings. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMstrs { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_], +} + +impl AMstrs { + pub fn new(strings: &[String]) -> Self { + Self { + detail: Detail::new(strings, 0).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[String]> for AMstrs { + fn as_ref(&self) -> &[String] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const String, detail.len) } + } +} + +impl Default for AMstrs { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMstrs +/// \brief Advances an iterator over a sequence of UTF-8 strings by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] strs A pointer to an `AMstrs` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsAdvance(strs: *mut AMstrs, n: isize) { + if let Some(strs) = strs.as_mut() { + strs.advance(n); + }; +} + +/// \memberof AMstrs +/// \brief Compares the sequences of UTF-8 strings underlying a pair of +/// iterators. +/// +/// \param[in] strs1 A pointer to an `AMstrs` struct. +/// \param[in] strs2 A pointer to an `AMstrs` struct. +/// \return `-1` if \p strs1 `<` \p strs2, `0` if +/// \p strs1 `==` \p strs2 and `1` if +/// \p strs1 `>` \p strs2. +/// \pre \p strs1 `!= NULL`. +/// \pre \p strs2 `!= NULL`. +/// \internal +/// +/// #Safety +/// strs1 must be a valid pointer to an AMstrs +/// strs2 must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsCmp(strs1: *const AMstrs, strs2: *const AMstrs) -> isize { + match (strs1.as_ref(), strs2.as_ref()) { + (Some(strs1), Some(strs2)) => match strs1.as_ref().cmp(strs2.as_ref()) { + Ordering::Less => -1, + Ordering::Equal => 0, + Ordering::Greater => 1, + }, + (None, Some(_)) => -1, + (Some(_), None) => 1, + (None, None) => 0, + } +} + +/// \memberof AMstrs +/// \brief Gets the key at the current position of an iterator over a sequence +/// of UTF-8 strings and then advances it by at most \p |n| positions +/// where the sign of \p n is relative to the iterator's direction. +/// +/// \param[in,out] strs A pointer to an `AMstrs` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A UTF-8 string view as an `AMbyteSpan` struct that's `AMstr(NULL)` +/// when \p strs was previously advanced past its forward/reverse limit. +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsNext(strs: *mut AMstrs, n: isize) -> AMbyteSpan { + if let Some(strs) = strs.as_mut() { + if let Some(key) = strs.next(n) { + return key; + } + } + Default::default() +} + +/// \memberof AMstrs +/// \brief Advances an iterator over a sequence of UTF-8 strings by at most +/// \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the key at its new position. +/// +/// \param[in,out] strs A pointer to an `AMstrs` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A UTF-8 string view as an `AMbyteSpan` struct that's `AMstr(NULL)` +/// when \p strs is presently advanced past its forward/reverse limit. +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsPrev(strs: *mut AMstrs, n: isize) -> AMbyteSpan { + if let Some(strs) = strs.as_mut() { + if let Some(key) = strs.prev(n) { + return key; + } + } + Default::default() +} + +/// \memberof AMstrs +/// \brief Gets the size of the sequence of UTF-8 strings underlying an +/// iterator. +/// +/// \param[in] strs A pointer to an `AMstrs` struct. +/// \return The count of values in \p strs. +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsSize(strs: *const AMstrs) -> usize { + if let Some(strs) = strs.as_ref() { + strs.len() + } else { + 0 + } +} + +/// \memberof AMstrs +/// \brief Creates an iterator over the same sequence of UTF-8 strings as the +/// given one but with the opposite position and direction. +/// +/// \param[in] strs A pointer to an `AMstrs` struct. +/// \return An `AMstrs` struct. +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsReversed(strs: *const AMstrs) -> AMstrs { + if let Some(strs) = strs.as_ref() { + strs.reversed() + } else { + AMstrs::default() + } +} + +/// \memberof AMstrs +/// \brief Creates an iterator at the starting position over the same sequence +/// of UTF-8 strings as the given one. +/// +/// \param[in] strs A pointer to an `AMstrs` struct. +/// \return An `AMstrs` struct +/// \pre \p strs `!= NULL`. +/// \internal +/// +/// #Safety +/// strs must be a valid pointer to an AMstrs +#[no_mangle] +pub unsafe extern "C" fn AMstrsRewound(strs: *const AMstrs) -> AMstrs { + if let Some(strs) = strs.as_ref() { + strs.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/sync.rs b/rust/automerge-c/src/sync.rs index fe0332a1..cfed1af5 100644 --- a/rust/automerge-c/src/sync.rs +++ b/rust/automerge-c/src/sync.rs @@ -1,7 +1,7 @@ mod have; +mod haves; mod message; mod state; -pub(crate) use have::AMsyncHave; pub(crate) use message::{to_sync_message, AMsyncMessage}; pub(crate) use state::AMsyncState; diff --git a/rust/automerge-c/src/sync/have.rs b/rust/automerge-c/src/sync/have.rs index 37d2031f..312151e7 100644 --- a/rust/automerge-c/src/sync/have.rs +++ b/rust/automerge-c/src/sync/have.rs @@ -1,23 +1,23 @@ use automerge as am; -use crate::result::{to_result, AMresult}; +use crate::change_hashes::AMchangeHashes; /// \struct AMsyncHave /// \installed_headerfile /// \brief A summary of the changes that the sender of a synchronization /// message already has. #[derive(Clone, Eq, PartialEq)] -pub struct AMsyncHave(am::sync::Have); +pub struct AMsyncHave(*const am::sync::Have); impl AMsyncHave { - pub fn new(have: am::sync::Have) -> Self { + pub fn new(have: &am::sync::Have) -> Self { Self(have) } } impl AsRef for AMsyncHave { fn as_ref(&self) -> &am::sync::Have { - &self.0 + unsafe { &*self.0 } } } @@ -25,18 +25,17 @@ impl AsRef for AMsyncHave { /// \brief Gets the heads of the sender. /// /// \param[in] sync_have A pointer to an `AMsyncHave` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_have `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_have `!= NULL`. /// \internal /// /// # Safety /// sync_have must be a valid pointer to an AMsyncHave #[no_mangle] -pub unsafe extern "C" fn AMsyncHaveLastSync(sync_have: *const AMsyncHave) -> *mut AMresult { - to_result(match sync_have.as_ref() { - Some(sync_have) => sync_have.as_ref().last_sync.as_slice(), - None => Default::default(), - }) +pub unsafe extern "C" fn AMsyncHaveLastSync(sync_have: *const AMsyncHave) -> AMchangeHashes { + if let Some(sync_have) = sync_have.as_ref() { + AMchangeHashes::new(&sync_have.as_ref().last_sync) + } else { + Default::default() + } } diff --git a/rust/automerge-c/src/sync/haves.rs b/rust/automerge-c/src/sync/haves.rs new file mode 100644 index 00000000..c74b8e96 --- /dev/null +++ b/rust/automerge-c/src/sync/haves.rs @@ -0,0 +1,378 @@ +use automerge as am; +use std::collections::BTreeMap; +use std::ffi::c_void; +use std::mem::size_of; + +use crate::sync::have::AMsyncHave; + +#[repr(C)] +struct Detail { + len: usize, + offset: isize, + ptr: *const c_void, + storage: *mut c_void, +} + +/// \note cbindgen won't propagate the value of a `std::mem::size_of()` call +/// (https://github.com/eqrion/cbindgen/issues/252) but it will +/// propagate the name of a constant initialized from it so if the +/// constant's name is a symbolic representation of the value it can be +/// converted into a number by post-processing the header it generated. +pub const USIZE_USIZE_USIZE_USIZE_: usize = size_of::(); + +impl Detail { + fn new( + haves: &[am::sync::Have], + offset: isize, + storage: &mut BTreeMap, + ) -> Self { + let storage: *mut BTreeMap = storage; + Self { + len: haves.len(), + offset, + ptr: haves.as_ptr() as *const c_void, + storage: storage as *mut c_void, + } + } + + pub fn advance(&mut self, n: isize) { + if n == 0 { + return; + } + let len = self.len as isize; + self.offset = if self.offset < 0 { + // It's reversed. + let unclipped = self.offset.checked_sub(n).unwrap_or(isize::MIN); + if unclipped >= 0 { + // Clip it to the forward stop. + len + } else { + std::cmp::min(std::cmp::max(-(len + 1), unclipped), -1) + } + } else { + let unclipped = self.offset.checked_add(n).unwrap_or(isize::MAX); + if unclipped < 0 { + // Clip it to the reverse stop. + -(len + 1) + } else { + std::cmp::max(0, std::cmp::min(unclipped, len)) + } + } + } + + pub fn get_index(&self) -> usize { + (self.offset + + if self.offset < 0 { + self.len as isize + } else { + 0 + }) as usize + } + + pub fn next(&mut self, n: isize) -> Option<*const AMsyncHave> { + if self.is_stopped() { + return None; + } + let slice: &[am::sync::Have] = + unsafe { std::slice::from_raw_parts(self.ptr as *const am::sync::Have, self.len) }; + let storage = unsafe { &mut *(self.storage as *mut BTreeMap) }; + let index = self.get_index(); + let value = match storage.get_mut(&index) { + Some(value) => value, + None => { + storage.insert(index, AMsyncHave::new(&slice[index])); + storage.get_mut(&index).unwrap() + } + }; + self.advance(n); + Some(value) + } + + pub fn is_stopped(&self) -> bool { + let len = self.len as isize; + self.offset < -len || self.offset == len + } + + pub fn prev(&mut self, n: isize) -> Option<*const AMsyncHave> { + self.advance(-n); + if self.is_stopped() { + return None; + } + let slice: &[am::sync::Have] = + unsafe { std::slice::from_raw_parts(self.ptr as *const am::sync::Have, self.len) }; + let storage = unsafe { &mut *(self.storage as *mut BTreeMap) }; + let index = self.get_index(); + Some(match storage.get_mut(&index) { + Some(value) => value, + None => { + storage.insert(index, AMsyncHave::new(&slice[index])); + storage.get_mut(&index).unwrap() + } + }) + } + + pub fn reversed(&self) -> Self { + Self { + len: self.len, + offset: -(self.offset + 1), + ptr: self.ptr, + storage: self.storage, + } + } + + pub fn rewound(&self) -> Self { + Self { + len: self.len, + offset: if self.offset < 0 { -1 } else { 0 }, + ptr: self.ptr, + storage: self.storage, + } + } +} + +impl From for [u8; USIZE_USIZE_USIZE_USIZE_] { + fn from(detail: Detail) -> Self { + unsafe { + std::slice::from_raw_parts( + (&detail as *const Detail) as *const u8, + USIZE_USIZE_USIZE_USIZE_, + ) + .try_into() + .unwrap() + } + } +} + +/// \struct AMsyncHaves +/// \installed_headerfile +/// \brief A random-access iterator over a sequence of synchronization haves. +#[repr(C)] +#[derive(Eq, PartialEq)] +pub struct AMsyncHaves { + /// An implementation detail that is intentionally opaque. + /// \warning Modifying \p detail will cause undefined behavior. + /// \note The actual size of \p detail will vary by platform, this is just + /// the one for the platform this documentation was built on. + detail: [u8; USIZE_USIZE_USIZE_USIZE_], +} + +impl AMsyncHaves { + pub fn new(haves: &[am::sync::Have], storage: &mut BTreeMap) -> Self { + Self { + detail: Detail::new(haves, 0, storage).into(), + } + } + + pub fn advance(&mut self, n: isize) { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.advance(n); + } + + pub fn len(&self) -> usize { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + detail.len + } + + pub fn next(&mut self, n: isize) -> Option<*const AMsyncHave> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.next(n) + } + + pub fn prev(&mut self, n: isize) -> Option<*const AMsyncHave> { + let detail = unsafe { &mut *(self.detail.as_mut_ptr() as *mut Detail) }; + detail.prev(n) + } + + pub fn reversed(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.reversed().into(), + } + } + + pub fn rewound(&self) -> Self { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + Self { + detail: detail.rewound().into(), + } + } +} + +impl AsRef<[am::sync::Have]> for AMsyncHaves { + fn as_ref(&self) -> &[am::sync::Have] { + let detail = unsafe { &*(self.detail.as_ptr() as *const Detail) }; + unsafe { std::slice::from_raw_parts(detail.ptr as *const am::sync::Have, detail.len) } + } +} + +impl Default for AMsyncHaves { + fn default() -> Self { + Self { + detail: [0; USIZE_USIZE_USIZE_USIZE_], + } + } +} + +/// \memberof AMsyncHaves +/// \brief Advances an iterator over a sequence of synchronization haves by at +/// most \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] sync_haves A pointer to an `AMsyncHaves` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesAdvance(sync_haves: *mut AMsyncHaves, n: isize) { + if let Some(sync_haves) = sync_haves.as_mut() { + sync_haves.advance(n); + }; +} + +/// \memberof AMsyncHaves +/// \brief Tests the equality of two sequences of synchronization haves +/// underlying a pair of iterators. +/// +/// \param[in] sync_haves1 A pointer to an `AMsyncHaves` struct. +/// \param[in] sync_haves2 A pointer to an `AMsyncHaves` struct. +/// \return `true` if \p sync_haves1 `==` \p sync_haves2 and `false` otherwise. +/// \pre \p sync_haves1 `!= NULL`. +/// \pre \p sync_haves2 `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves1 must be a valid pointer to an AMsyncHaves +/// sync_haves2 must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesEqual( + sync_haves1: *const AMsyncHaves, + sync_haves2: *const AMsyncHaves, +) -> bool { + match (sync_haves1.as_ref(), sync_haves2.as_ref()) { + (Some(sync_haves1), Some(sync_haves2)) => sync_haves1.as_ref() == sync_haves2.as_ref(), + (None, Some(_)) | (Some(_), None) | (None, None) => false, + } +} + +/// \memberof AMsyncHaves +/// \brief Gets the synchronization have at the current position of an iterator +/// over a sequence of synchronization haves and then advances it by at +/// most \p |n| positions where the sign of \p n is relative to the +/// iterator's direction. +/// +/// \param[in,out] sync_haves A pointer to an `AMsyncHaves` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMsyncHave` struct that's `NULL` when +/// \p sync_haves was previously advanced past its forward/reverse +/// limit. +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesNext( + sync_haves: *mut AMsyncHaves, + n: isize, +) -> *const AMsyncHave { + if let Some(sync_haves) = sync_haves.as_mut() { + if let Some(sync_have) = sync_haves.next(n) { + return sync_have; + } + } + std::ptr::null() +} + +/// \memberof AMsyncHaves +/// \brief Advances an iterator over a sequence of synchronization haves by at +/// most \p |n| positions where the sign of \p n is relative to the +/// iterator's direction and then gets the synchronization have at its +/// new position. +/// +/// \param[in,out] sync_haves A pointer to an `AMsyncHaves` struct. +/// \param[in] n The direction (\p -n -> opposite, \p n -> same) and maximum +/// number of positions to advance. +/// \return A pointer to an `AMsyncHave` struct that's `NULL` when +/// \p sync_haves is presently advanced past its forward/reverse limit. +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesPrev( + sync_haves: *mut AMsyncHaves, + n: isize, +) -> *const AMsyncHave { + if let Some(sync_haves) = sync_haves.as_mut() { + if let Some(sync_have) = sync_haves.prev(n) { + return sync_have; + } + } + std::ptr::null() +} + +/// \memberof AMsyncHaves +/// \brief Gets the size of the sequence of synchronization haves underlying an +/// iterator. +/// +/// \param[in] sync_haves A pointer to an `AMsyncHaves` struct. +/// \return The count of values in \p sync_haves. +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesSize(sync_haves: *const AMsyncHaves) -> usize { + if let Some(sync_haves) = sync_haves.as_ref() { + sync_haves.len() + } else { + 0 + } +} + +/// \memberof AMsyncHaves +/// \brief Creates an iterator over the same sequence of synchronization haves +/// as the given one but with the opposite position and direction. +/// +/// \param[in] sync_haves A pointer to an `AMsyncHaves` struct. +/// \return An `AMsyncHaves` struct +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesReversed(sync_haves: *const AMsyncHaves) -> AMsyncHaves { + if let Some(sync_haves) = sync_haves.as_ref() { + sync_haves.reversed() + } else { + Default::default() + } +} + +/// \memberof AMsyncHaves +/// \brief Creates an iterator at the starting position over the same sequence +/// of synchronization haves as the given one. +/// +/// \param[in] sync_haves A pointer to an `AMsyncHaves` struct. +/// \return An `AMsyncHaves` struct +/// \pre \p sync_haves `!= NULL`. +/// \internal +/// +/// #Safety +/// sync_haves must be a valid pointer to an AMsyncHaves +#[no_mangle] +pub unsafe extern "C" fn AMsyncHavesRewound(sync_haves: *const AMsyncHaves) -> AMsyncHaves { + if let Some(sync_haves) = sync_haves.as_ref() { + sync_haves.rewound() + } else { + Default::default() + } +} diff --git a/rust/automerge-c/src/sync/message.rs b/rust/automerge-c/src/sync/message.rs index bdb1db34..46a6d29a 100644 --- a/rust/automerge-c/src/sync/message.rs +++ b/rust/automerge-c/src/sync/message.rs @@ -3,15 +3,18 @@ use std::cell::RefCell; use std::collections::BTreeMap; use crate::change::AMchange; +use crate::change_hashes::AMchangeHashes; +use crate::changes::AMchanges; use crate::result::{to_result, AMresult}; use crate::sync::have::AMsyncHave; +use crate::sync::haves::AMsyncHaves; macro_rules! to_sync_message { ($handle:expr) => {{ let handle = $handle.as_ref(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMsyncMessage*`").into(), + None => return AMresult::err("Invalid AMsyncMessage pointer").into(), } }}; } @@ -48,52 +51,55 @@ impl AsRef for AMsyncMessage { /// \brief Gets the changes for the recipient to apply. /// /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE` items. -/// \pre \p sync_message `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchanges` struct. +/// \pre \p sync_message `!= NULL`. /// \internal /// /// # Safety /// sync_message must be a valid pointer to an AMsyncMessage #[no_mangle] -pub unsafe extern "C" fn AMsyncMessageChanges(sync_message: *const AMsyncMessage) -> *mut AMresult { - to_result(match sync_message.as_ref() { - Some(sync_message) => sync_message.body.changes.as_slice(), - None => Default::default(), - }) +pub unsafe extern "C" fn AMsyncMessageChanges(sync_message: *const AMsyncMessage) -> AMchanges { + if let Some(sync_message) = sync_message.as_ref() { + AMchanges::new( + &sync_message.body.changes, + &mut sync_message.changes_storage.borrow_mut(), + ) + } else { + Default::default() + } } /// \memberof AMsyncMessage -/// \brief Decodes an array of bytes into a synchronization message. +/// \brief Decodes a sequence of bytes into a synchronization message. /// /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to decode from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_SYNC_MESSAGE` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src to decode. +/// \return A pointer to an `AMresult` struct containing an `AMsyncMessage` +/// struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMsyncMessageDecode(src: *const u8, count: usize) -> *mut AMresult { - let data = std::slice::from_raw_parts(src, count); - to_result(am::sync::Message::decode(data)) + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(am::sync::Message::decode(&data)) } /// \memberof AMsyncMessage -/// \brief Encodes a synchronization message as an array of bytes. +/// \brief Encodes a synchronization message as a sequence of bytes. /// /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BYTES` item. -/// \pre \p sync_message `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing an array of bytes as +/// an `AMbyteSpan` struct. +/// \pre \p sync_message `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -108,40 +114,41 @@ pub unsafe extern "C" fn AMsyncMessageEncode(sync_message: *const AMsyncMessage) /// \brief Gets a summary of the changes that the sender already has. /// /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with `AM_SYNC_HAVE` items. -/// \pre \p sync_message `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMhaves` struct. +/// \pre \p sync_message `!= NULL`. /// \internal /// /// # Safety /// sync_message must be a valid pointer to an AMsyncMessage #[no_mangle] -pub unsafe extern "C" fn AMsyncMessageHaves(sync_message: *const AMsyncMessage) -> *mut AMresult { - to_result(match sync_message.as_ref() { - Some(sync_message) => sync_message.as_ref().have.as_slice(), - None => Default::default(), - }) +pub unsafe extern "C" fn AMsyncMessageHaves(sync_message: *const AMsyncMessage) -> AMsyncHaves { + if let Some(sync_message) = sync_message.as_ref() { + AMsyncHaves::new( + &sync_message.as_ref().have, + &mut sync_message.haves_storage.borrow_mut(), + ) + } else { + Default::default() + } } /// \memberof AMsyncMessage /// \brief Gets the heads of the sender. /// /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_message `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_message `!= NULL`. /// \internal /// /// # Safety /// sync_message must be a valid pointer to an AMsyncMessage #[no_mangle] -pub unsafe extern "C" fn AMsyncMessageHeads(sync_message: *const AMsyncMessage) -> *mut AMresult { - to_result(match sync_message.as_ref() { - Some(sync_message) => sync_message.as_ref().heads.as_slice(), - None => Default::default(), - }) +pub unsafe extern "C" fn AMsyncMessageHeads(sync_message: *const AMsyncMessage) -> AMchangeHashes { + if let Some(sync_message) = sync_message.as_ref() { + AMchangeHashes::new(&sync_message.as_ref().heads) + } else { + Default::default() + } } /// \memberof AMsyncMessage @@ -149,18 +156,17 @@ pub unsafe extern "C" fn AMsyncMessageHeads(sync_message: *const AMsyncMessage) /// by the recipient. /// /// \param[in] sync_message A pointer to an `AMsyncMessage` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_message `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_message `!= NULL`. /// \internal /// /// # Safety /// sync_message must be a valid pointer to an AMsyncMessage #[no_mangle] -pub unsafe extern "C" fn AMsyncMessageNeeds(sync_message: *const AMsyncMessage) -> *mut AMresult { - to_result(match sync_message.as_ref() { - Some(sync_message) => sync_message.as_ref().need.as_slice(), - None => Default::default(), - }) +pub unsafe extern "C" fn AMsyncMessageNeeds(sync_message: *const AMsyncMessage) -> AMchangeHashes { + if let Some(sync_message) = sync_message.as_ref() { + AMchangeHashes::new(&sync_message.as_ref().need) + } else { + Default::default() + } } diff --git a/rust/automerge-c/src/sync/state.rs b/rust/automerge-c/src/sync/state.rs index 1d85ed98..1c1d316f 100644 --- a/rust/automerge-c/src/sync/state.rs +++ b/rust/automerge-c/src/sync/state.rs @@ -2,15 +2,17 @@ use automerge as am; use std::cell::RefCell; use std::collections::BTreeMap; +use crate::change_hashes::AMchangeHashes; use crate::result::{to_result, AMresult}; use crate::sync::have::AMsyncHave; +use crate::sync::haves::AMsyncHaves; macro_rules! to_sync_state { ($handle:expr) => {{ let handle = $handle.as_ref(); match handle { Some(b) => b, - None => return AMresult::error("Invalid `AMsyncState*`").into(), + None => return AMresult::err("Invalid AMsyncState pointer").into(), } }}; } @@ -54,35 +56,36 @@ impl From for *mut AMsyncState { } /// \memberof AMsyncState -/// \brief Decodes an array of bytes into a synchronization state. +/// \brief Decodes a sequence of bytes into a synchronization state. /// /// \param[in] src A pointer to an array of bytes. -/// \param[in] count The count of bytes to decode from the array pointed to by -/// \p src. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_SYNC_STATE` item. -/// \pre \p src `!= NULL` -/// \pre `sizeof(`\p src `) > 0` -/// \pre \p count `<= sizeof(`\p src `)` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \param[in] count The number of bytes in \p src to decode. +/// \return A pointer to an `AMresult` struct containing an `AMsyncState` +/// struct. +/// \pre \p src `!= NULL`. +/// \pre `0 <` \p count `<= sizeof(`\p src`)`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety -/// src must be a byte array of length `>= count` +/// src must be a byte array of size `>= count` #[no_mangle] pub unsafe extern "C" fn AMsyncStateDecode(src: *const u8, count: usize) -> *mut AMresult { - let data = std::slice::from_raw_parts(src, count); - to_result(am::sync::State::decode(data)) + let mut data = Vec::new(); + data.extend_from_slice(std::slice::from_raw_parts(src, count)); + to_result(am::sync::State::decode(&data)) } /// \memberof AMsyncState -/// \brief Encodes a synchronization state as an array of bytes. +/// \brief Encodes a synchronizaton state as a sequence of bytes. /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_BYTE_SPAN` item. -/// \pre \p sync_state `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing an array of bytes as +/// an `AMbyteSpan` struct. +/// \pre \p sync_state `!= NULL`. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. /// \internal /// /// # Safety @@ -99,9 +102,8 @@ pub unsafe extern "C" fn AMsyncStateEncode(sync_state: *const AMsyncState) -> *m /// \param[in] sync_state1 A pointer to an `AMsyncState` struct. /// \param[in] sync_state2 A pointer to an `AMsyncState` struct. /// \return `true` if \p sync_state1 `==` \p sync_state2 and `false` otherwise. -/// \pre \p sync_state1 `!= NULL` -/// \pre \p sync_state2 `!= NULL` -/// \post `!(`\p sync_state1 `&&` \p sync_state2 `) -> false` +/// \pre \p sync_state1 `!= NULL`. +/// \pre \p sync_state2 `!= NULL`. /// \internal /// /// #Safety @@ -114,17 +116,18 @@ pub unsafe extern "C" fn AMsyncStateEqual( ) -> bool { match (sync_state1.as_ref(), sync_state2.as_ref()) { (Some(sync_state1), Some(sync_state2)) => sync_state1.as_ref() == sync_state2.as_ref(), - (None, None) | (None, Some(_)) | (Some(_), None) => false, + (None, Some(_)) | (Some(_), None) | (None, None) => false, } } /// \memberof AMsyncState -/// \brief Allocates a new synchronization state and initializes it from -/// default values. +/// \brief Allocates a new synchronization state and initializes it with +/// defaults. /// -/// \return A pointer to an `AMresult` struct with an `AM_VAL_TYPE_SYNC_STATE` item. -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return A pointer to an `AMresult` struct containing a pointer to an +/// `AMsyncState` struct. +/// \warning The returned `AMresult` struct must be deallocated with `AMfree()` +/// in order to prevent a memory leak. #[no_mangle] pub extern "C" fn AMsyncStateInit() -> *mut AMresult { to_result(am::sync::State::new()) @@ -134,36 +137,40 @@ pub extern "C" fn AMsyncStateInit() -> *mut AMresult { /// \brief Gets the heads that are shared by both peers. /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_state `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_state `!= NULL`. /// \internal /// /// # Safety /// sync_state must be a valid pointer to an AMsyncState #[no_mangle] -pub unsafe extern "C" fn AMsyncStateSharedHeads(sync_state: *const AMsyncState) -> *mut AMresult { - let sync_state = to_sync_state!(sync_state); - to_result(sync_state.as_ref().shared_heads.as_slice()) +pub unsafe extern "C" fn AMsyncStateSharedHeads(sync_state: *const AMsyncState) -> AMchangeHashes { + if let Some(sync_state) = sync_state.as_ref() { + AMchangeHashes::new(&sync_state.as_ref().shared_heads) + } else { + Default::default() + } } /// \memberof AMsyncState /// \brief Gets the heads that were last sent by this peer. /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_state `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_state `!= NULL`. /// \internal /// /// # Safety /// sync_state must be a valid pointer to an AMsyncState #[no_mangle] -pub unsafe extern "C" fn AMsyncStateLastSentHeads(sync_state: *const AMsyncState) -> *mut AMresult { - let sync_state = to_sync_state!(sync_state); - to_result(sync_state.as_ref().last_sent_heads.as_slice()) +pub unsafe extern "C" fn AMsyncStateLastSentHeads( + sync_state: *const AMsyncState, +) -> AMchangeHashes { + if let Some(sync_state) = sync_state.as_ref() { + AMchangeHashes::new(&sync_state.as_ref().last_sent_heads) + } else { + Default::default() + } } /// \memberof AMsyncState @@ -171,13 +178,11 @@ pub unsafe extern "C" fn AMsyncStateLastSentHeads(sync_state: *const AMsyncState /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. /// \param[out] has_value A pointer to a boolean flag that is set to `true` if -/// the returned `AMitems` struct is relevant, `false` otherwise. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_SYNC_HAVE` items. -/// \pre \p sync_state `!= NULL` -/// \pre \p has_value `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. -//// \internal +/// the returned `AMhaves` struct is relevant, `false` otherwise. +/// \return An `AMhaves` struct. +/// \pre \p sync_state `!= NULL`. +/// \pre \p has_value `!= NULL`. +/// \internal /// /// # Safety /// sync_state must be a valid pointer to an AMsyncState @@ -186,15 +191,15 @@ pub unsafe extern "C" fn AMsyncStateLastSentHeads(sync_state: *const AMsyncState pub unsafe extern "C" fn AMsyncStateTheirHaves( sync_state: *const AMsyncState, has_value: *mut bool, -) -> *mut AMresult { +) -> AMsyncHaves { if let Some(sync_state) = sync_state.as_ref() { if let Some(haves) = &sync_state.as_ref().their_have { *has_value = true; - return to_result(haves.as_slice()); - } + return AMsyncHaves::new(haves, &mut sync_state.their_haves_storage.borrow_mut()); + }; }; *has_value = false; - to_result(Vec::::new()) + Default::default() } /// \memberof AMsyncState @@ -202,31 +207,29 @@ pub unsafe extern "C" fn AMsyncStateTheirHaves( /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. /// \param[out] has_value A pointer to a boolean flag that is set to `true` if -/// the returned `AMitems` struct is relevant, `false` -/// otherwise. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_state `!= NULL` -/// \pre \p has_value `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// the returned `AMchangeHashes` struct is relevant, `false` +/// otherwise. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_state `!= NULL`. +/// \pre \p has_value `!= NULL`. /// \internal /// /// # Safety /// sync_state must be a valid pointer to an AMsyncState -/// has_value must be a valid pointer to a bool +/// has_value must be a valid pointer to a bool. #[no_mangle] pub unsafe extern "C" fn AMsyncStateTheirHeads( sync_state: *const AMsyncState, has_value: *mut bool, -) -> *mut AMresult { +) -> AMchangeHashes { if let Some(sync_state) = sync_state.as_ref() { if let Some(change_hashes) = &sync_state.as_ref().their_heads { *has_value = true; - return to_result(change_hashes.as_slice()); + return AMchangeHashes::new(change_hashes); } }; *has_value = false; - to_result(Vec::::new()) + Default::default() } /// \memberof AMsyncState @@ -234,29 +237,27 @@ pub unsafe extern "C" fn AMsyncStateTheirHeads( /// /// \param[in] sync_state A pointer to an `AMsyncState` struct. /// \param[out] has_value A pointer to a boolean flag that is set to `true` if -/// the returned `AMitems` struct is relevant, `false` -/// otherwise. -/// \return A pointer to an `AMresult` struct with `AM_VAL_TYPE_CHANGE_HASH` items. -/// \pre \p sync_state `!= NULL` -/// \pre \p has_value `!= NULL` -/// \warning The returned `AMresult` struct pointer must be passed to -/// `AMresultFree()` in order to avoid a memory leak. +/// the returned `AMchangeHashes` struct is relevant, `false` +/// otherwise. +/// \return An `AMchangeHashes` struct. +/// \pre \p sync_state `!= NULL`. +/// \pre \p has_value `!= NULL`. /// \internal /// /// # Safety /// sync_state must be a valid pointer to an AMsyncState -/// has_value must be a valid pointer to a bool +/// has_value must be a valid pointer to a bool. #[no_mangle] pub unsafe extern "C" fn AMsyncStateTheirNeeds( sync_state: *const AMsyncState, has_value: *mut bool, -) -> *mut AMresult { +) -> AMchangeHashes { if let Some(sync_state) = sync_state.as_ref() { if let Some(change_hashes) = &sync_state.as_ref().their_need { *has_value = true; - return to_result(change_hashes.as_slice()); + return AMchangeHashes::new(change_hashes); } }; *has_value = false; - to_result(Vec::::new()) + Default::default() } diff --git a/rust/automerge-c/src/utils/result.c b/rust/automerge-c/src/utils/result.c deleted file mode 100644 index f922ca31..00000000 --- a/rust/automerge-c/src/utils/result.c +++ /dev/null @@ -1,33 +0,0 @@ -#include - -#include - -AMresult* AMresultFrom(int count, ...) { - AMresult* result = NULL; - bool is_ok = true; - va_list args; - va_start(args, count); - for (int i = 0; i != count; ++i) { - AMresult* src = va_arg(args, AMresult*); - AMresult* dest = result; - is_ok = (AMresultStatus(src) == AM_STATUS_OK); - if (is_ok) { - if (dest) { - result = AMresultCat(dest, src); - is_ok = (AMresultStatus(result) == AM_STATUS_OK); - AMresultFree(dest); - AMresultFree(src); - } else { - result = src; - } - } else { - AMresultFree(src); - } - } - va_end(args); - if (!is_ok) { - AMresultFree(result); - result = NULL; - } - return result; -} diff --git a/rust/automerge-c/src/utils/stack.c b/rust/automerge-c/src/utils/stack.c deleted file mode 100644 index 2cad7c5c..00000000 --- a/rust/automerge-c/src/utils/stack.c +++ /dev/null @@ -1,106 +0,0 @@ -#include -#include - -#include -#include - -void AMstackFree(AMstack** stack) { - if (stack) { - while (*stack) { - AMresultFree(AMstackPop(stack, NULL)); - } - } -} - -AMresult* AMstackPop(AMstack** stack, const AMresult* result) { - if (!stack) { - return NULL; - } - AMstack** prev = stack; - if (result) { - while (*prev && ((*prev)->result != result)) { - *prev = (*prev)->prev; - } - } - if (!*prev) { - return NULL; - } - AMstack* target = *prev; - *prev = target->prev; - AMresult* popped = target->result; - free(target); - return popped; -} - -AMresult* AMstackResult(AMstack** stack, AMresult* result, AMstackCallback callback, void* data) { - if (!stack) { - if (callback) { - /* Create a local stack so that the callback can still examine the - * result. */ - AMstack node = {.result = result, .prev = NULL}; - AMstack* stack = &node; - callback(&stack, data); - } else { - /* \note There is no reason to call this function when both the - * stack and the callback are null. */ - fprintf(stderr, "ERROR: NULL AMstackCallback!\n"); - } - /* \note Nothing can be returned without a stack regardless of - * whether or not the callback validated the result. */ - AMresultFree(result); - return NULL; - } - /* Always push the result onto the stack, even if it's null, so that the - * callback can examine it. */ - AMstack* next = calloc(1, sizeof(AMstack)); - *next = (AMstack){.result = result, .prev = *stack}; - AMstack* top = next; - *stack = top; - if (callback) { - if (!callback(stack, data)) { - /* The result didn't pass the callback's examination. */ - return NULL; - } - } else { - /* Report an obvious error. */ - if (result) { - AMbyteSpan const err_msg = AMresultError(result); - if (err_msg.src && err_msg.count) { - /* \note The callback may be null because the result is supposed - * to be examined externally so return it despite an - * error. */ - char* const cstr = AMstrdup(err_msg, NULL); - fprintf(stderr, "WARNING: %s.\n", cstr); - free(cstr); - } - } else { - /* \note There's no reason to call this function when both the - * result and the callback are null. */ - fprintf(stderr, "ERROR: NULL AMresult*!\n"); - return NULL; - } - } - return result; -} - -AMitem* AMstackItem(AMstack** stack, AMresult* result, AMstackCallback callback, void* data) { - AMitems items = AMstackItems(stack, result, callback, data); - return AMitemsNext(&items, 1); -} - -AMitems AMstackItems(AMstack** stack, AMresult* result, AMstackCallback callback, void* data) { - return (AMstackResult(stack, result, callback, data)) ? AMresultItems(result) : (AMitems){0}; -} - -size_t AMstackSize(AMstack const* const stack) { - if (!stack) { - return 0; - } - size_t count = 0; - AMstack const* prev = stack; - while (prev) { - ++count; - prev = prev->prev; - } - return count; -} \ No newline at end of file diff --git a/rust/automerge-c/src/utils/stack_callback_data.c b/rust/automerge-c/src/utils/stack_callback_data.c deleted file mode 100644 index f1e988d8..00000000 --- a/rust/automerge-c/src/utils/stack_callback_data.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#include - -AMstackCallbackData* AMstackCallbackDataInit(AMvalType const bitmask, char const* const file, int const line) { - AMstackCallbackData* data = malloc(sizeof(AMstackCallbackData)); - *data = (AMstackCallbackData){.bitmask = bitmask, .file = file, .line = line}; - return data; -} diff --git a/rust/automerge-c/src/utils/string.c b/rust/automerge-c/src/utils/string.c deleted file mode 100644 index a0d1ebe3..00000000 --- a/rust/automerge-c/src/utils/string.c +++ /dev/null @@ -1,46 +0,0 @@ -#include -#include - -#include - -char* AMstrdup(AMbyteSpan const str, char const* nul) { - if (!str.src) { - return NULL; - } else if (!str.count) { - return strdup(""); - } - nul = (nul) ? nul : "\\0"; - size_t const nul_len = strlen(nul); - char* dup = NULL; - size_t dup_len = 0; - char const* begin = str.src; - char const* end = begin; - for (size_t i = 0; i != str.count; ++i, ++end) { - if (!*end) { - size_t const len = end - begin; - size_t const alloc_len = dup_len + len + nul_len; - if (dup) { - dup = realloc(dup, alloc_len + 1); - } else { - dup = malloc(alloc_len + 1); - } - memcpy(dup + dup_len, begin, len); - memcpy(dup + dup_len + len, nul, nul_len); - dup[alloc_len] = '\0'; - begin = end + 1; - dup_len = alloc_len; - } - } - if (begin != end) { - size_t const len = end - begin; - size_t const alloc_len = dup_len + len; - if (dup) { - dup = realloc(dup, alloc_len + 1); - } else { - dup = malloc(alloc_len + 1); - } - memcpy(dup + dup_len, begin, len); - dup[alloc_len] = '\0'; - } - return dup; -} diff --git a/rust/automerge-c/test/CMakeLists.txt b/rust/automerge-c/test/CMakeLists.txt index 1759f140..704a27da 100644 --- a/rust/automerge-c/test/CMakeLists.txt +++ b/rust/automerge-c/test/CMakeLists.txt @@ -1,51 +1,53 @@ -find_package(cmocka CONFIG REQUIRED) +cmake_minimum_required(VERSION 3.18 FATAL_ERROR) + +find_package(cmocka REQUIRED) add_executable( - ${LIBRARY_NAME}_test + test_${LIBRARY_NAME} actor_id_tests.c - base_state.c - byte_span_tests.c - cmocka_utils.c - enum_string_tests.c - doc_state.c doc_tests.c - item_tests.c + group_state.c list_tests.c macro_utils.c main.c map_tests.c + stack_utils.c str_utils.c ported_wasm/basic_tests.c ported_wasm/suite.c ported_wasm/sync_tests.c ) -set_target_properties(${LIBRARY_NAME}_test PROPERTIES LINKER_LANGUAGE C) +set_target_properties(test_${LIBRARY_NAME} PROPERTIES LINKER_LANGUAGE C) -if(WIN32) - set(CMOCKA "cmocka::cmocka") -else() - set(CMOCKA "cmocka") -endif() +# \note An imported library's INTERFACE_INCLUDE_DIRECTORIES property can't +# contain a non-existent path so its build-time include directory +# must be specified for all of its dependent targets instead. +target_include_directories( + test_${LIBRARY_NAME} + PRIVATE "$" +) -target_link_libraries(${LIBRARY_NAME}_test PRIVATE ${CMOCKA} ${LIBRARY_NAME}) +target_link_libraries(test_${LIBRARY_NAME} PRIVATE cmocka ${LIBRARY_NAME}) -add_dependencies(${LIBRARY_NAME}_test ${BINDINGS_NAME}_artifacts) +add_dependencies(test_${LIBRARY_NAME} ${LIBRARY_NAME}_artifacts) if(BUILD_SHARED_LIBS AND WIN32) add_custom_command( - TARGET ${LIBRARY_NAME}_test + TARGET test_${LIBRARY_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different $ $ - COMMENT "Copying the DLL into the tests directory..." + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CARGO_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBRARY_NAME}${CMAKE_${CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX} + ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Copying the DLL built by Cargo into the test directory..." VERBATIM ) endif() -add_test(NAME ${LIBRARY_NAME}_test COMMAND ${LIBRARY_NAME}_test) +add_test(NAME test_${LIBRARY_NAME} COMMAND test_${LIBRARY_NAME}) add_custom_command( - TARGET ${LIBRARY_NAME}_test + TARGET test_${LIBRARY_NAME} POST_BUILD COMMAND ${CMAKE_CTEST_COMMAND} --config $ --output-on-failure diff --git a/rust/automerge-c/test/actor_id_tests.c b/rust/automerge-c/test/actor_id_tests.c index 918d6213..c98f2554 100644 --- a/rust/automerge-c/test/actor_id_tests.c +++ b/rust/automerge-c/test/actor_id_tests.c @@ -14,126 +14,99 @@ #include "cmocka_utils.h" #include "str_utils.h" -/** - * \brief State for a group of cmocka test cases. - */ typedef struct { - /** An actor ID as an array of bytes. */ uint8_t* src; - /** The count of bytes in \p src. */ - size_t count; - /** A stack of results. */ - AMstack* stack; - /** An actor ID as a hexadecimal string. */ AMbyteSpan str; -} DocState; + size_t count; +} GroupState; static int group_setup(void** state) { - DocState* doc_state = test_calloc(1, sizeof(DocState)); - doc_state->str = AMstr("000102030405060708090a0b0c0d0e0f"); - doc_state->count = doc_state->str.count / 2; - doc_state->src = test_calloc(doc_state->count, sizeof(uint8_t)); - hex_to_bytes(doc_state->str.src, doc_state->src, doc_state->count); - *state = doc_state; + GroupState* group_state = test_calloc(1, sizeof(GroupState)); + group_state->str.src = "000102030405060708090a0b0c0d0e0f"; + group_state->str.count = strlen(group_state->str.src); + group_state->count = group_state->str.count / 2; + group_state->src = test_malloc(group_state->count); + hex_to_bytes(group_state->str.src, group_state->src, group_state->count); + *state = group_state; return 0; } static int group_teardown(void** state) { - DocState* doc_state = *state; - test_free(doc_state->src); - AMstackFree(&doc_state->stack); - test_free(doc_state); + GroupState* group_state = *state; + test_free(group_state->src); + test_free(group_state); return 0; } -static void test_AMactorIdFromBytes(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->stack; - /* Non-empty string. */ - AMresult* result = AMstackResult(stack_ptr, AMactorIdFromBytes(doc_state->src, doc_state->count), NULL, NULL); - if (AMresultStatus(result) != AM_STATUS_OK) { - fail_msg_view("%s", AMresultError(result)); - } - assert_int_equal(AMresultSize(result), 1); - AMitem* const item = AMresultItem(result); - assert_int_equal(AMitemValType(item), AM_VAL_TYPE_ACTOR_ID); - AMactorId const* actor_id; - assert_true(AMitemToActorId(item, &actor_id)); - AMbyteSpan const bytes = AMactorIdBytes(actor_id); - assert_int_equal(bytes.count, doc_state->count); - assert_memory_equal(bytes.src, doc_state->src, bytes.count); - /* Empty array. */ - /** \todo Find out if this is intentionally allowed. */ - result = AMstackResult(stack_ptr, AMactorIdFromBytes(doc_state->src, 0), NULL, NULL); - if (AMresultStatus(result) != AM_STATUS_OK) { - fail_msg_view("%s", AMresultError(result)); - } - /* NULL array. */ - result = AMstackResult(stack_ptr, AMactorIdFromBytes(NULL, doc_state->count), NULL, NULL); - if (AMresultStatus(result) == AM_STATUS_OK) { - fail_msg("AMactorId from NULL."); - } -} - -static void test_AMactorIdFromStr(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->stack; - AMresult* result = AMstackResult(stack_ptr, AMactorIdFromStr(doc_state->str), NULL, NULL); - if (AMresultStatus(result) != AM_STATUS_OK) { - fail_msg_view("%s", AMresultError(result)); - } - assert_int_equal(AMresultSize(result), 1); - AMitem* const item = AMresultItem(result); - assert_int_equal(AMitemValType(item), AM_VAL_TYPE_ACTOR_ID); - /* The hexadecimal string should've been decoded as identical bytes. */ - AMactorId const* actor_id; - assert_true(AMitemToActorId(item, &actor_id)); - AMbyteSpan const bytes = AMactorIdBytes(actor_id); - assert_int_equal(bytes.count, doc_state->count); - assert_memory_equal(bytes.src, doc_state->src, bytes.count); - /* The bytes should've been encoded as an identical hexadecimal string. */ - assert_true(AMitemToActorId(item, &actor_id)); - AMbyteSpan const str = AMactorIdStr(actor_id); - assert_int_equal(str.count, doc_state->str.count); - assert_memory_equal(str.src, doc_state->str.src, str.count); -} - -static void test_AMactorIdInit(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->stack; +static void test_AMactorIdInit() { AMresult* prior_result = NULL; AMbyteSpan prior_bytes = {NULL, 0}; AMbyteSpan prior_str = {NULL, 0}; + AMresult* result = NULL; for (size_t i = 0; i != 11; ++i) { - AMresult* result = AMstackResult(stack_ptr, AMactorIdInit(), NULL, NULL); + result = AMactorIdInit(); if (AMresultStatus(result) != AM_STATUS_OK) { - fail_msg_view("%s", AMresultError(result)); + fail_msg_view("%s", AMerrorMessage(result)); } assert_int_equal(AMresultSize(result), 1); - AMitem* const item = AMresultItem(result); - assert_int_equal(AMitemValType(item), AM_VAL_TYPE_ACTOR_ID); - AMactorId const* actor_id; - assert_true(AMitemToActorId(item, &actor_id)); - AMbyteSpan const bytes = AMactorIdBytes(actor_id); - assert_true(AMitemToActorId(item, &actor_id)); - AMbyteSpan const str = AMactorIdStr(actor_id); + AMvalue const value = AMresultValue(result); + assert_int_equal(value.tag, AM_VALUE_ACTOR_ID); + AMbyteSpan const bytes = AMactorIdBytes(value.actor_id); + AMbyteSpan const str = AMactorIdStr(value.actor_id); if (prior_result) { size_t const max_byte_count = fmax(bytes.count, prior_bytes.count); assert_memory_not_equal(bytes.src, prior_bytes.src, max_byte_count); size_t const max_char_count = fmax(str.count, prior_str.count); assert_memory_not_equal(str.src, prior_str.src, max_char_count); + AMfree(prior_result); } prior_result = result; prior_bytes = bytes; prior_str = str; } + AMfree(result); +} + +static void test_AMactorIdInitBytes(void **state) { + GroupState* group_state = *state; + AMresult* const result = AMactorIdInitBytes(group_state->src, group_state->count); + if (AMresultStatus(result) != AM_STATUS_OK) { + fail_msg_view("%s", AMerrorMessage(result)); + } + assert_int_equal(AMresultSize(result), 1); + AMvalue const value = AMresultValue(result); + assert_int_equal(value.tag, AM_VALUE_ACTOR_ID); + AMbyteSpan const bytes = AMactorIdBytes(value.actor_id); + assert_int_equal(bytes.count, group_state->count); + assert_memory_equal(bytes.src, group_state->src, bytes.count); + AMfree(result); +} + +static void test_AMactorIdInitStr(void **state) { + GroupState* group_state = *state; + AMresult* const result = AMactorIdInitStr(group_state->str); + if (AMresultStatus(result) != AM_STATUS_OK) { + fail_msg_view("%s", AMerrorMessage(result)); + } + assert_int_equal(AMresultSize(result), 1); + AMvalue const value = AMresultValue(result); + assert_int_equal(value.tag, AM_VALUE_ACTOR_ID); + /* The hexadecimal string should've been decoded as identical bytes. */ + AMbyteSpan const bytes = AMactorIdBytes(value.actor_id); + assert_int_equal(bytes.count, group_state->count); + assert_memory_equal(bytes.src, group_state->src, bytes.count); + /* The bytes should've been encoded as an identical hexadecimal string. */ + AMbyteSpan const str = AMactorIdStr(value.actor_id); + assert_int_equal(str.count, group_state->str.count); + assert_memory_equal(str.src, group_state->str.src, str.count); + AMfree(result); } int run_actor_id_tests(void) { const struct CMUnitTest tests[] = { - cmocka_unit_test(test_AMactorIdFromBytes), - cmocka_unit_test(test_AMactorIdFromStr), cmocka_unit_test(test_AMactorIdInit), + cmocka_unit_test(test_AMactorIdInitBytes), + cmocka_unit_test(test_AMactorIdInitStr), }; return cmocka_run_group_tests(tests, group_setup, group_teardown); diff --git a/rust/automerge-c/test/base_state.c b/rust/automerge-c/test/base_state.c deleted file mode 100644 index 53325a99..00000000 --- a/rust/automerge-c/test/base_state.c +++ /dev/null @@ -1,17 +0,0 @@ -#include - -/* local */ -#include "base_state.h" - -int setup_base(void** state) { - BaseState* base_state = calloc(1, sizeof(BaseState)); - *state = base_state; - return 0; -} - -int teardown_base(void** state) { - BaseState* base_state = *state; - AMstackFree(&base_state->stack); - free(base_state); - return 0; -} diff --git a/rust/automerge-c/test/base_state.h b/rust/automerge-c/test/base_state.h deleted file mode 100644 index 3c4ff01b..00000000 --- a/rust/automerge-c/test/base_state.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef TESTS_BASE_STATE_H -#define TESTS_BASE_STATE_H - -#include - -/* local */ -#include -#include - -/** - * \struct BaseState - * \brief The shared state for one or more cmocka test cases. - */ -typedef struct { - /** A stack of results. */ - AMstack* stack; -} BaseState; - -/** - * \memberof BaseState - * \brief Sets up the shared state for one or more cmocka test cases. - * - * \param[in,out] state A pointer to a pointer to a `BaseState` struct. - * \pre \p state `!= NULL`. - * \warning The `BaseState` struct returned through \p state must be - * passed to `teardown_base()` in order to avoid a memory leak. - */ -int setup_base(void** state); - -/** - * \memberof BaseState - * \brief Tears down the shared state for one or more cmocka test cases. - * - * \param[in] state A pointer to a pointer to a `BaseState` struct. - * \pre \p state `!= NULL`. - */ -int teardown_base(void** state); - -#endif /* TESTS_BASE_STATE_H */ diff --git a/rust/automerge-c/test/byte_span_tests.c b/rust/automerge-c/test/byte_span_tests.c deleted file mode 100644 index 0b1c86a1..00000000 --- a/rust/automerge-c/test/byte_span_tests.c +++ /dev/null @@ -1,119 +0,0 @@ -#include -#include -#include -#include -#include -#include - -/* third-party */ -#include - -/* local */ -#include -#include - -static void test_AMbytes(void** state) { - static char const DATA[] = {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf}; - - AMbyteSpan bytes = AMbytes(DATA, sizeof(DATA)); - assert_int_equal(bytes.count, sizeof(DATA)); - assert_memory_equal(bytes.src, DATA, bytes.count); - assert_ptr_equal(bytes.src, DATA); - /* Empty view */ - bytes = AMbytes(DATA, 0); - assert_int_equal(bytes.count, 0); - assert_ptr_equal(bytes.src, DATA); - /* Invalid array */ - bytes = AMbytes(NULL, SIZE_MAX); - assert_int_not_equal(bytes.count, SIZE_MAX); - assert_int_equal(bytes.count, 0); - assert_ptr_equal(bytes.src, NULL); -} - -static void test_AMstr(void** state) { - AMbyteSpan str = AMstr("abcdefghijkl"); - assert_int_equal(str.count, strlen("abcdefghijkl")); - assert_memory_equal(str.src, "abcdefghijkl", str.count); - /* Empty string */ - static char const* const EMPTY = ""; - - str = AMstr(EMPTY); - assert_int_equal(str.count, 0); - assert_ptr_equal(str.src, EMPTY); - /* Invalid string */ - str = AMstr(NULL); - assert_int_equal(str.count, 0); - assert_ptr_equal(str.src, NULL); -} - -static void test_AMstrCmp(void** state) { - /* Length ordering */ - assert_int_equal(AMstrCmp(AMstr("abcdef"), AMstr("abcdefghijkl")), -1); - assert_int_equal(AMstrCmp(AMstr("abcdefghijkl"), AMstr("abcdefghijkl")), 0); - assert_int_equal(AMstrCmp(AMstr("abcdefghijkl"), AMstr("abcdef")), 1); - /* Lexicographical ordering */ - assert_int_equal(AMstrCmp(AMstr("abcdef"), AMstr("ghijkl")), -1); - assert_int_equal(AMstrCmp(AMstr("ghijkl"), AMstr("abcdef")), 1); - /* Case ordering */ - assert_int_equal(AMstrCmp(AMstr("ABCDEFGHIJKL"), AMstr("abcdefghijkl")), -1); - assert_int_equal(AMstrCmp(AMstr("ABCDEFGHIJKL"), AMstr("ABCDEFGHIJKL")), 0); - assert_int_equal(AMstrCmp(AMstr("abcdefghijkl"), AMstr("ABCDEFGHIJKL")), 1); - assert_int_equal(AMstrCmp(AMstr("ABCDEFGHIJKL"), AMstr("abcdef")), -1); - assert_int_equal(AMstrCmp(AMstr("abcdef"), AMstr("ABCDEFGHIJKL")), 1); - assert_int_equal(AMstrCmp(AMstr("GHIJKL"), AMstr("abcdef")), -1); - assert_int_equal(AMstrCmp(AMstr("abcdef"), AMstr("GHIJKL")), 1); - /* NUL character inclusion */ - static char const SRC[] = {'a', 'b', 'c', 'd', 'e', 'f', '\0', 'g', 'h', 'i', 'j', 'k', 'l'}; - static AMbyteSpan const NUL_STR = {.src = SRC, .count = 13}; - - assert_int_equal(AMstrCmp(AMstr("abcdef"), NUL_STR), -1); - assert_int_equal(AMstrCmp(NUL_STR, NUL_STR), 0); - assert_int_equal(AMstrCmp(NUL_STR, AMstr("abcdef")), 1); - /* Empty string */ - assert_int_equal(AMstrCmp(AMstr(""), AMstr("abcdefghijkl")), -1); - assert_int_equal(AMstrCmp(AMstr(""), AMstr("")), 0); - assert_int_equal(AMstrCmp(AMstr("abcdefghijkl"), AMstr("")), 1); - /* Invalid string */ - assert_int_equal(AMstrCmp(AMstr(NULL), AMstr("abcdefghijkl")), -1); - assert_int_equal(AMstrCmp(AMstr(NULL), AMstr(NULL)), 0); - assert_int_equal(AMstrCmp(AMstr("abcdefghijkl"), AMstr(NULL)), 1); -} - -static void test_AMstrdup(void** state) { - static char const SRC[] = {'a', 'b', 'c', '\0', 'd', 'e', 'f', '\0', 'g', 'h', 'i', '\0', 'j', 'k', 'l'}; - static AMbyteSpan const NUL_STR = {.src = SRC, .count = 15}; - - /* Default substitution ("\\0") for NUL */ - char* dup = AMstrdup(NUL_STR, NULL); - assert_int_equal(strlen(dup), 18); - assert_string_equal(dup, "abc\\0def\\0ghi\\0jkl"); - free(dup); - /* Arbitrary substitution for NUL */ - dup = AMstrdup(NUL_STR, ":-O"); - assert_int_equal(strlen(dup), 21); - assert_string_equal(dup, "abc:-Odef:-Oghi:-Ojkl"); - free(dup); - /* Empty substitution for NUL */ - dup = AMstrdup(NUL_STR, ""); - assert_int_equal(strlen(dup), 12); - assert_string_equal(dup, "abcdefghijkl"); - free(dup); - /* Empty string */ - dup = AMstrdup(AMstr(""), NULL); - assert_int_equal(strlen(dup), 0); - assert_string_equal(dup, ""); - free(dup); - /* Invalid string */ - assert_null(AMstrdup(AMstr(NULL), NULL)); -} - -int run_byte_span_tests(void) { - const struct CMUnitTest tests[] = { - cmocka_unit_test(test_AMbytes), - cmocka_unit_test(test_AMstr), - cmocka_unit_test(test_AMstrCmp), - cmocka_unit_test(test_AMstrdup), - }; - - return cmocka_run_group_tests(tests, NULL, NULL); -} diff --git a/rust/automerge-c/test/cmocka_utils.c b/rust/automerge-c/test/cmocka_utils.c deleted file mode 100644 index 37c57fb1..00000000 --- a/rust/automerge-c/test/cmocka_utils.c +++ /dev/null @@ -1,88 +0,0 @@ -#include -#include -#include -#include - -/* third-party */ -#include -#include -#include -#include - -/* local */ -#include "cmocka_utils.h" - -/** - * \brief Assert that the given expression is true and report failure in terms - * of a line number within a file. - * - * \param[in] c An expression. - * \param[in] file A file's full path string. - * \param[in] line A line number. - */ -#define assert_true_where(c, file, line) _assert_true(cast_ptr_to_largest_integral_type(c), #c, file, line) - -/** - * \brief Assert that the given pointer is non-NULL and report failure in terms - * of a line number within a file. - * - * \param[in] c An expression. - * \param[in] file A file's full path string. - * \param[in] line A line number. - */ -#define assert_non_null_where(c, file, line) assert_true_where(c, file, line) - -/** - * \brief Forces the test to fail immediately and quit, printing the reason in - * terms of a line number within a file. - * - * \param[in] msg A message string into which \p str is interpolated. - * \param[in] str An owned string. - * \param[in] file A file's full path string. - * \param[in] line A line number. - */ -#define fail_msg_where(msg, str, file, line) \ - do { \ - print_error("ERROR: " msg "\n", str); \ - _fail(file, line); \ - } while (0) - -/** - * \brief Forces the test to fail immediately and quit, printing the reason in - * terms of a line number within a file. - * - * \param[in] msg A message string into which \p view.src is interpolated. - * \param[in] view A UTF-8 string view as an `AMbyteSpan` struct. - * \param[in] file A file's full path string. - * \param[in] line A line number. - */ -#define fail_msg_view_where(msg, view, file, line) \ - do { \ - char* const str = AMstrdup(view, NULL); \ - print_error("ERROR: " msg "\n", str); \ - free(str); \ - _fail(file, line); \ - } while (0) - -bool cmocka_cb(AMstack** stack, void* data) { - assert_non_null(data); - AMstackCallbackData* const sc_data = (AMstackCallbackData*)data; - assert_non_null_where(stack, sc_data->file, sc_data->line); - assert_non_null_where(*stack, sc_data->file, sc_data->line); - assert_non_null_where((*stack)->result, sc_data->file, sc_data->line); - if (AMresultStatus((*stack)->result) != AM_STATUS_OK) { - fail_msg_view_where("%s", AMresultError((*stack)->result), sc_data->file, sc_data->line); - return false; - } - /* Test that the types of all item values are members of the mask. */ - AMitems items = AMresultItems((*stack)->result); - AMitem* item = NULL; - while ((item = AMitemsNext(&items, 1)) != NULL) { - AMvalType const tag = AMitemValType(item); - if (!(tag & sc_data->bitmask)) { - fail_msg_where("Unexpected value type `%s`.", AMvalTypeToString(tag), sc_data->file, sc_data->line); - return false; - } - } - return true; -} diff --git a/rust/automerge-c/test/cmocka_utils.h b/rust/automerge-c/test/cmocka_utils.h index b6611bcc..1b488362 100644 --- a/rust/automerge-c/test/cmocka_utils.h +++ b/rust/automerge-c/test/cmocka_utils.h @@ -1,42 +1,22 @@ -#ifndef TESTS_CMOCKA_UTILS_H -#define TESTS_CMOCKA_UTILS_H +#ifndef CMOCKA_UTILS_H +#define CMOCKA_UTILS_H -#include #include /* third-party */ -#include #include -/* local */ -#include "base_state.h" - /** * \brief Forces the test to fail immediately and quit, printing the reason. * - * \param[in] msg A message string into which \p view.src is interpolated. - * \param[in] view A UTF-8 string view as an `AMbyteSpan` struct. + * \param[in] view A string view as an `AMbyteSpan` struct. */ -#define fail_msg_view(msg, view) \ - do { \ - char* const c_str = AMstrdup(view, NULL); \ - print_error("ERROR: " msg "\n", c_str); \ - free(c_str); \ - fail(); \ - } while (0) +#define fail_msg_view(msg, view) do { \ + char* const c_str = test_calloc(1, view.count + 1); \ + strncpy(c_str, view.src, view.count); \ + print_error(msg, c_str); \ + test_free(c_str); \ + fail(); \ +} while (0) -/** - * \brief Validates the top result in a stack based upon the parameters - * specified within the given data structure and reports violations - * using cmocka assertions. - * - * \param[in,out] stack A pointer to a pointer to an `AMstack` struct. - * \param[in] data A pointer to an owned `AMpushData` struct. - * \return `true` if the top `AMresult` struct in \p stack is valid, `false` - * otherwise. - * \pre \p stack `!= NULL`. - * \pre \p data `!= NULL`. - */ -bool cmocka_cb(AMstack** stack, void* data); - -#endif /* TESTS_CMOCKA_UTILS_H */ +#endif /* CMOCKA_UTILS_H */ diff --git a/rust/automerge-c/test/doc_state.c b/rust/automerge-c/test/doc_state.c deleted file mode 100644 index 3cbece50..00000000 --- a/rust/automerge-c/test/doc_state.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include -#include - -/* third-party */ -#include - -/* local */ -#include -#include "cmocka_utils.h" -#include "doc_state.h" - -int setup_doc(void** state) { - DocState* doc_state = test_calloc(1, sizeof(DocState)); - setup_base((void**)&doc_state->base_state); - AMitemToDoc(AMstackItem(&doc_state->base_state->stack, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), - &doc_state->doc); - *state = doc_state; - return 0; -} - -int teardown_doc(void** state) { - DocState* doc_state = *state; - teardown_base((void**)&doc_state->base_state); - test_free(doc_state); - return 0; -} diff --git a/rust/automerge-c/test/doc_state.h b/rust/automerge-c/test/doc_state.h deleted file mode 100644 index 525a49fa..00000000 --- a/rust/automerge-c/test/doc_state.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef TESTS_DOC_STATE_H -#define TESTS_DOC_STATE_H - -/* local */ -#include -#include "base_state.h" - -typedef struct { - BaseState* base_state; - AMdoc* doc; -} DocState; - -int setup_doc(void** state); - -int teardown_doc(void** state); - -#endif /* TESTS_DOC_STATE_H */ diff --git a/rust/automerge-c/test/doc_tests.c b/rust/automerge-c/test/doc_tests.c index c1d21928..dbd2d8f6 100644 --- a/rust/automerge-c/test/doc_tests.c +++ b/rust/automerge-c/test/doc_tests.c @@ -9,14 +9,12 @@ /* local */ #include -#include -#include "base_state.h" -#include "cmocka_utils.h" -#include "doc_state.h" +#include "group_state.h" +#include "stack_utils.h" #include "str_utils.h" typedef struct { - DocState* doc_state; + GroupState* group_state; AMbyteSpan actor_id_str; uint8_t* actor_id_bytes; size_t actor_id_size; @@ -24,7 +22,7 @@ typedef struct { static int setup(void** state) { TestState* test_state = test_calloc(1, sizeof(TestState)); - setup_doc((void**)&test_state->doc_state); + group_setup((void**)&test_state->group_state); test_state->actor_id_str.src = "000102030405060708090a0b0c0d0e0f"; test_state->actor_id_str.count = strlen(test_state->actor_id_str.src); test_state->actor_id_size = test_state->actor_id_str.count / 2; @@ -36,195 +34,195 @@ static int setup(void** state) { static int teardown(void** state) { TestState* test_state = *state; - teardown_doc((void**)&test_state->doc_state); + group_teardown((void**)&test_state->group_state); test_free(test_state->actor_id_bytes); test_free(test_state); return 0; } -static void test_AMkeys_empty(void** state) { - TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMitems forward = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_int_equal(AMitemsSize(&forward), 0); - AMitems reverse = AMitemsReversed(&forward); - assert_int_equal(AMitemsSize(&reverse), 0); - assert_null(AMitemsNext(&forward, 1)); - assert_null(AMitemsPrev(&forward, 1)); - assert_null(AMitemsNext(&reverse, 1)); - assert_null(AMitemsPrev(&reverse, 1)); +static void test_AMkeys_empty() { + AMresultStack* stack = NULL; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMstrs forward = AMpush(&stack, + AMkeys(doc, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsSize(&forward), 0); + AMstrs reverse = AMstrsReversed(&forward); + assert_int_equal(AMstrsSize(&reverse), 0); + assert_null(AMstrsNext(&forward, 1).src); + assert_null(AMstrsPrev(&forward, 1).src); + assert_null(AMstrsNext(&reverse, 1).src); + assert_null(AMstrsPrev(&reverse, 1).src); + AMfreeStack(&stack); } -static void test_AMkeys_list(void** state) { - TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMlistPutInt(doc, list, 0, true, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutInt(doc, list, 1, true, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutInt(doc, list, 2, true, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMitems forward = AMstackItems(stack_ptr, AMkeys(doc, list, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&forward), 3); - AMitems reverse = AMitemsReversed(&forward); - assert_int_equal(AMitemsSize(&reverse), 3); +static void test_AMkeys_list() { + AMresultStack* stack = NULL; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMlistPutInt(doc, AM_ROOT, 0, true, 1)); + AMfree(AMlistPutInt(doc, AM_ROOT, 1, true, 2)); + AMfree(AMlistPutInt(doc, AM_ROOT, 2, true, 3)); + AMstrs forward = AMpush(&stack, + AMkeys(doc, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsSize(&forward), 3); + AMstrs reverse = AMstrsReversed(&forward); + assert_int_equal(AMstrsSize(&reverse), 3); /* Forward iterator forward. */ - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); + AMbyteSpan str = AMstrsNext(&forward, 1); + assert_ptr_equal(strstr(str.src, "1@"), str.src); + str = AMstrsNext(&forward, 1); assert_ptr_equal(strstr(str.src, "2@"), str.src); - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); + str = AMstrsNext(&forward, 1); assert_ptr_equal(strstr(str.src, "3@"), str.src); - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); - assert_ptr_equal(strstr(str.src, "4@"), str.src); - assert_null(AMitemsNext(&forward, 1)); - // /* Forward iterator reverse. */ - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_ptr_equal(strstr(str.src, "4@"), str.src); - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_ptr_equal(strstr(str.src, "3@"), str.src); - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_ptr_equal(strstr(str.src, "2@"), str.src); - assert_null(AMitemsPrev(&forward, 1)); - /* Reverse iterator forward. */ - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "4@"), str.src); - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "3@"), str.src); - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "2@"), str.src); - assert_null(AMitemsNext(&reverse, 1)); - /* Reverse iterator reverse. */ - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "2@"), str.src); - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "3@"), str.src); - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_ptr_equal(strstr(str.src, "4@"), str.src); - assert_null(AMitemsPrev(&reverse, 1)); -} - -static void test_AMkeys_map(void** state) { - TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("one"), 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("two"), 2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("three"), 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMitems forward = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&forward), 3); - AMitems reverse = AMitemsReversed(&forward); - assert_int_equal(AMitemsSize(&reverse), 3); - /* Forward iterator forward. */ - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "one", str.count); - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); - assert_int_equal(str.count, 5); - assert_memory_equal(str.src, "three", str.count); - assert_true(AMitemToStr(AMitemsNext(&forward, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "two", str.count); - assert_null(AMitemsNext(&forward, 1)); + assert_null(AMstrsNext(&forward, 1).src); /* Forward iterator reverse. */ - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "two", str.count); - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_int_equal(str.count, 5); - assert_memory_equal(str.src, "three", str.count); - assert_true(AMitemToStr(AMitemsPrev(&forward, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "one", str.count); - assert_null(AMitemsPrev(&forward, 1)); + str = AMstrsPrev(&forward, 1); + assert_ptr_equal(strstr(str.src, "3@"), str.src); + str = AMstrsPrev(&forward, 1); + assert_ptr_equal(strstr(str.src, "2@"), str.src); + str = AMstrsPrev(&forward, 1); + assert_ptr_equal(strstr(str.src, "1@"), str.src); + assert_null(AMstrsPrev(&forward, 1).src); /* Reverse iterator forward. */ - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "two", str.count); - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_int_equal(str.count, 5); - assert_memory_equal(str.src, "three", str.count); - assert_true(AMitemToStr(AMitemsNext(&reverse, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "one", str.count); - assert_null(AMitemsNext(&reverse, 1)); + str = AMstrsNext(&reverse, 1); + assert_ptr_equal(strstr(str.src, "3@"), str.src); + str = AMstrsNext(&reverse, 1); + assert_ptr_equal(strstr(str.src, "2@"), str.src); + str = AMstrsNext(&reverse, 1); + assert_ptr_equal(strstr(str.src, "1@"), str.src); /* Reverse iterator reverse. */ - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "one", str.count); - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_int_equal(str.count, 5); - assert_memory_equal(str.src, "three", str.count); - assert_true(AMitemToStr(AMitemsPrev(&reverse, 1), &str)); - assert_int_equal(str.count, 3); - assert_memory_equal(str.src, "two", str.count); - assert_null(AMitemsPrev(&reverse, 1)); + assert_null(AMstrsNext(&reverse, 1).src); + str = AMstrsPrev(&reverse, 1); + assert_ptr_equal(strstr(str.src, "1@"), str.src); + str = AMstrsPrev(&reverse, 1); + assert_ptr_equal(strstr(str.src, "2@"), str.src); + str = AMstrsPrev(&reverse, 1); + assert_ptr_equal(strstr(str.src, "3@"), str.src); + assert_null(AMstrsPrev(&reverse, 1).src); + AMfreeStack(&stack); } -static void test_AMputActor_bytes(void** state) { +static void test_AMkeys_map() { + AMresultStack* stack = NULL; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("one"), 1)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("two"), 2)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("three"), 3)); + AMstrs forward = AMpush(&stack, + AMkeys(doc, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsSize(&forward), 3); + AMstrs reverse = AMstrsReversed(&forward); + assert_int_equal(AMstrsSize(&reverse), 3); + /* Forward iterator forward. */ + AMbyteSpan str = AMstrsNext(&forward, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "one", str.count); + str = AMstrsNext(&forward, 1); + assert_int_equal(str.count, 5); + assert_memory_equal(str.src, "three", str.count); + str = AMstrsNext(&forward, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "two", str.count); + assert_null(AMstrsNext(&forward, 1).src); + /* Forward iterator reverse. */ + str = AMstrsPrev(&forward, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "two", str.count); + str = AMstrsPrev(&forward, 1); + assert_int_equal(str.count, 5); + assert_memory_equal(str.src, "three", str.count); + str = AMstrsPrev(&forward, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "one", str.count); + assert_null(AMstrsPrev(&forward, 1).src); + /* Reverse iterator forward. */ + str = AMstrsNext(&reverse, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "two", str.count); + str = AMstrsNext(&reverse, 1); + assert_int_equal(str.count, 5); + assert_memory_equal(str.src, "three", str.count); + str = AMstrsNext(&reverse, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "one", str.count); + assert_null(AMstrsNext(&reverse, 1).src); + /* Reverse iterator reverse. */ + str = AMstrsPrev(&reverse, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "one", str.count); + str = AMstrsPrev(&reverse, 1); + assert_int_equal(str.count, 5); + assert_memory_equal(str.src, "three", str.count); + str = AMstrsPrev(&reverse, 1); + assert_int_equal(str.count, 3); + assert_memory_equal(str.src, "two", str.count); + assert_null(AMstrsPrev(&reverse, 1).src); + AMfreeStack(&stack); +} + +static void test_AMputActor_bytes(void **state) { TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromBytes(test_state->actor_id_bytes, test_state->actor_id_size), cmocka_cb, - AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->doc_state->doc, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMgetActorId(test_state->doc_state->doc), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); + AMactorId const* actor_id = AMpush(&test_state->group_state->stack, + AMactorIdInitBytes( + test_state->actor_id_bytes, + test_state->actor_id_size), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(test_state->group_state->doc, actor_id)); + actor_id = AMpush(&test_state->group_state->stack, + AMgetActorId(test_state->group_state->doc), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; AMbyteSpan const bytes = AMactorIdBytes(actor_id); assert_int_equal(bytes.count, test_state->actor_id_size); assert_memory_equal(bytes.src, test_state->actor_id_bytes, bytes.count); } -static void test_AMputActor_str(void** state) { +static void test_AMputActor_str(void **state) { TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(test_state->actor_id_str), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->doc_state->doc, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMgetActorId(test_state->doc_state->doc), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); + AMactorId const* actor_id = AMpush(&test_state->group_state->stack, + AMactorIdInitStr(test_state->actor_id_str), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(test_state->group_state->doc, actor_id)); + actor_id = AMpush(&test_state->group_state->stack, + AMgetActorId(test_state->group_state->doc), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; AMbyteSpan const str = AMactorIdStr(actor_id); assert_int_equal(str.count, test_state->actor_id_str.count); assert_memory_equal(str.src, test_state->actor_id_str.src, str.count); } -static void test_AMspliceText(void** state) { - TestState* test_state = *state; - AMstack** stack_ptr = &test_state->doc_state->base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMobjId const* const text = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMspliceText(doc, text, 0, 0, AMstr("one + ")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMspliceText(doc, text, 4, 2, AMstr("two = ")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMspliceText(doc, text, 8, 2, AMstr("three")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMbyteSpan str; - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMtext(doc, text, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); - assert_int_equal(str.count, strlen("one two three")); - assert_memory_equal(str.src, "one two three", str.count); +static void test_AMspliceText() { + AMresultStack* stack = NULL; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMspliceText(doc, AM_ROOT, 0, 0, AMstr("one + "))); + AMfree(AMspliceText(doc, AM_ROOT, 4, 2, AMstr("two = "))); + AMfree(AMspliceText(doc, AM_ROOT, 8, 2, AMstr("three"))); + AMbyteSpan const text = AMpush(&stack, + AMtext(doc, AM_ROOT, NULL), + AM_VALUE_STR, + cmocka_cb).str; + static char const* const TEXT_VALUE = "one two three"; + assert_int_equal(text.count, strlen(TEXT_VALUE)); + assert_memory_equal(text.src, TEXT_VALUE, text.count); + AMfreeStack(&stack); } int run_doc_tests(void) { const struct CMUnitTest tests[] = { - cmocka_unit_test_setup_teardown(test_AMkeys_empty, setup, teardown), - cmocka_unit_test_setup_teardown(test_AMkeys_list, setup, teardown), - cmocka_unit_test_setup_teardown(test_AMkeys_map, setup, teardown), + cmocka_unit_test(test_AMkeys_empty), + cmocka_unit_test(test_AMkeys_list), + cmocka_unit_test(test_AMkeys_map), cmocka_unit_test_setup_teardown(test_AMputActor_bytes, setup, teardown), cmocka_unit_test_setup_teardown(test_AMputActor_str, setup, teardown), - cmocka_unit_test_setup_teardown(test_AMspliceText, setup, teardown), + cmocka_unit_test(test_AMspliceText), }; return cmocka_run_group_tests(tests, NULL, NULL); diff --git a/rust/automerge-c/test/enum_string_tests.c b/rust/automerge-c/test/enum_string_tests.c deleted file mode 100644 index 11131e43..00000000 --- a/rust/automerge-c/test/enum_string_tests.c +++ /dev/null @@ -1,148 +0,0 @@ -#include -#include -#include -#include -#include - -/* third-party */ -#include - -/* local */ -#include -#include - -#define assert_to_string(function, tag) assert_string_equal(function(tag), #tag) - -#define assert_from_string(function, type, tag) \ - do { \ - type out; \ - assert_true(function(&out, #tag)); \ - assert_int_equal(out, tag); \ - } while (0) - -static void test_AMidxTypeToString(void** state) { - assert_to_string(AMidxTypeToString, AM_IDX_TYPE_DEFAULT); - assert_to_string(AMidxTypeToString, AM_IDX_TYPE_KEY); - assert_to_string(AMidxTypeToString, AM_IDX_TYPE_POS); - /* Zero tag */ - assert_string_equal(AMidxTypeToString(0), "AM_IDX_TYPE_DEFAULT"); - /* Invalid tag */ - assert_string_equal(AMidxTypeToString(-1), "???"); -} - -static void test_AMidxTypeFromString(void** state) { - assert_from_string(AMidxTypeFromString, AMidxType, AM_IDX_TYPE_DEFAULT); - assert_from_string(AMidxTypeFromString, AMidxType, AM_IDX_TYPE_KEY); - assert_from_string(AMidxTypeFromString, AMidxType, AM_IDX_TYPE_POS); - /* Invalid tag */ - AMidxType out = -1; - assert_false(AMidxTypeFromString(&out, "???")); - assert_int_equal(out, (AMidxType)-1); -} - -static void test_AMobjTypeToString(void** state) { - assert_to_string(AMobjTypeToString, AM_OBJ_TYPE_DEFAULT); - assert_to_string(AMobjTypeToString, AM_OBJ_TYPE_LIST); - assert_to_string(AMobjTypeToString, AM_OBJ_TYPE_MAP); - assert_to_string(AMobjTypeToString, AM_OBJ_TYPE_TEXT); - /* Zero tag */ - assert_string_equal(AMobjTypeToString(0), "AM_OBJ_TYPE_DEFAULT"); - /* Invalid tag */ - assert_string_equal(AMobjTypeToString(-1), "???"); -} - -static void test_AMobjTypeFromString(void** state) { - assert_from_string(AMobjTypeFromString, AMobjType, AM_OBJ_TYPE_DEFAULT); - assert_from_string(AMobjTypeFromString, AMobjType, AM_OBJ_TYPE_LIST); - assert_from_string(AMobjTypeFromString, AMobjType, AM_OBJ_TYPE_MAP); - assert_from_string(AMobjTypeFromString, AMobjType, AM_OBJ_TYPE_TEXT); - /* Invalid tag */ - AMobjType out = -1; - assert_false(AMobjTypeFromString(&out, "???")); - assert_int_equal(out, (AMobjType)-1); -} - -static void test_AMstatusToString(void** state) { - assert_to_string(AMstatusToString, AM_STATUS_ERROR); - assert_to_string(AMstatusToString, AM_STATUS_INVALID_RESULT); - assert_to_string(AMstatusToString, AM_STATUS_OK); - /* Zero tag */ - assert_string_equal(AMstatusToString(0), "AM_STATUS_OK"); - /* Invalid tag */ - assert_string_equal(AMstatusToString(-1), "???"); -} - -static void test_AMstatusFromString(void** state) { - assert_from_string(AMstatusFromString, AMstatus, AM_STATUS_ERROR); - assert_from_string(AMstatusFromString, AMstatus, AM_STATUS_INVALID_RESULT); - assert_from_string(AMstatusFromString, AMstatus, AM_STATUS_OK); - /* Invalid tag */ - AMstatus out = -1; - assert_false(AMstatusFromString(&out, "???")); - assert_int_equal(out, (AMstatus)-1); -} - -static void test_AMvalTypeToString(void** state) { - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_ACTOR_ID); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_BOOL); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_BYTES); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_CHANGE); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_CHANGE_HASH); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_COUNTER); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_DEFAULT); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_DOC); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_F64); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_INT); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_NULL); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_OBJ_TYPE); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_STR); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_SYNC_HAVE); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_SYNC_MESSAGE); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_SYNC_STATE); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_TIMESTAMP); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_UINT); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_UNKNOWN); - assert_to_string(AMvalTypeToString, AM_VAL_TYPE_VOID); - /* Zero tag */ - assert_string_equal(AMvalTypeToString(0), "AM_VAL_TYPE_DEFAULT"); - /* Invalid tag */ - assert_string_equal(AMvalTypeToString(-1), "???"); -} - -static void test_AMvalTypeFromString(void** state) { - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_ACTOR_ID); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_BOOL); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_BYTES); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_CHANGE); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_CHANGE_HASH); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_COUNTER); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_DEFAULT); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_DOC); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_F64); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_INT); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_NULL); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_OBJ_TYPE); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_STR); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_SYNC_HAVE); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_SYNC_MESSAGE); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_SYNC_STATE); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_TIMESTAMP); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_UINT); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_UNKNOWN); - assert_from_string(AMvalTypeFromString, AMvalType, AM_VAL_TYPE_VOID); - /* Invalid tag */ - AMvalType out = -1; - assert_false(AMvalTypeFromString(&out, "???")); - assert_int_equal(out, (AMvalType)-1); -} - -int run_enum_string_tests(void) { - const struct CMUnitTest tests[] = { - cmocka_unit_test(test_AMidxTypeToString), cmocka_unit_test(test_AMidxTypeFromString), - cmocka_unit_test(test_AMobjTypeToString), cmocka_unit_test(test_AMobjTypeFromString), - cmocka_unit_test(test_AMstatusToString), cmocka_unit_test(test_AMstatusFromString), - cmocka_unit_test(test_AMvalTypeToString), cmocka_unit_test(test_AMvalTypeFromString), - }; - - return cmocka_run_group_tests(tests, NULL, NULL); -} diff --git a/rust/automerge-c/test/group_state.c b/rust/automerge-c/test/group_state.c new file mode 100644 index 00000000..0ee14317 --- /dev/null +++ b/rust/automerge-c/test/group_state.c @@ -0,0 +1,27 @@ +#include +#include +#include + +/* third-party */ +#include + +/* local */ +#include "group_state.h" +#include "stack_utils.h" + +int group_setup(void** state) { + GroupState* group_state = test_calloc(1, sizeof(GroupState)); + group_state->doc = AMpush(&group_state->stack, + AMcreate(NULL), + AM_VALUE_DOC, + cmocka_cb).doc; + *state = group_state; + return 0; +} + +int group_teardown(void** state) { + GroupState* group_state = *state; + AMfreeStack(&group_state->stack); + test_free(group_state); + return 0; +} diff --git a/rust/automerge-c/test/group_state.h b/rust/automerge-c/test/group_state.h new file mode 100644 index 00000000..a71d9dc9 --- /dev/null +++ b/rust/automerge-c/test/group_state.h @@ -0,0 +1,16 @@ +#ifndef GROUP_STATE_H +#define GROUP_STATE_H + +/* local */ +#include + +typedef struct { + AMresultStack* stack; + AMdoc* doc; +} GroupState; + +int group_setup(void** state); + +int group_teardown(void** state); + +#endif /* GROUP_STATE_H */ diff --git a/rust/automerge-c/test/item_tests.c b/rust/automerge-c/test/item_tests.c deleted file mode 100644 index a30b0556..00000000 --- a/rust/automerge-c/test/item_tests.c +++ /dev/null @@ -1,94 +0,0 @@ -#include -#include -#include -#include -#include - -/* third-party */ -#include - -/* local */ -#include -#include -#include "cmocka_utils.h" -#include "doc_state.h" - -static void test_AMitemResult(void** state) { - enum { ITEM_COUNT = 1000 }; - - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - /* Append the strings to a list so that they'll be in numerical order. */ - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - for (size_t pos = 0; pos != ITEM_COUNT; ++pos) { - size_t const count = snprintf(NULL, 0, "%zu", pos); - char* const src = test_calloc(count + 1, sizeof(char)); - assert_int_equal(sprintf(src, "%zu", pos), count); - AMstackItem(NULL, AMlistPutStr(doc_state->doc, list, pos, true, AMbytes(src, count)), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - test_free(src); - } - /* Get an item iterator. */ - AMitems items = AMstackItems(stack_ptr, AMlistRange(doc_state->doc, list, 0, SIZE_MAX, NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - /* Get the item iterator's result so that it can be freed later. */ - AMresult const* const items_result = (*stack_ptr)->result; - /* Iterate over all of the items and copy their pointers into an array. */ - AMitem* item_ptrs[ITEM_COUNT] = {NULL}; - AMitem* item = NULL; - for (size_t pos = 0; (item = AMitemsNext(&items, 1)) != NULL; ++pos) { - /* The item's reference count should be 1. */ - assert_int_equal(AMitemRefCount(item), 1); - if (pos & 1) { - /* Create a redundant result for an odd item. */ - AMitem* const new_item = AMstackItem(stack_ptr, AMitemResult(item), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - /* The item's old and new pointers will never match. */ - assert_ptr_not_equal(new_item, item); - /* The item's reference count will have been incremented. */ - assert_int_equal(AMitemRefCount(item), 2); - assert_int_equal(AMitemRefCount(new_item), 2); - /* The item's old and new indices should match. */ - assert_int_equal(AMitemIdxType(item), AMitemIdxType(new_item)); - assert_int_equal(AMitemIdxType(item), AM_IDX_TYPE_POS); - size_t pos, new_pos; - assert_true(AMitemPos(item, &pos)); - assert_true(AMitemPos(new_item, &new_pos)); - assert_int_equal(pos, new_pos); - /* The item's old and new object IDs should match. */ - AMobjId const* const obj_id = AMitemObjId(item); - AMobjId const* const new_obj_id = AMitemObjId(new_item); - assert_true(AMobjIdEqual(obj_id, new_obj_id)); - /* The item's old and new value types should match. */ - assert_int_equal(AMitemValType(item), AMitemValType(new_item)); - /* The item's old and new string values should match. */ - AMbyteSpan str; - assert_true(AMitemToStr(item, &str)); - AMbyteSpan new_str; - assert_true(AMitemToStr(new_item, &new_str)); - assert_int_equal(str.count, new_str.count); - assert_memory_equal(str.src, new_str.src, new_str.count); - /* The item's old and new object IDs are one and the same. */ - assert_ptr_equal(obj_id, new_obj_id); - /* The item's old and new string values are one and the same. */ - assert_ptr_equal(str.src, new_str.src); - /* Save the item's new pointer. */ - item_ptrs[pos] = new_item; - } - } - /* Free the item iterator's result. */ - AMresultFree(AMstackPop(stack_ptr, items_result)); - /* An odd item's reference count should be 1 again. */ - for (size_t pos = 1; pos < ITEM_COUNT; pos += 2) { - assert_int_equal(AMitemRefCount(item_ptrs[pos]), 1); - } -} - -int run_item_tests(void) { - const struct CMUnitTest tests[] = { - cmocka_unit_test(test_AMitemResult), - }; - - return cmocka_run_group_tests(tests, setup_doc, teardown_doc); -} diff --git a/rust/automerge-c/test/list_tests.c b/rust/automerge-c/test/list_tests.c index 723dd038..25a24329 100644 --- a/rust/automerge-c/test/list_tests.c +++ b/rust/automerge-c/test/list_tests.c @@ -11,417 +11,342 @@ /* local */ #include -#include -#include "base_state.h" #include "cmocka_utils.h" -#include "doc_state.h" +#include "group_state.h" #include "macro_utils.h" +#include "stack_utils.h" static void test_AMlistIncrement(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMlistPutCounter(doc_state->doc, list, 0, true, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - int64_t counter; - assert_true(AMitemToCounter( - AMstackItem(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 0); - AMresultFree(AMstackPop(stack_ptr, NULL)); - AMstackItem(NULL, AMlistIncrement(doc_state->doc, list, 0, 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToCounter( - AMstackItem(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 3); - AMresultFree(AMstackPop(stack_ptr, NULL)); + GroupState* group_state = *state; + AMfree(AMlistPutCounter(group_state->doc, AM_ROOT, 0, true, 0)); + assert_int_equal(AMpush(&group_state->stack, + AMlistGet(group_state->doc, AM_ROOT, 0, NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 0); + AMfree(AMpop(&group_state->stack)); + AMfree(AMlistIncrement(group_state->doc, AM_ROOT, 0, 3)); + assert_int_equal(AMpush(&group_state->stack, + AMlistGet(group_state->doc, AM_ROOT, 0, NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 3); + AMfree(AMpop(&group_state->stack)); } -#define test_AMlistPut(suffix, mode) test_AMlistPut##suffix##_##mode +#define test_AMlistPut(suffix, mode) test_AMlistPut ## suffix ## _ ## mode -#define static_void_test_AMlistPut(suffix, mode, type, scalar_value) \ - static void test_AMlistPut##suffix##_##mode(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjId const* const list = AMitemObjId( \ - AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - AMstackItem(NULL, AMlistPut##suffix(doc_state->doc, list, 0, !strcmp(#mode, "insert"), scalar_value), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); \ - type value; \ - assert_true(AMitemTo##suffix(AMstackItem(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), cmocka_cb, \ - AMexpect(suffix_to_val_type(#suffix))), \ - &value)); \ - assert_true(value == scalar_value); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMlistPut(suffix, mode, member, scalar_value) \ +static void test_AMlistPut ## suffix ## _ ## mode(void **state) { \ + GroupState* group_state = *state; \ + AMfree(AMlistPut ## suffix(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"), \ + scalar_value)); \ + assert_true(AMpush( \ + &group_state->stack, \ + AMlistGet(group_state->doc, AM_ROOT, 0, NULL), \ + AMvalue_discriminant(#suffix), \ + cmocka_cb).member == scalar_value); \ + AMfree(AMpop(&group_state->stack)); \ +} -#define test_AMlistPutBytes(mode) test_AMlistPutBytes##_##mode +#define test_AMlistPutBytes(mode) test_AMlistPutBytes ## _ ## mode -#define static_void_test_AMlistPutBytes(mode, bytes_value) \ - static void test_AMlistPutBytes_##mode(void** state) { \ - static size_t const BYTES_SIZE = sizeof(bytes_value) / sizeof(uint8_t); \ - \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjId const* const list = AMitemObjId( \ - AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - AMstackItem( \ - NULL, AMlistPutBytes(doc_state->doc, list, 0, !strcmp(#mode, "insert"), AMbytes(bytes_value, BYTES_SIZE)), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); \ - AMbyteSpan bytes; \ - assert_true(AMitemToBytes( \ - AMstackItem(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), \ - &bytes)); \ - assert_int_equal(bytes.count, BYTES_SIZE); \ - assert_memory_equal(bytes.src, bytes_value, BYTES_SIZE); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMlistPutBytes(mode, bytes_value) \ +static void test_AMlistPutBytes_ ## mode(void **state) { \ + static size_t const BYTES_SIZE = sizeof(bytes_value) / sizeof(uint8_t); \ + \ + GroupState* group_state = *state; \ + AMfree(AMlistPutBytes(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"), \ + bytes_value, \ + BYTES_SIZE)); \ + AMbyteSpan const bytes = AMpush( \ + &group_state->stack, \ + AMlistGet(group_state->doc, AM_ROOT, 0, NULL), \ + AM_VALUE_BYTES, \ + cmocka_cb).bytes; \ + assert_int_equal(bytes.count, BYTES_SIZE); \ + assert_memory_equal(bytes.src, bytes_value, BYTES_SIZE); \ + AMfree(AMpop(&group_state->stack)); \ +} -#define test_AMlistPutNull(mode) test_AMlistPutNull_##mode +#define test_AMlistPutNull(mode) test_AMlistPutNull_ ## mode -#define static_void_test_AMlistPutNull(mode) \ - static void test_AMlistPutNull_##mode(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjId const* const list = AMitemObjId( \ - AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - AMstackItem(NULL, AMlistPutNull(doc_state->doc, list, 0, !strcmp(#mode, "insert")), cmocka_cb, \ - AMexpect(AM_VAL_TYPE_VOID)); \ - AMresult* result = AMstackResult(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), NULL, NULL); \ - if (AMresultStatus(result) != AM_STATUS_OK) { \ - fail_msg_view("%s", AMresultError(result)); \ - } \ - assert_int_equal(AMresultSize(result), 1); \ - assert_int_equal(AMitemValType(AMresultItem(result)), AM_VAL_TYPE_NULL); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMlistPutNull(mode) \ +static void test_AMlistPutNull_ ## mode(void **state) { \ + GroupState* group_state = *state; \ + AMfree(AMlistPutNull(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"))); \ + AMresult* const result = AMlistGet(group_state->doc, AM_ROOT, 0, NULL); \ + if (AMresultStatus(result) != AM_STATUS_OK) { \ + fail_msg_view("%s", AMerrorMessage(result)); \ + } \ + assert_int_equal(AMresultSize(result), 1); \ + assert_int_equal(AMresultValue(result).tag, AM_VALUE_NULL); \ + AMfree(result); \ +} -#define test_AMlistPutObject(label, mode) test_AMlistPutObject_##label##_##mode +#define test_AMlistPutObject(label, mode) test_AMlistPutObject_ ## label ## _ ## mode -#define static_void_test_AMlistPutObject(label, mode) \ - static void test_AMlistPutObject_##label##_##mode(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjId const* const list = AMitemObjId( \ - AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - AMobjType const obj_type = suffix_to_obj_type(#label); \ - AMobjId const* const obj_id = AMitemObjId( \ - AMstackItem(stack_ptr, AMlistPutObject(doc_state->doc, list, 0, !strcmp(#mode, "insert"), obj_type), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - assert_non_null(obj_id); \ - assert_int_equal(AMobjObjType(doc_state->doc, obj_id), obj_type); \ - assert_int_equal(AMobjSize(doc_state->doc, obj_id, NULL), 0); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMlistPutObject(label, mode) \ +static void test_AMlistPutObject_ ## label ## _ ## mode(void **state) { \ + GroupState* group_state = *state; \ + AMobjType const obj_type = AMobjType_tag(#label); \ + if (obj_type != AM_OBJ_TYPE_VOID) { \ + AMobjId const* const obj_id = AMpush( \ + &group_state->stack, \ + AMlistPutObject(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"), \ + obj_type), \ + AM_VALUE_OBJ_ID, \ + cmocka_cb).obj_id; \ + assert_non_null(obj_id); \ + assert_int_equal(AMobjObjType(group_state->doc, obj_id), obj_type); \ + assert_int_equal(AMobjSize(group_state->doc, obj_id, NULL), 0); \ + } \ + else { \ + AMpush(&group_state->stack, \ + AMlistPutObject(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"), \ + obj_type), \ + AM_VALUE_VOID, \ + NULL); \ + assert_int_not_equal(AMresultStatus(group_state->stack->result), \ + AM_STATUS_OK); \ + } \ + AMfree(AMpop(&group_state->stack)); \ +} -#define test_AMlistPutStr(mode) test_AMlistPutStr##_##mode +#define test_AMlistPutStr(mode) test_AMlistPutStr ## _ ## mode -#define static_void_test_AMlistPutStr(mode, str_value) \ - static void test_AMlistPutStr_##mode(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjId const* const list = AMitemObjId( \ - AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - AMstackItem(NULL, AMlistPutStr(doc_state->doc, list, 0, !strcmp(#mode, "insert"), AMstr(str_value)), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); \ - AMbyteSpan str; \ - assert_true(AMitemToStr( \ - AMstackItem(stack_ptr, AMlistGet(doc_state->doc, list, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), \ - &str)); \ - assert_int_equal(str.count, strlen(str_value)); \ - assert_memory_equal(str.src, str_value, str.count); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMlistPutStr(mode, str_value) \ +static void test_AMlistPutStr_ ## mode(void **state) { \ + GroupState* group_state = *state; \ + AMfree(AMlistPutStr(group_state->doc, \ + AM_ROOT, \ + 0, \ + !strcmp(#mode, "insert"), \ + AMstr(str_value))); \ + AMbyteSpan const str = AMpush( \ + &group_state->stack, \ + AMlistGet(group_state->doc, AM_ROOT, 0, NULL), \ + AM_VALUE_STR, \ + cmocka_cb).str; \ + char* const c_str = test_calloc(1, str.count + 1); \ + strncpy(c_str, str.src, str.count); \ + print_message("str -> \"%s\"\n", c_str); \ + test_free(c_str); \ + assert_int_equal(str.count, strlen(str_value)); \ + assert_memory_equal(str.src, str_value, str.count); \ + AMfree(AMpop(&group_state->stack)); \ +} -static_void_test_AMlistPut(Bool, insert, bool, true); +static_void_test_AMlistPut(Bool, insert, boolean, true) -static_void_test_AMlistPut(Bool, update, bool, true); +static_void_test_AMlistPut(Bool, update, boolean, true) static uint8_t const BYTES_VALUE[] = {INT8_MIN, INT8_MAX / 2, INT8_MAX}; -static_void_test_AMlistPutBytes(insert, BYTES_VALUE); +static_void_test_AMlistPutBytes(insert, BYTES_VALUE) -static_void_test_AMlistPutBytes(update, BYTES_VALUE); +static_void_test_AMlistPutBytes(update, BYTES_VALUE) -static_void_test_AMlistPut(Counter, insert, int64_t, INT64_MAX); +static_void_test_AMlistPut(Counter, insert, counter, INT64_MAX) -static_void_test_AMlistPut(Counter, update, int64_t, INT64_MAX); +static_void_test_AMlistPut(Counter, update, counter, INT64_MAX) -static_void_test_AMlistPut(F64, insert, double, DBL_MAX); +static_void_test_AMlistPut(F64, insert, f64, DBL_MAX) -static_void_test_AMlistPut(F64, update, double, DBL_MAX); +static_void_test_AMlistPut(F64, update, f64, DBL_MAX) -static_void_test_AMlistPut(Int, insert, int64_t, INT64_MAX); +static_void_test_AMlistPut(Int, insert, int_, INT64_MAX) -static_void_test_AMlistPut(Int, update, int64_t, INT64_MAX); +static_void_test_AMlistPut(Int, update, int_, INT64_MAX) -static_void_test_AMlistPutNull(insert); +static_void_test_AMlistPutNull(insert) -static_void_test_AMlistPutNull(update); +static_void_test_AMlistPutNull(update) -static_void_test_AMlistPutObject(List, insert); +static_void_test_AMlistPutObject(List, insert) -static_void_test_AMlistPutObject(List, update); +static_void_test_AMlistPutObject(List, update) -static_void_test_AMlistPutObject(Map, insert); +static_void_test_AMlistPutObject(Map, insert) -static_void_test_AMlistPutObject(Map, update); +static_void_test_AMlistPutObject(Map, update) -static_void_test_AMlistPutObject(Text, insert); +static_void_test_AMlistPutObject(Text, insert) -static_void_test_AMlistPutObject(Text, update); +static_void_test_AMlistPutObject(Text, update) -static_void_test_AMlistPutStr(insert, - "Hello, " - "world!"); +static_void_test_AMlistPutObject(Void, insert) -static_void_test_AMlistPutStr(update, - "Hello," - " world" - "!"); +static_void_test_AMlistPutObject(Void, update) -static_void_test_AMlistPut(Timestamp, insert, int64_t, INT64_MAX); +static_void_test_AMlistPutStr(insert, "Hello, world!") -static_void_test_AMlistPut(Timestamp, update, int64_t, INT64_MAX); +static_void_test_AMlistPutStr(update, "Hello, world!") -static_void_test_AMlistPut(Uint, insert, uint64_t, UINT64_MAX); +static_void_test_AMlistPut(Timestamp, insert, timestamp, INT64_MAX) -static_void_test_AMlistPut(Uint, update, uint64_t, UINT64_MAX); +static_void_test_AMlistPut(Timestamp, update, timestamp, INT64_MAX) -static void test_get_range_values(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc1, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); +static_void_test_AMlistPut(Uint, insert, uint, UINT64_MAX) + +static_void_test_AMlistPut(Uint, update, uint, UINT64_MAX) + +static void test_get_list_values(void** state) { + AMresultStack* stack = *state; + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMobjId const* const list = AMpush( + &stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* Insert elements. */ - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("First")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Second")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Third")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Fourth")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Fifth")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Sixth")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Seventh")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc1, list, 0, true, AMstr("Eighth")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("First"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Second"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Third"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Fourth"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Fifth"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Sixth"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Seventh"))); + AMfree(AMlistPutStr(doc1, list, 0, true, AMstr("Eighth"))); + AMfree(AMcommit(doc1, AMstr(NULL), NULL)); - AMitems const v1 = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMfork(doc1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); + AMchangeHashes const v1 = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMdoc* const doc2 = AMpush(&stack, + AMfork(doc1, NULL), + AM_VALUE_DOC, + cmocka_cb).doc; - AMstackItem(NULL, AMlistPutStr(doc1, list, 2, false, AMstr("Third V2")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMlistPutStr(doc1, list, 2, false, AMstr("Third V2"))); + AMfree(AMcommit(doc1, AMstr(NULL), NULL)); - AMstackItem(NULL, AMlistPutStr(doc2, list, 2, false, AMstr("Third V3")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc2, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMlistPutStr(doc2, list, 2, false, AMstr("Third V3"))); + AMfree(AMcommit(doc2, AMstr(NULL), NULL)); - AMstackItem(NULL, AMmerge(doc1, doc2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(doc1, doc2)); - /* Forward vs. reverse: complete current list range. */ - AMitems range = - AMstackItems(stack_ptr, AMlistRange(doc1, list, 0, SIZE_MAX, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - size_t size = AMitemsSize(&range); - assert_int_equal(size, 8); - AMitems range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - size_t pos; - assert_true(AMitemPos(AMitemsNext(&range, 1), &pos)); - assert_int_equal(pos, 0); - assert_true(AMitemPos(AMitemsNext(&range_back, 1), &pos)); - assert_int_equal(pos, 7); + AMlistItems range = AMpush(&stack, + AMlistRange(doc1, list, 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + assert_int_equal(AMlistItemsSize(&range), 8); - AMitem *item1, *item_back1; - size_t count, middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - size_t pos1, pos_back1; - assert_true(AMitemPos(item1, &pos1)); - assert_true(AMitemPos(item_back1, &pos_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(pos1, pos_back1); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(pos1, pos_back1); - } - AMitem* item2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos1, NULL), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos_back1, NULL), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + AMlistItem const* list_item = NULL; + while ((list_item = AMlistItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMresult* result = AMlistGet(doc1, list, AMlistItemIndex(list_item), NULL); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMlistItemObjId(list_item)); + AMfree(result); } - /* Forward vs. reverse: partial current list range. */ - range = AMstackItems(stack_ptr, AMlistRange(doc1, list, 1, 6, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 5); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemPos(AMitemsNext(&range, 1), &pos)); - assert_int_equal(pos, 1); - assert_true(AMitemPos(AMitemsNext(&range_back, 1), &pos)); - assert_int_equal(pos, 5); + range = AMpush(&stack, + AMlistRange(doc1, list, 3, 6, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMlistItems range_back = AMlistItemsReversed(&range); + assert_int_equal(AMlistItemsSize(&range), 3); + assert_int_equal(AMlistItemIndex(AMlistItemsNext(&range, 1)), 3); + assert_int_equal(AMlistItemIndex(AMlistItemsNext(&range_back, 1)), 5); - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - size_t pos1, pos_back1; - assert_true(AMitemPos(item1, &pos1)); - assert_true(AMitemPos(item_back1, &pos_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(pos1, pos_back1); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(pos1, pos_back1); - } - AMitem* item2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos1, NULL), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos_back1, NULL), NULL, NULL); - /** \note An item returned from an `AMlistGet()` call doesn't include - the index used to retrieve it. */ - assert_int_equal(AMitemIdxType(item2), 0); - assert_int_equal(AMitemIdxType(item_back2), 0); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + range = AMlistItemsRewound(&range); + while ((list_item = AMlistItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMresult* result = AMlistGet(doc1, list, AMlistItemIndex(list_item), NULL); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMlistItemObjId(list_item)); + AMfree(result); } - /* Forward vs. reverse: complete historical map range. */ - range = AMstackItems(stack_ptr, AMlistRange(doc1, list, 0, SIZE_MAX, &v1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 8); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemPos(AMitemsNext(&range, 1), &pos)); - assert_int_equal(pos, 0); - assert_true(AMitemPos(AMitemsNext(&range_back, 1), &pos)); - assert_int_equal(pos, 7); - - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - size_t pos1, pos_back1; - assert_true(AMitemPos(item1, &pos1)); - assert_true(AMitemPos(item_back1, &pos_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(pos1, pos_back1); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(pos1, pos_back1); - } - AMitem* item2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos1, &v1), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos_back1, &v1), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + range = AMpush(&stack, + AMlistRange(doc1, list, 0, SIZE_MAX, &v1), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + assert_int_equal(AMlistItemsSize(&range), 8); + while ((list_item = AMlistItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMresult* result = AMlistGet(doc1, list, AMlistItemIndex(list_item), &v1); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMlistItemObjId(list_item)); + AMfree(result); } - /* Forward vs. reverse: partial historical map range. */ - range = AMstackItems(stack_ptr, AMlistRange(doc1, list, 2, 7, &v1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 5); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemPos(AMitemsNext(&range, 1), &pos)); - assert_int_equal(pos, 2); - assert_true(AMitemPos(AMitemsNext(&range_back, 1), &pos)); - assert_int_equal(pos, 6); + range = AMpush(&stack, + AMlistRange(doc1, list, 3, 6, &v1), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + range_back = AMlistItemsReversed(&range); + assert_int_equal(AMlistItemsSize(&range), 3); + assert_int_equal(AMlistItemIndex(AMlistItemsNext(&range, 1)), 3); + assert_int_equal(AMlistItemIndex(AMlistItemsNext(&range_back, 1)), 5); - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - size_t pos1, pos_back1; - assert_true(AMitemPos(item1, &pos1)); - assert_true(AMitemPos(item_back1, &pos_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(pos1, pos_back1); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(pos1, pos_back1); - } - AMitem* item2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos1, &v1), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMlistGet(doc1, list, pos_back1, &v1), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + range = AMlistItemsRewound(&range); + while ((list_item = AMlistItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMresult* result = AMlistGet(doc1, list, AMlistItemIndex(list_item), &v1); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMlistItemObjId(list_item)); + AMfree(result); } - /* List range vs. object range: complete current. */ - range = AMstackItems(stack_ptr, AMlistRange(doc1, list, 0, SIZE_MAX, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMitems obj_items = AMstackItems(stack_ptr, AMobjItems(doc1, list, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&range), AMitemsSize(&obj_items)); - - AMitem *item, *obj_item; - for (item = NULL, obj_item = NULL; item && obj_item; - item = AMitemsNext(&range, 1), obj_item = AMitemsNext(&obj_items, 1)) { - /** \note Object iteration doesn't yield any item indices. */ - assert_true(AMitemIdxType(item)); - assert_false(AMitemIdxType(obj_item)); - assert_true(AMitemEqual(item, obj_item)); - assert_true(AMobjIdEqual(AMitemObjId(item), AMitemObjId(obj_item))); + range = AMpush(&stack, + AMlistRange(doc1, list, 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMobjItems values = AMpush(&stack, + AMobjValues(doc1, list, NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; + assert_int_equal(AMlistItemsSize(&range), AMobjItemsSize(&values)); + AMobjItem const* value = NULL; + while ((list_item = AMlistItemsNext(&range, 1)) != NULL && + (value = AMobjItemsNext(&values, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMvalue const val2 = AMobjItemValue(value); + assert_true(AMvalueEqual(&val1, &val2)); + assert_true(AMobjIdEqual(AMlistItemObjId(list_item), AMobjItemObjId(value))); } - /* List range vs. object range: complete historical. */ - range = AMstackItems(stack_ptr, AMlistRange(doc1, list, 0, SIZE_MAX, &v1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - obj_items = AMstackItems(stack_ptr, AMobjItems(doc1, list, &v1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&range), AMitemsSize(&obj_items)); - - for (item = NULL, obj_item = NULL; item && obj_item; - item = AMitemsNext(&range, 1), obj_item = AMitemsNext(&obj_items, 1)) { - /** \note Object iteration doesn't yield any item indices. */ - assert_true(AMitemIdxType(item)); - assert_false(AMitemIdxType(obj_item)); - assert_true(AMitemEqual(item, obj_item)); - assert_true(AMobjIdEqual(AMitemObjId(item), AMitemObjId(obj_item))); + range = AMpush(&stack, + AMlistRange(doc1, list, 0, SIZE_MAX, &v1), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + values = AMpush(&stack, + AMobjValues(doc1, list, &v1), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; + assert_int_equal(AMlistItemsSize(&range), AMobjItemsSize(&values)); + while ((list_item = AMlistItemsNext(&range, 1)) != NULL && + (value = AMobjItemsNext(&values, 1)) != NULL) { + AMvalue const val1 = AMlistItemValue(list_item); + AMvalue const val2 = AMobjItemValue(value); + assert_true(AMvalueEqual(&val1, &val2)); + assert_true(AMobjIdEqual(AMlistItemObjId(list_item), AMobjItemObjId(value))); } } -/** - * \brief A JavaScript application can introduce NUL (`\0`) characters into a - * list object's string value which will truncate it in a C application. +/** \brief A JavaScript application can introduce NUL (`\0`) characters into a + * list object's string value which will truncate it in a C application. */ static void test_get_NUL_string_value(void** state) { /* @@ -431,52 +356,60 @@ static void test_get_NUL_string_value(void** state) { doc[0] = 'o\0ps'; }); const bytes = Automerge.save(doc); - console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], - bytes).join(", ") + "};"); + console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], bytes).join(", ") + "};"); */ static uint8_t const OOPS_VALUE[] = {'o', '\0', 'p', 's'}; static size_t const OOPS_SIZE = sizeof(OOPS_VALUE) / sizeof(uint8_t); static uint8_t const SAVED_DOC[] = { - 133, 111, 74, 131, 224, 28, 197, 17, 0, 113, 1, 16, 246, 137, 63, 193, 255, 181, 76, 79, 129, - 213, 133, 29, 214, 158, 164, 15, 1, 207, 184, 14, 57, 1, 194, 79, 247, 82, 160, 134, 227, 144, - 5, 241, 136, 205, 238, 250, 251, 54, 34, 250, 210, 96, 204, 132, 153, 203, 110, 109, 6, 6, 1, - 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 3, 33, 2, 35, 2, 52, 1, 66, - 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, 127, 0, 127, 7, 127, - 1, 48, 127, 0, 127, 1, 1, 127, 1, 127, 70, 111, 0, 112, 115, 127, 0, 0}; + 133, 111, 74, 131, 224, 28, 197, 17, 0, 113, 1, 16, 246, 137, 63, 193, + 255, 181, 76, 79, 129, 213, 133, 29, 214, 158, 164, 15, 1, 207, 184, + 14, 57, 1, 194, 79, 247, 82, 160, 134, 227, 144, 5, 241, 136, 205, + 238, 250, 251, 54, 34, 250, 210, 96, 204, 132, 153, 203, 110, 109, 6, + 6, 1, 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 3, 33, 2, 35, 2, 52, + 1, 66, 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, + 127, 0, 127, 7, 127, 1, 48, 127, 0, 127, 1, 1, 127, 1, 127, 70, 111, + 0, 112, 115, 127, 0, 0}; static size_t const SAVED_DOC_SIZE = sizeof(SAVED_DOC) / sizeof(uint8_t); - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(SAVED_DOC, SAVED_DOC_SIZE), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, AM_ROOT, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, + AMload(SAVED_DOC, SAVED_DOC_SIZE), + AM_VALUE_DOC, + cmocka_cb).doc; + AMbyteSpan const str = AMpush(&stack, + AMlistGet(doc, AM_ROOT, 0, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_not_equal(str.count, strlen(OOPS_VALUE)); assert_int_equal(str.count, OOPS_SIZE); assert_memory_equal(str.src, OOPS_VALUE, str.count); } static void test_insert_at_index(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + + AMobjId const* const list = AMpush( + &stack, + AMlistPutObject(doc, AM_ROOT, 0, true, AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* Insert both at the same index. */ - AMstackItem(NULL, AMlistPutUint(doc, list, 0, true, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutUint(doc, list, 0, true, 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutUint(doc, list, 0, true, 0)); + AMfree(AMlistPutUint(doc, list, 0, true, 1)); assert_int_equal(AMobjSize(doc, list, NULL), 2); - AMitems const keys = AMstackItems(stack_ptr, AMkeys(doc, list, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&keys), 2); - AMitems const range = - AMstackItems(stack_ptr, AMlistRange(doc, list, 0, SIZE_MAX, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_UINT)); - assert_int_equal(AMitemsSize(&range), 2); + AMstrs const keys = AMpush(&stack, + AMkeys(doc, list, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsSize(&keys), 2); + AMlistItems const range = AMpush(&stack, + AMlistRange(doc, list, 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + assert_int_equal(AMlistItemsSize(&range), 2); } int run_list_tests(void) { @@ -500,16 +433,18 @@ int run_list_tests(void) { cmocka_unit_test(test_AMlistPutObject(Map, update)), cmocka_unit_test(test_AMlistPutObject(Text, insert)), cmocka_unit_test(test_AMlistPutObject(Text, update)), + cmocka_unit_test(test_AMlistPutObject(Void, insert)), + cmocka_unit_test(test_AMlistPutObject(Void, update)), cmocka_unit_test(test_AMlistPutStr(insert)), cmocka_unit_test(test_AMlistPutStr(update)), cmocka_unit_test(test_AMlistPut(Timestamp, insert)), cmocka_unit_test(test_AMlistPut(Timestamp, update)), cmocka_unit_test(test_AMlistPut(Uint, insert)), cmocka_unit_test(test_AMlistPut(Uint, update)), - cmocka_unit_test_setup_teardown(test_get_range_values, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_get_NUL_string_value, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_insert_at_index, setup_base, teardown_base), + cmocka_unit_test_setup_teardown(test_get_list_values, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_get_NUL_string_value, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_insert_at_index, setup_stack, teardown_stack), }; - return cmocka_run_group_tests(tests, setup_doc, teardown_doc); + return cmocka_run_group_tests(tests, group_setup, group_teardown); } diff --git a/rust/automerge-c/test/macro_utils.c b/rust/automerge-c/test/macro_utils.c index 3a546eb5..6d7578b6 100644 --- a/rust/automerge-c/test/macro_utils.c +++ b/rust/automerge-c/test/macro_utils.c @@ -3,36 +3,23 @@ /* local */ #include "macro_utils.h" -AMobjType suffix_to_obj_type(char const* obj_type_label) { - if (!strcmp(obj_type_label, "List")) - return AM_OBJ_TYPE_LIST; - else if (!strcmp(obj_type_label, "Map")) - return AM_OBJ_TYPE_MAP; - else if (!strcmp(obj_type_label, "Text")) - return AM_OBJ_TYPE_TEXT; - else - return AM_OBJ_TYPE_DEFAULT; +AMvalueVariant AMvalue_discriminant(char const* suffix) { + if (!strcmp(suffix, "Bool")) return AM_VALUE_BOOLEAN; + else if (!strcmp(suffix, "Bytes")) return AM_VALUE_BYTES; + else if (!strcmp(suffix, "Counter")) return AM_VALUE_COUNTER; + else if (!strcmp(suffix, "F64")) return AM_VALUE_F64; + else if (!strcmp(suffix, "Int")) return AM_VALUE_INT; + else if (!strcmp(suffix, "Null")) return AM_VALUE_NULL; + else if (!strcmp(suffix, "Str")) return AM_VALUE_STR; + else if (!strcmp(suffix, "Timestamp")) return AM_VALUE_TIMESTAMP; + else if (!strcmp(suffix, "Uint")) return AM_VALUE_UINT; + else return AM_VALUE_VOID; } -AMvalType suffix_to_val_type(char const* suffix) { - if (!strcmp(suffix, "Bool")) - return AM_VAL_TYPE_BOOL; - else if (!strcmp(suffix, "Bytes")) - return AM_VAL_TYPE_BYTES; - else if (!strcmp(suffix, "Counter")) - return AM_VAL_TYPE_COUNTER; - else if (!strcmp(suffix, "F64")) - return AM_VAL_TYPE_F64; - else if (!strcmp(suffix, "Int")) - return AM_VAL_TYPE_INT; - else if (!strcmp(suffix, "Null")) - return AM_VAL_TYPE_NULL; - else if (!strcmp(suffix, "Str")) - return AM_VAL_TYPE_STR; - else if (!strcmp(suffix, "Timestamp")) - return AM_VAL_TYPE_TIMESTAMP; - else if (!strcmp(suffix, "Uint")) - return AM_VAL_TYPE_UINT; - else - return AM_VAL_TYPE_DEFAULT; +AMobjType AMobjType_tag(char const* obj_type_label) { + if (!strcmp(obj_type_label, "List")) return AM_OBJ_TYPE_LIST; + else if (!strcmp(obj_type_label, "Map")) return AM_OBJ_TYPE_MAP; + else if (!strcmp(obj_type_label, "Text")) return AM_OBJ_TYPE_TEXT; + else if (!strcmp(obj_type_label, "Void")) return AM_OBJ_TYPE_VOID; + else return 0; } diff --git a/rust/automerge-c/test/macro_utils.h b/rust/automerge-c/test/macro_utils.h index e4c2c5b9..62e262ce 100644 --- a/rust/automerge-c/test/macro_utils.h +++ b/rust/automerge-c/test/macro_utils.h @@ -1,23 +1,24 @@ -#ifndef TESTS_MACRO_UTILS_H -#define TESTS_MACRO_UTILS_H +#ifndef MACRO_UTILS_H +#define MACRO_UTILS_H /* local */ #include /** - * \brief Gets the object type tag corresponding to an object type suffix. + * \brief Gets the result value discriminant corresponding to a function name + * suffix. * - * \param[in] suffix An object type suffix string. - * \return An `AMobjType` enum tag. + * \param[in] suffix A string. + * \return An `AMvalue` struct discriminant. */ -AMobjType suffix_to_obj_type(char const* suffix); +AMvalueVariant AMvalue_discriminant(char const* suffix); /** - * \brief Gets the value type tag corresponding to a value type suffix. + * \brief Gets the object type tag corresponding to an object type label. * - * \param[in] suffix A value type suffix string. - * \return An `AMvalType` enum tag. + * \param[in] obj_type_label A string. + * \return An `AMobjType` enum tag. */ -AMvalType suffix_to_val_type(char const* suffix); +AMobjType AMobjType_tag(char const* obj_type_label); -#endif /* TESTS_MACRO_UTILS_H */ +#endif /* MACRO_UTILS_H */ diff --git a/rust/automerge-c/test/main.c b/rust/automerge-c/test/main.c index 2996c9b3..09b71bd5 100644 --- a/rust/automerge-c/test/main.c +++ b/rust/automerge-c/test/main.c @@ -1,6 +1,6 @@ -#include #include #include +#include #include /* third-party */ @@ -8,14 +8,8 @@ extern int run_actor_id_tests(void); -extern int run_byte_span_tests(void); - extern int run_doc_tests(void); -extern int run_enum_string_tests(void); - -extern int run_item_tests(void); - extern int run_list_tests(void); extern int run_map_tests(void); @@ -23,6 +17,11 @@ extern int run_map_tests(void); extern int run_ported_wasm_suite(void); int main(void) { - return (run_actor_id_tests() + run_byte_span_tests() + run_doc_tests() + run_enum_string_tests() + - run_item_tests() + run_list_tests() + run_map_tests() + run_ported_wasm_suite()); + return ( + run_actor_id_tests() + + run_doc_tests() + + run_list_tests() + + run_map_tests() + + run_ported_wasm_suite() + ); } diff --git a/rust/automerge-c/test/map_tests.c b/rust/automerge-c/test/map_tests.c index 2ee2e69a..51a536ce 100644 --- a/rust/automerge-c/test/map_tests.c +++ b/rust/automerge-c/test/map_tests.c @@ -11,133 +11,145 @@ /* local */ #include -#include -#include -#include "base_state.h" #include "cmocka_utils.h" -#include "doc_state.h" +#include "group_state.h" #include "macro_utils.h" +#include "stack_utils.h" static void test_AMmapIncrement(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - AMstackItem(NULL, AMmapPutCounter(doc_state->doc, AM_ROOT, AMstr("Counter"), 0), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - int64_t counter; - assert_true(AMitemToCounter(AMstackItem(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, AMstr("Counter"), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 0); - AMresultFree(AMstackPop(stack_ptr, NULL)); - AMstackItem(NULL, AMmapIncrement(doc_state->doc, AM_ROOT, AMstr("Counter"), 3), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToCounter(AMstackItem(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, AMstr("Counter"), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 3); - AMresultFree(AMstackPop(stack_ptr, NULL)); + GroupState* group_state = *state; + AMfree(AMmapPutCounter(group_state->doc, AM_ROOT, AMstr("Counter"), 0)); + assert_int_equal(AMpush(&group_state->stack, + AMmapGet(group_state->doc, AM_ROOT, AMstr("Counter"), NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 0); + AMfree(AMpop(&group_state->stack)); + AMfree(AMmapIncrement(group_state->doc, AM_ROOT, AMstr("Counter"), 3)); + assert_int_equal(AMpush(&group_state->stack, + AMmapGet(group_state->doc, AM_ROOT, AMstr("Counter"), NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 3); + AMfree(AMpop(&group_state->stack)); } -#define test_AMmapPut(suffix) test_AMmapPut##suffix +#define test_AMmapPut(suffix) test_AMmapPut ## suffix -#define static_void_test_AMmapPut(suffix, type, scalar_value) \ - static void test_AMmapPut##suffix(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMstackItem(NULL, AMmapPut##suffix(doc_state->doc, AM_ROOT, AMstr(#suffix), scalar_value), cmocka_cb, \ - AMexpect(AM_VAL_TYPE_VOID)); \ - type value; \ - assert_true(AMitemTo##suffix(AMstackItem(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, AMstr(#suffix), NULL), \ - cmocka_cb, AMexpect(suffix_to_val_type(#suffix))), \ - &value)); \ - assert_true(value == scalar_value); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMmapPut(suffix, member, scalar_value) \ +static void test_AMmapPut ## suffix(void **state) { \ + GroupState* group_state = *state; \ + AMfree(AMmapPut ## suffix(group_state->doc, \ + AM_ROOT, \ + AMstr(#suffix), \ + scalar_value)); \ + assert_true(AMpush( \ + &group_state->stack, \ + AMmapGet(group_state->doc, AM_ROOT, AMstr(#suffix), NULL), \ + AMvalue_discriminant(#suffix), \ + cmocka_cb).member == scalar_value); \ + AMfree(AMpop(&group_state->stack)); \ +} -static void test_AMmapPutBytes(void** state) { +static void test_AMmapPutBytes(void **state) { static AMbyteSpan const KEY = {"Bytes", 5}; static uint8_t const BYTES_VALUE[] = {INT8_MIN, INT8_MAX / 2, INT8_MAX}; static size_t const BYTES_SIZE = sizeof(BYTES_VALUE) / sizeof(uint8_t); - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - AMstackItem(NULL, AMmapPutBytes(doc_state->doc, AM_ROOT, KEY, AMbytes(BYTES_VALUE, BYTES_SIZE)), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMbyteSpan bytes; - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, KEY, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), - &bytes)); + GroupState* group_state = *state; + AMfree(AMmapPutBytes(group_state->doc, + AM_ROOT, + KEY, + BYTES_VALUE, + BYTES_SIZE)); + AMbyteSpan const bytes = AMpush(&group_state->stack, + AMmapGet(group_state->doc, AM_ROOT, KEY, NULL), + AM_VALUE_BYTES, + cmocka_cb).bytes; assert_int_equal(bytes.count, BYTES_SIZE); assert_memory_equal(bytes.src, BYTES_VALUE, BYTES_SIZE); - AMresultFree(AMstackPop(stack_ptr, NULL)); + AMfree(AMpop(&group_state->stack)); } -static void test_AMmapPutNull(void** state) { +static void test_AMmapPutNull(void **state) { static AMbyteSpan const KEY = {"Null", 4}; - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - AMstackItem(NULL, AMmapPutNull(doc_state->doc, AM_ROOT, KEY), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMresult* result = AMstackResult(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, KEY, NULL), NULL, NULL); + GroupState* group_state = *state; + AMfree(AMmapPutNull(group_state->doc, AM_ROOT, KEY)); + AMresult* const result = AMmapGet(group_state->doc, AM_ROOT, KEY, NULL); if (AMresultStatus(result) != AM_STATUS_OK) { - fail_msg_view("%s", AMresultError(result)); + fail_msg_view("%s", AMerrorMessage(result)); } assert_int_equal(AMresultSize(result), 1); - AMitem* item = AMresultItem(result); - assert_int_equal(AMitemValType(item), AM_VAL_TYPE_NULL); + assert_int_equal(AMresultValue(result).tag, AM_VALUE_NULL); + AMfree(result); } -#define test_AMmapPutObject(label) test_AMmapPutObject_##label +#define test_AMmapPutObject(label) test_AMmapPutObject_ ## label -#define static_void_test_AMmapPutObject(label) \ - static void test_AMmapPutObject_##label(void** state) { \ - DocState* doc_state = *state; \ - AMstack** stack_ptr = &doc_state->base_state->stack; \ - AMobjType const obj_type = suffix_to_obj_type(#label); \ - AMobjId const* const obj_id = \ - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc_state->doc, AM_ROOT, AMstr(#label), obj_type), \ - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); \ - assert_non_null(obj_id); \ - assert_int_equal(AMobjObjType(doc_state->doc, obj_id), obj_type); \ - assert_int_equal(AMobjSize(doc_state->doc, obj_id, NULL), 0); \ - AMresultFree(AMstackPop(stack_ptr, NULL)); \ - } +#define static_void_test_AMmapPutObject(label) \ +static void test_AMmapPutObject_ ## label(void **state) { \ + GroupState* group_state = *state; \ + AMobjType const obj_type = AMobjType_tag(#label); \ + if (obj_type != AM_OBJ_TYPE_VOID) { \ + AMobjId const* const obj_id = AMpush( \ + &group_state->stack, \ + AMmapPutObject(group_state->doc, \ + AM_ROOT, \ + AMstr(#label), \ + obj_type), \ + AM_VALUE_OBJ_ID, \ + cmocka_cb).obj_id; \ + assert_non_null(obj_id); \ + assert_int_equal(AMobjObjType(group_state->doc, obj_id), obj_type); \ + assert_int_equal(AMobjSize(group_state->doc, obj_id, NULL), 0); \ + } \ + else { \ + AMpush(&group_state->stack, \ + AMmapPutObject(group_state->doc, \ + AM_ROOT, \ + AMstr(#label), \ + obj_type), \ + AM_VALUE_VOID, \ + NULL); \ + assert_int_not_equal(AMresultStatus(group_state->stack->result), \ + AM_STATUS_OK); \ + } \ + AMfree(AMpop(&group_state->stack)); \ +} -static void test_AMmapPutStr(void** state) { - DocState* doc_state = *state; - AMstack** stack_ptr = &doc_state->base_state->stack; - AMstackItem(NULL, AMmapPutStr(doc_state->doc, AM_ROOT, AMstr("Str"), AMstr("Hello, world!")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMbyteSpan str; - assert_true(AMitemToStr(AMstackItem(stack_ptr, AMmapGet(doc_state->doc, AM_ROOT, AMstr("Str"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)), - &str)); +static void test_AMmapPutStr(void **state) { + GroupState* group_state = *state; + AMfree(AMmapPutStr(group_state->doc, AM_ROOT, AMstr("Str"), AMstr("Hello, world!"))); + AMbyteSpan const str = AMpush(&group_state->stack, + AMmapGet(group_state->doc, AM_ROOT, AMstr("Str"), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("Hello, world!")); assert_memory_equal(str.src, "Hello, world!", str.count); - AMresultFree(AMstackPop(stack_ptr, NULL)); + AMfree(AMpop(&group_state->stack)); } -static_void_test_AMmapPut(Bool, bool, true); +static_void_test_AMmapPut(Bool, boolean, true) -static_void_test_AMmapPut(Counter, int64_t, INT64_MAX); +static_void_test_AMmapPut(Counter, counter, INT64_MAX) -static_void_test_AMmapPut(F64, double, DBL_MAX); +static_void_test_AMmapPut(F64, f64, DBL_MAX) -static_void_test_AMmapPut(Int, int64_t, INT64_MAX); +static_void_test_AMmapPut(Int, int_, INT64_MAX) -static_void_test_AMmapPutObject(List); +static_void_test_AMmapPutObject(List) -static_void_test_AMmapPutObject(Map); +static_void_test_AMmapPutObject(Map) -static_void_test_AMmapPutObject(Text); +static_void_test_AMmapPutObject(Text) -static_void_test_AMmapPut(Timestamp, int64_t, INT64_MAX); +static_void_test_AMmapPutObject(Void) -static_void_test_AMmapPut(Uint, int64_t, UINT64_MAX); +static_void_test_AMmapPut(Timestamp, timestamp, INT64_MAX) -/** - * \brief A JavaScript application can introduce NUL (`\0`) characters into - * a map object's key which will truncate it in a C application. +static_void_test_AMmapPut(Uint, uint, UINT64_MAX) + +/** \brief A JavaScript application can introduce NUL (`\0`) characters into a + * map object's key which will truncate it in a C application. */ static void test_get_NUL_key(void** state) { /* @@ -147,37 +159,39 @@ static void test_get_NUL_key(void** state) { doc['o\0ps'] = 'oops'; }); const bytes = Automerge.save(doc); - console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], - bytes).join(", ") + "};"); + console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], bytes).join(", ") + "};"); */ static uint8_t const OOPS_SRC[] = {'o', '\0', 'p', 's'}; static AMbyteSpan const OOPS_KEY = {.src = OOPS_SRC, .count = sizeof(OOPS_SRC) / sizeof(uint8_t)}; static uint8_t const SAVED_DOC[] = { - 133, 111, 74, 131, 233, 150, 60, 244, 0, 116, 1, 16, 223, 253, 146, 193, 58, 122, 66, 134, 151, - 225, 210, 51, 58, 86, 247, 8, 1, 49, 118, 234, 228, 42, 116, 171, 13, 164, 99, 244, 27, 19, - 150, 44, 201, 136, 222, 219, 90, 246, 226, 123, 77, 120, 157, 155, 55, 182, 2, 178, 64, 6, 1, - 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 6, 33, 2, 35, 2, 52, 1, 66, - 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, 127, 0, 127, 7, 127, - 4, 111, 0, 112, 115, 127, 0, 127, 1, 1, 127, 1, 127, 70, 111, 111, 112, 115, 127, 0, 0}; + 133, 111, 74, 131, 233, 150, 60, 244, 0, 116, 1, 16, 223, 253, 146, + 193, 58, 122, 66, 134, 151, 225, 210, 51, 58, 86, 247, 8, 1, 49, 118, + 234, 228, 42, 116, 171, 13, 164, 99, 244, 27, 19, 150, 44, 201, 136, + 222, 219, 90, 246, 226, 123, 77, 120, 157, 155, 55, 182, 2, 178, 64, 6, + 1, 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 6, 33, 2, 35, 2, 52, 1, + 66, 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, 127, 0, + 127, 7, 127, 4, 111, 0, 112, 115, 127, 0, 127, 1, 1, 127, 1, 127, 70, + 111, 111, 112, 115, 127, 0, 0 + }; static size_t const SAVED_DOC_SIZE = sizeof(SAVED_DOC) / sizeof(uint8_t); - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(SAVED_DOC, SAVED_DOC_SIZE), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, OOPS_KEY, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, + AMload(SAVED_DOC, SAVED_DOC_SIZE), + AM_VALUE_DOC, + cmocka_cb).doc; + AMbyteSpan const str = AMpush(&stack, + AMmapGet(doc, AM_ROOT, OOPS_KEY, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_not_equal(OOPS_KEY.count, strlen(OOPS_KEY.src)); assert_int_equal(str.count, strlen("oops")); assert_memory_equal(str.src, "oops", str.count); } -/** - * \brief A JavaScript application can introduce NUL (`\0`) characters into a - * map object's string value which will truncate it in a C application. +/** \brief A JavaScript application can introduce NUL (`\0`) characters into a + * map object's string value which will truncate it in a C application. */ static void test_get_NUL_string_value(void** state) { /* @@ -187,1369 +201,1209 @@ static void test_get_NUL_string_value(void** state) { doc.oops = 'o\0ps'; }); const bytes = Automerge.save(doc); - console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], - bytes).join(", ") + "};"); + console.log("static uint8_t const SAVED_DOC[] = {" + Array.apply([], bytes).join(", ") + "};"); */ static uint8_t const OOPS_VALUE[] = {'o', '\0', 'p', 's'}; static size_t const OOPS_SIZE = sizeof(OOPS_VALUE) / sizeof(uint8_t); static uint8_t const SAVED_DOC[] = { - 133, 111, 74, 131, 63, 94, 151, 29, 0, 116, 1, 16, 156, 159, 189, 12, 125, 55, 71, 154, 136, - 104, 237, 186, 45, 224, 32, 22, 1, 36, 163, 164, 222, 81, 42, 1, 247, 231, 156, 54, 222, 76, - 6, 109, 18, 172, 75, 36, 118, 120, 68, 73, 87, 186, 230, 127, 68, 19, 81, 149, 185, 6, 1, - 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 6, 33, 2, 35, 2, 52, 1, 66, - 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, 127, 0, 127, 7, 127, - 4, 111, 111, 112, 115, 127, 0, 127, 1, 1, 127, 1, 127, 70, 111, 0, 112, 115, 127, 0, 0}; + 133, 111, 74, 131, 63, 94, 151, 29, 0, 116, 1, 16, 156, 159, 189, 12, + 125, 55, 71, 154, 136, 104, 237, 186, 45, 224, 32, 22, 1, 36, 163, + 164, 222, 81, 42, 1, 247, 231, 156, 54, 222, 76, 6, 109, 18, 172, 75, + 36, 118, 120, 68, 73, 87, 186, 230, 127, 68, 19, 81, 149, 185, 6, 1, + 2, 3, 2, 19, 2, 35, 2, 64, 2, 86, 2, 8, 21, 6, 33, 2, 35, 2, 52, 1, + 66, 2, 86, 2, 87, 4, 128, 1, 2, 127, 0, 127, 1, 127, 1, 127, 0, 127, + 0, 127, 7, 127, 4, 111, 111, 112, 115, 127, 0, 127, 1, 1, 127, 1, 127, + 70, 111, 0, 112, 115, 127, 0, 0 + }; static size_t const SAVED_DOC_SIZE = sizeof(SAVED_DOC) / sizeof(uint8_t); - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(SAVED_DOC, SAVED_DOC_SIZE), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("oops"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), - &str)); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, + AMload(SAVED_DOC, SAVED_DOC_SIZE), + AM_VALUE_DOC, + cmocka_cb).doc; + AMbyteSpan const str = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("oops"), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_not_equal(str.count, strlen(OOPS_VALUE)); assert_int_equal(str.count, OOPS_SIZE); assert_memory_equal(str.src, OOPS_VALUE, str.count); } static void test_range_iter_map(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("a"), 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("b"), 4), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("c"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("d"), 6), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("a"), 7), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("a"), 8), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("d"), 9), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMactorId const* actor_id; - assert_true(AMitemToActorId(AMstackItem(stack_ptr, AMgetActorId(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMitems map_items = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)); - assert_int_equal(AMitemsSize(&map_items), 4); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("a"), 3)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("b"), 4)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("c"), 5)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("d"), 6)); + AMfree(AMcommit(doc, AMstr(NULL), NULL)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("a"), 7)); + AMfree(AMcommit(doc, AMstr(NULL), NULL)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("a"), 8)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("d"), 9)); + AMfree(AMcommit(doc, AMstr(NULL), NULL)); + AMactorId const* const actor_id = AMpush(&stack, + AMgetActorId(doc), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMmapItems map_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + assert_int_equal(AMmapItemsSize(&map_items), 4); /* ["b"-"d") */ - AMitems range = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr("b"), AMstr("d"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)); + AMmapItems range = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr("b"), AMstr("d"), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - AMitem* next = AMitemsNext(&range, 1); + AMmapItem const* next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(next, &key)); + AMbyteSpan key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "b", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - uint64_t uint; - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 4); - AMobjId const* next_obj_id = AMitemObjId(next); + AMvalue next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 4); + AMobjId const* next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "c", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 5); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 5); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - assert_null(AMitemsNext(&range, 1)); + assert_null(AMmapItemsNext(&range, 1)); /* ["b"-) */ - range = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr("b"), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)); + range = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr("b"), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "b", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 4); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 4); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "c", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 5); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 5); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "d", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 9); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 9); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 7); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Fourth */ - assert_null(AMitemsNext(&range, 1)); + assert_null(AMmapItemsNext(&range, 1)); /* [-"d") */ - range = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr("d"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)); + range = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr("d"), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "a", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 8); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 8); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 6); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "b", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 4); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 4); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "c", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 5); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 5); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Fourth */ - assert_null(AMitemsNext(&range, 1)); + assert_null(AMmapItemsNext(&range, 1)); /* ["a"-) */ - range = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr("a"), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)); + range = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr("a"), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "a", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 8); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 8); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 6); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "b", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 4); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 4); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "c", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 5); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 5); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Fourth */ - next = AMitemsNext(&range, 1); + next = AMmapItemsNext(&range, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "d", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_UINT); - assert_true(AMitemToUint(next, &uint)); - assert_int_equal(uint, 9); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_UINT); + assert_int_equal(next_value.uint, 9); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 7); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Fifth */ - assert_null(AMitemsNext(&range, 1)); + assert_null(AMmapItemsNext(&range, 1)); } static void test_map_range_back_and_forth_single(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMactorId const* actor_id; - assert_true(AMitemToActorId(AMstackItem(stack_ptr, AMgetActorId(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id = AMpush(&stack, + AMgetActorId(doc), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("1"), AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("2"), AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("3"), AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("1"), AMstr("a"))); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("2"), AMstr("b"))); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("3"), AMstr("c"))); /* Forward, back, back. */ - AMitems range_all = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); + AMmapItems range_all = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - AMitem* next = AMitemsNext(&range_all, 1); + AMmapItem const* next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(next, &key)); + AMbyteSpan key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - AMbyteSpan str; - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - AMobjId const* next_obj_id = AMitemObjId(next); + AMvalue next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + AMobjId const* next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - AMitems range_back_all = AMitemsReversed(&range_all); - range_back_all = AMitemsRewound(&range_back_all); - AMitem* next_back = AMitemsNext(&range_back_all, 1); + AMmapItems range_back_all = AMmapItemsReversed(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); + AMmapItem const* next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - AMbyteSpan str_back; - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - AMobjId const* next_back_obj_id = AMitemObjId(next_back); + AMvalue next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + AMobjId const* next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "b", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "b", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Forward, back, forward. */ - range_all = AMitemsRewound(&range_all); - range_back_all = AMitemsRewound(&range_back_all); + range_all = AMmapItemsRewound(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "b", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "b", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Forward, forward, forward. */ - range_all = AMitemsRewound(&range_all); + range_all = AMmapItemsRewound(&range_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "b", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "b", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "c", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "c", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Forward stop */ - assert_null(AMitemsNext(&range_all, 1)); + assert_null(AMmapItemsNext(&range_all, 1)); /* Back, back, back. */ - range_back_all = AMitemsRewound(&range_back_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "b", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "b", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* First */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "a", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "a", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Back stop */ - assert_null(AMitemsNext(&range_back_all, 1)); + assert_null(AMmapItemsNext(&range_back_all, 1)); } static void test_map_range_back_and_forth_double(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); - AMactorId const* actor_id1; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromBytes("\0", 1), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id1)); - AMstackItem(NULL, AMsetActorId(doc1, actor_id1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMresultStack* stack = *state; + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id1= AMpush(&stack, + AMactorIdInitBytes("\0", 1), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(doc1, actor_id1)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("1"), AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("2"), AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("3"), AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("1"), AMstr("a"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("2"), AMstr("b"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("3"), AMstr("c"))); /* The second actor should win all conflicts here. */ - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); - AMactorId const* actor_id2; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromBytes("\1", 1), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id2)); - AMstackItem(NULL, AMsetActorId(doc2, actor_id2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("1"), AMstr("aa")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("2"), AMstr("bb")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("3"), AMstr("cc")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMdoc* const doc2 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id2 = AMpush(&stack, + AMactorIdInitBytes("\1", 1), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(doc2, actor_id2)); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("1"), AMstr("aa"))); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("2"), AMstr("bb"))); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("3"), AMstr("cc"))); - AMstackItem(NULL, AMmerge(doc1, doc2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(doc1, doc2)); /* Forward, back, back. */ - AMitems range_all = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); + AMmapItems range_all = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - AMitem* next = AMitemsNext(&range_all, 1); + AMmapItem const* next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(next, &key)); + AMbyteSpan key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - AMbyteSpan str; - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - AMobjId const* next_obj_id = AMitemObjId(next); + AMvalue next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + AMobjId const* next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - AMitems range_back_all = AMitemsReversed(&range_all); - range_back_all = AMitemsRewound(&range_back_all); - AMitem* next_back = AMitemsNext(&range_back_all, 1); + AMmapItems range_back_all = AMmapItemsReversed(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); + AMmapItem const* next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - AMbyteSpan str_back; - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - AMobjId const* next_back_obj_id = AMitemObjId(next_back); + AMvalue next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + AMobjId const* next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "bb", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "bb", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Forward, back, forward. */ - range_all = AMitemsRewound(&range_all); - range_back_all = AMitemsRewound(&range_back_all); + range_all = AMmapItemsRewound(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "bb", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "bb", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Forward, forward, forward. */ - range_all = AMitemsRewound(&range_all); + range_all = AMmapItemsRewound(&range_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "bb", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "bb", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "cc", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "cc", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Forward stop */ - assert_null(AMitemsNext(&range_all, 1)); + assert_null(AMmapItemsNext(&range_all, 1)); /* Back, back, back. */ - range_back_all = AMitemsRewound(&range_back_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "bb", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "bb", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* First */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "aa", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "aa", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Back stop */ - assert_null(AMitemsNext(&range_back_all, 1)); + assert_null(AMmapItemsNext(&range_back_all, 1)); } static void test_map_range_at_back_and_forth_single(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); - AMactorId const* actor_id; - assert_true(AMitemToActorId(AMstackItem(stack_ptr, AMgetActorId(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); + AMresultStack* stack = *state; + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id = AMpush(&stack, + AMgetActorId(doc), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("1"), AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("2"), AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("3"), AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("1"), AMstr("a"))); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("2"), AMstr("b"))); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("3"), AMstr("c"))); - AMitems const heads = AMstackItems(stack_ptr, AMgetHeads(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads = AMpush(&stack, + AMgetHeads(doc), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* Forward, back, back. */ - AMitems range_all = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); + AMmapItems range_all = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - AMitem* next = AMitemsNext(&range_all, 1); + AMmapItem const* next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(next, &key)); + AMbyteSpan key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - AMbyteSpan str; - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - AMobjId const* next_obj_id = AMitemObjId(next); + AMvalue next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + AMobjId const* next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - AMitems range_back_all = AMitemsReversed(&range_all); - range_back_all = AMitemsRewound(&range_back_all); - AMitem* next_back = AMitemsNext(&range_back_all, 1); + AMmapItems range_back_all = AMmapItemsReversed(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); + AMmapItem const* next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - AMbyteSpan str_back; - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - AMobjId const* next_back_obj_id = AMitemObjId(next_back); + AMvalue next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + AMobjId const* next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "b", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "b", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Forward, back, forward. */ - range_all = AMitemsRewound(&range_all); - range_back_all = AMitemsRewound(&range_back_all); + range_all = AMmapItemsRewound(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "b", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "b", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Forward, forward, forward. */ - range_all = AMitemsRewound(&range_all); + range_all = AMmapItemsRewound(&range_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "a", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "a", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "b", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "b", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Third */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 1); - assert_memory_equal(str.src, "c", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 1); + assert_memory_equal(next_value.str.src, "c", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 0); /* Forward stop */ - assert_null(AMitemsNext(&range_all, 1)); + assert_null(AMmapItemsNext(&range_all, 1)); /* Back, back, back. */ - range_back_all = AMitemsRewound(&range_back_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "c", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "c", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "b", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "b", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* First */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 1); - assert_memory_equal(str_back.src, "a", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 1); + assert_memory_equal(next_back_value.str.src, "a", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 0); /* Back stop */ - assert_null(AMitemsNext(&range_back_all, 1)); + assert_null(AMmapItemsNext(&range_back_all, 1)); } static void test_map_range_at_back_and_forth_double(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); - AMactorId const* actor_id1; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromBytes("\0", 1), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id1)); - AMstackItem(NULL, AMsetActorId(doc1, actor_id1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMresultStack* stack = *state; + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id1= AMpush(&stack, + AMactorIdInitBytes("\0", 1), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(doc1, actor_id1)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("1"), AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("2"), AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("3"), AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("1"), AMstr("a"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("2"), AMstr("b"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("3"), AMstr("c"))); /* The second actor should win all conflicts here. */ - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); - AMactorId const* actor_id2; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromBytes("\1", 1), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id2)); - AMstackItem(NULL, AMsetActorId(doc2, actor_id2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("1"), AMstr("aa")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("2"), AMstr("bb")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("3"), AMstr("cc")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMdoc* const doc2 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMactorId const* const actor_id2= AMpush(&stack, + AMactorIdInitBytes("\1", 1), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id; + AMfree(AMsetActorId(doc2, actor_id2)); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("1"), AMstr("aa"))); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("2"), AMstr("bb"))); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("3"), AMstr("cc"))); - AMstackItem(NULL, AMmerge(doc1, doc2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems const heads = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(doc1, doc2)); + AMchangeHashes const heads = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* Forward, back, back. */ - AMitems range_all = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); + AMmapItems range_all = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; /* First */ - AMitem* next = AMitemsNext(&range_all, 1); + AMmapItem const* next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(next, &key)); + AMbyteSpan key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - AMbyteSpan str; - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - AMobjId const* next_obj_id = AMitemObjId(next); + AMvalue next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + AMobjId const* next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - AMitems range_back_all = AMitemsReversed(&range_all); - range_back_all = AMitemsRewound(&range_back_all); - AMitem* next_back = AMitemsNext(&range_back_all, 1); + AMmapItems range_back_all = AMmapItemsReversed(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); + AMmapItem const* next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - AMbyteSpan str_back; - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - AMobjId const* next_back_obj_id = AMitemObjId(next_back); + AMvalue next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + AMobjId const* next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "bb", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "bb", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Forward, back, forward. */ - range_all = AMitemsRewound(&range_all); - range_back_all = AMitemsRewound(&range_back_all); + range_all = AMmapItemsRewound(&range_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "bb", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "bb", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Forward, forward, forward. */ - range_all = AMitemsRewound(&range_all); + range_all = AMmapItemsRewound(&range_all); /* First */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "aa", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "aa", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Second */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "bb", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "bb", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Third */ - next = AMitemsNext(&range_all, 1); + next = AMmapItemsNext(&range_all, 1); assert_non_null(next); - assert_int_equal(AMitemIdxType(next), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next, &key)); + key = AMmapItemKey(next); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next, &str)); - assert_int_equal(str.count, 2); - assert_memory_equal(str.src, "cc", str.count); - next_obj_id = AMitemObjId(next); + next_value = AMmapItemValue(next); + assert_int_equal(next_value.tag, AM_VALUE_STR); + assert_int_equal(next_value.str.count, 2); + assert_memory_equal(next_value.str.src, "cc", next_value.str.count); + next_obj_id = AMmapItemObjId(next); assert_int_equal(AMobjIdCounter(next_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_obj_id), 1); /* Forward stop */ - assert_null(AMitemsNext(&range_all, 1)); + assert_null(AMmapItemsNext(&range_all, 1)); /* Back, back, back. */ - range_back_all = AMitemsRewound(&range_back_all); + range_back_all = AMmapItemsRewound(&range_back_all); /* Third */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "3", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "cc", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "cc", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 3); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Second */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "2", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "bb", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "bb", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 2); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* First */ - next_back = AMitemsNext(&range_back_all, 1); + next_back = AMmapItemsNext(&range_back_all, 1); assert_non_null(next_back); - assert_int_equal(AMitemIdxType(next_back), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(next_back, &key)); + key = AMmapItemKey(next_back); assert_int_equal(key.count, 1); assert_memory_equal(key.src, "1", key.count); - assert_int_equal(AMitemValType(next_back), AM_VAL_TYPE_STR); - assert_true(AMitemToStr(next_back, &str_back)); - assert_int_equal(str_back.count, 2); - assert_memory_equal(str_back.src, "aa", str_back.count); - next_back_obj_id = AMitemObjId(next_back); + next_back_value = AMmapItemValue(next_back); + assert_int_equal(next_back_value.tag, AM_VALUE_STR); + assert_int_equal(next_back_value.str.count, 2); + assert_memory_equal(next_back_value.str.src, "aa", next_back_value.str.count); + next_back_obj_id = AMmapItemObjId(next_back); assert_int_equal(AMobjIdCounter(next_back_obj_id), 1); assert_int_equal(AMactorIdCmp(AMobjIdActorId(next_back_obj_id), actor_id2), 0); assert_int_equal(AMobjIdIndex(next_back_obj_id), 1); /* Back stop */ - assert_null(AMitemsNext(&range_back_all, 1)); + assert_null(AMmapItemsNext(&range_back_all, 1)); } static void test_get_range_values(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("aa"), AMstr("aaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("bb"), AMstr("bbb")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("cc"), AMstr("ccc")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("dd"), AMstr("ddd")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMresultStack* stack = *state; + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("aa"), AMstr("aaa"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("bb"), AMstr("bbb"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("cc"), AMstr("ccc"))); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("dd"), AMstr("ddd"))); + AMfree(AMcommit(doc1, AMstr(NULL), NULL)); - AMitems const v1 = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMfork(doc1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); + AMchangeHashes const v1 = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMdoc* const doc2 = AMpush(&stack, AMfork(doc1, NULL), AM_VALUE_DOC, cmocka_cb).doc; - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("cc"), AMstr("ccc V2")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc1, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("cc"), AMstr("ccc V2"))); + AMfree(AMcommit(doc1, AMstr(NULL), NULL)); - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("cc"), AMstr("ccc V3")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(doc2, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("cc"), AMstr("ccc V3"))); + AMfree(AMcommit(doc2, AMstr(NULL), NULL)); - AMstackItem(NULL, AMmerge(doc1, doc2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(doc1, doc2)); - /* Forward vs. reverse: complete current map range. */ - AMitems range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - size_t size = AMitemsSize(&range); - assert_int_equal(size, 4); - AMitems range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - AMbyteSpan key; - assert_true(AMitemKey(AMitemsNext(&range, 1), &key)); - assert_memory_equal(key.src, "aa", key.count); - assert_true(AMitemKey(AMitemsNext(&range_back, 1), &key)); - assert_memory_equal(key.src, "dd", key.count); + AMmapItems range = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr("b"), AMstr("d"), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItems range_back = AMmapItemsReversed(&range); + assert_int_equal(AMmapItemsSize(&range), 2); - AMitem *item1, *item_back1; - size_t count, middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - AMbyteSpan key1, key_back1; - assert_true(AMitemKey(item1, &key1)); - assert_true(AMitemKey(item_back1, &key_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(AMstrCmp(key1, key_back1), 0); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(AMstrCmp(key1, key_back1), 0); - } - AMitem* item2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key1, NULL), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key_back1, NULL), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + AMmapItem const* map_item = NULL; + while ((map_item = AMmapItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMresult* result = AMmapGet(doc1, AM_ROOT, AMmapItemKey(map_item), NULL); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMmapItemObjId(map_item)); + AMfree(result); } - /* Forward vs. reverse: partial current map range. */ - range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr("aa"), AMstr("dd"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 3); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemKey(AMitemsNext(&range, 1), &key)); - assert_memory_equal(key.src, "aa", key.count); - assert_true(AMitemKey(AMitemsNext(&range_back, 1), &key)); - assert_memory_equal(key.src, "cc", key.count); + assert_int_equal(AMmapItemsSize(&range_back), 2); - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - AMbyteSpan key1, key_back1; - assert_true(AMitemKey(item1, &key1)); - assert_true(AMitemKey(item_back1, &key_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(AMstrCmp(key1, key_back1), 0); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(AMstrCmp(key1, key_back1), 0); - } - AMitem* item2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key1, NULL), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key_back1, NULL), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + while ((map_item = AMmapItemsNext(&range_back, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMresult* result = AMmapGet(doc1, AM_ROOT, AMmapItemKey(map_item), NULL); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMmapItemObjId(map_item)); + AMfree(result); } - /* Forward vs. reverse: complete historical map range. */ - range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), &v1), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 4); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemKey(AMitemsNext(&range, 1), &key)); - assert_memory_equal(key.src, "aa", key.count); - assert_true(AMitemKey(AMitemsNext(&range_back, 1), &key)); - assert_memory_equal(key.src, "dd", key.count); + range = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr("b"), AMstr("d"), &v1), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + range_back = AMmapItemsReversed(&range); + assert_int_equal(AMmapItemsSize(&range), 2); - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - AMbyteSpan key1, key_back1; - assert_true(AMitemKey(item1, &key1)); - assert_true(AMitemKey(item_back1, &key_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(AMstrCmp(key1, key_back1), 0); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(AMstrCmp(key1, key_back1), 0); - } - AMitem* item2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key1, &v1), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key_back1, &v1), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + while ((map_item = AMmapItemsNext(&range, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMresult* result = AMmapGet(doc1, AM_ROOT, AMmapItemKey(map_item), &v1); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMmapItemObjId(map_item)); + AMfree(result); } - /* Forward vs. reverse: partial historical map range. */ - range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr("bb"), AMstr(NULL), &v1), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - size = AMitemsSize(&range); - assert_int_equal(size, 3); - range_back = AMitemsReversed(&range); - assert_int_equal(AMitemsSize(&range_back), size); - assert_true(AMitemKey(AMitemsNext(&range, 1), &key)); - assert_memory_equal(key.src, "bb", key.count); - assert_true(AMitemKey(AMitemsNext(&range_back, 1), &key)); - assert_memory_equal(key.src, "dd", key.count); + assert_int_equal(AMmapItemsSize(&range_back), 2); - middle = size / 2; - range = AMitemsRewound(&range); - range_back = AMitemsRewound(&range_back); - for (item1 = NULL, item_back1 = NULL, count = 0; item1 && item_back1; - item1 = AMitemsNext(&range, 1), item_back1 = AMitemsNext(&range_back, 1), ++count) { - AMbyteSpan key1, key_back1; - assert_true(AMitemKey(item1, &key1)); - assert_true(AMitemKey(item_back1, &key_back1)); - if ((count == middle) && (middle & 1)) { - /* The iterators are crossing in the middle. */ - assert_int_equal(AMstrCmp(key1, key_back1), 0); - assert_true(AMitemEqual(item1, item_back1)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item_back1))); - } else { - assert_int_not_equal(AMstrCmp(key1, key_back1), 0); - } - AMitem* item2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key1, &v1), NULL, NULL); - AMitem* item_back2 = AMstackItem(stack_ptr, AMmapGet(doc1, AM_ROOT, key_back1, &v1), NULL, NULL); - /** \note An item returned from an `AM...Get()` call doesn't include the - index used to retrieve it. */ - assert_false(AMitemIdxType(item2)); - assert_false(AMitemIdxType(item_back2)); - assert_true(AMitemEqual(item1, item2)); - assert_true(AMobjIdEqual(AMitemObjId(item1), AMitemObjId(item2))); - assert_true(AMitemEqual(item_back1, item_back2)); - assert_true(AMobjIdEqual(AMitemObjId(item_back1), AMitemObjId(item_back2))); - AMresultFree(AMstackPop(stack_ptr, NULL)); + while ((map_item = AMmapItemsNext(&range_back, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMresult* result = AMmapGet(doc1, AM_ROOT, AMmapItemKey(map_item), &v1); + AMvalue const val2 = AMresultValue(result); + assert_true(AMvalueEqual(&val1, &val2)); + assert_non_null(AMmapItemObjId(map_item)); + AMfree(result); } - /* Map range vs. object range: complete current. */ - range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - AMitems obj_items = AMstackItems(stack_ptr, AMobjItems(doc1, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&range), AMitemsSize(&obj_items)); - - AMitem *item, *obj_item; - for (item = NULL, obj_item = NULL; item && obj_item; - item = AMitemsNext(&range, 1), obj_item = AMitemsNext(&obj_items, 1)) { - /** \note Object iteration doesn't yield any item indices. */ - assert_true(AMitemIdxType(item)); - assert_false(AMitemIdxType(obj_item)); - assert_true(AMitemEqual(item, obj_item)); - assert_true(AMobjIdEqual(AMitemObjId(item), AMitemObjId(obj_item))); + range = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMobjItems values = AMpush(&stack, + AMobjValues(doc1, AM_ROOT, NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; + assert_int_equal(AMmapItemsSize(&range), AMobjItemsSize(&values)); + AMobjItem const* value = NULL; + while ((map_item = AMmapItemsNext(&range, 1)) != NULL && + (value = AMobjItemsNext(&values, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMvalue const val2 = AMobjItemValue(value); + assert_true(AMvalueEqual(&val1, &val2)); + assert_true(AMobjIdEqual(AMmapItemObjId(map_item), AMobjItemObjId(value))); } - /* Map range vs. object range: complete historical. */ - range = AMstackItems(stack_ptr, AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), &v1), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - obj_items = AMstackItems(stack_ptr, AMobjItems(doc1, AM_ROOT, &v1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&range), AMitemsSize(&obj_items)); - - for (item = NULL, obj_item = NULL; item && obj_item; - item = AMitemsNext(&range, 1), obj_item = AMitemsNext(&obj_items, 1)) { - /** \note Object iteration doesn't yield any item indices. */ - assert_true(AMitemIdxType(item)); - assert_false(AMitemIdxType(obj_item)); - assert_true(AMitemEqual(item, obj_item)); - assert_true(AMobjIdEqual(AMitemObjId(item), AMitemObjId(obj_item))); + range = AMpush(&stack, + AMmapRange(doc1, AM_ROOT, AMstr(NULL), AMstr(NULL), &v1), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + values = AMpush(&stack, + AMobjValues(doc1, AM_ROOT, &v1), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; + assert_int_equal(AMmapItemsSize(&range), AMobjItemsSize(&values)); + while ((map_item = AMmapItemsNext(&range, 1)) != NULL && + (value = AMobjItemsNext(&values, 1)) != NULL) { + AMvalue const val1 = AMmapItemValue(map_item); + AMvalue const val2 = AMobjItemValue(value); + assert_true(AMvalueEqual(&val1, &val2)); + assert_true(AMobjIdEqual(AMmapItemObjId(map_item), AMobjItemObjId(value))); } } @@ -1565,18 +1419,19 @@ int run_map_tests(void) { cmocka_unit_test(test_AMmapPutObject(List)), cmocka_unit_test(test_AMmapPutObject(Map)), cmocka_unit_test(test_AMmapPutObject(Text)), + cmocka_unit_test(test_AMmapPutObject(Void)), cmocka_unit_test(test_AMmapPutStr), cmocka_unit_test(test_AMmapPut(Timestamp)), cmocka_unit_test(test_AMmapPut(Uint)), - cmocka_unit_test_setup_teardown(test_get_NUL_key, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_get_NUL_string_value, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_range_iter_map, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_map_range_back_and_forth_single, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_map_range_back_and_forth_double, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_map_range_at_back_and_forth_single, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_map_range_at_back_and_forth_double, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_get_range_values, setup_base, teardown_base), + cmocka_unit_test_setup_teardown(test_get_NUL_key, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_get_NUL_string_value, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_range_iter_map, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_map_range_back_and_forth_single, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_map_range_back_and_forth_double, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_map_range_at_back_and_forth_single, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_map_range_at_back_and_forth_double, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_get_range_values, setup_stack, teardown_stack), }; - return cmocka_run_group_tests(tests, setup_doc, teardown_doc); + return cmocka_run_group_tests(tests, group_setup, group_teardown); } diff --git a/rust/automerge-c/test/ported_wasm/basic_tests.c b/rust/automerge-c/test/ported_wasm/basic_tests.c index b83ff132..aafa32d8 100644 --- a/rust/automerge-c/test/ported_wasm/basic_tests.c +++ b/rust/automerge-c/test/ported_wasm/basic_tests.c @@ -11,10 +11,7 @@ /* local */ #include -#include -#include -#include "../base_state.h" -#include "../cmocka_utils.h" +#include "../stack_utils.h" /** * \brief default import init() should return a promise @@ -25,171 +22,163 @@ static void test_default_import_init_should_return_a_promise(void** state); * \brief should create, clone and free */ static void test_create_clone_and_free(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc1 = create() */ - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); + AMdoc* const doc1 = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const doc2 = doc1.clone() */ - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMclone(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); + AMdoc* const doc2 = AMpush(&stack, AMclone(doc1), AM_VALUE_DOC, cmocka_cb).doc; } /** * \brief should be able to start and commit */ static void test_start_and_commit(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* doc.commit() */ - AMstackItems(stack_ptr, AMemptyChange(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMpush(&stack, AMcommit(doc, AMstr(NULL), NULL), AM_VALUE_CHANGE_HASHES, cmocka_cb); } /** * \brief getting a nonexistent prop does not throw an error */ static void test_getting_a_nonexistent_prop_does_not_throw_an_error(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* const result = doc.getWithType(root, "hello") */ /* assert.deepEqual(result, undefined) */ - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("hello"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("hello"), NULL), + AM_VALUE_VOID, + cmocka_cb); } /** * \brief should be able to set and get a simple value */ static void test_should_be_able_to_set_and_get_a_simple_value(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc: Automerge = create("aabbcc") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aabbcc")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aabbcc")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const root = "_root" */ /* let result */ /* */ /* doc.put(root, "hello", "world") */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("hello"), AMstr("world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("hello"), AMstr("world"))); /* doc.put(root, "number1", 5, "uint") */ - AMstackItem(NULL, AMmapPutUint(doc, AM_ROOT, AMstr("number1"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(doc, AM_ROOT, AMstr("number1"), 5)); /* doc.put(root, "number2", 5) */ - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("number2"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("number2"), 5)); /* doc.put(root, "number3", 5.5) */ - AMstackItem(NULL, AMmapPutF64(doc, AM_ROOT, AMstr("number3"), 5.5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutF64(doc, AM_ROOT, AMstr("number3"), 5.5)); /* doc.put(root, "number4", 5.5, "f64") */ - AMstackItem(NULL, AMmapPutF64(doc, AM_ROOT, AMstr("number4"), 5.5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutF64(doc, AM_ROOT, AMstr("number4"), 5.5)); /* doc.put(root, "number5", 5.5, "int") */ - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("number5"), 5.5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("number5"), 5.5)); /* doc.put(root, "bool", true) */ - AMstackItem(NULL, AMmapPutBool(doc, AM_ROOT, AMstr("bool"), true), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutBool(doc, AM_ROOT, AMstr("bool"), true)); /* doc.put(root, "time1", 1000, "timestamp") */ - AMstackItem(NULL, AMmapPutTimestamp(doc, AM_ROOT, AMstr("time1"), 1000), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutTimestamp(doc, AM_ROOT, AMstr("time1"), 1000)); /* doc.put(root, "time2", new Date(1001)) */ - AMstackItem(NULL, AMmapPutTimestamp(doc, AM_ROOT, AMstr("time2"), 1001), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutTimestamp(doc, AM_ROOT, AMstr("time2"), 1001)); /* doc.putObject(root, "list", []); */ - AMstackItem(NULL, AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); + AMfree(AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST)); /* doc.put(root, "null", null) */ - AMstackItem(NULL, AMmapPutNull(doc, AM_ROOT, AMstr("null")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutNull(doc, AM_ROOT, AMstr("null"))); /* */ /* result = doc.getWithType(root, "hello") */ /* assert.deepEqual(result, ["str", "world"]) */ /* assert.deepEqual(doc.get("/", "hello"), "world") */ - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("hello"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), - &str)); + AMbyteSpan str = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("hello"), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("world")); assert_memory_equal(str.src, "world", str.count); /* assert.deepEqual(doc.get("/", "hello"), "world") */ /* */ /* result = doc.getWithType(root, "number1") */ /* assert.deepEqual(result, ["uint", 5]) */ - uint64_t uint; - assert_true(AMitemToUint( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("number1"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 5); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("number1"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 5); /* assert.deepEqual(doc.get("/", "number1"), 5) */ /* */ /* result = doc.getWithType(root, "number2") */ /* assert.deepEqual(result, ["int", 5]) */ - int64_t int_; - assert_true(AMitemToInt( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("number2"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_INT)), - &int_)); - assert_int_equal(int_, 5); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("number2"), NULL), + AM_VALUE_INT, + cmocka_cb).int_, 5); /* */ /* result = doc.getWithType(root, "number3") */ /* assert.deepEqual(result, ["f64", 5.5]) */ - double f64; - assert_true(AMitemToF64( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("number3"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_F64)), - &f64)); - assert_float_equal(f64, 5.5, DBL_EPSILON); + assert_float_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("number3"), NULL), + AM_VALUE_F64, + cmocka_cb).f64, 5.5, DBL_EPSILON); /* */ /* result = doc.getWithType(root, "number4") */ /* assert.deepEqual(result, ["f64", 5.5]) */ - assert_true(AMitemToF64( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("number4"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_F64)), - &f64)); - assert_float_equal(f64, 5.5, DBL_EPSILON); + assert_float_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("number4"), NULL), + AM_VALUE_F64, + cmocka_cb).f64, 5.5, DBL_EPSILON); /* */ /* result = doc.getWithType(root, "number5") */ /* assert.deepEqual(result, ["int", 5]) */ - assert_true(AMitemToInt( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("number5"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_INT)), - &int_)); - assert_int_equal(int_, 5); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("number5"), NULL), + AM_VALUE_INT, + cmocka_cb).int_, 5); /* */ /* result = doc.getWithType(root, "bool") */ /* assert.deepEqual(result, ["boolean", true]) */ - bool boolean; - assert_true(AMitemToBool( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("bool"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BOOL)), - &boolean)); - assert_true(boolean); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("bool"), NULL), + AM_VALUE_BOOLEAN, + cmocka_cb).boolean, true); /* */ /* doc.put(root, "bool", false, "boolean") */ - AMstackItem(NULL, AMmapPutBool(doc, AM_ROOT, AMstr("bool"), false), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutBool(doc, AM_ROOT, AMstr("bool"), false)); /* */ /* result = doc.getWithType(root, "bool") */ /* assert.deepEqual(result, ["boolean", false]) */ - assert_true(AMitemToBool( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("bool"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BOOL)), - &boolean)); - assert_false(boolean); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("bool"), NULL), + AM_VALUE_BOOLEAN, + cmocka_cb).boolean, false); /* */ /* result = doc.getWithType(root, "time1") */ /* assert.deepEqual(result, ["timestamp", new Date(1000)]) */ - int64_t timestamp; - assert_true(AMitemToTimestamp(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("time1"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_TIMESTAMP)), - ×tamp)); - assert_int_equal(timestamp, 1000); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("time1"), NULL), + AM_VALUE_TIMESTAMP, + cmocka_cb).timestamp, 1000); /* */ /* result = doc.getWithType(root, "time2") */ /* assert.deepEqual(result, ["timestamp", new Date(1001)]) */ - assert_true(AMitemToTimestamp(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("time2"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_TIMESTAMP)), - ×tamp)); - assert_int_equal(timestamp, 1001); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("time2"), NULL), + AM_VALUE_TIMESTAMP, + cmocka_cb).timestamp, 1001); /* */ /* result = doc.getWithType(root, "list") */ /* assert.deepEqual(result, ["list", "10@aabbcc"]); */ - AMobjId const* const list = AMitemObjId( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("list"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const list = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("list"), NULL), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; assert_int_equal(AMobjIdCounter(list), 10); str = AMactorIdStr(AMobjIdActorId(list)); assert_int_equal(str.count, strlen("aabbcc")); @@ -197,39 +186,38 @@ static void test_should_be_able_to_set_and_get_a_simple_value(void** state) { /* */ /* result = doc.getWithType(root, "null") */ /* assert.deepEqual(result, ["null", null]); */ - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("null"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_NULL)); + AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("null"), NULL), + AM_VALUE_NULL, + cmocka_cb); } /** * \brief should be able to use bytes */ static void test_should_be_able_to_use_bytes(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* doc.put("_root", "data1", new Uint8Array([10, 11, 12])); */ static uint8_t const DATA1[] = {10, 11, 12}; - AMstackItem(NULL, AMmapPutBytes(doc, AM_ROOT, AMstr("data1"), AMbytes(DATA1, sizeof(DATA1))), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutBytes(doc, AM_ROOT, AMstr("data1"), DATA1, sizeof(DATA1))); /* doc.put("_root", "data2", new Uint8Array([13, 14, 15]), "bytes"); */ static uint8_t const DATA2[] = {13, 14, 15}; - AMstackItem(NULL, AMmapPutBytes(doc, AM_ROOT, AMstr("data2"), AMbytes(DATA2, sizeof(DATA2))), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutBytes(doc, AM_ROOT, AMstr("data2"), DATA2, sizeof(DATA2))); /* const value1 = doc.getWithType("_root", "data1") */ - AMbyteSpan value1; - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("data1"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), - &value1)); + AMbyteSpan const value1 = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("data1"), NULL), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* assert.deepEqual(value1, ["bytes", new Uint8Array([10, 11, 12])]); */ assert_int_equal(value1.count, sizeof(DATA1)); assert_memory_equal(value1.src, DATA1, sizeof(DATA1)); /* const value2 = doc.getWithType("_root", "data2") */ - AMbyteSpan value2; - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("data2"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), - &value2)); + AMbyteSpan const value2 = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("data2"), NULL), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* assert.deepEqual(value2, ["bytes", new Uint8Array([13, 14, 15])]); */ assert_int_equal(value2.count, sizeof(DATA2)); assert_memory_equal(value2.src, DATA2, sizeof(DATA2)); @@ -239,92 +227,103 @@ static void test_should_be_able_to_use_bytes(void** state) { * \brief should be able to make subobjects */ static void test_should_be_able_to_make_subobjects(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* let result */ /* */ /* const submap = doc.putObject(root, "submap", {}) */ - AMobjId const* const submap = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("submap"), AM_OBJ_TYPE_MAP), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const submap = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("submap"), AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc.put(submap, "number", 6, "uint") */ - AMstackItem(NULL, AMmapPutUint(doc, submap, AMstr("number"), 6), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(doc, submap, AMstr("number"), 6)); /* assert.strictEqual(doc.pendingOps(), 2) */ assert_int_equal(AMpendingOps(doc), 2); /* */ /* result = doc.getWithType(root, "submap") */ /* assert.deepEqual(result, ["map", submap]) */ - assert_true(AMobjIdEqual(AMitemObjId(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("submap"), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))), + assert_true(AMobjIdEqual(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("submap"), NULL), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id, submap)); /* */ /* result = doc.getWithType(submap, "number") */ /* assert.deepEqual(result, ["uint", 6]) */ - uint64_t uint; - assert_true(AMitemToUint( - AMstackItem(stack_ptr, AMmapGet(doc, submap, AMstr("number"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 6); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, submap, AMstr("number"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, + 6); } /** * \brief should be able to make lists */ static void test_should_be_able_to_make_lists(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* */ /* const sublist = doc.putObject(root, "numbers", []) */ - AMobjId const* const sublist = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("numbers"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const sublist = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("numbers"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc.insert(sublist, 0, "a"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 0, true, AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 0, true, AMstr("a"))); /* doc.insert(sublist, 1, "b"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 1, true, AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 1, true, AMstr("b"))); /* doc.insert(sublist, 2, "c"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 2, true, AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 2, true, AMstr("c"))); /* doc.insert(sublist, 0, "z"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 0, true, AMstr("z")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 0, true, AMstr("z"))); /* */ /* assert.deepEqual(doc.getWithType(sublist, 0), ["str", "z"]) */ - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, sublist, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMbyteSpan str = AMpush(&stack, + AMlistGet(doc, sublist, 0, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "z", str.count); /* assert.deepEqual(doc.getWithType(sublist, 1), ["str", "a"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, sublist, 1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, sublist, 1, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); /* assert.deepEqual(doc.getWithType(sublist, 2), ["str", "b"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, sublist, 2, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, sublist, 2, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); /* assert.deepEqual(doc.getWithType(sublist, 3), ["str", "c"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, sublist, 3, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, sublist, 3, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); /* assert.deepEqual(doc.length(sublist), 4) */ assert_int_equal(AMobjSize(doc, sublist, NULL), 4); /* */ /* doc.put(sublist, 2, "b v2"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 2, false, AMstr("b v2")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 2, false, AMstr("b v2"))); /* */ /* assert.deepEqual(doc.getWithType(sublist, 2), ["str", "b v2"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, sublist, 2, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, sublist, 2, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 4); assert_memory_equal(str.src, "b v2", str.count); /* assert.deepEqual(doc.length(sublist), 4) */ @@ -335,217 +334,233 @@ static void test_should_be_able_to_make_lists(void** state) { * \brief lists have insert, set, splice, and push ops */ static void test_lists_have_insert_set_splice_and_push_ops(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* */ /* const sublist = doc.putObject(root, "letters", []) */ - AMobjId const* const sublist = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("letters"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const sublist = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("letters"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc.insert(sublist, 0, "a"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 0, true, AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 0, true, AMstr("a"))); /* doc.insert(sublist, 0, "b"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 0, true, AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, 0, true, AMstr("b"))); /* assert.deepEqual(doc.materialize(), { letters: ["b", "a"] }) */ - AMitem* doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(doc_item, &key)); + AMmapItems doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* doc_item = AMmapItemsNext(&doc_items, 1); + AMbyteSpan key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&list_items), 2); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_null(AMitemsNext(&list_items, 1)); + assert_null(AMlistItemsNext(&list_items, 1)); } /* doc.push(sublist, "c"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, SIZE_MAX, true, AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc, sublist, SIZE_MAX, true, AMstr("c"))); /* const heads = doc.getHeads() */ - AMitems const heads = AMstackItems(stack_ptr, AMgetHeads(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads = AMpush(&stack, + AMgetHeads(doc), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* assert.deepEqual(doc.materialize(), { letters: ["b", "a", "c"] }) */ - doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&list_items), 3); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - assert_null(AMitemsNext(&list_items, 1)); + assert_null(AMlistItemsNext(&list_items, 1)); } /* doc.push(sublist, 3, "timestamp"); */ - AMstackItem(NULL, AMlistPutTimestamp(doc, sublist, SIZE_MAX, true, 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* assert.deepEqual(doc.materialize(), { letters: ["b", "a", "c", new - * Date(3)] } */ - doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + AMfree(AMlistPutTimestamp(doc, sublist, SIZE_MAX, true, 3)); + /* assert.deepEqual(doc.materialize(), { letters: ["b", "a", "c", new Date(3)] } */ + doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR | AM_VAL_TYPE_TIMESTAMP)); - assert_int_equal(AMitemsSize(&list_items), 4); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - int64_t timestamp; - assert_true(AMitemToTimestamp(AMitemsNext(&list_items, 1), ×tamp)); - assert_int_equal(timestamp, 3); - assert_null(AMitemsNext(&list_items, 1)); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).timestamp, + 3); + assert_null(AMlistItemsNext(&list_items, 1)); } /* doc.splice(sublist, 1, 1, ["d", "e", "f"]); */ - AMresult* data = AMstackResult( - stack_ptr, AMresultFrom(3, AMitemFromStr(AMstr("d")), AMitemFromStr(AMstr("e")), AMitemFromStr(AMstr("f"))), - NULL, NULL); - AMstackItem(NULL, AMsplice(doc, sublist, 1, 1, AMresultItems(data)), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* assert.deepEqual(doc.materialize(), { letters: ["b", "d", "e", "f", "c", - * new Date(3)] } */ - doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + static AMvalue const DATA[] = {{.str_tag = AM_VALUE_STR, .str = {.src = "d", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "e", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "f", .count = 1}}}; + AMfree(AMsplice(doc, sublist, 1, 1, DATA, sizeof(DATA)/sizeof(AMvalue))); + /* assert.deepEqual(doc.materialize(), { letters: ["b", "d", "e", "f", "c", new Date(3)] } */ + doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR | AM_VAL_TYPE_TIMESTAMP)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "d", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "e", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "f", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - int64_t timestamp; - assert_true(AMitemToTimestamp(AMitemsNext(&list_items, 1), ×tamp)); - assert_int_equal(timestamp, 3); - assert_null(AMitemsNext(&list_items, 1)); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).timestamp, + 3); + assert_null(AMlistItemsNext(&list_items, 1)); } /* doc.put(sublist, 0, "z"); */ - AMstackItem(NULL, AMlistPutStr(doc, sublist, 0, false, AMstr("z")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* assert.deepEqual(doc.materialize(), { letters: ["z", "d", "e", "f", "c", - * new Date(3)] } */ - doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + AMfree(AMlistPutStr(doc, sublist, 0, false, AMstr("z"))); + /* assert.deepEqual(doc.materialize(), { letters: ["z", "d", "e", "f", "c", new Date(3)] } */ + doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR | AM_VAL_TYPE_TIMESTAMP)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "z", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "d", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "e", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "f", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - int64_t timestamp; - assert_true(AMitemToTimestamp(AMitemsNext(&list_items, 1), ×tamp)); - assert_int_equal(timestamp, 3); - assert_null(AMitemsNext(&list_items, 1)); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).timestamp, + 3); + assert_null(AMlistItemsNext(&list_items, 1)); } - /* assert.deepEqual(doc.materialize(sublist), ["z", "d", "e", "f", "c", new - * Date(3)] */ - AMitems sublist_items = AMstackItems(stack_ptr, AMlistRange(doc, sublist, 0, SIZE_MAX, NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR | AM_VAL_TYPE_TIMESTAMP)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&sublist_items, 1), &str)); + /* assert.deepEqual(doc.materialize(sublist), ["z", "d", "e", "f", "c", new Date(3)] */ + AMlistItems sublist_items = AMpush( + &stack, + AMlistRange(doc, sublist, 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "z", str.count); - assert_true(AMitemToStr(AMitemsNext(&sublist_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "d", str.count); - assert_true(AMitemToStr(AMitemsNext(&sublist_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "e", str.count); - assert_true(AMitemToStr(AMitemsNext(&sublist_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "f", str.count); - assert_true(AMitemToStr(AMitemsNext(&sublist_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - int64_t timestamp; - assert_true(AMitemToTimestamp(AMitemsNext(&sublist_items, 1), ×tamp)); - assert_int_equal(timestamp, 3); - assert_null(AMitemsNext(&sublist_items, 1)); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&sublist_items, 1)).timestamp, + 3); + assert_null(AMlistItemsNext(&sublist_items, 1)); /* assert.deepEqual(doc.length(sublist), 6) */ assert_int_equal(AMobjSize(doc, sublist, NULL), 6); - /* assert.deepEqual(doc.materialize("/", heads), { letters: ["b", "a", "c"] - * } */ - doc_item = AMstackItem(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + /* assert.deepEqual(doc.materialize("/", heads), { letters: ["b", "a", "c"] } */ + doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("letters")); assert_memory_equal(key.src, "letters", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, &heads), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, &heads), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "c", str.count); - assert_null(AMitemsNext(&list_items, 1)); + assert_null(AMlistItemsNext(&list_items, 1)); } } @@ -553,54 +568,67 @@ static void test_lists_have_insert_set_splice_and_push_ops(void** state) { * \brief should be able to delete non-existent props */ static void test_should_be_able_to_delete_non_existent_props(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* */ /* doc.put("_root", "foo", "bar") */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("foo"), AMstr("bar")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("foo"), AMstr("bar"))); /* doc.put("_root", "bip", "bap") */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("bip"), AMstr("bap")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("bip"), AMstr("bap"))); /* const hash1 = doc.commit() */ - AMitems const hash1 = - AMstackItems(stack_ptr, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const hash1 = AMpush(&stack, + AMcommit(doc, AMstr(NULL), NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* */ /* assert.deepEqual(doc.keys("_root"), ["bip", "foo"]) */ - AMitems keys = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + AMstrs keys = AMpush(&stack, + AMkeys(doc, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + AMbyteSpan str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bip", str.count); - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "foo", str.count); /* */ /* doc.delete("_root", "foo") */ - AMstackItem(NULL, AMmapDelete(doc, AM_ROOT, AMstr("foo")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapDelete(doc, AM_ROOT, AMstr("foo"))); /* doc.delete("_root", "baz") */ - AMstackItem(NULL, AMmapDelete(doc, AM_ROOT, AMstr("baz")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapDelete(doc, AM_ROOT, AMstr("baz"))); /* const hash2 = doc.commit() */ - AMitems const hash2 = - AMstackItems(stack_ptr, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const hash2 = AMpush(&stack, + AMcommit(doc, AMstr(NULL), NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* */ /* assert.deepEqual(doc.keys("_root"), ["bip"]) */ - keys = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + keys = AMpush(&stack, + AMkeys(doc, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bip", str.count); /* assert.deepEqual(doc.keys("_root", [hash1]), ["bip", "foo"]) */ - keys = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, &hash1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + keys = AMpush(&stack, + AMkeys(doc, AM_ROOT, &hash1), + AM_VALUE_STRS, + cmocka_cb).strs; + str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bip", str.count); - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "foo", str.count); /* assert.deepEqual(doc.keys("_root", [hash2]), ["bip"]) */ - keys = AMstackItems(stack_ptr, AMkeys(doc, AM_ROOT, &hash2), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + keys = AMpush(&stack, + AMkeys(doc, AM_ROOT, &hash2), + AM_VALUE_STRS, + cmocka_cb).strs; + str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bip", str.count); } @@ -608,161 +636,226 @@ static void test_should_be_able_to_delete_non_existent_props(void** state) { /** * \brief should be able to del */ -static void test_should_be_able_to_del(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; +static void test_should_be_able_to_del(void **state) { + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* */ /* doc.put(root, "xxx", "xxx"); */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("xxx"), AMstr("xxx")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("xxx"), AMstr("xxx"))); /* assert.deepEqual(doc.getWithType(root, "xxx"), ["str", "xxx"]) */ - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("xxx"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), - &str)); + AMbyteSpan const str = AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("xxx"), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 3); assert_memory_equal(str.src, "xxx", str.count); /* doc.delete(root, "xxx"); */ - AMstackItem(NULL, AMmapDelete(doc, AM_ROOT, AMstr("xxx")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapDelete(doc, AM_ROOT, AMstr("xxx"))); /* assert.deepEqual(doc.getWithType(root, "xxx"), undefined) */ - AMstackItem(NULL, AMmapGet(doc, AM_ROOT, AMstr("xxx"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("xxx"), NULL), + AM_VALUE_VOID, + cmocka_cb); } /** * \brief should be able to use counters */ static void test_should_be_able_to_use_counters(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root" */ /* */ /* doc.put(root, "counter", 10, "counter"); */ - AMstackItem(NULL, AMmapPutCounter(doc, AM_ROOT, AMstr("counter"), 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutCounter(doc, AM_ROOT, AMstr("counter"), 10)); /* assert.deepEqual(doc.getWithType(root, "counter"), ["counter", 10]) */ - int64_t counter; - assert_true(AMitemToCounter(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 10); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 10); /* doc.increment(root, "counter", 10); */ - AMstackItem(NULL, AMmapIncrement(doc, AM_ROOT, AMstr("counter"), 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapIncrement(doc, AM_ROOT, AMstr("counter"), 10)); /* assert.deepEqual(doc.getWithType(root, "counter"), ["counter", 20]) */ - assert_true(AMitemToCounter(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 20); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 20); /* doc.increment(root, "counter", -5); */ - AMstackItem(NULL, AMmapIncrement(doc, AM_ROOT, AMstr("counter"), -5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapIncrement(doc, AM_ROOT, AMstr("counter"), -5)); /* assert.deepEqual(doc.getWithType(root, "counter"), ["counter", 15]) */ - assert_true(AMitemToCounter(AMstackItem(stack_ptr, AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER)), - &counter)); - assert_int_equal(counter, 15); + assert_int_equal(AMpush(&stack, + AMmapGet(doc, AM_ROOT, AMstr("counter"), NULL), + AM_VALUE_COUNTER, + cmocka_cb).counter, 15); } /** * \brief should be able to splice text */ static void test_should_be_able_to_splice_text(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const root = "_root"; */ /* */ /* const text = doc.putObject(root, "text", ""); */ - AMobjId const* const text = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const text = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc.splice(text, 0, 0, "hello ") */ - AMstackItem(NULL, AMspliceText(doc, text, 0, 0, AMstr("hello ")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* doc.splice(text, 6, 0, "world") */ - AMstackItem(NULL, AMspliceText(doc, text, 6, 0, AMstr("world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* doc.splice(text, 11, 0, "!?") */ - AMstackItem(NULL, AMspliceText(doc, text, 11, 0, AMstr("!?")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(doc, text, 0, 0, AMstr("hello "))); + /* doc.splice(text, 6, 0, ["w", "o", "r", "l", "d"]) */ + static AMvalue const WORLD[] = {{.str_tag = AM_VALUE_STR, .str = {.src = "w", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "o", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "r", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "l", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "d", .count = 1}}}; + AMfree(AMsplice(doc, text, 6, 0, WORLD, sizeof(WORLD)/sizeof(AMvalue))); + /* doc.splice(text, 11, 0, ["!", "?"]) */ + static AMvalue const INTERROBANG[] = {{.str_tag = AM_VALUE_STR, .str = {.src = "!", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "?", .count = 1}}}; + AMfree(AMsplice(doc, text, 11, 0, INTERROBANG, sizeof(INTERROBANG)/sizeof(AMvalue))); /* assert.deepEqual(doc.getWithType(text, 0), ["str", "h"]) */ - AMbyteSpan str; - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMlistGet(doc, text, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMbyteSpan str = AMpush(&stack, + AMlistGet(doc, text, 0, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "h", str.count); /* assert.deepEqual(doc.getWithType(text, 1), ["str", "e"]) */ - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMlistGet(doc, text, 1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, text, 1, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "e", str.count); /* assert.deepEqual(doc.getWithType(text, 9), ["str", "l"]) */ - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMlistGet(doc, text, 9, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, text, 9, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "l", str.count); /* assert.deepEqual(doc.getWithType(text, 10), ["str", "d"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, text, 10, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, text, 10, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "d", str.count); /* assert.deepEqual(doc.getWithType(text, 11), ["str", "!"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, text, 11, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, text, 11, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "!", str.count); /* assert.deepEqual(doc.getWithType(text, 12), ["str", "?"]) */ - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMlistGet(doc, text, 12, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMlistGet(doc, text, 12, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "?", str.count); } +/** + * \brief should be able to insert objects into text + */ +static void test_should_be_able_to_insert_objects_into_text(void** state) { + AMresultStack* stack = *state; + /* const doc = create() */ + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; + /* const text = doc.putObject("/", "text", "Hello world"); */ + AMobjId const* const text = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMspliceText(doc, text, 0, 0, AMstr("Hello world"))); + /* const obj = doc.insertObject(text, 6, { hello: "world" }); */ + AMobjId const* const obj = AMpush( + &stack, + AMlistPutObject(doc, text, 6, true, AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMmapPutStr(doc, obj, AMstr("hello"), AMstr("world"))); + /* assert.deepEqual(doc.text(text), "Hello \ufffcworld"); */ + AMbyteSpan str = AMpush(&stack, + AMtext(doc, text, NULL), + AM_VALUE_STR, + cmocka_cb).str; + assert_int_equal(str.count, strlen(u8"Hello \ufffcworld")); + assert_memory_equal(str.src, u8"Hello \ufffcworld", str.count); + /* assert.deepEqual(doc.getWithType(text, 6), ["map", obj]); */ + assert_true(AMobjIdEqual(AMpush(&stack, + AMlistGet(doc, text, 6, NULL), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id, obj)); + /* assert.deepEqual(doc.getWithType(obj, "hello"), ["str", "world"]); */ + str = AMpush(&stack, + AMmapGet(doc, obj, AMstr("hello"), NULL), + AM_VALUE_STR, + cmocka_cb).str; + assert_int_equal(str.count, strlen("world")); + assert_memory_equal(str.src, "world", str.count); +} + /** * \brief should be able to save all or incrementally */ static void test_should_be_able_to_save_all_or_incrementally(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* */ /* doc.put("_root", "foo", 1) */ - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("foo"), 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("foo"), 1)); /* */ /* const save1 = doc.save() */ - AMbyteSpan save1; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save1)); + AMbyteSpan const save1 = AMpush(&stack, + AMsave(doc), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* */ /* doc.put("_root", "bar", 2) */ - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("bar"), 2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("bar"), 2)); /* */ /* const saveMidway = doc.clone().save(); */ - AMdoc* doc_clone; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMclone(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc_clone)); - AMbyteSpan saveMidway; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc_clone), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &saveMidway)); + AMbyteSpan const saveMidway = AMpush(&stack, + AMsave( + AMpush(&stack, + AMclone(doc), + AM_VALUE_DOC, + cmocka_cb).doc), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* */ /* const save2 = doc.saveIncremental(); */ - AMbyteSpan save2; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsaveIncremental(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save2)); + AMbyteSpan const save2 = AMpush(&stack, + AMsaveIncremental(doc), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* */ /* doc.put("_root", "baz", 3); */ - AMstackItem(NULL, AMmapPutInt(doc, AM_ROOT, AMstr("baz"), 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc, AM_ROOT, AMstr("baz"), 3)); /* */ /* const save3 = doc.saveIncremental(); */ - AMbyteSpan save3; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsaveIncremental(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save3)); + AMbyteSpan const save3 = AMpush(&stack, + AMsaveIncremental(doc), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* */ /* const saveA = doc.save(); */ - AMbyteSpan saveA; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &saveA)); + AMbyteSpan const saveA = AMpush(&stack, + AMsave(doc), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* const saveB = new Uint8Array([...save1, ...save2, ...save3]); */ size_t const saveB_count = save1.count + save2.count + save3.count; uint8_t* const saveB_src = test_malloc(saveB_count); @@ -774,83 +867,104 @@ static void test_should_be_able_to_save_all_or_incrementally(void** state) { assert_memory_not_equal(saveA.src, saveB_src, saveA.count); /* */ /* const docA = load(saveA); */ - AMdoc* docA; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(saveA.src, saveA.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &docA)); + AMdoc* const docA = AMpush(&stack, + AMload(saveA.src, saveA.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* const docB = load(saveB); */ - AMdoc* docB; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(saveB_src, saveB_count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &docB)); + AMdoc* const docB = AMpush(&stack, + AMload(saveB_src, saveB_count), + AM_VALUE_DOC, + cmocka_cb).doc; test_free(saveB_src); /* const docC = load(saveMidway) */ - AMdoc* docC; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(saveMidway.src, saveMidway.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &docC)); + AMdoc* const docC = AMpush(&stack, + AMload(saveMidway.src, saveMidway.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* docC.loadIncremental(save3) */ - AMstackItem(NULL, AMloadIncremental(docC, save3.src, save3.count), cmocka_cb, AMexpect(AM_VAL_TYPE_UINT)); + AMfree(AMloadIncremental(docC, save3.src, save3.count)); /* */ /* assert.deepEqual(docA.keys("_root"), docB.keys("_root")); */ - AMitems const keysA = AMstackItems(stack_ptr, AMkeys(docA, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMitems const keysB = AMstackItems(stack_ptr, AMkeys(docB, AM_ROOT, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemsEqual(&keysA, &keysB)); + AMstrs const keysA = AMpush(&stack, + AMkeys(docA, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + AMstrs const keysB = AMpush(&stack, + AMkeys(docB, AM_ROOT, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsCmp(&keysA, &keysB), 0); /* assert.deepEqual(docA.save(), docB.save()); */ - AMbyteSpan docA_save; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(docA), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &docA_save)); - AMbyteSpan docB_save; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(docB), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &docB_save)); - assert_int_equal(docA_save.count, docB_save.count); - assert_memory_equal(docA_save.src, docB_save.src, docA_save.count); + AMbyteSpan const save = AMpush(&stack, + AMsave(docA), + AM_VALUE_BYTES, + cmocka_cb).bytes; + assert_memory_equal(save.src, + AMpush(&stack, + AMsave(docB), + AM_VALUE_BYTES, + cmocka_cb).bytes.src, + save.count); /* assert.deepEqual(docA.save(), docC.save()); */ - AMbyteSpan docC_save; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(docC), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &docC_save)); - assert_int_equal(docA_save.count, docC_save.count); - assert_memory_equal(docA_save.src, docC_save.src, docA_save.count); + assert_memory_equal(save.src, + AMpush(&stack, + AMsave(docC), + AM_VALUE_BYTES, + cmocka_cb).bytes.src, + save.count); } /** * \brief should be able to splice text #2 */ static void test_should_be_able_to_splice_text_2(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create() */ - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, AMcreate(NULL), AM_VALUE_DOC, cmocka_cb).doc; /* const text = doc.putObject("_root", "text", ""); */ - AMobjId const* const text = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const text = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc.splice(text, 0, 0, "hello world"); */ - AMstackItem(NULL, AMspliceText(doc, text, 0, 0, AMstr("hello world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(doc, text, 0, 0, AMstr("hello world"))); /* const hash1 = doc.commit(); */ - AMitems const hash1 = - AMstackItems(stack_ptr, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const hash1 = AMpush(&stack, + AMcommit(doc, AMstr(NULL), NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* doc.splice(text, 6, 0, "big bad "); */ - AMstackItem(NULL, AMspliceText(doc, text, 6, 0, AMstr("big bad ")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(doc, text, 6, 0, AMstr("big bad "))); /* const hash2 = doc.commit(); */ - AMitems const hash2 = - AMstackItems(stack_ptr, AMcommit(doc, AMstr(NULL), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const hash2 = AMpush(&stack, + AMcommit(doc, AMstr(NULL), NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* assert.strictEqual(doc.text(text), "hello big bad world") */ - AMbyteSpan str; - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMtext(doc, text, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMbyteSpan str = AMpush(&stack, + AMtext(doc, text, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("hello big bad world")); assert_memory_equal(str.src, "hello big bad world", str.count); /* assert.strictEqual(doc.length(text), 19) */ assert_int_equal(AMobjSize(doc, text, NULL), 19); /* assert.strictEqual(doc.text(text, [hash1]), "hello world") */ - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMtext(doc, text, &hash1), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMtext(doc, text, &hash1), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("hello world")); assert_memory_equal(str.src, "hello world", str.count); /* assert.strictEqual(doc.length(text, [hash1]), 11) */ assert_int_equal(AMobjSize(doc, text, &hash1), 11); /* assert.strictEqual(doc.text(text, [hash2]), "hello big bad world") */ - assert_true( - AMitemToStr(AMstackItem(stack_ptr, AMtext(doc, text, &hash2), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMtext(doc, text, &hash2), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("hello big bad world")); assert_memory_equal(str.src, "hello big bad world", str.count); /* assert.strictEqual(doc.length(text, [hash2]), 19) */ @@ -861,234 +975,266 @@ static void test_should_be_able_to_splice_text_2(void** state) { * \brief local inc increments all visible counters in a map */ static void test_local_inc_increments_all_visible_counters_in_a_map(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc1 = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); + AMdoc* const doc1 = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* doc1.put("_root", "hello", "world") */ - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("hello"), AMstr("world")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("hello"), AMstr("world"))); /* const doc2 = load(doc1.save(), "bbbb"); */ - AMbyteSpan save; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save)); - AMdoc* doc2; - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMload(save.src, save.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("bbbb")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMstackItem(NULL, AMsetActorId(doc2, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMbyteSpan const save = AMpush(&stack, + AMsave(doc1), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMdoc* const doc2 = AMpush(&stack, + AMload(save.src, save.count), + AM_VALUE_DOC, + cmocka_cb).doc; + AMfree(AMsetActorId(doc2, AMpush(&stack, + AMactorIdInitStr(AMstr("bbbb")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* const doc3 = load(doc1.save(), "cccc"); */ - AMdoc* doc3; - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMload(save.src, save.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc3)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("cccc")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMstackItem(NULL, AMsetActorId(doc3, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMdoc* const doc3 = AMpush(&stack, + AMload(save.src, save.count), + AM_VALUE_DOC, + cmocka_cb).doc; + AMfree(AMsetActorId(doc3, AMpush(&stack, + AMactorIdInitStr(AMstr("cccc")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* let heads = doc1.getHeads() */ - AMitems const heads1 = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads1 = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* doc1.put("_root", "cnt", 20) */ - AMstackItem(NULL, AMmapPutInt(doc1, AM_ROOT, AMstr("cnt"), 20), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutInt(doc1, AM_ROOT, AMstr("cnt"), 20)); /* doc2.put("_root", "cnt", 0, "counter") */ - AMstackItem(NULL, AMmapPutCounter(doc2, AM_ROOT, AMstr("cnt"), 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutCounter(doc2, AM_ROOT, AMstr("cnt"), 0)); /* doc3.put("_root", "cnt", 10, "counter") */ - AMstackItem(NULL, AMmapPutCounter(doc3, AM_ROOT, AMstr("cnt"), 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutCounter(doc3, AM_ROOT, AMstr("cnt"), 10)); /* doc1.applyChanges(doc2.getChanges(heads)) */ - AMitems const changes2 = - AMstackItems(stack_ptr, AMgetChanges(doc2, &heads1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMstackItem(NULL, AMapplyChanges(doc1, &changes2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMchanges const changes2 = AMpush(&stack, + AMgetChanges(doc2, &heads1), + AM_VALUE_CHANGES, + cmocka_cb).changes; + AMfree(AMapplyChanges(doc1, &changes2)); /* doc1.applyChanges(doc3.getChanges(heads)) */ - AMitems const changes3 = - AMstackItems(stack_ptr, AMgetChanges(doc3, &heads1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMstackItem(NULL, AMapplyChanges(doc1, &changes3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMchanges const changes3 = AMpush(&stack, + AMgetChanges(doc3, &heads1), + AM_VALUE_CHANGES, + cmocka_cb).changes; + AMfree(AMapplyChanges(doc1, &changes3)); /* let result = doc1.getAll("_root", "cnt") */ - AMitems result = AMstackItems(stack_ptr, AMmapGetAll(doc1, AM_ROOT, AMstr("cnt"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER | AM_VAL_TYPE_INT | AM_VAL_TYPE_STR)); + AMobjItems result = AMpush(&stack, + AMmapGetAll(doc1, AM_ROOT, AMstr("cnt"), NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; /* assert.deepEqual(result, [ ['int', 20, '2@aaaa'], ['counter', 0, '2@bbbb'], ['counter', 10, '2@cccc'], ]) */ - AMitem* result_item = AMitemsNext(&result, 1); - int64_t int_; - assert_true(AMitemToInt(result_item, &int_)); - assert_int_equal(int_, 20); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 2); - AMbyteSpan str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + AMobjItem const* result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).int_, 20); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 2); + AMbyteSpan str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "aaaa", str.count); - result_item = AMitemsNext(&result, 1); - int64_t counter; - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 0); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 2); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 0); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 2); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "bbbb", str.count); - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 10); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 2); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 10); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 2); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "cccc", str.count); /* doc1.increment("_root", "cnt", 5) */ - AMstackItem(NULL, AMmapIncrement(doc1, AM_ROOT, AMstr("cnt"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapIncrement(doc1, AM_ROOT, AMstr("cnt"), 5)); /* result = doc1.getAll("_root", "cnt") */ - result = AMstackItems(stack_ptr, AMmapGetAll(doc1, AM_ROOT, AMstr("cnt"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER)); + result = AMpush(&stack, + AMmapGetAll(doc1, AM_ROOT, AMstr("cnt"), NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; /* assert.deepEqual(result, [ ['counter', 5, '2@bbbb'], ['counter', 15, '2@cccc'], ]) */ - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 5); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 2); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 5); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 2); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "bbbb", str.count); - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 15); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 2); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 15); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 2); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "cccc", str.count); /* */ /* const save1 = doc1.save() */ - AMbyteSpan save1; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save1)); + AMbyteSpan const save1 = AMpush(&stack, + AMsave(doc1), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* const doc4 = load(save1) */ - AMdoc* doc4; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(save1.src, save1.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc4)); + AMdoc* const doc4 = AMpush(&stack, + AMload(save1.src, save1.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* assert.deepEqual(doc4.save(), save1); */ - AMbyteSpan doc4_save; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc4), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &doc4_save)); - assert_int_equal(doc4_save.count, save1.count); - assert_memory_equal(doc4_save.src, save1.src, doc4_save.count); + assert_memory_equal(AMpush(&stack, + AMsave(doc4), + AM_VALUE_BYTES, + cmocka_cb).bytes.src, + save1.src, + save1.count); } /** * \brief local inc increments all visible counters in a sequence */ static void test_local_inc_increments_all_visible_counters_in_a_sequence(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc1 = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); + AMdoc* const doc1 = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const seq = doc1.putObject("_root", "seq", []) */ - AMobjId const* const seq = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc1, AM_ROOT, AMstr("seq"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const seq = AMpush( + &stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("seq"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* doc1.insert(seq, 0, "hello") */ - AMstackItem(NULL, AMlistPutStr(doc1, seq, 0, true, AMstr("hello")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(doc1, seq, 0, true, AMstr("hello"))); /* const doc2 = load(doc1.save(), "bbbb"); */ - AMbyteSpan save1; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save1)); - AMdoc* doc2; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(save1.src, save1.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("bbbb")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMstackItem(NULL, AMsetActorId(doc2, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMbyteSpan const save1 = AMpush(&stack, + AMsave(doc1), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMdoc* const doc2 = AMpush(&stack, + AMload(save1.src, save1.count), + AM_VALUE_DOC, + cmocka_cb).doc; + AMfree(AMsetActorId(doc2, AMpush(&stack, + AMactorIdInitStr(AMstr("bbbb")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* const doc3 = load(doc1.save(), "cccc"); */ - AMdoc* doc3; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(save1.src, save1.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc3)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("cccc")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMstackItem(NULL, AMsetActorId(doc3, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMdoc* const doc3 = AMpush(&stack, + AMload(save1.src, save1.count), + AM_VALUE_DOC, + cmocka_cb).doc; + AMfree(AMsetActorId(doc3, AMpush(&stack, + AMactorIdInitStr(AMstr("cccc")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* let heads = doc1.getHeads() */ - AMitems const heads1 = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads1 = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* doc1.put(seq, 0, 20) */ - AMstackItem(NULL, AMlistPutInt(doc1, seq, 0, false, 20), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutInt(doc1, seq, 0, false, 20)); /* doc2.put(seq, 0, 0, "counter") */ - AMstackItem(NULL, AMlistPutCounter(doc2, seq, 0, false, 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutCounter(doc2, seq, 0, false, 0)); /* doc3.put(seq, 0, 10, "counter") */ - AMstackItem(NULL, AMlistPutCounter(doc3, seq, 0, false, 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutCounter(doc3, seq, 0, false, 10)); /* doc1.applyChanges(doc2.getChanges(heads)) */ - AMitems const changes2 = - AMstackItems(stack_ptr, AMgetChanges(doc2, &heads1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMstackItem(NULL, AMapplyChanges(doc1, &changes2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMchanges const changes2 = AMpush(&stack, + AMgetChanges(doc2, &heads1), + AM_VALUE_CHANGES, + cmocka_cb).changes; + AMfree(AMapplyChanges(doc1, &changes2)); /* doc1.applyChanges(doc3.getChanges(heads)) */ - AMitems const changes3 = - AMstackItems(stack_ptr, AMgetChanges(doc3, &heads1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMstackItem(NULL, AMapplyChanges(doc1, &changes3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMchanges const changes3 = AMpush(&stack, + AMgetChanges(doc3, &heads1), + AM_VALUE_CHANGES, + cmocka_cb).changes; + AMfree(AMapplyChanges(doc1, &changes3)); /* let result = doc1.getAll(seq, 0) */ - AMitems result = AMstackItems(stack_ptr, AMlistGetAll(doc1, seq, 0, NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_COUNTER | AM_VAL_TYPE_INT)); + AMobjItems result = AMpush(&stack, + AMlistGetAll(doc1, seq, 0, NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; /* assert.deepEqual(result, [ ['int', 20, '3@aaaa'], ['counter', 0, '3@bbbb'], ['counter', 10, '3@cccc'], ]) */ - AMitem* result_item = AMitemsNext(&result, 1); - int64_t int_; - assert_true(AMitemToInt(result_item, &int_)); - assert_int_equal(int_, 20); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 3); - AMbyteSpan str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + AMobjItem const* result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).int_, 20); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 3); + AMbyteSpan str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "aaaa", str.count); - result_item = AMitemsNext(&result, 1); - int64_t counter; - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 0); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 3); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 0); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 3); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_memory_equal(str.src, "bbbb", str.count); - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 10); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 3); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 10); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 3); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "cccc", str.count); /* doc1.increment(seq, 0, 5) */ - AMstackItem(NULL, AMlistIncrement(doc1, seq, 0, 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistIncrement(doc1, seq, 0, 5)); /* result = doc1.getAll(seq, 0) */ - result = AMstackItems(stack_ptr, AMlistGetAll(doc1, seq, 0, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_COUNTER)); + result = AMpush(&stack, + AMlistGetAll(doc1, seq, 0, NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; /* assert.deepEqual(result, [ ['counter', 5, '3@bbbb'], ['counter', 15, '3@cccc'], ]) */ - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 5); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 3); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 5); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 3); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_int_equal(str.count, 4); assert_memory_equal(str.src, "bbbb", str.count); - result_item = AMitemsNext(&result, 1); - assert_true(AMitemToCounter(result_item, &counter)); - assert_int_equal(counter, 15); - assert_int_equal(AMobjIdCounter(AMitemObjId(result_item)), 3); - str = AMactorIdStr(AMobjIdActorId(AMitemObjId(result_item))); + result_item = AMobjItemsNext(&result, 1); + assert_int_equal(AMobjItemValue(result_item).counter, 15); + assert_int_equal(AMobjIdCounter(AMobjItemObjId(result_item)), 3); + str = AMactorIdStr(AMobjIdActorId(AMobjItemObjId(result_item))); assert_memory_equal(str.src, "cccc", str.count); /* */ /* const save = doc1.save() */ - AMbyteSpan save; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &save)); + AMbyteSpan const save = AMpush(&stack, + AMsave(doc1), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* const doc4 = load(save) */ - AMdoc* doc4; - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMload(save.src, save.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc4)); + AMdoc* const doc4 = AMpush(&stack, + AMload(save.src, save.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* assert.deepEqual(doc4.save(), save); */ - AMbyteSpan doc4_save; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc4), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &doc4_save)); - assert_int_equal(doc4_save.count, save.count); - assert_memory_equal(doc4_save.src, save.src, doc4_save.count); + assert_memory_equal(AMpush(&stack, + AMsave(doc4), + AM_VALUE_BYTES, + cmocka_cb).bytes.src, + save.src, + save.count); } /** @@ -1100,269 +1246,314 @@ static void test_paths_can_be_used_instead_of_objids(void** state); * \brief should be able to fetch changes by hash */ static void test_should_be_able_to_fetch_changes_by_hash(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc1 = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); + AMdoc* const doc1 = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const doc2 = create("bbbb") */ - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("bbbb")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc2; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); + AMdoc* const doc2 = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("bbbb")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* doc1.put("/", "a", "b") */ - AMstackItem(NULL, AMmapPutStr(doc1, AM_ROOT, AMstr("a"), AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc1, AM_ROOT, AMstr("a"), AMstr("b"))); /* doc2.put("/", "b", "c") */ - AMstackItem(NULL, AMmapPutStr(doc2, AM_ROOT, AMstr("b"), AMstr("c")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc2, AM_ROOT, AMstr("b"), AMstr("c"))); /* const head1 = doc1.getHeads() */ - AMitems head1 = AMstackItems(stack_ptr, AMgetHeads(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes head1 = AMpush(&stack, + AMgetHeads(doc1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* const head2 = doc2.getHeads() */ - AMitems head2 = AMstackItems(stack_ptr, AMgetHeads(doc2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes head2 = AMpush(&stack, + AMgetHeads(doc2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* const change1 = doc1.getChangeByHash(head1[0]) - if (change1 === null) { throw new RangeError("change1 should not be - null") */ - AMbyteSpan change_hash1; - assert_true(AMitemToChangeHash(AMitemsNext(&head1, 1), &change_hash1)); - AMchange const* change1; - assert_true(AMitemToChange(AMstackItem(stack_ptr, AMgetChangeByHash(doc1, change_hash1.src, change_hash1.count), - cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)), - &change1)); + if (change1 === null) { throw new RangeError("change1 should not be null") */ + AMbyteSpan const change_hash1 = AMchangeHashesNext(&head1, 1); + AMchanges change1 = AMpush( + &stack, + AMgetChangeByHash(doc1, change_hash1.src, change_hash1.count), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* const change2 = doc1.getChangeByHash(head2[0]) assert.deepEqual(change2, null) */ - AMbyteSpan change_hash2; - assert_true(AMitemToChangeHash(AMitemsNext(&head2, 1), &change_hash2)); - AMstackItem(NULL, AMgetChangeByHash(doc1, change_hash2.src, change_hash2.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMbyteSpan const change_hash2 = AMchangeHashesNext(&head2, 1); + AMpush(&stack, + AMgetChangeByHash(doc1, change_hash2.src, change_hash2.count), + AM_VALUE_VOID, + cmocka_cb); /* assert.deepEqual(decodeChange(change1).hash, head1[0]) */ - assert_memory_equal(AMchangeHash(change1).src, change_hash1.src, change_hash1.count); + assert_memory_equal(AMchangeHash(AMchangesNext(&change1, 1)).src, + change_hash1.src, + change_hash1.count); } /** * \brief recursive sets are possible */ static void test_recursive_sets_are_possible(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const l1 = doc.putObject("_root", "list", [{ foo: "bar" }, [1, 2, 3]] */ - AMobjId const* const l1 = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const l1 = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; { - AMobjId const* const map = AMitemObjId(AMstackItem( - stack_ptr, AMlistPutObject(doc, l1, 0, true, AM_OBJ_TYPE_MAP), cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMmapPutStr(doc, map, AMstr("foo"), AMstr("bar")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMlistPutObject(doc, l1, SIZE_MAX, true, AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const map = AMpush( + &stack, + AMlistPutObject(doc, l1, 0, true, AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMmapPutStr(doc, map, AMstr("foo"), AMstr("bar"))); + AMobjId const* const list = AMpush( + &stack, + AMlistPutObject(doc, l1, SIZE_MAX, true, AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; for (int value = 1; value != 4; ++value) { - AMstackItem(NULL, AMlistPutInt(doc, list, SIZE_MAX, true, value), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutInt(doc, list, SIZE_MAX, true, value)); } } /* const l2 = doc.insertObject(l1, 0, { zip: ["a", "b"] }) */ - AMobjId const* const l2 = AMitemObjId(AMstackItem(stack_ptr, AMlistPutObject(doc, l1, 0, true, AM_OBJ_TYPE_MAP), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const l2 = AMpush( + &stack, + AMlistPutObject(doc, l1, 0, true, AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; { - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, l2, AMstr("zip"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMlistPutStr(doc, list, SIZE_MAX, true, AMstr("a")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMlistPutStr(doc, list, SIZE_MAX, true, AMstr("b")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMobjId const* const list = AMpush( + &stack, + AMmapPutObject(doc, l2, AMstr("zip"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMlistPutStr(doc, list, SIZE_MAX, true, AMstr("a"))); + AMfree(AMlistPutStr(doc, list, SIZE_MAX, true, AMstr("b"))); } - /* const l3 = doc.putObject("_root", "info1", "hello world") // 'text' - * object */ - AMobjId const* const l3 = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("info1"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMspliceText(doc, l3, 0, 0, AMstr("hello world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + /* const l3 = doc.putObject("_root", "info1", "hello world") // 'text' object */ + AMobjId const* const l3 = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("info1"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMspliceText(doc, l3, 0, 0, AMstr("hello world"))); /* doc.put("_root", "info2", "hello world") // 'str' */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("info2"), AMstr("hello world")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc, AM_ROOT, AMstr("info2"), AMstr("hello world"))); /* const l4 = doc.putObject("_root", "info3", "hello world") */ - AMobjId const* const l4 = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("info3"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); - AMstackItem(NULL, AMspliceText(doc, l4, 0, 0, AMstr("hello world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMobjId const* const l4 = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("info3"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; + AMfree(AMspliceText(doc, l4, 0, 0, AMstr("hello world"))); /* assert.deepEqual(doc.materialize(), { "list": [{ zip: ["a", "b"] }, { foo: "bar" }, [1, 2, 3]], "info1": "hello world", "info2": "hello world", "info3": "hello world", - }) */ - AMitems doc_items = AMstackItems(stack_ptr, AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE | AM_VAL_TYPE_STR)); - AMitem* doc_item = AMitemsNext(&doc_items, 1); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(doc_item, &key)); + }) */ + AMmapItems doc_items = AMpush(&stack, + AMmapRange(doc, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* doc_item = AMmapItemsNext(&doc_items, 1); + AMbyteSpan key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("info1")); assert_memory_equal(key.src, "info1", key.count); - AMbyteSpan str; - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMtext(doc, AMitemObjId(doc_item), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + AMbyteSpan str = AMpush(&stack, + AMtext(doc, AMmapItemObjId(doc_item), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("hello world")); assert_memory_equal(str.src, "hello world", str.count); - doc_item = AMitemsNext(&doc_items, 1); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("info2")); assert_memory_equal(key.src, "info2", key.count); - assert_true(AMitemToStr(doc_item, &str)); + str = AMmapItemValue(doc_item).str; assert_int_equal(str.count, strlen("hello world")); assert_memory_equal(str.src, "hello world", str.count); - doc_item = AMitemsNext(&doc_items, 1); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("info3")); assert_memory_equal(key.src, "info3", key.count); - assert_true(AMitemToStr( - AMstackItem(stack_ptr, AMtext(doc, AMitemObjId(doc_item), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, + AMtext(doc, AMmapItemObjId(doc_item), NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, strlen("hello world")); assert_memory_equal(str.src, "hello world", str.count); - doc_item = AMitemsNext(&doc_items, 1); - assert_int_equal(AMitemIdxType(doc_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(doc_item, &key)); + doc_item = AMmapItemsNext(&doc_items, 1); + key = AMmapItemKey(doc_item); assert_int_equal(key.count, strlen("list")); assert_memory_equal(key.src, "list", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(doc_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - AMitem const* list_item = AMitemsNext(&list_items, 1); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(doc_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMlistItem const* list_item = AMlistItemsNext(&list_items, 1); { - AMitems map_items = - AMstackItems(stack_ptr, AMmapRange(doc, AMitemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - AMitem const* map_item = AMitemsNext(&map_items, 1); - assert_int_equal(AMitemIdxType(map_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(map_item, &key)); + AMmapItems map_items = AMpush( + &stack, + AMmapRange(doc, AMlistItemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* map_item = AMmapItemsNext(&map_items, 1); + AMbyteSpan const key = AMmapItemKey(map_item); assert_int_equal(key.count, strlen("zip")); assert_memory_equal(key.src, "zip", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(map_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE | AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(map_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); } } - list_item = AMitemsNext(&list_items, 1); + list_item = AMlistItemsNext(&list_items, 1); { - AMitems map_items = - AMstackItems(stack_ptr, AMmapRange(doc, AMitemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE | AM_VAL_TYPE_STR)); - AMitem* map_item = AMitemsNext(&map_items, 1); - assert_int_equal(AMitemIdxType(map_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(map_item, &key)); + AMmapItems map_items = AMpush( + &stack, + AMmapRange(doc, AMlistItemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* map_item = AMmapItemsNext(&map_items, 1); + AMbyteSpan const key = AMmapItemKey(map_item); assert_int_equal(key.count, strlen("foo")); assert_memory_equal(key.src, "foo", key.count); - AMbyteSpan str; - assert_true(AMitemToStr(map_item, &str)); + AMbyteSpan const str = AMmapItemValue(map_item).str; assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bar", str.count); } - list_item = AMitemsNext(&list_items, 1); + list_item = AMlistItemsNext(&list_items, 1); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(list_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_INT)); - int64_t int_; - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 1); - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 2); - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 3); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMlistItemObjId(list_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + assert_int_equal(AMlistItemValue( + AMlistItemsNext(&list_items, 1)).int_, + 1); + assert_int_equal(AMlistItemValue( + AMlistItemsNext(&list_items, 1)).int_, + 2); + assert_int_equal(AMlistItemValue( + AMlistItemsNext(&list_items, 1)).int_, + 3); } } /* assert.deepEqual(doc.materialize(l2), { zip: ["a", "b"] }) */ - AMitems map_items = AMstackItems(stack_ptr, AMmapRange(doc, l2, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - AMitem const* map_item = AMitemsNext(&map_items, 1); - assert_int_equal(AMitemIdxType(map_item), AM_IDX_TYPE_KEY); - assert_true(AMitemKey(map_item, &key)); + AMmapItems map_items = AMpush( + &stack, + AMmapRange(doc, l2, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* map_item = AMmapItemsNext(&map_items, 1); + key = AMmapItemKey(map_item); assert_int_equal(key.count, strlen("zip")); assert_memory_equal(key.src, "zip", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(map_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(map_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); } - /* assert.deepEqual(doc.materialize(l1), [{ zip: ["a", "b"] }, { foo: "bar" - * }, [1, 2, 3]] */ - AMitems list_items = - AMstackItems(stack_ptr, AMlistRange(doc, l1, 0, SIZE_MAX, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - AMitem const* list_item = AMitemsNext(&list_items, 1); + /* assert.deepEqual(doc.materialize(l1), [{ zip: ["a", "b"] }, { foo: "bar" }, [1, 2, 3]] */ + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, l1, 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMlistItem const* list_item = AMlistItemsNext(&list_items, 1); { - AMitems map_items = - AMstackItems(stack_ptr, AMmapRange(doc, AMitemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - AMitem const* map_item = AMitemsNext(&map_items, 1); - assert_int_equal(AMitemIdxType(map_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(map_item, &key)); + AMmapItems map_items = AMpush( + &stack, + AMmapRange(doc, AMlistItemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* map_item = AMmapItemsNext(&map_items, 1); + AMbyteSpan const key = AMmapItemKey(map_item); assert_int_equal(key.count, strlen("zip")); assert_memory_equal(key.src, "zip", key.count); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(map_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMmapItemObjId(map_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + AMbyteSpan str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "a", str.count); - assert_true(AMitemToStr(AMitemsNext(&list_items, 1), &str)); + str = AMlistItemValue(AMlistItemsNext(&list_items, 1)).str; assert_int_equal(str.count, 1); assert_memory_equal(str.src, "b", str.count); } } - list_item = AMitemsNext(&list_items, 1); + list_item = AMlistItemsNext(&list_items, 1); { - AMitems map_items = - AMstackItems(stack_ptr, AMmapRange(doc, AMitemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - AMitem* map_item = AMitemsNext(&map_items, 1); - assert_int_equal(AMitemIdxType(map_item), AM_IDX_TYPE_KEY); - AMbyteSpan key; - assert_true(AMitemKey(map_item, &key)); + AMmapItems map_items = AMpush( + &stack, + AMmapRange(doc, AMlistItemObjId(list_item), AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItem const* map_item = AMmapItemsNext(&map_items, 1); + AMbyteSpan const key = AMmapItemKey(map_item); assert_int_equal(key.count, strlen("foo")); assert_memory_equal(key.src, "foo", key.count); - AMbyteSpan str; - assert_true(AMitemToStr(map_item, &str)); + AMbyteSpan const str = AMmapItemValue(map_item).str; assert_int_equal(str.count, 3); assert_memory_equal(str.src, "bar", str.count); } - list_item = AMitemsNext(&list_items, 1); + list_item = AMlistItemsNext(&list_items, 1); { - AMitems list_items = AMstackItems(stack_ptr, AMlistRange(doc, AMitemObjId(list_item), 0, SIZE_MAX, NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_INT)); - int64_t int_; - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 1); - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 2); - assert_true(AMitemToInt(AMitemsNext(&list_items, 1), &int_)); - assert_int_equal(int_, 3); + AMlistItems list_items = AMpush( + &stack, + AMlistRange(doc, AMlistItemObjId(list_item), 0, SIZE_MAX, NULL), + AM_VALUE_LIST_ITEMS, + cmocka_cb).list_items; + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).int_, + 1); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).int_, + 2); + assert_int_equal(AMlistItemValue(AMlistItemsNext(&list_items, 1)).int_, + 3); } /* assert.deepEqual(doc.materialize(l4), "hello world") */ - assert_true(AMitemToStr(AMstackItem(stack_ptr, AMtext(doc, l4, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, AMtext(doc, l4, NULL), AM_VALUE_STR, cmocka_cb).str; assert_int_equal(str.count, strlen("hello world")); assert_memory_equal(str.src, "hello world", str.count); } @@ -1371,41 +1562,65 @@ static void test_recursive_sets_are_possible(void** state) { * \brief only returns an object id when objects are created */ static void test_only_returns_an_object_id_when_objects_are_created(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc)); + AMdoc* const doc = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const r1 = doc.put("_root", "foo", "bar") assert.deepEqual(r1, null); */ - AMstackItem(NULL, AMmapPutStr(doc, AM_ROOT, AMstr("foo"), AMstr("bar")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapPutStr(doc, AM_ROOT, AMstr("foo"), AMstr("bar")), + AM_VALUE_VOID, + cmocka_cb); /* const r2 = doc.putObject("_root", "list", []) */ - AMobjId const* const r2 = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const r2 = AMpush( + &stack, + AMmapPutObject(doc, AM_ROOT, AMstr("list"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* const r3 = doc.put("_root", "counter", 10, "counter") assert.deepEqual(r3, null); */ - AMstackItem(NULL, AMmapPutCounter(doc, AM_ROOT, AMstr("counter"), 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapPutCounter(doc, AM_ROOT, AMstr("counter"), 10), + AM_VALUE_VOID, + cmocka_cb); /* const r4 = doc.increment("_root", "counter", 1) assert.deepEqual(r4, null); */ - AMstackItem(NULL, AMmapIncrement(doc, AM_ROOT, AMstr("counter"), 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapIncrement(doc, AM_ROOT, AMstr("counter"), 1), + AM_VALUE_VOID, + cmocka_cb); /* const r5 = doc.delete("_root", "counter") assert.deepEqual(r5, null); */ - AMstackItem(NULL, AMmapDelete(doc, AM_ROOT, AMstr("counter")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMmapDelete(doc, AM_ROOT, AMstr("counter")), + AM_VALUE_VOID, + cmocka_cb); /* const r6 = doc.insert(r2, 0, 10); assert.deepEqual(r6, null); */ - AMstackItem(NULL, AMlistPutInt(doc, r2, 0, true, 10), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&stack, + AMlistPutInt(doc, r2, 0, true, 10), + AM_VALUE_VOID, + cmocka_cb); /* const r7 = doc.insertObject(r2, 0, {}); */ - AMobjId const* const r7 = AMitemObjId(AMstackItem(stack_ptr, AMlistPutObject(doc, r2, 0, true, AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const r7 = AMpush( + &stack, + AMlistPutObject(doc, r2, 0, true, AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* const r8 = doc.splice(r2, 1, 0, ["a", "b", "c"]); */ - AMresult* data = AMstackResult( - stack_ptr, AMresultFrom(3, AMitemFromStr(AMstr("a")), AMitemFromStr(AMstr("b")), AMitemFromStr(AMstr("c"))), - NULL, NULL); - AMstackItem(NULL, AMsplice(doc, r2, 1, 0, AMresultItems(data)), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMvalue const STRS[] = {{.str_tag = AM_VALUE_STR, .str = {.src = "a", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "b", .count = 1}}, + {.str_tag = AM_VALUE_STR, .str = {.src = "c", .count = 1}}}; + AMpush(&stack, + AMsplice(doc, r2, 1, 0, STRS, sizeof(STRS)/sizeof(AMvalue)), + AM_VALUE_VOID, + cmocka_cb); /* assert.deepEqual(r2, "2@aaaa"); */ assert_int_equal(AMobjIdCounter(r2), 2); AMbyteSpan str = AMactorIdStr(AMobjIdActorId(r2)); @@ -1421,58 +1636,75 @@ static void test_only_returns_an_object_id_when_objects_are_created(void** state * \brief objects without properties are preserved */ static void test_objects_without_properties_are_preserved(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const doc1 = create("aaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), &actor_id)); - AMdoc* doc1; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc1)); + AMdoc* const doc1 = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const a = doc1.putObject("_root", "a", {}); */ - AMobjId const* const a = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc1, AM_ROOT, AMstr("a"), AM_OBJ_TYPE_MAP), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const a = AMpush( + &stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("a"), AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* const b = doc1.putObject("_root", "b", {}); */ - AMobjId const* const b = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc1, AM_ROOT, AMstr("b"), AM_OBJ_TYPE_MAP), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const b = AMpush( + &stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("b"), AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* const c = doc1.putObject("_root", "c", {}); */ - AMobjId const* const c = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(doc1, AM_ROOT, AMstr("c"), AM_OBJ_TYPE_MAP), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const c = AMpush( + &stack, + AMmapPutObject(doc1, AM_ROOT, AMstr("c"), AM_OBJ_TYPE_MAP), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* const d = doc1.put(c, "d", "dd"); */ - AMstackItem(NULL, AMmapPutStr(doc1, c, AMstr("d"), AMstr("dd")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(doc1, c, AMstr("d"), AMstr("dd"))); /* const saved = doc1.save(); */ - AMbyteSpan saved; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(doc1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &saved)); + AMbyteSpan const saved = AMpush(&stack, + AMsave(doc1), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* const doc2 = load(saved); */ - AMdoc* doc2; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(saved.src, saved.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &doc2)); + AMdoc* const doc2 = AMpush(&stack, + AMload(saved.src, saved.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* assert.deepEqual(doc2.getWithType("_root", "a"), ["map", a]) */ - AMitems doc_items = AMstackItems(stack_ptr, AMmapRange(doc2, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE)); - assert_true(AMobjIdEqual(AMitemObjId(AMitemsNext(&doc_items, 1)), a)); + AMmapItems doc_items = AMpush(&stack, + AMmapRange(doc2, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + assert_true(AMobjIdEqual(AMmapItemObjId(AMmapItemsNext(&doc_items, 1)), a)); /* assert.deepEqual(doc2.keys(a), []) */ - AMitems keys = AMstackItems(stack_ptr, AMkeys(doc1, a, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&keys), 0); + AMstrs keys = AMpush(&stack, + AMkeys(doc1, a, NULL), + AM_VALUE_STRS, + cmocka_cb).strs; + assert_int_equal(AMstrsSize(&keys), 0); /* assert.deepEqual(doc2.getWithType("_root", "b"), ["map", b]) */ - assert_true(AMobjIdEqual(AMitemObjId(AMitemsNext(&doc_items, 1)), b)); + assert_true(AMobjIdEqual(AMmapItemObjId(AMmapItemsNext(&doc_items, 1)), b)); /* assert.deepEqual(doc2.keys(b), []) */ - keys = AMstackItems(stack_ptr, AMkeys(doc1, b, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_int_equal(AMitemsSize(&keys), 0); + keys = AMpush(&stack, AMkeys(doc1, b, NULL), AM_VALUE_STRS, cmocka_cb).strs; + assert_int_equal(AMstrsSize(&keys), 0); /* assert.deepEqual(doc2.getWithType("_root", "c"), ["map", c]) */ - assert_true(AMobjIdEqual(AMitemObjId(AMitemsNext(&doc_items, 1)), c)); + assert_true(AMobjIdEqual(AMmapItemObjId(AMmapItemsNext(&doc_items, 1)), c)); /* assert.deepEqual(doc2.keys(c), ["d"]) */ - keys = AMstackItems(stack_ptr, AMkeys(doc1, c, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMbyteSpan str; - assert_true(AMitemToStr(AMitemsNext(&keys, 1), &str)); + keys = AMpush(&stack, AMkeys(doc1, c, NULL), AM_VALUE_STRS, cmocka_cb).strs; + AMbyteSpan str = AMstrsNext(&keys, 1); assert_int_equal(str.count, 1); assert_memory_equal(str.src, "d", str.count); /* assert.deepEqual(doc2.getWithType(c, "d"), ["str", "dd"]) */ - AMitems obj_items = AMstackItems(stack_ptr, AMobjItems(doc1, c, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemToStr(AMitemsNext(&obj_items, 1), &str)); + AMobjItems obj_items = AMpush(&stack, + AMobjValues(doc1, c, NULL), + AM_VALUE_OBJ_ITEMS, + cmocka_cb).obj_items; + str = AMobjItemValue(AMobjItemsNext(&obj_items, 1)).str; assert_int_equal(str.count, 2); assert_memory_equal(str.src, "dd", str.count); } @@ -1481,162 +1713,178 @@ static void test_objects_without_properties_are_preserved(void** state) { * \brief should allow you to forkAt a heads */ static void test_should_allow_you_to_forkAt_a_heads(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const A = create("aaaaaa") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aaaaaa")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* A; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &A)); + AMdoc* const A = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aaaaaa")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* A.put("/", "key1", "val1"); */ - AMstackItem(NULL, AMmapPutStr(A, AM_ROOT, AMstr("key1"), AMstr("val1")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(A, AM_ROOT, AMstr("key1"), AMstr("val1"))); /* A.put("/", "key2", "val2"); */ - AMstackItem(NULL, AMmapPutStr(A, AM_ROOT, AMstr("key2"), AMstr("val2")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(A, AM_ROOT, AMstr("key2"), AMstr("val2"))); /* const heads1 = A.getHeads(); */ - AMitems const heads1 = AMstackItems(stack_ptr, AMgetHeads(A), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads1 = AMpush(&stack, + AMgetHeads(A), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* const B = A.fork("bbbbbb") */ - AMdoc* B; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMfork(A, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &B)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("bbbbbb")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(B, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMdoc* const B = AMpush(&stack, AMfork(A, NULL), AM_VALUE_DOC, cmocka_cb).doc; + AMfree(AMsetActorId(B, AMpush(&stack, + AMactorIdInitStr(AMstr("bbbbbb")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* A.put("/", "key3", "val3"); */ - AMstackItem(NULL, AMmapPutStr(A, AM_ROOT, AMstr("key3"), AMstr("val3")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(A, AM_ROOT, AMstr("key3"), AMstr("val3"))); /* B.put("/", "key4", "val4"); */ - AMstackItem(NULL, AMmapPutStr(B, AM_ROOT, AMstr("key4"), AMstr("val4")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutStr(B, AM_ROOT, AMstr("key4"), AMstr("val4"))); /* A.merge(B) */ - AMstackItem(NULL, AMmerge(A, B), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(A, B)); /* const heads2 = A.getHeads(); */ - AMitems const heads2 = AMstackItems(stack_ptr, AMgetHeads(A), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMchangeHashes const heads2 = AMpush(&stack, + AMgetHeads(A), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; /* A.put("/", "key5", "val5"); */ - AMstackItem(NULL, AMmapPutStr(A, AM_ROOT, AMstr("key5"), AMstr("val5")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* assert.deepEqual(A.forkAt(heads1).materialize("/"), A.materialize("/", - * heads1) */ - AMdoc* A_forkAt1; - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMfork(A, &heads1), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &A_forkAt1)); - AMitems AforkAt1_items = AMstackItems(stack_ptr, AMmapRange(A_forkAt1, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMitems A1_items = AMstackItems(stack_ptr, AMmapRange(A, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads1), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemsEqual(&AforkAt1_items, &A1_items)); - /* assert.deepEqual(A.forkAt(heads2).materialize("/"), A.materialize("/", - * heads2) */ - AMdoc* A_forkAt2; - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMfork(A, &heads2), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &A_forkAt2)); - AMitems AforkAt2_items = AMstackItems(stack_ptr, AMmapRange(A_forkAt2, AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)); - AMitems A2_items = AMstackItems(stack_ptr, AMmapRange(A, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads2), cmocka_cb, - AMexpect(AM_VAL_TYPE_STR)); - assert_true(AMitemsEqual(&AforkAt2_items, &A2_items)); + AMfree(AMmapPutStr(A, AM_ROOT, AMstr("key5"), AMstr("val5"))); + /* assert.deepEqual(A.forkAt(heads1).materialize("/"), A.materialize("/", heads1) */ + AMmapItems AforkAt1_items = AMpush( + &stack, + AMmapRange( + AMpush(&stack, AMfork(A, &heads1), AM_VALUE_DOC, cmocka_cb).doc, + AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItems A1_items = AMpush(&stack, + AMmapRange(A, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads1), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + assert_true(AMmapItemsEqual(&AforkAt1_items, &A1_items)); + /* assert.deepEqual(A.forkAt(heads2).materialize("/"), A.materialize("/", heads2) */ + AMmapItems AforkAt2_items = AMpush( + &stack, + AMmapRange( + AMpush(&stack, AMfork(A, &heads2), AM_VALUE_DOC, cmocka_cb).doc, + AM_ROOT, AMstr(NULL), AMstr(NULL), NULL), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + AMmapItems A2_items = AMpush(&stack, + AMmapRange(A, AM_ROOT, AMstr(NULL), AMstr(NULL), &heads2), + AM_VALUE_MAP_ITEMS, + cmocka_cb).map_items; + assert_true(AMmapItemsEqual(&AforkAt2_items, &A2_items)); } /** * \brief should handle merging text conflicts then saving & loading */ static void test_should_handle_merging_text_conflicts_then_saving_and_loading(void** state) { - BaseState* base_state = *state; - AMstack** stack_ptr = &base_state->stack; + AMresultStack* stack = *state; /* const A = create("aabbcc") */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("aabbcc")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* A; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &A)); + AMdoc* const A = AMpush(&stack, + AMcreate(AMpush(&stack, + AMactorIdInitStr(AMstr("aabbcc")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* const At = A.putObject('_root', 'text', "") */ - AMobjId const* const At = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(A, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), cmocka_cb, - AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const At = AMpush( + &stack, + AMmapPutObject(A, AM_ROOT, AMstr("text"), AM_OBJ_TYPE_TEXT), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* A.splice(At, 0, 0, 'hello') */ - AMstackItem(NULL, AMspliceText(A, At, 0, 0, AMstr("hello")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(A, At, 0, 0, AMstr("hello"))); /* */ /* const B = A.fork() */ - AMdoc* B; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMfork(A, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &B)); + AMdoc* const B = AMpush(&stack, AMfork(A, NULL), AM_VALUE_DOC, cmocka_cb).doc; /* */ /* assert.deepEqual(B.getWithType("_root", "text"), ["text", At]) */ - AMbyteSpan str; - assert_true( - AMitemToStr(AMstackItem(stack_ptr, - AMtext(B, - AMitemObjId(AMstackItem(stack_ptr, AMmapGet(B, AM_ROOT, AMstr("text"), NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))), - NULL), - cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), - &str)); - AMbyteSpan str2; - assert_true(AMitemToStr(AMstackItem(stack_ptr, AMtext(A, At, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str2)); + AMbyteSpan str = AMpush(&stack, + AMtext(B, + AMpush(&stack, + AMmapGet(B, AM_ROOT, AMstr("text"), NULL), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id, + NULL), + AM_VALUE_STR, + cmocka_cb).str; + AMbyteSpan const str2 = AMpush(&stack, + AMtext(A, At, NULL), + AM_VALUE_STR, + cmocka_cb).str; assert_int_equal(str.count, str2.count); assert_memory_equal(str.src, str2.src, str.count); /* */ /* B.splice(At, 4, 1) */ - AMstackItem(NULL, AMspliceText(B, At, 4, 1, AMstr(NULL)), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(B, At, 4, 1, AMstr(NULL))); /* B.splice(At, 4, 0, '!') */ - AMstackItem(NULL, AMspliceText(B, At, 4, 0, AMstr("!")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(B, At, 4, 0, AMstr("!"))); /* B.splice(At, 5, 0, ' ') */ - AMstackItem(NULL, AMspliceText(B, At, 5, 0, AMstr(" ")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(B, At, 5, 0, AMstr(" "))); /* B.splice(At, 6, 0, 'world') */ - AMstackItem(NULL, AMspliceText(B, At, 6, 0, AMstr("world")), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMspliceText(B, At, 6, 0, AMstr("world"))); /* */ /* A.merge(B) */ - AMstackItem(NULL, AMmerge(A, B), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmerge(A, B)); /* */ /* const binary = A.save() */ - AMbyteSpan binary; - assert_true(AMitemToBytes(AMstackItem(stack_ptr, AMsave(A), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &binary)); + AMbyteSpan const binary = AMpush(&stack, + AMsave(A), + AM_VALUE_BYTES, + cmocka_cb).bytes; /* */ /* const C = load(binary) */ - AMdoc* C; - assert_true(AMitemToDoc( - AMstackItem(stack_ptr, AMload(binary.src, binary.count), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &C)); + AMdoc* const C = AMpush(&stack, + AMload(binary.src, binary.count), + AM_VALUE_DOC, + cmocka_cb).doc; /* */ /* assert.deepEqual(C.getWithType('_root', 'text'), ['text', '1@aabbcc'] */ - AMobjId const* const C_text = AMitemObjId( - AMstackItem(stack_ptr, AMmapGet(C, AM_ROOT, AMstr("text"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const C_text = AMpush(&stack, + AMmapGet(C, AM_ROOT, AMstr("text"), NULL), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; assert_int_equal(AMobjIdCounter(C_text), 1); str = AMactorIdStr(AMobjIdActorId(C_text)); assert_int_equal(str.count, strlen("aabbcc")); assert_memory_equal(str.src, "aabbcc", str.count); /* assert.deepEqual(C.text(At), 'hell! world') */ - assert_true(AMitemToStr(AMstackItem(stack_ptr, AMtext(C, At, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_STR)), &str)); + str = AMpush(&stack, AMtext(C, At, NULL), AM_VALUE_STR, cmocka_cb).str; assert_int_equal(str.count, strlen("hell! world")); assert_memory_equal(str.src, "hell! world", str.count); } int run_ported_wasm_basic_tests(void) { const struct CMUnitTest tests[] = { - cmocka_unit_test_setup_teardown(test_create_clone_and_free, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_start_and_commit, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_getting_a_nonexistent_prop_does_not_throw_an_error, setup_base, - teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_set_and_get_a_simple_value, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_use_bytes, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_make_subobjects, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_make_lists, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_lists_have_insert_set_splice_and_push_ops, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_delete_non_existent_props, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_del, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_use_counters, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_splice_text, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_save_all_or_incrementally, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_splice_text_2, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_local_inc_increments_all_visible_counters_in_a_map, setup_base, - teardown_base), - cmocka_unit_test_setup_teardown(test_local_inc_increments_all_visible_counters_in_a_sequence, setup_base, - teardown_base), - cmocka_unit_test_setup_teardown(test_should_be_able_to_fetch_changes_by_hash, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_recursive_sets_are_possible, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_only_returns_an_object_id_when_objects_are_created, setup_base, - teardown_base), - cmocka_unit_test_setup_teardown(test_objects_without_properties_are_preserved, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_allow_you_to_forkAt_a_heads, setup_base, teardown_base), - cmocka_unit_test_setup_teardown(test_should_handle_merging_text_conflicts_then_saving_and_loading, setup_base, - teardown_base)}; + cmocka_unit_test_setup_teardown(test_create_clone_and_free, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_start_and_commit, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_getting_a_nonexistent_prop_does_not_throw_an_error, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_set_and_get_a_simple_value, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_use_bytes, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_make_subobjects, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_make_lists, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_lists_have_insert_set_splice_and_push_ops, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_delete_non_existent_props, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_del, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_use_counters, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_splice_text, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_insert_objects_into_text, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_save_all_or_incrementally, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_splice_text_2, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_local_inc_increments_all_visible_counters_in_a_map, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_local_inc_increments_all_visible_counters_in_a_sequence, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_be_able_to_fetch_changes_by_hash, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_recursive_sets_are_possible, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_only_returns_an_object_id_when_objects_are_created, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_objects_without_properties_are_preserved, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_allow_you_to_forkAt_a_heads, setup_stack, teardown_stack), + cmocka_unit_test_setup_teardown(test_should_handle_merging_text_conflicts_then_saving_and_loading, setup_stack, teardown_stack) + }; return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/rust/automerge-c/test/ported_wasm/suite.c b/rust/automerge-c/test/ported_wasm/suite.c index 440ed899..fc10fadc 100644 --- a/rust/automerge-c/test/ported_wasm/suite.c +++ b/rust/automerge-c/test/ported_wasm/suite.c @@ -1,6 +1,6 @@ -#include #include #include +#include #include /* third-party */ @@ -11,5 +11,8 @@ extern int run_ported_wasm_basic_tests(void); extern int run_ported_wasm_sync_tests(void); int run_ported_wasm_suite(void) { - return (run_ported_wasm_basic_tests() + run_ported_wasm_sync_tests()); + return ( + run_ported_wasm_basic_tests() + + run_ported_wasm_sync_tests() + ); } diff --git a/rust/automerge-c/test/ported_wasm/sync_tests.c b/rust/automerge-c/test/ported_wasm/sync_tests.c index 099f8dbf..a1ddbf3c 100644 --- a/rust/automerge-c/test/ported_wasm/sync_tests.c +++ b/rust/automerge-c/test/ported_wasm/sync_tests.c @@ -9,12 +9,10 @@ /* local */ #include -#include -#include "../base_state.h" -#include "../cmocka_utils.h" +#include "../stack_utils.h" typedef struct { - BaseState* base_state; + AMresultStack* stack; AMdoc* n1; AMdoc* n2; AMsyncState* s1; @@ -23,35 +21,43 @@ typedef struct { static int setup(void** state) { TestState* test_state = test_calloc(1, sizeof(TestState)); - setup_base((void**)&test_state->base_state); - AMstack** stack_ptr = &test_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("01234567")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &test_state->n1)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("89abcdef")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - assert_true( - AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &test_state->n2)); - assert_true(AMitemToSyncState( - AMstackItem(stack_ptr, AMsyncStateInit(), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_STATE)), &test_state->s1)); - assert_true(AMitemToSyncState( - AMstackItem(stack_ptr, AMsyncStateInit(), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_STATE)), &test_state->s2)); + test_state->n1 = AMpush(&test_state->stack, + AMcreate(AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("01234567")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; + test_state->n2 = AMpush(&test_state->stack, + AMcreate(AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("89abcdef")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; + test_state->s1 = AMpush(&test_state->stack, + AMsyncStateInit(), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; + test_state->s2 = AMpush(&test_state->stack, + AMsyncStateInit(), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; *state = test_state; return 0; } static int teardown(void** state) { TestState* test_state = *state; - teardown_base((void**)&test_state->base_state); + AMfreeStack(&test_state->stack); test_free(test_state); return 0; } -static void sync(AMdoc* a, AMdoc* b, AMsyncState* a_sync_state, AMsyncState* b_sync_state) { +static void sync(AMdoc* a, + AMdoc* b, + AMsyncState* a_sync_state, + AMsyncState* b_sync_state) { static size_t const MAX_ITER = 10; AMsyncMessage const* a2b_msg = NULL; @@ -60,35 +66,29 @@ static void sync(AMdoc* a, AMdoc* b, AMsyncState* a_sync_state, AMsyncState* b_s do { AMresult* a2b_msg_result = AMgenerateSyncMessage(a, a_sync_state); AMresult* b2a_msg_result = AMgenerateSyncMessage(b, b_sync_state); - AMitem* item = AMresultItem(a2b_msg_result); - switch (AMitemValType(item)) { - case AM_VAL_TYPE_SYNC_MESSAGE: { - AMitemToSyncMessage(item, &a2b_msg); - AMstackResult(NULL, AMreceiveSyncMessage(b, b_sync_state, a2b_msg), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - } break; - case AM_VAL_TYPE_VOID: - a2b_msg = NULL; - break; + AMvalue value = AMresultValue(a2b_msg_result); + switch (value.tag) { + case AM_VALUE_SYNC_MESSAGE: { + a2b_msg = value.sync_message; + AMfree(AMreceiveSyncMessage(b, b_sync_state, a2b_msg)); + } + break; + case AM_VALUE_VOID: a2b_msg = NULL; break; } - item = AMresultItem(b2a_msg_result); - switch (AMitemValType(item)) { - case AM_VAL_TYPE_SYNC_MESSAGE: { - AMitemToSyncMessage(item, &b2a_msg); - AMstackResult(NULL, AMreceiveSyncMessage(a, a_sync_state, b2a_msg), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - } break; - case AM_VAL_TYPE_VOID: - b2a_msg = NULL; - break; + value = AMresultValue(b2a_msg_result); + switch (value.tag) { + case AM_VALUE_SYNC_MESSAGE: { + b2a_msg = value.sync_message; + AMfree(AMreceiveSyncMessage(a, a_sync_state, b2a_msg)); + } + break; + case AM_VALUE_VOID: b2a_msg = NULL; break; } if (++iter > MAX_ITER) { - fail_msg( - "Did not synchronize within %d iterations. " - "Do you have a bug causing an infinite loop?", - MAX_ITER); + fail_msg("Did not synchronize within %d iterations. " + "Do you have a bug causing an infinite loop?", MAX_ITER); } - } while (a2b_msg || b2a_msg); + } while(a2b_msg || b2a_msg); } static time_t const TIME_0 = 0; @@ -96,135 +96,151 @@ static time_t const TIME_0 = 0; /** * \brief should send a sync message implying no local data */ -static void test_should_send_a_sync_message_implying_no_local_data(void** state) { +static void test_should_send_a_sync_message_implying_no_local_data(void **state) { /* const doc = create() const s1 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* const m1 = doc.generateSyncMessage(s1) if (m1 === null) { throw new RangeError("message should not be null") } const message: DecodedSyncMessage = decodeSyncMessage(m1) */ - AMsyncMessage const* m1; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &m1)); + AMsyncMessage const* const m1 = AMpush(&test_state->stack, + AMgenerateSyncMessage( + test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(message.heads, []) */ - AMitems heads = AMstackItems(stack_ptr, AMsyncMessageHeads(m1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&heads), 0); + AMchangeHashes heads = AMsyncMessageHeads(m1); + assert_int_equal(AMchangeHashesSize(&heads), 0); /* assert.deepStrictEqual(message.need, []) */ - AMitems needs = AMstackItems(stack_ptr, AMsyncMessageNeeds(m1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&needs), 0); + AMchangeHashes needs = AMsyncMessageNeeds(m1); + assert_int_equal(AMchangeHashesSize(&needs), 0); /* assert.deepStrictEqual(message.have.length, 1) */ - AMitems haves = AMstackItems(stack_ptr, AMsyncMessageHaves(m1), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_HAVE)); - assert_int_equal(AMitemsSize(&haves), 1); + AMsyncHaves haves = AMsyncMessageHaves(m1); + assert_int_equal(AMsyncHavesSize(&haves), 1); /* assert.deepStrictEqual(message.have[0].lastSync, []) */ - AMsyncHave const* have0; - assert_true(AMitemToSyncHave(AMitemsNext(&haves, 1), &have0)); - AMitems last_sync = - AMstackItems(stack_ptr, AMsyncHaveLastSync(have0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&last_sync), 0); + AMsyncHave const* have0 = AMsyncHavesNext(&haves, 1); + AMchangeHashes last_sync = AMsyncHaveLastSync(have0); + assert_int_equal(AMchangeHashesSize(&last_sync), 0); /* assert.deepStrictEqual(message.have[0].bloom.byteLength, 0) assert.deepStrictEqual(message.changes, []) */ - AMitems changes = AMstackItems(stack_ptr, AMsyncMessageChanges(m1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&changes), 0); + AMchanges changes = AMsyncMessageChanges(m1); + assert_int_equal(AMchangesSize(&changes), 0); } /** * \brief should not reply if we have no data as well */ -static void test_should_not_reply_if_we_have_no_data_as_well(void** state) { +static void test_should_not_reply_if_we_have_no_data_as_well(void **state) { /* const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* const m1 = n1.generateSyncMessage(s1) if (m1 === null) { throw new RangeError("message should not be null") */ - AMsyncMessage const* m1; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &m1)); + AMsyncMessage const* const m1 = AMpush(&test_state->stack, + AMgenerateSyncMessage( + test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* n2.receiveSyncMessage(s2, m1) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, m1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, m1)); /* const m2 = n2.generateSyncMessage(s2) assert.deepStrictEqual(m2, null) */ - AMstackItem(NULL, AMgenerateSyncMessage(test_state->n2, test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_VOID, + cmocka_cb); } /** * \brief repos with equal heads do not need a reply message */ -static void test_repos_with_equal_heads_do_not_need_a_reply_message(void** state) { +static void test_repos_with_equal_heads_do_not_need_a_reply_message(void **state) { /* const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* make two nodes with the same changes */ /* const list = n1.putObject("_root", "n", []) */ - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(test_state->n1, AM_ROOT, AMstr("n"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const list = AMpush(&test_state->stack, + AMmapPutObject(test_state->n1, + AM_ROOT, + AMstr("n"), + AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* for (let i = 0; i < 10; i++) { */ for (size_t i = 0; i != 10; ++i) { /* n1.insert(list, i, i) */ - AMstackItem(NULL, AMlistPutUint(test_state->n1, list, i, true, i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutUint(test_state->n1, AM_ROOT, i, true, i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* n2.applyChanges(n1.getChanges([])) */ - AMitems const items = - AMstackItems(stack_ptr, AMgetChanges(test_state->n1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - AMstackItem(NULL, AMapplyChanges(test_state->n2, &items), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMchanges const changes = AMpush(&test_state->stack, + AMgetChanges(test_state->n1, NULL), + AM_VALUE_CHANGES, + cmocka_cb).changes; + AMfree(AMapplyChanges(test_state->n2, &changes)); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); /* */ /* generate a naive sync message */ /* const m1 = n1.generateSyncMessage(s1) if (m1 === null) { throw new RangeError("message should not be null") */ - AMsyncMessage const* m1; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &m1)); + AMsyncMessage const* m1 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(s1.lastSentHeads, n1.getHeads()) */ - AMitems const last_sent_heads = - AMstackItems(stack_ptr, AMsyncStateLastSentHeads(test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems const heads = - AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&last_sent_heads, &heads)); + AMchangeHashes const last_sent_heads = AMsyncStateLastSentHeads( + test_state->s1 + ); + AMchangeHashes const heads = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&last_sent_heads, &heads), 0); /* */ /* heads are equal so this message should be null */ /* n2.receiveSyncMessage(s2, m1) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, m1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, m1)); /* const m2 = n2.generateSyncMessage(s2) assert.strictEqual(m2, null) */ - AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_VOID, + cmocka_cb); } /** * \brief n1 should offer all changes to n2 when starting from nothing */ -static void test_n1_should_offer_all_changes_to_n2_when_starting_from_nothing(void** state) { +static void test_n1_should_offer_all_changes_to_n2_when_starting_from_nothing(void **state) { /* const n1 = create(), n2 = create() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; + /* make changes for n1 that n2 should request */ /* const list = n1.putObject("_root", "n", []) */ - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(test_state->n1, AM_ROOT, AMstr("n"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const list = AMpush( + &test_state->stack, + AMmapPutObject(test_state->n1, AM_ROOT, AMstr("n"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* for (let i = 0; i < 10; i++) { */ for (size_t i = 0; i != 10; ++i) { /* n1.insert(list, i, i) */ - AMstackItem(NULL, AMlistPutUint(test_state->n1, list, i, true, i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutUint(test_state->n1, AM_ROOT, i, true, i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ @@ -238,24 +254,26 @@ static void test_n1_should_offer_all_changes_to_n2_when_starting_from_nothing(vo /** * \brief should sync peers where one has commits the other does not */ -static void test_should_sync_peers_where_one_has_commits_the_other_does_not(void** state) { +static void test_should_sync_peers_where_one_has_commits_the_other_does_not(void **state) { /* const n1 = create(), n2 = create() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; + /* make changes for n1 that n2 should request */ /* const list = n1.putObject("_root", "n", []) */ - AMobjId const* const list = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(test_state->n1, AM_ROOT, AMstr("n"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* const list = AMpush( + &test_state->stack, + AMmapPutObject(test_state->n1, AM_ROOT, AMstr("n"), AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* for (let i = 0; i < 10; i++) { */ for (size_t i = 0; i != 10; ++i) { /* n1.insert(list, i, i) */ - AMstackItem(NULL, AMlistPutUint(test_state->n1, list, i, true, i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutUint(test_state->n1, AM_ROOT, i, true, i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ @@ -269,20 +287,19 @@ static void test_should_sync_peers_where_one_has_commits_the_other_does_not(void /** * \brief should work with prior sync state */ -static void test_should_work_with_prior_sync_state(void** state) { +static void test_should_work_with_prior_sync_state(void **state) { /* create & synchronize two nodes */ /* const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); @@ -291,10 +308,10 @@ static void test_should_work_with_prior_sync_state(void** state) { /* for (let i = 5; i < 10; i++) { */ for (size_t i = 5; i != 10; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ @@ -308,333 +325,326 @@ static void test_should_work_with_prior_sync_state(void** state) { /** * \brief should not generate messages once synced */ -static void test_should_not_generate_messages_once_synced(void** state) { +static void test_should_not_generate_messages_once_synced(void **state) { /* create & synchronize two nodes */ /* const n1 = create('abc123'), n2 = create('def456') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("abc123")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->n1, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("def456")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->n2, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMsetActorId(test_state->n1, AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("abc123")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); + AMfree(AMsetActorId(test_state->n2, AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("def456")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* */ /* let message, patch for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n2.put("_root", "y", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("y"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("y"), i)); /* n2.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); + /* { */ } /* */ /* n1 reports what it has */ /* message = n1.generateSyncMessage(s1) - if (message === null) { throw new RangeError("message should not be - null") */ - AMsyncMessage const* message; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); + if (message === null) { throw new RangeError("message should not be null") */ + AMsyncMessage const* message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* */ /* n2 receives that message and sends changes along with what it has */ /* n2.receiveSyncMessage(s2, message) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, message), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, message)); /* message = n2.generateSyncMessage(s2) - if (message === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); - AMitems message_changes = - AMstackItems(stack_ptr, AMsyncMessageChanges(message), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&message_changes), 5); + if (message === null) { throw new RangeError("message should not be null") */ + message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; + AMchanges message_changes = AMsyncMessageChanges(message); + assert_int_equal(AMchangesSize(&message_changes), 5); /* */ /* n1 receives the changes and replies with the changes it now knows that * n2 needs */ /* n1.receiveSyncMessage(s1, message) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n1, test_state->s1, message), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n1, test_state->s1, message)); /* message = n2.generateSyncMessage(s2) - if (message === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); - message_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(message), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&message_changes), 5); + if (message === null) { throw new RangeError("message should not be null") */ + message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; + message_changes = AMsyncMessageChanges(message); + assert_int_equal(AMchangesSize(&message_changes), 5); /* */ /* n2 applies the changes and sends confirmation ending the exchange */ /* n2.receiveSyncMessage(s2, message) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, message), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, message)); /* message = n2.generateSyncMessage(s2) - if (message === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); + if (message === null) { throw new RangeError("message should not be null") */ + message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* */ /* n1 receives the message and has nothing more to say */ /* n1.receiveSyncMessage(s1, message) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n1, test_state->s1, message), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n1, test_state->s1, message)); /* message = n1.generateSyncMessage(s1) assert.deepStrictEqual(message, null) */ - AMstackItem(NULL, AMgenerateSyncMessage(test_state->n1, test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_VOID, + cmocka_cb); /* //assert.deepStrictEqual(patch, null) // no changes arrived */ /* */ /* n2 also has nothing left to say */ /* message = n2.generateSyncMessage(s2) assert.deepStrictEqual(message, null) */ - AMstackItem(NULL, AMgenerateSyncMessage(test_state->n2, test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_VOID, + cmocka_cb); } /** * \brief should allow simultaneous messages during synchronization */ -static void test_should_allow_simultaneous_messages_during_synchronization(void** state) { +static void test_should_allow_simultaneous_messages_during_synchronization(void **state) { /* create & synchronize two nodes */ /* const n1 = create('abc123'), n2 = create('def456') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("abc123")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->n1, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("def456")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMstackItem(NULL, AMsetActorId(test_state->n2, actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMsetActorId(test_state->n1, AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("abc123")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); + AMfree(AMsetActorId(test_state->n2, AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("def456")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id)); /* */ /* for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n2.put("_root", "y", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("y"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("y"), i)); /* n2.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); + /* { */ } /* const head1 = n1.getHeads()[0], head2 = n2.getHeads()[0] */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMbyteSpan head1; - assert_true(AMitemToChangeHash(AMitemsNext(&heads1, 1), &head1)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMbyteSpan head2; - assert_true(AMitemToChangeHash(AMitemsNext(&heads2, 1), &head2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMbyteSpan const head1 = AMchangeHashesNext(&heads1, 1); + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMbyteSpan const head2 = AMchangeHashesNext(&heads2, 1); /* */ /* both sides report what they have but have no shared peer state */ /* let msg1to2, msg2to1 msg1to2 = n1.generateSyncMessage(s1) - if (msg1to2 === null) { throw new RangeError("message should not be - null") */ - AMsyncMessage const* msg1to2; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg1to2)); + if (msg1to2 === null) { throw new RangeError("message should not be null") */ + AMsyncMessage const* msg1to2 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* msg2to1 = n2.generateSyncMessage(s2) - if (msg2to1 === null) { throw new RangeError("message should not be - null") */ - AMsyncMessage const* msg2to1; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg2to1)); + if (msg2to1 === null) { throw new RangeError("message should not be null") */ + AMsyncMessage const* msg2to1 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, + test_state->s2), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).changes.length, 0) */ - AMitems msg1to2_changes = - AMstackItems(stack_ptr, AMsyncMessageChanges(msg1to2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg1to2_changes), 0); - /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync.length, - * 0 */ - AMitems msg1to2_haves = - AMstackItems(stack_ptr, AMsyncMessageHaves(msg1to2), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_HAVE)); - AMsyncHave const* msg1to2_have; - assert_true(AMitemToSyncHave(AMitemsNext(&msg1to2_haves, 1), &msg1to2_have)); - AMitems msg1to2_last_sync = - AMstackItems(stack_ptr, AMsyncHaveLastSync(msg1to2_have), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&msg1to2_last_sync), 0); + AMchanges msg1to2_changes = AMsyncMessageChanges(msg1to2); + assert_int_equal(AMchangesSize(&msg1to2_changes), 0); + /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync.length, 0 */ + AMsyncHaves msg1to2_haves = AMsyncMessageHaves(msg1to2); + AMsyncHave const* msg1to2_have = AMsyncHavesNext(&msg1to2_haves, 1); + AMchangeHashes msg1to2_last_sync = AMsyncHaveLastSync(msg1to2_have); + assert_int_equal(AMchangeHashesSize(&msg1to2_last_sync), 0); /* assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 0) */ - AMitems msg2to1_changes = - AMstackItems(stack_ptr, AMsyncMessageChanges(msg2to1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg2to1_changes), 0); - /* assert.deepStrictEqual(decodeSyncMessage(msg2to1).have[0].lastSync.length, - * 0 */ - AMitems msg2to1_haves = - AMstackItems(stack_ptr, AMsyncMessageHaves(msg2to1), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_HAVE)); - AMsyncHave const* msg2to1_have; - assert_true(AMitemToSyncHave(AMitemsNext(&msg2to1_haves, 1), &msg2to1_have)); - AMitems msg2to1_last_sync = - AMstackItems(stack_ptr, AMsyncHaveLastSync(msg2to1_have), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&msg2to1_last_sync), 0); + AMchanges msg2to1_changes = AMsyncMessageChanges(msg2to1); + assert_int_equal(AMchangesSize(&msg2to1_changes), 0); + /* assert.deepStrictEqual(decodeSyncMessage(msg2to1).have[0].lastSync.length, 0 */ + AMsyncHaves msg2to1_haves = AMsyncMessageHaves(msg2to1); + AMsyncHave const* msg2to1_have = AMsyncHavesNext(&msg2to1_haves, 1); + AMchangeHashes msg2to1_last_sync = AMsyncHaveLastSync(msg2to1_have); + assert_int_equal(AMchangeHashesSize(&msg2to1_last_sync), 0); /* */ /* n1 and n2 receive that message and update sync state but make no patc */ /* n1.receiveSyncMessage(s1, msg2to1) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n1, test_state->s1, msg2to1), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n1, test_state->s1, msg2to1)); /* n2.receiveSyncMessage(s2, msg1to2) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2)); /* */ /* now both reply with their local changes that the other lacks * (standard warning that 1% of the time this will result in a "needs" * message) */ /* msg1to2 = n1.generateSyncMessage(s1) - if (msg1to2 === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg1to2)); + if (msg1to2 === null) { throw new RangeError("message should not be null") */ + msg1to2 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).changes.length, 5) */ - msg1to2_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(msg1to2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg1to2_changes), 5); + msg1to2_changes = AMsyncMessageChanges(msg1to2); + assert_int_equal(AMchangesSize(&msg1to2_changes), 5); /* msg2to1 = n2.generateSyncMessage(s2) - if (msg2to1 === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg2to1)); + if (msg2to1 === null) { throw new RangeError("message should not be null") */ + msg2to1 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 5) */ - msg2to1_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(msg2to1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg2to1_changes), 5); + msg2to1_changes = AMsyncMessageChanges(msg2to1); + assert_int_equal(AMchangesSize(&msg2to1_changes), 5); /* */ /* both should now apply the changes and update the frontend */ /* n1.receiveSyncMessage(s1, msg2to1) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n1, test_state->s1, msg2to1), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n1, + test_state->s1, + msg2to1)); /* assert.deepStrictEqual(n1.getMissingDeps(), []) */ - AMitems missing_deps = - AMstackItems(stack_ptr, AMgetMissingDeps(test_state->n1, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&missing_deps), 0); + AMchangeHashes missing_deps = AMpush(&test_state->stack, + AMgetMissingDeps(test_state->n1, NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesSize(&missing_deps), 0); /* //assert.notDeepStrictEqual(patch1, null) assert.deepStrictEqual(n1.materialize(), { x: 4, y: 4 }) */ - uint64_t uint; - assert_true(AMitemToUint(AMstackItem(stack_ptr, AMmapGet(test_state->n1, AM_ROOT, AMstr("x"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 4); - assert_true(AMitemToUint(AMstackItem(stack_ptr, AMmapGet(test_state->n1, AM_ROOT, AMstr("y"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 4); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(test_state->n1, AM_ROOT, AMstr("x"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 4); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(test_state->n1, AM_ROOT, AMstr("y"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 4); /* */ /* n2.receiveSyncMessage(s2, msg1to2) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2)); /* assert.deepStrictEqual(n2.getMissingDeps(), []) */ - missing_deps = - AMstackItems(stack_ptr, AMgetMissingDeps(test_state->n2, NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_int_equal(AMitemsSize(&missing_deps), 0); + missing_deps = AMpush(&test_state->stack, + AMgetMissingDeps(test_state->n2, NULL), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesSize(&missing_deps), 0); /* //assert.notDeepStrictEqual(patch2, null) assert.deepStrictEqual(n2.materialize(), { x: 4, y: 4 }) */ - assert_true(AMitemToUint(AMstackItem(stack_ptr, AMmapGet(test_state->n2, AM_ROOT, AMstr("x"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 4); - assert_true(AMitemToUint(AMstackItem(stack_ptr, AMmapGet(test_state->n2, AM_ROOT, AMstr("y"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 4); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(test_state->n2, AM_ROOT, AMstr("x"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 4); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(test_state->n2, AM_ROOT, AMstr("y"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 4); /* */ /* The response acknowledges the changes received and sends no further * changes */ /* msg1to2 = n1.generateSyncMessage(s1) - if (msg1to2 === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg1to2)); + if (msg1to2 === null) { throw new RangeError("message should not be null") */ + msg1to2 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).changes.length, 0) */ - msg1to2_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(msg1to2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg1to2_changes), 0); + msg1to2_changes = AMsyncMessageChanges(msg1to2); + assert_int_equal(AMchangesSize(&msg1to2_changes), 0); /* msg2to1 = n2.generateSyncMessage(s2) - if (msg2to1 === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n2, test_state->s2), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg2to1)); + if (msg2to1 === null) { throw new RangeError("message should not be null") */ + msg2to1 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(msg2to1).changes.length, 0) */ - msg2to1_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(msg2to1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&msg2to1_changes), 0); + msg2to1_changes = AMsyncMessageChanges(msg2to1); + assert_int_equal(AMchangesSize(&msg2to1_changes), 0); /* */ /* After receiving acknowledgements, their shared heads should be equal */ /* n1.receiveSyncMessage(s1, msg2to1) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n1, test_state->s1, msg2to1), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n1, test_state->s1, msg2to1)); /* n2.receiveSyncMessage(s2, msg1to2) */ - AMstackItem(NULL, AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMreceiveSyncMessage(test_state->n2, test_state->s2, msg1to2)); /* assert.deepStrictEqual(s1.sharedHeads, [head1, head2].sort()) */ - AMitems s1_shared_heads = - AMstackItems(stack_ptr, AMsyncStateSharedHeads(test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMbyteSpan s1_shared_change_hash; - assert_true(AMitemToChangeHash(AMitemsNext(&s1_shared_heads, 1), &s1_shared_change_hash)); - assert_memory_equal(s1_shared_change_hash.src, head1.src, head1.count); - assert_true(AMitemToChangeHash(AMitemsNext(&s1_shared_heads, 1), &s1_shared_change_hash)); - assert_memory_equal(s1_shared_change_hash.src, head2.src, head2.count); + AMchangeHashes s1_shared_heads = AMsyncStateSharedHeads(test_state->s1); + assert_memory_equal(AMchangeHashesNext(&s1_shared_heads, 1).src, + head1.src, + head1.count); + assert_memory_equal(AMchangeHashesNext(&s1_shared_heads, 1).src, + head2.src, + head2.count); /* assert.deepStrictEqual(s2.sharedHeads, [head1, head2].sort()) */ - AMitems s2_shared_heads = - AMstackItems(stack_ptr, AMsyncStateSharedHeads(test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMbyteSpan s2_shared_change_hash; - assert_true(AMitemToChangeHash(AMitemsNext(&s2_shared_heads, 1), &s2_shared_change_hash)); - assert_memory_equal(s2_shared_change_hash.src, head1.src, head1.count); - assert_true(AMitemToChangeHash(AMitemsNext(&s2_shared_heads, 1), &s2_shared_change_hash)); - assert_memory_equal(s2_shared_change_hash.src, head2.src, head2.count); + AMchangeHashes s2_shared_heads = AMsyncStateSharedHeads(test_state->s2); + assert_memory_equal(AMchangeHashesNext(&s2_shared_heads, 1).src, + head1.src, + head1.count); + assert_memory_equal(AMchangeHashesNext(&s2_shared_heads, 1).src, + head2.src, + head2.count); /* //assert.deepStrictEqual(patch1, null) //assert.deepStrictEqual(patch2, null) */ /* */ /* We're in sync, no more messages required */ /* msg1to2 = n1.generateSyncMessage(s1) assert.deepStrictEqual(msg1to2, null) */ - AMstackItem(NULL, AMgenerateSyncMessage(test_state->n1, test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_VOID, + cmocka_cb); /* msg2to1 = n2.generateSyncMessage(s2) assert.deepStrictEqual(msg2to1, null) */ - AMstackItem(NULL, AMgenerateSyncMessage(test_state->n2, test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n2, test_state->s2), + AM_VALUE_VOID, + cmocka_cb); /* */ /* If we make one more change and start another sync then its lastSync * should be updated */ /* n1.put("_root", "x", 5) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 5)); /* msg1to2 = n1.generateSyncMessage(s1) - if (msg1to2 === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &msg1to2)); - /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync, - * [head1, head2].sort( */ - msg1to2_haves = AMstackItems(stack_ptr, AMsyncMessageHaves(msg1to2), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_HAVE)); - assert_true(AMitemToSyncHave(AMitemsNext(&msg1to2_haves, 1), &msg1to2_have)); - msg1to2_last_sync = - AMstackItems(stack_ptr, AMsyncHaveLastSync(msg1to2_have), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMbyteSpan msg1to2_last_sync_next; - assert_true(AMitemToChangeHash(AMitemsNext(&msg1to2_last_sync, 1), &msg1to2_last_sync_next)); + if (msg1to2 === null) { throw new RangeError("message should not be null") */ + msg1to2 = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; + /* assert.deepStrictEqual(decodeSyncMessage(msg1to2).have[0].lastSync, [head1, head2].sort( */ + msg1to2_haves = AMsyncMessageHaves(msg1to2); + msg1to2_have = AMsyncHavesNext(&msg1to2_haves, 1); + msg1to2_last_sync = AMsyncHaveLastSync(msg1to2_have); + AMbyteSpan msg1to2_last_sync_next = AMchangeHashesNext(&msg1to2_last_sync, 1); assert_int_equal(msg1to2_last_sync_next.count, head1.count); assert_memory_equal(msg1to2_last_sync_next.src, head1.src, head1.count); - assert_true(AMitemToChangeHash(AMitemsNext(&msg1to2_last_sync, 1), &msg1to2_last_sync_next)); + msg1to2_last_sync_next = AMchangeHashesNext(&msg1to2_last_sync, 1); assert_int_equal(msg1to2_last_sync_next.count, head2.count); assert_memory_equal(msg1to2_last_sync_next.src, head2.src, head2.count); } @@ -642,89 +652,87 @@ static void test_should_allow_simultaneous_messages_during_synchronization(void* /** * \brief should assume sent changes were received until we hear otherwise */ -static void test_should_assume_sent_changes_were_received_until_we_hear_otherwise(void** state) { +static void test_should_assume_sent_changes_were_received_until_we_hear_otherwise(void **state) { /* const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* let message = null */ /* */ /* const items = n1.putObject("_root", "items", []) */ - AMobjId const* const items = - AMitemObjId(AMstackItem(stack_ptr, AMmapPutObject(test_state->n1, AM_ROOT, AMstr("items"), AM_OBJ_TYPE_LIST), - cmocka_cb, AMexpect(AM_VAL_TYPE_OBJ_TYPE))); + AMobjId const* items = AMpush(&test_state->stack, + AMmapPutObject(test_state->n1, + AM_ROOT, + AMstr("items"), + AM_OBJ_TYPE_LIST), + AM_VALUE_OBJ_ID, + cmocka_cb).obj_id; /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* */ /* sync(n1, n2, s1, s2) */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); /* */ /* n1.push(items, "x") */ - AMstackItem(NULL, AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("x")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("x"))); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* message = n1.generateSyncMessage(s1) - if (message === null) { throw new RangeError("message should not be null") - */ - AMsyncMessage const* message; - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); + if (message === null) { throw new RangeError("message should not be null") */ + AMsyncMessage const* message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, + test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) */ - AMitems message_changes = - AMstackItems(stack_ptr, AMsyncMessageChanges(message), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&message_changes), 1); + AMchanges message_changes = AMsyncMessageChanges(message); + assert_int_equal(AMchangesSize(&message_changes), 1); /* */ /* n1.push(items, "y") */ - AMstackItem(NULL, AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("y")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("y"))); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* message = n1.generateSyncMessage(s1) - if (message === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); + if (message === null) { throw new RangeError("message should not be null") */ + message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) */ - message_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(message), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&message_changes), 1); + message_changes = AMsyncMessageChanges(message); + assert_int_equal(AMchangesSize(&message_changes), 1); /* */ /* n1.push(items, "z") */ - AMstackItem(NULL, AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("z")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMlistPutStr(test_state->n1, items, SIZE_MAX, true, AMstr("z"))); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* */ /* message = n1.generateSyncMessage(s1) - if (message === null) { throw new RangeError("message should not be - null") */ - assert_true(AMitemToSyncMessage(AMstackItem(stack_ptr, AMgenerateSyncMessage(test_state->n1, test_state->s1), - cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_MESSAGE)), - &message)); + if (message === null) { throw new RangeError("message should not be null") */ + message = AMpush(&test_state->stack, + AMgenerateSyncMessage(test_state->n1, test_state->s1), + AM_VALUE_SYNC_MESSAGE, + cmocka_cb).sync_message; /* assert.deepStrictEqual(decodeSyncMessage(message).changes.length, 1) */ - message_changes = AMstackItems(stack_ptr, AMsyncMessageChanges(message), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); - assert_int_equal(AMitemsSize(&message_changes), 1); + message_changes = AMsyncMessageChanges(message); + assert_int_equal(AMchangesSize(&message_changes), 1); } /** * \brief should work regardless of who initiates the exchange */ -static void test_should_work_regardless_of_who_initiates_the_exchange(void** state) { +static void test_should_work_regardless_of_who_initiates_the_exchange(void **state) { /* create & synchronize two nodes */ /* const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* for (let i = 0; i < 5; i++) { */ for (size_t i = 0; i != 5; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ @@ -734,10 +742,10 @@ static void test_should_work_regardless_of_who_initiates_the_exchange(void** sta /* for (let i = 5; i < 10; i++) { */ for (size_t i = 5; i != 10; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ @@ -751,26 +759,24 @@ static void test_should_work_regardless_of_who_initiates_the_exchange(void** sta /** * \brief should work without prior sync state */ -static void test_should_work_without_prior_sync_state(void** state) { - /* Scenario: ,-- - * c10 <-- c11 <-- c12 <-- c13 <-- c14 c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 - * <-- c6 <-- c7 <-- c8 <-- c9 <-+ - * `-- - * c15 <-- c16 <-- c17 lastSync is undefined. */ +static void test_should_work_without_prior_sync_state(void **state) { + /* Scenario: ,-- c10 <-- c11 <-- c12 <-- c13 <-- c14 + * c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ + * `-- c15 <-- c16 <-- c17 + * lastSync is undefined. */ /* */ /* create two peers both with divergent commits */ /* const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* for (let i = 0; i < 10; i++) { */ for (size_t i = 0; i != 10; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2) */ @@ -779,19 +785,19 @@ static void test_should_work_without_prior_sync_state(void** state) { /* for (let i = 10; i < 15; i++) { */ for (size_t i = 10; i != 15; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* for (let i = 15; i < 18; i++) { */ for (size_t i = 15; i != 18; ++i) { /* n2.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), i)); /* n2.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); + /* { */ } /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ @@ -799,9 +805,15 @@ static void test_should_work_without_prior_sync_state(void** state) { /* sync(n1, n2) */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); } @@ -809,27 +821,25 @@ static void test_should_work_without_prior_sync_state(void** state) { /** * \brief should work with prior sync state */ -static void test_should_work_with_prior_sync_state_2(void** state) { +static void test_should_work_with_prior_sync_state_2(void **state) { /* Scenario: - * ,-- - * c10 <-- c11 <-- c12 <-- c13 <-- c14 c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 - * <-- c6 <-- c7 <-- c8 <-- c9 <-+ - * `-- - * c15 <-- c16 <-- c17 lastSync is c9. */ + * ,-- c10 <-- c11 <-- c12 <-- c13 <-- c14 + * c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ + * `-- c15 <-- c16 <-- c17 + * lastSync is c9. */ /* */ /* create two peers both with divergent commits */ /* const n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* for (let i = 0; i < 10; i++) { */ for (size_t i = 0; i != 10; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ @@ -838,44 +848,54 @@ static void test_should_work_with_prior_sync_state_2(void** state) { /* for (let i = 10; i < 15; i++) { */ for (size_t i = 10; i != 15; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* for (let i = 15; i < 18; i++) { */ for (size_t i = 15; i != 18; ++i) { /* n2.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), i)); /* n2.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); + /* { */ } /* */ /* s1 = decodeSyncState(encodeSyncState(s1)) */ - AMbyteSpan encoded; - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMsyncStateEncode(test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &encoded)); - AMsyncState* s1; - assert_true(AMitemToSyncState(AMstackItem(stack_ptr, AMsyncStateDecode(encoded.src, encoded.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_SYNC_STATE)), - &s1)); + AMbyteSpan encoded = AMpush(&test_state->stack, + AMsyncStateEncode(test_state->s1), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMsyncState* s1 = AMpush(&test_state->stack, + AMsyncStateDecode(encoded.src, encoded.count), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* s2 = decodeSyncState(encodeSyncState(s2)) */ - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMsyncStateEncode(test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &encoded)); - AMsyncState* s2; - assert_true(AMitemToSyncState(AMstackItem(stack_ptr, AMsyncStateDecode(encoded.src, encoded.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_SYNC_STATE)), - &s2)); + encoded = AMpush(&test_state->stack, + AMsyncStateEncode(test_state->s2), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMsyncState* s2 = AMpush(&test_state->stack, + AMsyncStateDecode(encoded.src, + encoded.count), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* */ /* assert.notDeepStrictEqual(n1.materialize(), n2.materialize()) */ assert_false(AMequal(test_state->n1, test_state->n2)); /* sync(n1, n2, s1, s2) */ sync(test_state->n1, test_state->n2, s1, s2); /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); } @@ -883,39 +903,39 @@ static void test_should_work_with_prior_sync_state_2(void** state) { /** * \brief should ensure non-empty state after sync */ -static void test_should_ensure_non_empty_state_after_sync(void** state) { +static void test_should_ensure_non_empty_state_after_sync(void **state) { /* const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* for (let i = 0; i < 3; i++) { */ for (size_t i = 0; i != 3; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); /* */ /* assert.deepStrictEqual(s1.sharedHeads, n1.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems shared_heads1 = - AMstackItems(stack_ptr, AMsyncStateSharedHeads(test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&shared_heads1, &heads1)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes shared_heads1 = AMsyncStateSharedHeads(test_state->s1); + assert_int_equal(AMchangeHashesCmp(&shared_heads1, &heads1), 0); /* assert.deepStrictEqual(s2.sharedHeads, n1.getHeads()) */ - AMitems shared_heads2 = - AMstackItems(stack_ptr, AMsyncStateSharedHeads(test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&shared_heads2, &heads1)); + AMchangeHashes shared_heads2 = AMsyncStateSharedHeads(test_state->s2); + assert_int_equal(AMchangeHashesCmp(&shared_heads2, &heads1), 0); } /** * \brief should re-sync after one node crashed with data loss */ -static void test_should_resync_after_one_node_crashed_with_data_loss(void** state) { +static void test_should_resync_after_one_node_crashed_with_data_loss(void **state) { /* Scenario: (r) (n2) (n1) * c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 * n2 has changes {c0, c1, c2}, n1's lastSync is c5, and n2's lastSync @@ -926,16 +946,15 @@ static void test_should_resync_after_one_node_crashed_with_data_loss(void** stat let s1 = initSyncState() const s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* n1 makes three changes, which we sync to n2 */ /* for (let i = 0; i < 3; i++) { */ for (size_t i = 0; i != 3; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); @@ -944,25 +963,28 @@ static void test_should_resync_after_one_node_crashed_with_data_loss(void** stat /* let r let rSyncState ;[r, rSyncState] = [n2.clone(), s2.clone()] */ - AMdoc* r; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMclone(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &r)); - AMbyteSpan encoded_s2; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsyncStateEncode(test_state->s2), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), - &encoded_s2)); - AMsyncState* sync_state_r; - assert_true(AMitemToSyncState(AMstackItem(stack_ptr, AMsyncStateDecode(encoded_s2.src, encoded_s2.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_SYNC_STATE)), - &sync_state_r)); + AMdoc* r = AMpush(&test_state->stack, + AMclone(test_state->n2), + AM_VALUE_DOC, + cmocka_cb).doc; + AMbyteSpan const encoded_s2 = AMpush(&test_state->stack, + AMsyncStateEncode(test_state->s2), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMsyncState* sync_state_r = AMpush(&test_state->stack, + AMsyncStateDecode(encoded_s2.src, + encoded_s2.count), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* */ /* sync another few commits */ /* for (let i = 3; i < 6; i++) { */ for (size_t i = 3; i != 6; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ @@ -970,9 +992,15 @@ static void test_should_resync_after_one_node_crashed_with_data_loss(void** stat /* */ /* everyone should be on the same page here */ /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); /* */ @@ -981,106 +1009,132 @@ static void test_should_resync_after_one_node_crashed_with_data_loss(void** stat /* for (let i = 6; i < 9; i++) { */ for (size_t i = 6; i != 9; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* s1 = decodeSyncState(encodeSyncState(s1)) */ - AMbyteSpan encoded_s1; - assert_true( - AMitemToBytes(AMstackItem(stack_ptr, AMsyncStateEncode(test_state->s1), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), - &encoded_s1)); - AMsyncState* s1; - assert_true(AMitemToSyncState(AMstackItem(stack_ptr, AMsyncStateDecode(encoded_s1.src, encoded_s1.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_SYNC_STATE)), - &s1)); + AMbyteSpan const encoded_s1 = AMpush(&test_state->stack, + AMsyncStateEncode(test_state->s1), + AM_VALUE_BYTES, + cmocka_cb).bytes; + AMsyncState* const s1 = AMpush(&test_state->stack, + AMsyncStateDecode(encoded_s1.src, + encoded_s1.count), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* rSyncState = decodeSyncState(encodeSyncState(rSyncState)) */ - AMbyteSpan encoded_r; - assert_true(AMitemToBytes( - AMstackItem(stack_ptr, AMsyncStateEncode(sync_state_r), cmocka_cb, AMexpect(AM_VAL_TYPE_BYTES)), &encoded_r)); - assert_true(AMitemToSyncState(AMstackItem(stack_ptr, AMsyncStateDecode(encoded_r.src, encoded_r.count), cmocka_cb, - AMexpect(AM_VAL_TYPE_SYNC_STATE)), - &sync_state_r)); + AMbyteSpan const encoded_r = AMpush(&test_state->stack, + AMsyncStateEncode(sync_state_r), + AM_VALUE_BYTES, + cmocka_cb).bytes; + sync_state_r = AMpush(&test_state->stack, + AMsyncStateDecode(encoded_r.src, encoded_r.count), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* */ /* assert.notDeepStrictEqual(n1.getHeads(), r.getHeads()) */ - heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads_r = AMstackItems(stack_ptr, AMgetHeads(r), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_false(AMitemsEqual(&heads1, &heads_r)); + heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads_r = AMpush(&test_state->stack, + AMgetHeads(r), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_not_equal(AMchangeHashesCmp(&heads1, &heads_r), 0); /* assert.notDeepStrictEqual(n1.materialize(), r.materialize()) */ assert_false(AMequal(test_state->n1, r)); /* assert.deepStrictEqual(n1.materialize(), { x: 8 }) */ - uint64_t uint; - assert_true(AMitemToUint(AMstackItem(stack_ptr, AMmapGet(test_state->n1, AM_ROOT, AMstr("x"), NULL), cmocka_cb, - AMexpect(AM_VAL_TYPE_UINT)), - &uint)); - assert_int_equal(uint, 8); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(test_state->n1, AM_ROOT, AMstr("x"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 8); /* assert.deepStrictEqual(r.materialize(), { x: 2 }) */ - assert_true(AMitemToUint( - AMstackItem(stack_ptr, AMmapGet(r, AM_ROOT, AMstr("x"), NULL), cmocka_cb, AMexpect(AM_VAL_TYPE_UINT)), &uint)); - assert_int_equal(uint, 2); + assert_int_equal(AMpush(&test_state->stack, + AMmapGet(r, AM_ROOT, AMstr("x"), NULL), + AM_VALUE_UINT, + cmocka_cb).uint, 2); /* sync(n1, r, s1, rSyncState) */ sync(test_state->n1, r, test_state->s1, sync_state_r); /* assert.deepStrictEqual(n1.getHeads(), r.getHeads()) */ - heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - heads_r = AMstackItems(stack_ptr, AMgetHeads(r), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads_r)); + heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + heads_r = AMpush(&test_state->stack, + AMgetHeads(r), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads_r), 0); /* assert.deepStrictEqual(n1.materialize(), r.materialize()) */ assert_true(AMequal(test_state->n1, r)); } /** - * \brief should re-sync after one node experiences data loss without - * disconnecting + * \brief should re-sync after one node experiences data loss without disconnecting */ -static void test_should_resync_after_one_node_experiences_data_loss_without_disconnecting(void** state) { +static void test_should_resync_after_one_node_experiences_data_loss_without_disconnecting(void **state) { /* const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; /* */ /* n1 makes three changes which we sync to n2 */ /* for (let i = 0; i < 3; i++) { */ for (size_t i = 0; i != 3; ++i) { /* n1.put("_root", "x", i) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), i)); /* n1.commit("", 0) */ - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - /* { */ + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); /* */ /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); /* */ /* const n2AfterDataLoss = create('89abcdef') */ - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("89abcdef")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* n2_after_data_loss; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), - &n2_after_data_loss)); + AMdoc* n2_after_data_loss = AMpush(&test_state->stack, + AMcreate(AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("89abcdef")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* */ /* "n2" now has no data, but n1 still thinks it does. Note we don't do * decodeSyncState(encodeSyncState(s1)) in order to simulate data loss * without disconnecting */ /* sync(n1, n2AfterDataLoss, s1, initSyncState()) */ - AMsyncState* s2_after_data_loss; - assert_true(AMitemToSyncState( - AMstackItem(stack_ptr, AMsyncStateInit(), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_STATE)), &s2_after_data_loss)); + AMsyncState* s2_after_data_loss = AMpush(&test_state->stack, + AMsyncStateInit(), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; sync(test_state->n1, n2_after_data_loss, test_state->s1, s2_after_data_loss); /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); } @@ -1088,33 +1142,33 @@ static void test_should_resync_after_one_node_experiences_data_loss_without_disc /** * \brief should handle changes concurrent to the last sync heads */ -static void test_should_handle_changes_concurrrent_to_the_last_sync_heads(void** state) { - /* const n1 = create('01234567'), n2 = create('89abcdef'), n3 = - * create('fedcba98' */ +static void test_should_handle_changes_concurrrent_to_the_last_sync_heads(void **state) { + /* const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('fedcba98' */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("fedcba98")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* n3; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &n3)); - /* const s12 = initSyncState(), s21 = initSyncState(), s23 = - * initSyncState(), s32 = initSyncState( */ + AMdoc* n3 = AMpush(&test_state->stack, + AMcreate(AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("fedcba98")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; + /* const s12 = initSyncState(), s21 = initSyncState(), s23 = initSyncState(), s32 = initSyncState( */ AMsyncState* s12 = test_state->s1; AMsyncState* s21 = test_state->s2; - AMsyncState* s23; - assert_true(AMitemToSyncState( - AMstackItem(stack_ptr, AMsyncStateInit(), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_STATE)), &s23)); - AMsyncState* s32; - assert_true(AMitemToSyncState( - AMstackItem(stack_ptr, AMsyncStateInit(), cmocka_cb, AMexpect(AM_VAL_TYPE_SYNC_STATE)), &s32)); + AMsyncState* s23 = AMpush(&test_state->stack, + AMsyncStateInit(), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; + AMsyncState* s32 = AMpush(&test_state->stack, + AMsyncStateInit(), + AM_VALUE_SYNC_STATE, + cmocka_cb).sync_state; /* */ /* Change 1 is known to all three nodes */ /* //n1 = Automerge.change(n1, {time: 0}, doc => doc.x = 1) */ /* n1.put("_root", "x", 1); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 1)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* */ /* sync(n1, n2, s12, s21) */ sync(test_state->n1, test_state->n2, s12, s21); @@ -1123,38 +1177,47 @@ static void test_should_handle_changes_concurrrent_to_the_last_sync_heads(void** /* */ /* Change 2 is known to n1 and n2 */ /* n1.put("_root", "x", 2); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 2)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* */ /* sync(n1, n2, s12, s21) */ sync(test_state->n1, test_state->n2, s12, s21); /* */ /* Each of the three nodes makes one change (changes 3, 4, 5) */ /* n1.put("_root", "x", 3); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 3)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* n2.put("_root", "x", 4); n2.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), 4), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("x"), 4)); + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); /* n3.put("_root", "x", 5); n3.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(n3, AM_ROOT, AMstr("x"), 5), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(n3, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(n3, AM_ROOT, AMstr("x"), 5)); + AMfree(AMcommit(n3, AMstr(""), &TIME_0)); /* */ /* Apply n3's latest change to n2. */ /* let change = n3.getLastLocalChange() if (change === null) throw new RangeError("no local change") */ - AMitems changes = AMstackItems(stack_ptr, AMgetLastLocalChange(n3), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges changes = AMpush(&test_state->stack, + AMgetLastLocalChange(n3), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* n2.applyChanges([change]) */ - AMstackItem(NULL, AMapplyChanges(test_state->n2, &changes), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMapplyChanges(test_state->n2, &changes)); /* */ /* Now sync n1 and n2. n3's change is concurrent to n1 and n2's last sync * heads */ /* sync(n1, n2, s12, s21) */ sync(test_state->n1, test_state->n2, s12, s21); /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); } @@ -1162,35 +1225,39 @@ static void test_should_handle_changes_concurrrent_to_the_last_sync_heads(void** /** * \brief should handle histories with lots of branching and merging */ -static void test_should_handle_histories_with_lots_of_branching_and_merging(void** state) { - /* const n1 = create('01234567'), n2 = create('89abcdef'), n3 = - create('fedcba98') const s1 = initSyncState(), s2 = initSyncState() */ +static void test_should_handle_histories_with_lots_of_branching_and_merging(void **state) { + /* const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('fedcba98') + const s1 = initSyncState(), s2 = initSyncState() */ TestState* test_state = *state; - AMstack** stack_ptr = &test_state->base_state->stack; - AMactorId const* actor_id; - assert_true(AMitemToActorId( - AMstackItem(stack_ptr, AMactorIdFromStr(AMstr("fedcba98")), cmocka_cb, AMexpect(AM_VAL_TYPE_ACTOR_ID)), - &actor_id)); - AMdoc* n3; - assert_true(AMitemToDoc(AMstackItem(stack_ptr, AMcreate(actor_id), cmocka_cb, AMexpect(AM_VAL_TYPE_DOC)), &n3)); + AMdoc* n3 = AMpush(&test_state->stack, + AMcreate(AMpush(&test_state->stack, + AMactorIdInitStr(AMstr("fedcba98")), + AM_VALUE_ACTOR_ID, + cmocka_cb).actor_id), + AM_VALUE_DOC, + cmocka_cb).doc; /* n1.put("_root", "x", 0); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 0), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("x"), 0)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* let change1 = n1.getLastLocalChange() if (change1 === null) throw new RangeError("no local change") */ - AMitems change1 = - AMstackItems(stack_ptr, AMgetLastLocalChange(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges change1 = AMpush(&test_state->stack, + AMgetLastLocalChange(test_state->n1), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* n2.applyChanges([change1]) */ - AMstackItem(NULL, AMapplyChanges(test_state->n2, &change1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMapplyChanges(test_state->n2, &change1)); /* let change2 = n1.getLastLocalChange() if (change2 === null) throw new RangeError("no local change") */ - AMitems change2 = - AMstackItems(stack_ptr, AMgetLastLocalChange(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges change2 = AMpush(&test_state->stack, + AMgetLastLocalChange(test_state->n1), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* n3.applyChanges([change2]) */ - AMstackItem(NULL, AMapplyChanges(n3, &change2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMapplyChanges(n3, &change2)); /* n3.put("_root", "x", 1); n3.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(n3, AM_ROOT, AMstr("x"), 1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(n3, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(n3, AM_ROOT, AMstr("x"), 1)); + AMfree(AMcommit(n3, AMstr(""), &TIME_0)); /* */ /* - n1c1 <------ n1c2 <------ n1c3 <-- etc. <-- n1c20 <------ n1c21 * / \/ \/ \/ @@ -1202,24 +1269,28 @@ static void test_should_handle_histories_with_lots_of_branching_and_merging(void /* for (let i = 1; i < 20; i++) { */ for (size_t i = 1; i != 20; ++i) { /* n1.put("_root", "n1", i); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n1, AM_ROOT, AMstr("n1"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n1, AM_ROOT, AMstr("n1"), i)); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* n2.put("_root", "n2", i); n2.commit("", 0) */ - AMstackItem(NULL, AMmapPutUint(test_state->n2, AM_ROOT, AMstr("n2"), i), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutUint(test_state->n2, AM_ROOT, AMstr("n2"), i)); + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); /* const change1 = n1.getLastLocalChange() if (change1 === null) throw new RangeError("no local change") */ - AMitems change1 = - AMstackItems(stack_ptr, AMgetLastLocalChange(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges change1 = AMpush(&test_state->stack, + AMgetLastLocalChange(test_state->n1), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* const change2 = n2.getLastLocalChange() if (change2 === null) throw new RangeError("no local change") */ - AMitems change2 = - AMstackItems(stack_ptr, AMgetLastLocalChange(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges change2 = AMpush(&test_state->stack, + AMgetLastLocalChange(test_state->n2), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* n1.applyChanges([change2]) */ - AMstackItem(NULL, AMapplyChanges(test_state->n1, &change2), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMapplyChanges(test_state->n1, &change2)); /* n2.applyChanges([change1]) */ - AMstackItem(NULL, AMapplyChanges(test_state->n2, &change1), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); - /* { */ + AMfree(AMapplyChanges(test_state->n2, &change1)); + /* { */ } /* */ /* sync(n1, n2, s1, s2) */ @@ -1229,24 +1300,31 @@ static void test_should_handle_histories_with_lots_of_branching_and_merging(void * the slower code path */ /* const change3 = n2.getLastLocalChange() if (change3 === null) throw new RangeError("no local change") */ - AMitems change3 = AMstackItems(stack_ptr, AMgetLastLocalChange(n3), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE)); + AMchanges change3 = AMpush(&test_state->stack, + AMgetLastLocalChange(n3), + AM_VALUE_CHANGES, + cmocka_cb).changes; /* n2.applyChanges([change3]) */ - AMstackItem(NULL, AMapplyChanges(test_state->n2, &change3), cmocka_cb, AMexpect(AM_VAL_TYPE_VOID)); + AMfree(AMapplyChanges(test_state->n2, &change3)); /* n1.put("_root", "n1", "final"); n1.commit("", 0) */ - AMstackItem(NULL, AMmapPutStr(test_state->n1, AM_ROOT, AMstr("n1"), AMstr("final")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n1, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutStr(test_state->n1, AM_ROOT, AMstr("n1"), AMstr("final"))); + AMfree(AMcommit(test_state->n1, AMstr(""), &TIME_0)); /* n2.put("_root", "n2", "final"); n2.commit("", 0) */ - AMstackItem(NULL, AMmapPutStr(test_state->n2, AM_ROOT, AMstr("n2"), AMstr("final")), cmocka_cb, - AMexpect(AM_VAL_TYPE_VOID)); - AMstackItem(NULL, AMcommit(test_state->n2, AMstr(""), &TIME_0), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); + AMfree(AMmapPutStr(test_state->n2, AM_ROOT, AMstr("n2"), AMstr("final"))); + AMfree(AMcommit(test_state->n2, AMstr(""), &TIME_0)); /* */ /* sync(n1, n2, s1, s2) */ sync(test_state->n1, test_state->n2, test_state->s1, test_state->s2); /* assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) */ - AMitems heads1 = AMstackItems(stack_ptr, AMgetHeads(test_state->n1), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - AMitems heads2 = AMstackItems(stack_ptr, AMgetHeads(test_state->n2), cmocka_cb, AMexpect(AM_VAL_TYPE_CHANGE_HASH)); - assert_true(AMitemsEqual(&heads1, &heads2)); + AMchangeHashes heads1 = AMpush(&test_state->stack, + AMgetHeads(test_state->n1), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + AMchangeHashes heads2 = AMpush(&test_state->stack, + AMgetHeads(test_state->n2), + AM_VALUE_CHANGE_HASHES, + cmocka_cb).change_hashes; + assert_int_equal(AMchangeHashesCmp(&heads1, &heads2), 0); /* assert.deepStrictEqual(n1.materialize(), n2.materialize()) */ assert_true(AMequal(test_state->n1, test_state->n2)); } @@ -1256,26 +1334,20 @@ int run_ported_wasm_sync_tests(void) { cmocka_unit_test_setup_teardown(test_should_send_a_sync_message_implying_no_local_data, setup, teardown), cmocka_unit_test_setup_teardown(test_should_not_reply_if_we_have_no_data_as_well, setup, teardown), cmocka_unit_test_setup_teardown(test_repos_with_equal_heads_do_not_need_a_reply_message, setup, teardown), - cmocka_unit_test_setup_teardown(test_n1_should_offer_all_changes_to_n2_when_starting_from_nothing, setup, - teardown), - cmocka_unit_test_setup_teardown(test_should_sync_peers_where_one_has_commits_the_other_does_not, setup, - teardown), + cmocka_unit_test_setup_teardown(test_n1_should_offer_all_changes_to_n2_when_starting_from_nothing, setup, teardown), + cmocka_unit_test_setup_teardown(test_should_sync_peers_where_one_has_commits_the_other_does_not, setup, teardown), cmocka_unit_test_setup_teardown(test_should_work_with_prior_sync_state, setup, teardown), cmocka_unit_test_setup_teardown(test_should_not_generate_messages_once_synced, setup, teardown), - cmocka_unit_test_setup_teardown(test_should_allow_simultaneous_messages_during_synchronization, setup, - teardown), - cmocka_unit_test_setup_teardown(test_should_assume_sent_changes_were_received_until_we_hear_otherwise, setup, - teardown), + cmocka_unit_test_setup_teardown(test_should_allow_simultaneous_messages_during_synchronization, setup, teardown), + cmocka_unit_test_setup_teardown(test_should_assume_sent_changes_were_received_until_we_hear_otherwise, setup, teardown), cmocka_unit_test_setup_teardown(test_should_work_regardless_of_who_initiates_the_exchange, setup, teardown), cmocka_unit_test_setup_teardown(test_should_work_without_prior_sync_state, setup, teardown), cmocka_unit_test_setup_teardown(test_should_work_with_prior_sync_state_2, setup, teardown), cmocka_unit_test_setup_teardown(test_should_ensure_non_empty_state_after_sync, setup, teardown), cmocka_unit_test_setup_teardown(test_should_resync_after_one_node_crashed_with_data_loss, setup, teardown), - cmocka_unit_test_setup_teardown(test_should_resync_after_one_node_experiences_data_loss_without_disconnecting, - setup, teardown), + cmocka_unit_test_setup_teardown(test_should_resync_after_one_node_experiences_data_loss_without_disconnecting, setup, teardown), cmocka_unit_test_setup_teardown(test_should_handle_changes_concurrrent_to_the_last_sync_heads, setup, teardown), - cmocka_unit_test_setup_teardown(test_should_handle_histories_with_lots_of_branching_and_merging, setup, - teardown), + cmocka_unit_test_setup_teardown(test_should_handle_histories_with_lots_of_branching_and_merging, setup, teardown), }; return cmocka_run_group_tests(tests, NULL, NULL); diff --git a/rust/automerge-c/test/stack_utils.c b/rust/automerge-c/test/stack_utils.c new file mode 100644 index 00000000..f65ea2e5 --- /dev/null +++ b/rust/automerge-c/test/stack_utils.c @@ -0,0 +1,31 @@ +#include +#include +#include + +/* third-party */ +#include + +/* local */ +#include "cmocka_utils.h" +#include "stack_utils.h" + +void cmocka_cb(AMresultStack** stack, uint8_t discriminant) { + assert_non_null(stack); + assert_non_null(*stack); + assert_non_null((*stack)->result); + if (AMresultStatus((*stack)->result) != AM_STATUS_OK) { + fail_msg_view("%s", AMerrorMessage((*stack)->result)); + } + assert_int_equal(AMresultValue((*stack)->result).tag, discriminant); +} + +int setup_stack(void** state) { + *state = NULL; + return 0; +} + +int teardown_stack(void** state) { + AMresultStack* stack = *state; + AMfreeStack(&stack); + return 0; +} diff --git a/rust/automerge-c/test/stack_utils.h b/rust/automerge-c/test/stack_utils.h new file mode 100644 index 00000000..473feebc --- /dev/null +++ b/rust/automerge-c/test/stack_utils.h @@ -0,0 +1,38 @@ +#ifndef STACK_UTILS_H +#define STACK_UTILS_H + +#include + +/* local */ +#include + +/** + * \brief Reports an error through a cmocka assertion. + * + * \param[in,out] stack A pointer to a pointer to an `AMresultStack` struct. + * \param[in] discriminant An `AMvalueVariant` enum tag. + * \pre \p stack` != NULL`. + */ +void cmocka_cb(AMresultStack** stack, uint8_t discriminant); + +/** + * \brief Allocates a result stack for storing the results allocated during one + * or more test cases. + * + * \param[in,out] state A pointer to a pointer to an `AMresultStack` struct. + * \pre \p state` != NULL`. + * \warning The `AMresultStack` struct returned through \p state must be + * deallocated with `teardown_stack()` in order to prevent memory leaks. + */ +int setup_stack(void** state); + +/** + * \brief Deallocates a result stack after deallocating any results that were + * stored in it by one or more test cases. + * + * \param[in] state A pointer to a pointer to an `AMresultStack` struct. + * \pre \p state` != NULL`. + */ +int teardown_stack(void** state); + +#endif /* STACK_UTILS_H */ diff --git a/rust/automerge-c/test/str_utils.c b/rust/automerge-c/test/str_utils.c index 2937217a..cc923cb4 100644 --- a/rust/automerge-c/test/str_utils.c +++ b/rust/automerge-c/test/str_utils.c @@ -1,5 +1,5 @@ -#include #include +#include /* local */ #include "str_utils.h" diff --git a/rust/automerge-c/test/str_utils.h b/rust/automerge-c/test/str_utils.h index 14a4af73..b9985683 100644 --- a/rust/automerge-c/test/str_utils.h +++ b/rust/automerge-c/test/str_utils.h @@ -1,17 +1,14 @@ -#ifndef TESTS_STR_UTILS_H -#define TESTS_STR_UTILS_H +#ifndef STR_UTILS_H +#define STR_UTILS_H /** - * \brief Converts a hexadecimal string into an array of bytes. + * \brief Converts a hexadecimal string into a sequence of bytes. * - * \param[in] hex_str A hexadecimal string. - * \param[in] src A pointer to an array of bytes. - * \param[in] count The count of bytes to copy into the array pointed to by - * \p src. - * \pre \p src `!= NULL` - * \pre `sizeof(`\p src `) > 0` - * \pre \p count `<= sizeof(`\p src `)` + * \param[in] hex_str A string. + * \param[in] src A pointer to a contiguous sequence of bytes. + * \param[in] count The number of bytes to copy to \p src. + * \pre \p count `<=` length of \p src. */ void hex_to_bytes(char const* hex_str, uint8_t* src, size_t const count); -#endif /* TESTS_STR_UTILS_H */ +#endif /* STR_UTILS_H */ diff --git a/rust/automerge-cli/Cargo.lock b/rust/automerge-cli/Cargo.lock new file mode 100644 index 00000000..a330ee89 --- /dev/null +++ b/rust/automerge-cli/Cargo.lock @@ -0,0 +1,857 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "159bb86af3a200e19a068f4224eae4c8bb2d0fa054c7e5d1cacd5cef95e684cd" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "automerge" +version = "0.1.0" +dependencies = [ + "flate2", + "fxhash", + "hex", + "itertools", + "js-sys", + "leb128", + "nonzero_ext", + "rand", + "serde", + "sha2", + "smol_str", + "thiserror", + "tinyvec", + "tracing", + "unicode-segmentation", + "uuid", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "automerge-cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "atty", + "automerge", + "clap", + "colored_json", + "combine", + "duct", + "maplit", + "serde_json", + "thiserror", + "tracing-subscriber", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced1892c55c910c1219e98d6fc8d71f6bddba7905866ce740066d8bfea859312" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "indexmap", + "lazy_static", + "os_str_bytes", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "colored_json" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd32eb54d016e203b7c2600e3a7802c75843a92e38ccc4869aefeca21771a64" +dependencies = [ + "ansi_term", + "atty", + "libc", + "serde", + "serde_json", +] + +[[package]] +name = "combine" +version = "4.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "cpufeatures" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "duct" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d" +dependencies = [ + "libc", + "once_cell", + "os_pipe", + "shared_child", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "flate2" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +dependencies = [ + "cfg-if", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "generic-array" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "indexmap" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itertools" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "js-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + +[[package]] +name = "nonzero_ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44a1290799eababa63ea60af0cbc3f03363e328e58f32fb0294798ed3e85f444" + +[[package]] +name = "once_cell" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" + +[[package]] +name = "os_pipe" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "os_str_bytes" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +dependencies = [ + "memchr", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_child" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "smallvec" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" + +[[package]] +name = "smol_str" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61d15c83e300cce35b7c8cd39ff567c1ef42dde6d4a1a38dbdbf9a59902261bd" +dependencies = [ + "serde", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + +[[package]] +name = "thiserror" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tinyvec" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tracing" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6c650a8ef0cd2dd93736f033d21cbd1224c5a967aa0c258d00fcf7dafef9b9f" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" +dependencies = [ + "lazy_static", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" +dependencies = [ + "ansi_term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasm-bindgen" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" + +[[package]] +name = "web-sys" +version = "0.3.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/rust/automerge-cli/Cargo.toml b/rust/automerge-cli/Cargo.toml index 430090a6..f434bc69 100644 --- a/rust/automerge-cli/Cargo.toml +++ b/rust/automerge-cli/Cargo.toml @@ -13,18 +13,17 @@ bench = false doc = false [dependencies] -clap = {version = "~4", features = ["derive"]} +clap = {version = "~3.1", features = ["derive"]} serde_json = "^1.0" anyhow = "1.0" +atty = "^0.2" thiserror = "^1.0" combine = "^4.5" maplit = "^1.0" +colored_json = "^2.1" tracing-subscriber = "~0.3" automerge = { path = "../automerge" } -is-terminal = "0.4.1" -termcolor = "1.1.3" -serde = "1.0.150" [dev-dependencies] duct = "^0.13" diff --git a/rust/automerge-cli/src/color_json.rs b/rust/automerge-cli/src/color_json.rs deleted file mode 100644 index 9514da22..00000000 --- a/rust/automerge-cli/src/color_json.rs +++ /dev/null @@ -1,370 +0,0 @@ -use std::io::Write; - -use serde::Serialize; -use serde_json::ser::Formatter; -use termcolor::{Buffer, BufferWriter, Color, ColorSpec, WriteColor}; - -struct Style { - /// style of object brackets - object_brackets: ColorSpec, - /// style of array brackets - array_brackets: ColorSpec, - /// style of object - key: ColorSpec, - /// style of string values - string_value: ColorSpec, - /// style of integer values - integer_value: ColorSpec, - /// style of float values - float_value: ColorSpec, - /// style of bool values - bool_value: ColorSpec, - /// style of the `nil` value - nil_value: ColorSpec, - /// should the quotation get the style of the inner string/key? - string_include_quotation: bool, -} - -impl Default for Style { - fn default() -> Self { - Self { - object_brackets: ColorSpec::new().set_bold(true).clone(), - array_brackets: ColorSpec::new().set_bold(true).clone(), - key: ColorSpec::new() - .set_fg(Some(Color::Blue)) - .set_bold(true) - .clone(), - string_value: ColorSpec::new().set_fg(Some(Color::Green)).clone(), - integer_value: ColorSpec::new(), - float_value: ColorSpec::new(), - bool_value: ColorSpec::new(), - nil_value: ColorSpec::new(), - string_include_quotation: true, - } - } -} - -/// Write pretty printed, colored json to stdout -pub(crate) fn print_colored_json(value: &serde_json::Value) -> std::io::Result<()> { - let formatter = ColoredFormatter { - formatter: serde_json::ser::PrettyFormatter::new(), - style: Style::default(), - in_object_key: false, - }; - let mut ignored_writer = Vec::new(); - let mut ser = serde_json::Serializer::with_formatter(&mut ignored_writer, formatter); - value - .serialize(&mut ser) - .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string())) -} - -struct ColoredFormatter { - formatter: F, - style: Style, - in_object_key: bool, -} - -fn write_colored(color: ColorSpec, handler: H) -> std::io::Result<()> -where - H: FnOnce(&mut Buffer) -> std::io::Result<()>, -{ - let buf = BufferWriter::stdout(termcolor::ColorChoice::Auto); - let mut buffer = buf.buffer(); - buffer.set_color(&color)?; - handler(&mut buffer)?; - buffer.reset()?; - buf.print(&buffer)?; - Ok(()) -} - -impl Formatter for ColoredFormatter { - fn write_null(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.nil_value.clone(), |w| { - self.formatter.write_null(w) - }) - } - - fn write_bool(&mut self, _writer: &mut W, value: bool) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.bool_value.clone(), |w| { - self.formatter.write_bool(w, value) - }) - } - - fn write_i8(&mut self, _writer: &mut W, value: i8) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_i8(w, value) - }) - } - - fn write_i16(&mut self, _writer: &mut W, value: i16) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_i16(w, value) - }) - } - - fn write_i32(&mut self, _writer: &mut W, value: i32) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_i32(w, value) - }) - } - - fn write_i64(&mut self, _writer: &mut W, value: i64) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_i64(w, value) - }) - } - - fn write_i128(&mut self, _writer: &mut W, value: i128) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_i128(w, value) - }) - } - - fn write_u8(&mut self, _writer: &mut W, value: u8) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_u8(w, value) - }) - } - - fn write_u16(&mut self, _writer: &mut W, value: u16) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_u16(w, value) - }) - } - - fn write_u32(&mut self, _writer: &mut W, value: u32) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_u32(w, value) - }) - } - - fn write_u64(&mut self, _writer: &mut W, value: u64) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_u64(w, value) - }) - } - - fn write_u128(&mut self, _writer: &mut W, value: u128) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_u128(w, value) - }) - } - - fn write_f32(&mut self, _writer: &mut W, value: f32) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.float_value.clone(), |w| { - self.formatter.write_f32(w, value) - }) - } - - fn write_f64(&mut self, _writer: &mut W, value: f64) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.float_value.clone(), |w| { - self.formatter.write_f64(w, value) - }) - } - - fn write_number_str(&mut self, _writer: &mut W, value: &str) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.integer_value.clone(), |w| { - self.formatter.write_number_str(w, value) - }) - } - - fn begin_string(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - let style = if self.style.string_include_quotation { - if self.in_object_key { - self.style.key.clone() - } else { - self.style.string_value.clone() - } - } else { - ColorSpec::new() - }; - write_colored(style, |w| self.formatter.begin_string(w)) - } - - fn end_string(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - let style = if self.style.string_include_quotation { - if self.in_object_key { - self.style.key.clone() - } else { - self.style.string_value.clone() - } - } else { - ColorSpec::new() - }; - write_colored(style, |w| self.formatter.end_string(w)) - } - - fn write_string_fragment(&mut self, _writer: &mut W, fragment: &str) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - let style = if self.in_object_key { - self.style.key.clone() - } else { - self.style.string_value.clone() - }; - write_colored(style, |w| w.write_all(fragment.as_bytes())) - } - - fn write_char_escape( - &mut self, - _writer: &mut W, - char_escape: serde_json::ser::CharEscape, - ) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - let style = if self.in_object_key { - self.style.key.clone() - } else { - self.style.string_value.clone() - }; - write_colored(style, |w| self.formatter.write_char_escape(w, char_escape)) - } - - fn begin_array(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.array_brackets.clone(), |w| { - self.formatter.begin_array(w) - }) - } - - fn end_array(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.array_brackets.clone(), |w| { - self.formatter.end_array(w) - }) - } - - fn begin_array_value(&mut self, _writer: &mut W, first: bool) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(ColorSpec::new(), |w| { - self.formatter.begin_array_value(w, first) - }) - } - - fn end_array_value(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(ColorSpec::new(), |w| self.formatter.end_array_value(w)) - } - - fn begin_object(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.object_brackets.clone(), |w| { - self.formatter.begin_object(w) - }) - } - - fn end_object(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(self.style.object_brackets.clone(), |w| { - self.formatter.end_object(w) - }) - } - - fn begin_object_key(&mut self, _writer: &mut W, first: bool) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - self.in_object_key = true; - write_colored(ColorSpec::new(), |w| { - self.formatter.begin_object_key(w, first) - }) - } - - fn end_object_key(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - self.in_object_key = false; - write_colored(ColorSpec::new(), |w| self.formatter.end_object_key(w)) - } - - fn begin_object_value(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - self.in_object_key = false; - write_colored(ColorSpec::new(), |w| self.formatter.begin_object_value(w)) - } - - fn end_object_value(&mut self, _writer: &mut W) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - self.in_object_key = false; - write_colored(ColorSpec::new(), |w| self.formatter.end_object_value(w)) - } - - fn write_raw_fragment(&mut self, _writer: &mut W, fragment: &str) -> std::io::Result<()> - where - W: ?Sized + std::io::Write, - { - write_colored(ColorSpec::new(), |w| { - self.formatter.write_raw_fragment(w, fragment) - }) - } -} diff --git a/rust/automerge-cli/src/examine.rs b/rust/automerge-cli/src/examine.rs index 0ee102fb..847abd4f 100644 --- a/rust/automerge-cli/src/examine.rs +++ b/rust/automerge-cli/src/examine.rs @@ -1,8 +1,6 @@ use automerge as am; use thiserror::Error; -use crate::{color_json::print_colored_json, SkipVerifyFlag}; - #[derive(Error, Debug)] pub enum ExamineError { #[error("Error reading change file: {:?}", source)] @@ -22,18 +20,16 @@ pub enum ExamineError { }, } -pub(crate) fn examine( +pub fn examine( mut input: impl std::io::Read, mut output: impl std::io::Write, - skip: SkipVerifyFlag, is_tty: bool, ) -> Result<(), ExamineError> { let mut buf: Vec = Vec::new(); input .read_to_end(&mut buf) .map_err(|e| ExamineError::ReadingChanges { source: e })?; - let doc = skip - .load(&buf) + let doc = am::Automerge::load(&buf) .map_err(|e| ExamineError::ApplyingInitialChanges { source: e })?; let uncompressed_changes: Vec<_> = doc .get_changes(&[]) @@ -43,7 +39,7 @@ pub(crate) fn examine( .collect(); if is_tty { let json_changes = serde_json::to_value(uncompressed_changes).unwrap(); - print_colored_json(&json_changes).unwrap(); + colored_json::write_colored_json(&json_changes, &mut output).unwrap(); writeln!(output).unwrap(); } else { let json_changes = serde_json::to_string_pretty(&uncompressed_changes).unwrap(); diff --git a/rust/automerge-cli/src/examine_sync.rs b/rust/automerge-cli/src/examine_sync.rs deleted file mode 100644 index c0d5df97..00000000 --- a/rust/automerge-cli/src/examine_sync.rs +++ /dev/null @@ -1,38 +0,0 @@ -use automerge::sync::ReadMessageError; - -use crate::color_json::print_colored_json; - -#[derive(Debug, thiserror::Error)] -pub enum ExamineSyncError { - #[error("Error reading message: {0}")] - ReadMessage(#[source] std::io::Error), - - #[error("error writing message: {0}")] - WriteMessage(#[source] std::io::Error), - - #[error("error writing json to output: {0}")] - WriteJson(#[source] serde_json::Error), - - #[error("Error parsing message: {0}")] - ParseMessage(#[from] ReadMessageError), -} - -pub(crate) fn examine_sync( - mut input: Box, - output: W, - is_tty: bool, -) -> Result<(), ExamineSyncError> { - let mut buf: Vec = Vec::new(); - input - .read_to_end(&mut buf) - .map_err(ExamineSyncError::ReadMessage)?; - - let message = automerge::sync::Message::decode(&buf)?; - let json = serde_json::to_value(message).unwrap(); - if is_tty { - print_colored_json(&json).map_err(ExamineSyncError::WriteMessage)?; - } else { - serde_json::to_writer(output, &json).map_err(ExamineSyncError::WriteJson)?; - } - Ok(()) -} diff --git a/rust/automerge-cli/src/export.rs b/rust/automerge-cli/src/export.rs index 45f39101..49cded8f 100644 --- a/rust/automerge-cli/src/export.rs +++ b/rust/automerge-cli/src/export.rs @@ -1,8 +1,5 @@ use anyhow::Result; use automerge as am; -use automerge::ReadDoc; - -use crate::{color_json::print_colored_json, SkipVerifyFlag}; pub(crate) fn map_to_json(doc: &am::Automerge, obj: &am::ObjId) -> serde_json::Value { let keys = doc.keys(obj); @@ -31,7 +28,7 @@ fn list_to_json(doc: &am::Automerge, obj: &am::ObjId) -> serde_json::Value { let len = doc.length(obj); let mut array = Vec::new(); for i in 0..len { - let val = doc.get(obj, i); + let val = doc.get(obj, i as usize); match val { Ok(Some((am::Value::Object(o), exid))) if o == am::ObjType::Map || o == am::ObjType::Table => @@ -72,23 +69,22 @@ fn scalar_to_json(val: &am::ScalarValue) -> serde_json::Value { } } -fn get_state_json(input_data: Vec, skip: SkipVerifyFlag) -> Result { - let doc = skip.load(&input_data).unwrap(); // FIXME +fn get_state_json(input_data: Vec) -> Result { + let doc = am::Automerge::load(&input_data).unwrap(); // FIXME Ok(map_to_json(&doc, &am::ObjId::Root)) } -pub(crate) fn export_json( +pub fn export_json( mut changes_reader: impl std::io::Read, mut writer: impl std::io::Write, - skip: SkipVerifyFlag, is_tty: bool, ) -> Result<()> { let mut input_data = vec![]; changes_reader.read_to_end(&mut input_data)?; - let state_json = get_state_json(input_data, skip)?; + let state_json = get_state_json(input_data)?; if is_tty { - print_colored_json(&state_json).unwrap(); + colored_json::write_colored_json(&state_json, &mut writer).unwrap(); writeln!(writer).unwrap(); } else { writeln!( @@ -107,10 +103,7 @@ mod tests { #[test] fn cli_export_with_empty_input() { - assert_eq!( - get_state_json(vec![], Default::default()).unwrap(), - serde_json::json!({}) - ) + assert_eq!(get_state_json(vec![]).unwrap(), serde_json::json!({})) } #[test] @@ -124,7 +117,7 @@ mod tests { let mut backend = initialize_from_json(&initial_state_json).unwrap(); let change_bytes = backend.save(); assert_eq!( - get_state_json(change_bytes, Default::default()).unwrap(), + get_state_json(change_bytes).unwrap(), serde_json::json!({"sparrows": 15.0}) ) } @@ -151,7 +144,7 @@ mod tests { */ let change_bytes = backend.save(); assert_eq!( - get_state_json(change_bytes, Default::default()).unwrap(), + get_state_json(change_bytes).unwrap(), serde_json::json!({ "birds": { "wrens": 3.0, diff --git a/rust/automerge-cli/src/main.rs b/rust/automerge-cli/src/main.rs index 8f3f816d..ffc13012 100644 --- a/rust/automerge-cli/src/main.rs +++ b/rust/automerge-cli/src/main.rs @@ -1,15 +1,10 @@ use std::{fs::File, path::PathBuf, str::FromStr}; use anyhow::{anyhow, Result}; -use clap::{ - builder::{BoolishValueParser, TypedValueParser, ValueParserFactory}, - Parser, -}; -use is_terminal::IsTerminal; +use clap::Parser; -mod color_json; +//mod change; mod examine; -mod examine_sync; mod export; mod import; mod merge; @@ -21,50 +16,12 @@ struct Opts { cmd: Command, } -#[derive(clap::ValueEnum, Clone, Debug)] +#[derive(Debug)] enum ExportFormat { Json, Toml, } -#[derive(Copy, Clone, Default, Debug)] -pub(crate) struct SkipVerifyFlag(bool); - -impl SkipVerifyFlag { - fn load(&self, buf: &[u8]) -> Result { - if self.0 { - automerge::Automerge::load(buf) - } else { - automerge::Automerge::load_unverified_heads(buf) - } - } -} - -#[derive(Clone)] -struct SkipVerifyFlagParser; -impl ValueParserFactory for SkipVerifyFlag { - type Parser = SkipVerifyFlagParser; - - fn value_parser() -> Self::Parser { - SkipVerifyFlagParser - } -} - -impl TypedValueParser for SkipVerifyFlagParser { - type Value = SkipVerifyFlag; - - fn parse_ref( - &self, - cmd: &clap::Command, - arg: Option<&clap::Arg>, - value: &std::ffi::OsStr, - ) -> Result { - BoolishValueParser::new() - .parse_ref(cmd, arg, value) - .map(SkipVerifyFlag) - } -} - impl FromStr for ExportFormat { type Err = anyhow::Error; @@ -86,15 +43,12 @@ enum Command { format: ExportFormat, /// Path that contains Automerge changes + #[clap(parse(from_os_str))] changes_file: Option, /// The file to write to. If omitted assumes stdout - #[clap(long("out"), short('o'))] + #[clap(parse(from_os_str), long("out"), short('o'))] output_file: Option, - - /// Whether to verify the head hashes of a compressed document - #[clap(long, action = clap::ArgAction::SetFalse)] - skip_verifying_heads: SkipVerifyFlag, }, Import { @@ -102,37 +56,69 @@ enum Command { #[clap(long, short, default_value = "json")] format: ExportFormat, + #[clap(parse(from_os_str))] input_file: Option, /// Path to write Automerge changes to - #[clap(long("out"), short('o'))] + #[clap(parse(from_os_str), long("out"), short('o'))] changes_file: Option, }, - /// Read an automerge document and print a JSON representation of the changes in it to stdout - Examine { + /// Read an automerge document from a file or stdin, perform a change on it and write a new + /// document to stdout or the specified output file. + Change { + /// The change script to perform. Change scripts have the form []. + /// The possible commands are 'set', 'insert', 'delete', and 'increment'. + /// + /// Paths look like this: $["mapkey"][0]. They always lways start with a '$', then each + /// subsequent segment of the path is either a string in double quotes to index a key in a + /// map, or an integer index to address an array element. + /// + /// Examples + /// + /// ## set + /// + /// > automerge change 'set $["someobject"] {"items": []}' somefile + /// + /// ## insert + /// + /// > automerge change 'insert $["someobject"]["items"][0] "item1"' somefile + /// + /// ## increment + /// + /// > automerge change 'increment $["mycounter"]' + /// + /// ## delete + /// + /// > automerge change 'delete $["someobject"]["items"]' somefile + script: String, + + /// The file to change, if omitted will assume stdin + #[clap(parse(from_os_str))] input_file: Option, - skip_verifying_heads: SkipVerifyFlag, + + /// Path to write Automerge changes to, if omitted will write to stdout + #[clap(parse(from_os_str), long("out"), short('o'))] + output_file: Option, }, - /// Read an automerge sync messaage and print a JSON representation of it - ExamineSync { input_file: Option }, + /// Read an automerge document and print a JSON representation of the changes in it to stdout + Examine { input_file: Option }, /// Read one or more automerge documents and output a merged, compacted version of them Merge { /// The file to write to. If omitted assumes stdout - #[clap(long("out"), short('o'))] + #[clap(parse(from_os_str), long("out"), short('o'))] output_file: Option, - /// The file(s) to compact. If empty assumes stdin input: Vec, }, } fn open_file_or_stdin(maybe_path: Option) -> Result> { - if std::io::stdin().is_terminal() { + if atty::is(atty::Stream::Stdin) { if let Some(path) = maybe_path { - Ok(Box::new(File::open(path).unwrap())) + Ok(Box::new(File::open(&path).unwrap())) } else { Err(anyhow!( "Must provide file path if not providing input via stdin" @@ -144,9 +130,9 @@ fn open_file_or_stdin(maybe_path: Option) -> Result) -> Result> { - if std::io::stdout().is_terminal() { + if atty::is(atty::Stream::Stdout) { if let Some(path) = maybe_path { - Ok(Box::new(File::create(path).unwrap())) + Ok(Box::new(File::create(&path).unwrap())) } else { Err(anyhow!("Must provide file path if not piping to stdout")) } @@ -163,22 +149,16 @@ fn main() -> Result<()> { changes_file, format, output_file, - skip_verifying_heads, } => { let output: Box = if let Some(output_file) = output_file { - Box::new(File::create(output_file)?) + Box::new(File::create(&output_file)?) } else { Box::new(std::io::stdout()) }; match format { ExportFormat::Json => { let mut in_buffer = open_file_or_stdin(changes_file)?; - export::export_json( - &mut in_buffer, - output, - skip_verifying_heads, - std::io::stdout().is_terminal(), - ) + export::export_json(&mut in_buffer, output, atty::is(atty::Stream::Stdout)) } ExportFormat::Toml => unimplemented!(), } @@ -195,30 +175,23 @@ fn main() -> Result<()> { } ExportFormat::Toml => unimplemented!(), }, - Command::Examine { - input_file, - skip_verifying_heads, + Command::Change { .. + //input_file, + //output_file, + //script, } => { + unimplemented!() +/* let in_buffer = open_file_or_stdin(input_file)?; - let out_buffer = std::io::stdout(); - match examine::examine( - in_buffer, - out_buffer, - skip_verifying_heads, - std::io::stdout().is_terminal(), - ) { - Ok(()) => {} - Err(e) => { - eprintln!("Error: {:?}", e); - } - } - Ok(()) + let mut out_buffer = create_file_or_stdout(output_file)?; + change::change(in_buffer, &mut out_buffer, script.as_str()) + .map_err(|e| anyhow::format_err!("Unable to make changes: {:?}", e)) +*/ } - Command::ExamineSync { input_file } => { + Command::Examine { input_file } => { let in_buffer = open_file_or_stdin(input_file)?; let out_buffer = std::io::stdout(); - match examine_sync::examine_sync(in_buffer, out_buffer, std::io::stdout().is_terminal()) - { + match examine::examine(in_buffer, out_buffer, atty::is(atty::Stream::Stdout)) { Ok(()) => {} Err(e) => { eprintln!("Error: {:?}", e); diff --git a/rust/automerge-test/Cargo.toml b/rust/automerge-test/Cargo.toml index 9290d7ac..4fba0379 100644 --- a/rust/automerge-test/Cargo.toml +++ b/rust/automerge-test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "automerge-test" -version = "0.2.0" +version = "0.1.0" edition = "2021" license = "MIT" repository = "https://github.com/automerge/automerge-rs" @@ -10,7 +10,7 @@ description = "Utilities for testing automerge libraries" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -automerge = { version = "^0.3", path = "../automerge" } +automerge = { version = "^0.2", path = "../automerge" } smol_str = { version = "^0.1.21", features=["serde"] } serde = { version = "^1.0", features=["derive"] } decorum = "0.3.1" diff --git a/rust/automerge-test/src/lib.rs b/rust/automerge-test/src/lib.rs index a1d4ea89..b2af72e1 100644 --- a/rust/automerge-test/src/lib.rs +++ b/rust/automerge-test/src/lib.rs @@ -4,8 +4,6 @@ use std::{ hash::Hash, }; -use automerge::ReadDoc; - use serde::ser::{SerializeMap, SerializeSeq}; pub fn new_doc() -> automerge::AutoCommit { @@ -50,7 +48,7 @@ pub fn sorted_actors() -> (automerge::ActorId, automerge::ActorId) { /// let title = doc.put(todo, "title", "water plants").unwrap(); /// /// assert_doc!( -/// &doc, +/// &doc.document(), /// map!{ /// "todos" => { /// list![ @@ -69,7 +67,6 @@ pub fn sorted_actors() -> (automerge::ActorId, automerge::ActorId) { /// ```rust /// # use automerge_test::{assert_doc, map}; /// # use automerge::transaction::Transactable; -/// # use automerge::ReadDoc; /// /// let mut doc1 = automerge::AutoCommit::new(); /// let mut doc2 = automerge::AutoCommit::new(); @@ -77,7 +74,7 @@ pub fn sorted_actors() -> (automerge::ActorId, automerge::ActorId) { /// doc2.put(automerge::ROOT, "field", "two").unwrap(); /// doc1.merge(&mut doc2); /// assert_doc!( -/// doc1.document(), +/// &doc1.document(), /// map!{ /// "field" => { /// "one", @@ -333,12 +330,12 @@ impl serde::Serialize for RealizedObject { } } -pub fn realize(doc: &R) -> RealizedObject { +pub fn realize(doc: &automerge::Automerge) -> RealizedObject { realize_obj(doc, &automerge::ROOT, automerge::ObjType::Map) } -pub fn realize_prop>( - doc: &R, +pub fn realize_prop>( + doc: &automerge::Automerge, obj_id: &automerge::ObjId, prop: P, ) -> RealizedObject { @@ -349,8 +346,8 @@ pub fn realize_prop>( } } -pub fn realize_obj( - doc: &R, +pub fn realize_obj( + doc: &automerge::Automerge, obj_id: &automerge::ObjId, objtype: automerge::ObjType, ) -> RealizedObject { @@ -373,8 +370,8 @@ pub fn realize_obj( } } -fn realize_values>( - doc: &R, +fn realize_values>( + doc: &automerge::Automerge, obj_id: &automerge::ObjId, key: K, ) -> BTreeSet { diff --git a/rust/automerge-wasm/.gitignore b/rust/automerge-wasm/.gitignore index 77c11e08..ab957e1c 100644 --- a/rust/automerge-wasm/.gitignore +++ b/rust/automerge-wasm/.gitignore @@ -1,6 +1,5 @@ /node_modules /bundler /nodejs -/deno Cargo.lock yarn.lock diff --git a/rust/automerge-wasm/Cargo.toml b/rust/automerge-wasm/Cargo.toml index b6055a7d..ebc823e1 100644 --- a/rust/automerge-wasm/Cargo.toml +++ b/rust/automerge-wasm/Cargo.toml @@ -34,7 +34,7 @@ serde_bytes = "0.11.5" hex = "^0.4.3" regex = "^1.5" itertools = "^0.10.3" -thiserror = "^1.0.16" +ropey = "1.5.0" [dependencies.wasm-bindgen] version = "^0.2.83" @@ -57,6 +57,5 @@ features = ["console"] [dev-dependencies] futures = "^0.1" -proptest = { version = "^1.0.0", default-features = false, features = ["std"] } wasm-bindgen-futures = "^0.4" wasm-bindgen-test = "^0.3" diff --git a/rust/automerge-wasm/deno-tests/deno.ts b/rust/automerge-wasm/deno-tests/deno.ts deleted file mode 100644 index b346435a..00000000 --- a/rust/automerge-wasm/deno-tests/deno.ts +++ /dev/null @@ -1,8 +0,0 @@ -// @deno-types="../index.d.ts" -import { create } from '../deno/automerge_wasm.js' - -Deno.test("It should create, clone and free", () => { - const doc1 = create(false) - const doc2 = doc1.clone() - doc2.free() -}); diff --git a/rust/automerge-wasm/index.d.ts b/rust/automerge-wasm/index.d.ts index be12e4c1..67d03b84 100644 --- a/rust/automerge-wasm/index.d.ts +++ b/rust/automerge-wasm/index.d.ts @@ -82,9 +82,6 @@ export type DecodedChange = { ops: Op[] } -type PartialBy = Omit & Partial> -export type ChangeToEncode = PartialBy - export type Op = { action: string, obj: ObjID, @@ -94,7 +91,7 @@ export type Op = { pred: string[], } -export type Patch = PutPatch | DelPatch | SpliceTextPatch | IncPatch | InsertPatch; +export type Patch = PutPatch | DelPatch | SplicePatch | IncPatch; export type PutPatch = { action: 'put' @@ -104,7 +101,7 @@ export type PutPatch = { } export type IncPatch = { - action: 'inc' + action: 'put' path: Prop[], value: number } @@ -115,21 +112,15 @@ export type DelPatch = { length?: number, } -export type SpliceTextPatch = { +export type SplicePatch = { action: 'splice' path: Prop[], - value: string, -} - -export type InsertPatch = { - action: 'insert' - path: Prop[], values: Value[], } -export function encodeChange(change: ChangeToEncode): Change; -export function create(text_v2: boolean, actor?: Actor): Automerge; -export function load(data: Uint8Array, text_v2: boolean, actor?: Actor): Automerge; +export function create(actor?: Actor): Automerge; +export function load(data: Uint8Array, actor?: Actor): Automerge; +export function encodeChange(change: DecodedChange): Change; export function decodeChange(change: Change): DecodedChange; export function initSyncState(): SyncState; export function encodeSyncMessage(message: DecodedSyncMessage): SyncMessage; @@ -140,9 +131,9 @@ export function exportSyncState(state: SyncState): JsSyncState; export function importSyncState(state: JsSyncState): SyncState; export interface API { - create(text_v2: boolean, actor?: Actor): Automerge; - load(data: Uint8Array, text_v2: boolean, actor?: Actor): Automerge; - encodeChange(change: ChangeToEncode): Change; + create(actor?: Actor): Automerge; + load(data: Uint8Array, actor?: Actor): Automerge; + encodeChange(change: DecodedChange): Change; decodeChange(change: Change): DecodedChange; initSyncState(): SyncState; encodeSyncMessage(message: DecodedSyncMessage): SyncMessage; @@ -177,8 +168,7 @@ export class Automerge { toJS(): MaterializeValue; // transactions - commit(message?: string, time?: number): Hash | null; - emptyChange(message?: string, time?: number): Hash; + commit(message?: string, time?: number): Hash; merge(other: Automerge): Heads; getActorId(): Actor; pendingOps(): number; @@ -217,7 +207,7 @@ export class Automerge { dump(): void; // experimental api can go here - applyPatches(obj: Doc, meta?: unknown, callback?: (patch: Array, before: Doc, after: Doc) => void): Doc; + applyPatches(obj: Doc, meta?: unknown, callback?: (patch: Patch, before: Doc, after: Doc) => void): Doc; } export interface JsSyncState { diff --git a/rust/automerge-wasm/package.json b/rust/automerge-wasm/package.json index 80b39fd4..3c8490b2 100644 --- a/rust/automerge-wasm/package.json +++ b/rust/automerge-wasm/package.json @@ -8,7 +8,7 @@ "description": "wasm-bindgen bindings to the automerge rust implementation", "homepage": "https://github.com/automerge/automerge-rs/tree/main/automerge-wasm", "repository": "github:automerge/automerge-rs", - "version": "0.1.25", + "version": "0.1.18", "license": "MIT", "files": [ "README.md", @@ -17,8 +17,6 @@ "index.d.ts", "nodejs/automerge_wasm.js", "nodejs/automerge_wasm_bg.wasm", - "deno/automerge_wasm.js", - "deno/automerge_wasm_bg.wasm", "bundler/automerge_wasm.js", "bundler/automerge_wasm_bg.js", "bundler/automerge_wasm_bg.wasm" @@ -32,26 +30,29 @@ "debug": "cross-env PROFILE=dev TARGET_DIR=debug yarn buildall", "build": "cross-env PROFILE=dev TARGET_DIR=debug FEATURES='' yarn buildall", "release": "cross-env PROFILE=release TARGET_DIR=release yarn buildall", - "buildall": "cross-env TARGET=nodejs yarn target && cross-env TARGET=bundler yarn target && cross-env TARGET=deno yarn target", + "buildall": "cross-env TARGET=nodejs yarn target && cross-env TARGET=bundler yarn target", "target": "rimraf ./$TARGET && yarn compile && yarn bindgen && yarn opt", "compile": "cargo build --target wasm32-unknown-unknown --profile $PROFILE", "bindgen": "wasm-bindgen --no-typescript --weak-refs --target $TARGET --out-dir $TARGET ../target/wasm32-unknown-unknown/$TARGET_DIR/automerge_wasm.wasm", - "opt": "wasm-opt -O4 $TARGET/automerge_wasm_bg.wasm -o $TARGET/automerge_wasm_bg.wasm", + "opt": "wasm-opt -Oz $TARGET/automerge_wasm_bg.wasm -o $TARGET/automerge_wasm_bg.wasm", "test": "ts-mocha -p tsconfig.json --type-check --bail --full-trace test/*.ts" }, "devDependencies": { - "@types/mocha": "^10.0.1", - "@types/node": "^18.11.13", - "@typescript-eslint/eslint-plugin": "^5.46.0", - "@typescript-eslint/parser": "^5.46.0", + "@types/expect": "^24.3.0", + "@types/jest": "^27.4.0", + "@types/mocha": "^9.1.0", + "@types/node": "^17.0.13", + "@types/uuid": "^8.3.4", + "@typescript-eslint/eslint-plugin": "^5.25.0", + "@typescript-eslint/parser": "^5.25.0", "cross-env": "^7.0.3", - "eslint": "^8.29.0", + "eslint": "^8.16.0", "fast-sha256": "^1.3.0", - "mocha": "^10.2.0", - "pako": "^2.1.0", + "mocha": "^9.1.3", + "pako": "^2.0.4", "rimraf": "^3.0.2", - "ts-mocha": "^10.0.0", - "typescript": "^4.9.4" + "ts-mocha": "^9.0.2", + "typescript": "^4.6.4" }, "exports": { "browser": "./bundler/automerge_wasm.js", diff --git a/rust/automerge-wasm/src/interop.rs b/rust/automerge-wasm/src/interop.rs index 1546ff10..cfb5ef72 100644 --- a/rust/automerge-wasm/src/interop.rs +++ b/rust/automerge-wasm/src/interop.rs @@ -1,12 +1,10 @@ -use crate::error::InsertObject; use crate::value::Datatype; -use crate::{Automerge, TextRepresentation}; +use crate::Automerge; use automerge as am; -use automerge::ReadDoc; +use automerge::transaction::Transactable; use automerge::ROOT; use automerge::{Change, ChangeHash, ObjType, Prop}; use js_sys::{Array, Function, JsString, Object, Reflect, Symbol, Uint8Array}; -use std::borrow::Cow; use std::collections::{BTreeSet, HashSet}; use std::fmt::Display; use wasm_bindgen::prelude::*; @@ -104,146 +102,88 @@ impl From>> for JS { } impl TryFrom for HashSet { - type Error = error::BadChangeHashSet; + type Error = JsValue; fn try_from(value: JS) -> Result { - let result = HashSet::new(); - fold_hash_set(result, &value.0, |mut set, hash| { - set.insert(hash); - set - }) + let mut result = HashSet::new(); + for key in Reflect::own_keys(&value.0)?.iter() { + if let Some(true) = Reflect::get(&value.0, &key)?.as_bool() { + result.insert(serde_wasm_bindgen::from_value(key).map_err(to_js_err)?); + } + } + Ok(result) } } impl TryFrom for BTreeSet { - type Error = error::BadChangeHashSet; + type Error = JsValue; fn try_from(value: JS) -> Result { - let result = BTreeSet::new(); - fold_hash_set(result, &value.0, |mut set, hash| { - set.insert(hash); - set - }) - } -} - -fn fold_hash_set(init: O, val: &JsValue, f: F) -> Result -where - F: Fn(O, ChangeHash) -> O, -{ - let mut result = init; - for key in Reflect::own_keys(val) - .map_err(|_| error::BadChangeHashSet::ListProp)? - .iter() - { - if let Some(true) = js_get(val, &key)?.0.as_bool() { - let hash = ChangeHash::try_from(JS(key.clone())) - .map_err(|e| error::BadChangeHashSet::BadHash(key, e))?; - result = f(result, hash); - } - } - Ok(result) -} - -impl TryFrom for ChangeHash { - type Error = error::BadChangeHash; - - fn try_from(value: JS) -> Result { - if let Some(s) = value.0.as_string() { - Ok(s.parse()?) - } else { - Err(error::BadChangeHash::NotString) - } - } -} - -impl TryFrom for Option> { - type Error = error::BadChangeHashes; - - fn try_from(value: JS) -> Result { - if value.0.is_null() { - Ok(None) - } else { - Vec::::try_from(value).map(Some) + let mut result = BTreeSet::new(); + for key in Reflect::own_keys(&value.0)?.iter() { + if let Some(true) = Reflect::get(&value.0, &key)?.as_bool() { + result.insert(serde_wasm_bindgen::from_value(key).map_err(to_js_err)?); + } } + Ok(result) } } impl TryFrom for Vec { - type Error = error::BadChangeHashes; + type Error = JsValue; fn try_from(value: JS) -> Result { - let value = value - .0 - .dyn_into::() - .map_err(|_| error::BadChangeHashes::NotArray)?; - let value = value - .iter() - .enumerate() - .map(|(i, v)| { - ChangeHash::try_from(JS(v)).map_err(|e| error::BadChangeHashes::BadElem(i, e)) - }) - .collect::, _>>()?; + let value = value.0.dyn_into::()?; + let value: Result, _> = + value.iter().map(serde_wasm_bindgen::from_value).collect(); + let value = value.map_err(to_js_err)?; Ok(value) } } +impl From for Option> { + fn from(value: JS) -> Self { + let value = value.0.dyn_into::().ok()?; + let value: Result, _> = + value.iter().map(serde_wasm_bindgen::from_value).collect(); + let value = value.ok()?; + Some(value) + } +} + impl TryFrom for Vec { - type Error = error::BadJSChanges; + type Error = JsValue; fn try_from(value: JS) -> Result { - let value = value - .0 - .dyn_into::() - .map_err(|_| error::BadJSChanges::ChangesNotArray)?; - let changes = value - .iter() - .enumerate() - .map(|(i, j)| { - j.dyn_into().map_err::(|_| { - error::BadJSChanges::ElemNotUint8Array(i) - }) - }) - .collect::, _>>()?; - let changes = changes - .iter() - .enumerate() - .map(|(i, arr)| { - automerge::Change::try_from(arr.to_vec().as_slice()) - .map_err(|e| error::BadJSChanges::BadChange(i, e)) - }) - .collect::, _>>()?; + let value = value.0.dyn_into::()?; + let changes: Result, _> = value.iter().map(|j| j.dyn_into()).collect(); + let changes = changes?; + let changes = changes.iter().try_fold(Vec::new(), |mut acc, arr| { + match automerge::Change::try_from(arr.to_vec().as_slice()) { + Ok(c) => acc.push(c), + Err(e) => return Err(to_js_err(e)), + } + Ok(acc) + })?; Ok(changes) } } impl TryFrom for am::sync::State { - type Error = error::BadSyncState; + type Error = JsValue; fn try_from(value: JS) -> Result { let value = value.0; - let shared_heads = js_get(&value, "sharedHeads")? - .try_into() - .map_err(error::BadSyncState::BadSharedHeads)?; - let last_sent_heads = js_get(&value, "lastSentHeads")? - .try_into() - .map_err(error::BadSyncState::BadLastSentHeads)?; - let their_heads = js_get(&value, "theirHeads")? - .try_into() - .map_err(error::BadSyncState::BadTheirHeads)?; - let their_need = js_get(&value, "theirNeed")? - .try_into() - .map_err(error::BadSyncState::BadTheirNeed)?; - let their_have = js_get(&value, "theirHave")? - .try_into() - .map_err(error::BadSyncState::BadTheirHave)?; - let sent_hashes = js_get(&value, "sentHashes")? - .try_into() - .map_err(error::BadSyncState::BadSentHashes)?; + let shared_heads = js_get(&value, "sharedHeads")?.try_into()?; + let last_sent_heads = js_get(&value, "lastSentHeads")?.try_into()?; + let their_heads = js_get(&value, "theirHeads")?.into(); + let their_need = js_get(&value, "theirNeed")?.into(); + let their_have = js_get(&value, "theirHave")?.try_into()?; + let sent_hashes = js_get(&value, "sentHashes")?.try_into()?; let in_flight = js_get(&value, "inFlight")? .0 .as_bool() - .ok_or(error::BadSyncState::InFlightNotBoolean)?; + .ok_or_else(|| JsValue::from_str("SyncState.inFLight must be a boolean"))?; Ok(am::sync::State { shared_heads, last_sent_heads, @@ -256,22 +196,8 @@ impl TryFrom for am::sync::State { } } -impl TryFrom for am::sync::Have { - type Error = error::BadHave; - - fn try_from(value: JS) -> Result { - let last_sync = js_get(&value.0, "lastSync")? - .try_into() - .map_err(error::BadHave::BadLastSync)?; - let bloom = js_get(&value.0, "bloom")? - .try_into() - .map_err(error::BadHave::BadBloom)?; - Ok(am::sync::Have { last_sync, bloom }) - } -} - impl TryFrom for Option> { - type Error = error::BadHaves; + type Error = JsValue; fn try_from(value: JS) -> Result { if value.0.is_null() { @@ -283,57 +209,34 @@ impl TryFrom for Option> { } impl TryFrom for Vec { - type Error = error::BadHaves; + type Error = JsValue; fn try_from(value: JS) -> Result { - let value = value - .0 - .dyn_into::() - .map_err(|_| error::BadHaves::NotArray)?; - let have = value + let value = value.0.dyn_into::()?; + let have: Result, JsValue> = value .iter() - .enumerate() - .map(|(i, s)| JS(s).try_into().map_err(|e| error::BadHaves::BadElem(i, e))) - .collect::, _>>()?; + .map(|s| { + let last_sync = js_get(&s, "lastSync")?.try_into()?; + let bloom = js_get(&s, "bloom")?.try_into()?; + Ok(am::sync::Have { last_sync, bloom }) + }) + .collect(); + let have = have?; Ok(have) } } impl TryFrom for am::sync::BloomFilter { - type Error = error::BadBloom; + type Error = JsValue; fn try_from(value: JS) -> Result { - let value: Uint8Array = value - .0 - .dyn_into() - .map_err(|_| error::BadBloom::NotU8Array)?; + let value: Uint8Array = value.0.dyn_into()?; let value = value.to_vec(); - let value = value.as_slice().try_into()?; + let value = value.as_slice().try_into().map_err(to_js_err)?; Ok(value) } } -impl TryFrom for am::sync::Message { - type Error = error::BadSyncMessage; - - fn try_from(value: JS) -> Result { - let heads = js_get(&value.0, "heads")? - .try_into() - .map_err(error::BadSyncMessage::BadHeads)?; - let need = js_get(&value.0, "need")? - .try_into() - .map_err(error::BadSyncMessage::BadNeed)?; - let changes = js_get(&value.0, "changes")?.try_into()?; - let have = js_get(&value.0, "have")?.try_into()?; - Ok(am::sync::Message { - heads, - need, - have, - changes, - }) - } -} - impl From<&[ChangeHash]> for AR { fn from(value: &[ChangeHash]) -> Self { AR(value @@ -379,137 +282,57 @@ pub(crate) fn to_js_err(err: T) -> JsValue { js_sys::Error::new(&std::format!("{}", err)).into() } -pub(crate) fn js_get, S: std::fmt::Debug + Into>( - obj: J, - prop: S, -) -> Result { - let prop = prop.into(); - Ok(JS(Reflect::get(&obj.into(), &prop).map_err(|e| { - error::GetProp { - property: format!("{:?}", prop), - error: e, - } - })?)) +pub(crate) fn js_get>(obj: J, prop: &str) -> Result { + Ok(JS(Reflect::get(&obj.into(), &prop.into())?)) } -pub(crate) fn js_set, S: std::fmt::Debug + Into>( - obj: &JsValue, - prop: S, - val: V, -) -> Result { - let prop = prop.into(); - Reflect::set(obj, &prop, &val.into()).map_err(|e| error::SetProp { - property: prop, - error: e, - }) +pub(crate) fn js_set>(obj: &JsValue, prop: &str, val: V) -> Result { + Reflect::set(obj, &prop.into(), &val.into()) } -pub(crate) fn js_get_symbol>(obj: J, prop: &Symbol) -> Result { - Ok(JS(Reflect::get(&obj.into(), &prop.into()).map_err( - |e| error::GetProp { - property: format!("{}", prop.to_string()), - error: e, - }, - )?)) -} - -pub(crate) fn to_prop(p: JsValue) -> Result { +pub(crate) fn to_prop(p: JsValue) -> Result { if let Some(s) = p.as_string() { Ok(Prop::Map(s)) } else if let Some(n) = p.as_f64() { Ok(Prop::Seq(n as usize)) } else { - Err(error::InvalidProp) + Err(to_js_err("prop must me a string or number")) } } -pub(crate) enum JsObjType { - Text(String), - Map(Vec<(Prop, JsValue)>), - List(Vec<(Prop, JsValue)>), -} - -impl JsObjType { - pub(crate) fn objtype(&self) -> ObjType { - match self { - Self::Text(_) => ObjType::Text, - Self::Map(_) => ObjType::Map, - Self::List(_) => ObjType::List, - } - } - - pub(crate) fn text(&self) -> Option<&str> { - match self { - Self::Text(s) => Some(s.as_ref()), - Self::Map(_) => None, - Self::List(_) => None, - } - } - - pub(crate) fn subvals(&self) -> impl Iterator, JsValue)> + '_ + Clone { - match self { - Self::Text(s) => SubValIter::Str(s.chars().enumerate()), - Self::Map(sub) => SubValIter::Slice(sub.as_slice().iter()), - Self::List(sub) => SubValIter::Slice(sub.as_slice().iter()), - } - } -} - -#[derive(Debug, Clone)] -pub(crate) enum SubValIter<'a> { - Slice(std::slice::Iter<'a, (Prop, JsValue)>), - Str(std::iter::Enumerate>), -} - -impl<'a> Iterator for SubValIter<'a> { - type Item = (std::borrow::Cow<'a, Prop>, JsValue); - - fn next(&mut self) -> Option { - match self { - Self::Slice(i) => i - .next() - .map(|(p, v)| (std::borrow::Cow::Borrowed(p), v.clone())), - Self::Str(i) => i - .next() - .map(|(n, c)| (std::borrow::Cow::Owned(Prop::Seq(n)), c.to_string().into())), - } - } -} - -pub(crate) fn import_obj( +pub(crate) fn to_objtype( value: &JsValue, datatype: &Option, -) -> Result { +) -> Option<(ObjType, Vec<(Prop, JsValue)>)> { match datatype.as_deref() { Some("map") => { - let map = value - .clone() - .dyn_into::() - .map_err(|_| InsertObject::ValueNotObject)?; + let map = value.clone().dyn_into::().ok()?; let map = js_sys::Object::keys(&map) .iter() .zip(js_sys::Object::values(&map).iter()) .map(|(key, val)| (key.as_string().unwrap().into(), val)) .collect(); - Ok(JsObjType::Map(map)) + Some((ObjType::Map, map)) } Some("list") => { - let list = value - .clone() - .dyn_into::() - .map_err(|_| InsertObject::ValueNotObject)?; + let list = value.clone().dyn_into::().ok()?; let list = list .iter() .enumerate() .map(|(i, e)| (i.into(), e)) .collect(); - Ok(JsObjType::List(list)) + Some((ObjType::List, list)) } Some("text") => { - let text = value.as_string().ok_or(InsertObject::ValueNotObject)?; - Ok(JsObjType::Text(text)) + let text = value.as_string()?; + let text = text + .chars() + .enumerate() + .map(|(i, ch)| (i.into(), ch.to_string().into())) + .collect(); + Some((ObjType::Text, text)) } - Some(_) => Err(InsertObject::ValueNotObject), + Some(_) => None, None => { if let Ok(list) = value.clone().dyn_into::() { let list = list @@ -517,36 +340,29 @@ pub(crate) fn import_obj( .enumerate() .map(|(i, e)| (i.into(), e)) .collect(); - Ok(JsObjType::List(list)) + Some((ObjType::List, list)) } else if let Ok(map) = value.clone().dyn_into::() { + // FIXME unwrap let map = js_sys::Object::keys(&map) .iter() .zip(js_sys::Object::values(&map).iter()) .map(|(key, val)| (key.as_string().unwrap().into(), val)) .collect(); - Ok(JsObjType::Map(map)) - } else if let Some(s) = value.as_string() { - Ok(JsObjType::Text(s)) + Some((ObjType::Map, map)) + } else if value.as_string().is_some() { + Some((ObjType::Text, vec![(0.into(), value.clone())])) } else { - Err(InsertObject::ValueNotObject) + None } } } } -pub(crate) fn get_heads( - heads: Option, -) -> Result>, error::BadChangeHashes> { - heads - .map(|h| { - h.iter() - .enumerate() - .map(|(i, v)| { - ChangeHash::try_from(JS(v)).map_err(|e| error::BadChangeHashes::BadElem(i, e)) - }) - .collect() - }) - .transpose() +pub(crate) fn get_heads(heads: Option) -> Option> { + let heads = heads?; + let heads: Result, _> = + heads.iter().map(serde_wasm_bindgen::from_value).collect(); + heads.ok() } impl Automerge { @@ -556,25 +372,30 @@ impl Automerge { datatype: Datatype, heads: Option<&Vec>, meta: &JsValue, - ) -> Result { + ) -> Result { let result = match datatype { - Datatype::Text => match self.text_rep { - TextRepresentation::String => { - if let Some(heads) = heads { - self.doc.text_at(obj, heads)?.into() - } else { - self.doc.text(obj)?.into() - } + Datatype::Text => { + if let Some(heads) = heads { + self.doc.text_at(obj, heads)?.into() + } else { + self.doc.text(obj)?.into() } - TextRepresentation::Array => self - .wrap_object(self.export_list(obj, heads, meta)?, datatype, obj, meta)? - .into(), - }, + } Datatype::List => self - .wrap_object(self.export_list(obj, heads, meta)?, datatype, obj, meta)? + .wrap_object( + self.export_list(obj, heads, meta)?, + datatype, + &obj.to_string().into(), + meta, + )? .into(), _ => self - .wrap_object(self.export_map(obj, heads, meta)?, datatype, obj, meta)? + .wrap_object( + self.export_map(obj, heads, meta)?, + datatype, + &obj.to_string().into(), + meta, + )? .into(), }; Ok(result) @@ -585,7 +406,7 @@ impl Automerge { obj: &ObjId, heads: Option<&Vec>, meta: &JsValue, - ) -> Result { + ) -> Result { let keys = self.doc.keys(obj); let map = Object::new(); for k in keys { @@ -597,9 +418,9 @@ impl Automerge { if let Ok(Some((val, id))) = val_and_id { let subval = match val { Value::Object(o) => self.export_object(&id, o.into(), heads, meta)?, - Value::Scalar(_) => self.export_value(alloc(&val, self.text_rep))?, + Value::Scalar(_) => self.export_value(alloc(&val))?, }; - js_set(&map, &k, &subval)?; + Reflect::set(&map, &k.into(), &subval)?; }; } @@ -611,19 +432,19 @@ impl Automerge { obj: &ObjId, heads: Option<&Vec>, meta: &JsValue, - ) -> Result { + ) -> Result { let len = self.doc.length(obj); let array = Array::new(); for i in 0..len { let val_and_id = if let Some(heads) = heads { - self.doc.get_at(obj, i, heads) + self.doc.get_at(obj, i as usize, heads) } else { - self.doc.get(obj, i) + self.doc.get(obj, i as usize) }; if let Ok(Some((val, id))) = val_and_id { let subval = match val { Value::Object(o) => self.export_object(&id, o.into(), heads, meta)?, - Value::Scalar(_) => self.export_value(alloc(&val, self.text_rep))?, + Value::Scalar(_) => self.export_value(alloc(&val))?, }; array.push(&subval); }; @@ -635,11 +456,9 @@ impl Automerge { pub(crate) fn export_value( &self, (datatype, raw_value): (Datatype, JsValue), - ) -> Result { + ) -> Result { if let Some(function) = self.external_types.get(&datatype) { - let wrapped_value = function - .call1(&JsValue::undefined(), &raw_value) - .map_err(|e| error::Export::CallDataHandler(datatype.to_string(), e))?; + let wrapped_value = function.call1(&JsValue::undefined(), &raw_value)?; if let Ok(o) = wrapped_value.dyn_into::() { let key = Symbol::for_(RAW_DATA_SYMBOL); set_hidden_value(&o, &key, &raw_value)?; @@ -647,7 +466,10 @@ impl Automerge { set_hidden_value(&o, &key, datatype)?; Ok(o.into()) } else { - Err(error::Export::InvalidDataHandler(datatype.to_string())) + Err(to_js_err(format!( + "data handler for type {} did not return a valid object", + datatype + ))) } } else { Ok(raw_value) @@ -657,19 +479,15 @@ impl Automerge { pub(crate) fn unwrap_object( &self, ext_val: &Object, - ) -> Result<(Object, Datatype, ObjId), error::Export> { - let inner = js_get_symbol(ext_val, &Symbol::for_(RAW_DATA_SYMBOL))?.0; + ) -> Result<(Object, Datatype, JsValue), JsValue> { + let inner = Reflect::get(ext_val, &Symbol::for_(RAW_DATA_SYMBOL))?; - let datatype = js_get_symbol(ext_val, &Symbol::for_(DATATYPE_SYMBOL))? - .0 - .try_into(); + let datatype = Reflect::get(ext_val, &Symbol::for_(DATATYPE_SYMBOL))?.try_into(); - let id_val = js_get_symbol(ext_val, &Symbol::for_(RAW_OBJECT_SYMBOL))?.0; - let id = if id_val.is_undefined() { - am::ROOT - } else { - self.doc.import(&id_val.as_string().unwrap_or_default())?.0 - }; + let mut id = Reflect::get(ext_val, &Symbol::for_(RAW_OBJECT_SYMBOL))?; + if id.is_undefined() { + id = "_root".into(); + } let inner = inner .dyn_into::() @@ -684,8 +502,8 @@ impl Automerge { Ok((inner, datatype, id)) } - pub(crate) fn unwrap_scalar(&self, ext_val: JsValue) -> Result { - let inner = js_get_symbol(&ext_val, &Symbol::for_(RAW_DATA_SYMBOL))?.0; + pub(crate) fn unwrap_scalar(&self, ext_val: JsValue) -> Result { + let inner = Reflect::get(&ext_val, &Symbol::for_(RAW_DATA_SYMBOL))?; if !inner.is_undefined() { Ok(inner) } else { @@ -698,9 +516,9 @@ impl Automerge { (datatype, raw_value): (Datatype, JsValue), id: &ObjId, meta: &JsValue, - ) -> Result { + ) -> Result { if let Ok(obj) = raw_value.clone().dyn_into::() { - let result = self.wrap_object(obj, datatype, id, meta)?; + let result = self.wrap_object(obj, datatype, &id.to_string().into(), meta)?; Ok(result.into()) } else { self.export_value((datatype, raw_value)) @@ -711,29 +529,24 @@ impl Automerge { &self, value: Object, datatype: Datatype, - id: &ObjId, + id: &JsValue, meta: &JsValue, - ) -> Result { + ) -> Result { let value = if let Some(function) = self.external_types.get(&datatype) { - let wrapped_value = function - .call1(&JsValue::undefined(), &value) - .map_err(|e| error::Export::CallDataHandler(datatype.to_string(), e))?; - let wrapped_object = wrapped_value - .dyn_into::() - .map_err(|_| error::Export::InvalidDataHandler(datatype.to_string()))?; + let wrapped_value = function.call1(&JsValue::undefined(), &value)?; + let wrapped_object = wrapped_value.dyn_into::().map_err(|_| { + to_js_err(format!( + "data handler for type {} did not return a valid object", + datatype + )) + })?; set_hidden_value(&wrapped_object, &Symbol::for_(RAW_DATA_SYMBOL), value)?; wrapped_object } else { value }; - if matches!(datatype, Datatype::Map | Datatype::List) - || (datatype == Datatype::Text && self.text_rep == TextRepresentation::Array) - { - set_hidden_value( - &value, - &Symbol::for_(RAW_OBJECT_SYMBOL), - &JsValue::from(&id.to_string()), - )?; + if matches!(datatype, Datatype::Map | Datatype::List) { + set_hidden_value(&value, &Symbol::for_(RAW_OBJECT_SYMBOL), id)?; } set_hidden_value(&value, &Symbol::for_(DATATYPE_SYMBOL), datatype)?; set_hidden_value(&value, &Symbol::for_(META_SYMBOL), meta)?; @@ -749,7 +562,7 @@ impl Automerge { patch: &Patch, meta: &JsValue, exposed: &mut HashSet, - ) -> Result { + ) -> Result { let result = Array::from(array); // shallow copy match patch { Patch::PutSeq { @@ -760,65 +573,35 @@ impl Automerge { } => { if *expose && value.0.is_object() { exposed.insert(value.1.clone()); - js_set(&result, *index as f64, &JsValue::null())?; + Reflect::set(&result, &(*index as f64).into(), &JsValue::null())?; } else { - let sub_val = - self.maybe_wrap_object(alloc(&value.0, self.text_rep), &value.1, meta)?; - js_set(&result, *index as f64, &sub_val)?; + let sub_val = self.maybe_wrap_object(alloc(&value.0), &value.1, meta)?; + Reflect::set(&result, &(*index as f64).into(), &sub_val)?; } Ok(result.into()) } - Patch::DeleteSeq { index, length, .. } => { - Ok(self.sub_splice(result, *index, *length, vec![], meta)?) - } - Patch::Insert { index, values, .. } => { - Ok(self.sub_splice(result, *index, 0, values, meta)?) - } + Patch::DeleteSeq { index, .. } => self.sub_splice(result, *index, 1, vec![], meta), + Patch::Insert { index, values, .. } => self.sub_splice(result, *index, 0, values, meta), Patch::Increment { prop, value, .. } => { if let Prop::Seq(index) = prop { - let index = *index as f64; - let old_val = js_get(&result, index)?.0; + let index = (*index as f64).into(); + let old_val = Reflect::get(&result, &index)?; let old_val = self.unwrap_scalar(old_val)?; if let Some(old) = old_val.as_f64() { let new_value: Value<'_> = am::ScalarValue::counter(old as i64 + *value).into(); - js_set( - &result, - index, - &self.export_value(alloc(&new_value, self.text_rep))?, - )?; + Reflect::set(&result, &index, &self.export_value(alloc(&new_value))?)?; Ok(result.into()) } else { - Err(error::ApplyPatch::IncrementNonNumeric) + Err(to_js_err("cant increment a non number value")) } } else { - Err(error::ApplyPatch::IncrementKeyInSeq) - } - } - Patch::DeleteMap { .. } => Err(error::ApplyPatch::DeleteKeyFromSeq), - Patch::PutMap { .. } => Err(error::ApplyPatch::PutKeyInSeq), - Patch::SpliceText { index, value, .. } => { - match self.text_rep { - TextRepresentation::String => Err(error::ApplyPatch::SpliceTextInSeq), - TextRepresentation::Array => { - let bytes: Vec = value.iter().cloned().collect(); - let val = String::from_utf16_lossy(bytes.as_slice()); - let elems = val - .chars() - .map(|c| { - ( - Value::Scalar(std::borrow::Cow::Owned(am::ScalarValue::Str( - c.to_string().into(), - ))), - ObjId::Root, // Using ROOT is okay because this ID is never used as - // we're producing ScalarValue::Str - ) - }) - .collect::>(); - Ok(self.sub_splice(result, *index, 0, &elems, meta)?) - } + Err(to_js_err("cant increment a key on a seq")) } } + Patch::DeleteMap { .. } => Err(to_js_err("cannot delete from a seq")), + Patch::PutMap { .. } => Err(to_js_err("cannot set key in seq")), + Patch::SpliceText { .. } => Err(to_js_err("cannot splice text in seq")), } } @@ -828,7 +611,7 @@ impl Automerge { patch: &Patch, meta: &JsValue, exposed: &mut HashSet, - ) -> Result { + ) -> Result { let result = Object::assign(&Object::new(), map); // shallow copy match patch { Patch::PutMap { @@ -836,48 +619,38 @@ impl Automerge { } => { if *expose && value.0.is_object() { exposed.insert(value.1.clone()); - js_set(&result, key, &JsValue::null())?; + Reflect::set(&result, &key.into(), &JsValue::null())?; } else { - let sub_val = - self.maybe_wrap_object(alloc(&value.0, self.text_rep), &value.1, meta)?; - js_set(&result, key, &sub_val)?; + let sub_val = self.maybe_wrap_object(alloc(&value.0), &value.1, meta)?; + Reflect::set(&result, &key.into(), &sub_val)?; } Ok(result) } Patch::DeleteMap { key, .. } => { - Reflect::delete_property(&result, &key.into()).map_err(|e| { - error::Export::Delete { - prop: key.to_string(), - err: e, - } - })?; + Reflect::delete_property(&result, &key.into())?; Ok(result) } Patch::Increment { prop, value, .. } => { if let Prop::Map(key) = prop { - let old_val = js_get(&result, key)?.0; + let key = key.into(); + let old_val = Reflect::get(&result, &key)?; let old_val = self.unwrap_scalar(old_val)?; if let Some(old) = old_val.as_f64() { let new_value: Value<'_> = am::ScalarValue::counter(old as i64 + *value).into(); - js_set( - &result, - key, - &self.export_value(alloc(&new_value, self.text_rep))?, - )?; + Reflect::set(&result, &key, &self.export_value(alloc(&new_value))?)?; Ok(result) } else { - Err(error::ApplyPatch::IncrementNonNumeric) + Err(to_js_err("cant increment a non number value")) } } else { - Err(error::ApplyPatch::IncrementIndexInMap) + Err(to_js_err("cant increment an index on a map")) } } - Patch::Insert { .. } => Err(error::ApplyPatch::InsertInMap), - Patch::DeleteSeq { .. } => Err(error::ApplyPatch::SpliceInMap), - //Patch::SpliceText { .. } => Err(to_js_err("cannot Splice into map")), - Patch::SpliceText { .. } => Err(error::ApplyPatch::SpliceTextInMap), - Patch::PutSeq { .. } => Err(error::ApplyPatch::PutIdxInMap), + Patch::Insert { .. } => Err(to_js_err("cannot insert into map")), + Patch::SpliceText { .. } => Err(to_js_err("cannot Splice into map")), + Patch::DeleteSeq { .. } => Err(to_js_err("cannot splice a map")), + Patch::PutSeq { .. } => Err(to_js_err("cannot array index a map")), } } @@ -888,25 +661,24 @@ impl Automerge { depth: usize, meta: &JsValue, exposed: &mut HashSet, - ) -> Result { + ) -> Result { let (inner, datatype, id) = self.unwrap_object(&obj)?; let prop = patch.path().get(depth).map(|p| prop_to_js(&p.1)); let result = if let Some(prop) = prop { - let subval = js_get(&inner, &prop)?.0; + let subval = Reflect::get(&inner, &prop)?; if subval.is_string() && patch.path().len() - 1 == depth { if let Ok(s) = subval.dyn_into::() { let new_value = self.apply_patch_to_text(&s, patch)?; let result = shallow_copy(&inner); - js_set(&result, &prop, &new_value)?; + Reflect::set(&result, &prop, &new_value)?; Ok(result) } else { - // bad patch - short circuit - Ok(obj) + panic!("string is not JsString") } - } else if let Ok(sub_obj) = js_get(&inner, &prop)?.0.dyn_into::() { + } else if let Ok(sub_obj) = Reflect::get(&inner, &prop)?.dyn_into::() { let new_value = self.apply_patch(sub_obj, patch, depth + 1, meta, exposed)?; let result = shallow_copy(&inner); - js_set(&result, &prop, &new_value)?; + Reflect::set(&result, &prop, &new_value)?; Ok(result) } else { // if a patch is trying to access a deleted object make no change @@ -914,44 +686,49 @@ impl Automerge { return Ok(obj); } } else if Array::is_array(&inner) { - if &id == patch.obj() { + if id.as_string() == Some(patch.obj().to_string()) { self.apply_patch_to_array(&inner, patch, meta, exposed) } else { Ok(Array::from(&inner).into()) } - } else if &id == patch.obj() { + } else if id.as_string() == Some(patch.obj().to_string()) { self.apply_patch_to_map(&inner, patch, meta, exposed) } else { Ok(Object::assign(&Object::new(), &inner)) }?; self.wrap_object(result, datatype, &id, meta) - .map_err(|e| e.into()) } - fn apply_patch_to_text( - &self, - string: &JsString, - patch: &Patch, - ) -> Result { + fn apply_patch_to_text(&self, string: &JsString, patch: &Patch) -> Result { match patch { - Patch::DeleteSeq { index, length, .. } => { + Patch::DeleteSeq { index, .. } => { let index = *index as u32; + let length = string.length(); let before = string.slice(0, index); - let after = string.slice(index + *length as u32, string.length()); - let result = before.concat(&after); - Ok(result.into()) + let after = string.slice(index + 1, length); + Ok(before.concat(&after).into()) + } + Patch::Insert { index, values, .. } => { + let index = *index as u32; + let length = string.length(); + let before = string.slice(0, index); + let after = string.slice(index, length); + let to_insert: String = values + .iter() + .map(|v| v.0.to_str().unwrap_or("\u{fffc}")) + .collect(); + Ok(before.concat(&to_insert.into()).concat(&after).into()) } Patch::SpliceText { index, value, .. } => { let index = *index as u32; let length = string.length(); let before = string.slice(0, index); let after = string.slice(index, length); - let bytes: Vec = value.iter().cloned().collect(); - let result = before - .concat(&String::from_utf16_lossy(bytes.as_slice()).into()) - .concat(&after); - Ok(result.into()) + Ok(before + .concat(&value.to_string().into()) + .concat(&after) + .into()) } _ => Ok(string.into()), } @@ -964,93 +741,66 @@ impl Automerge { num_del: usize, values: I, meta: &JsValue, - ) -> Result { + ) -> Result { let args: Array = values .into_iter() - .map(|v| self.maybe_wrap_object(alloc(&v.0, self.text_rep), &v.1, meta)) + .map(|v| self.maybe_wrap_object(alloc(&v.0), &v.1, meta)) .collect::>()?; args.unshift(&(num_del as u32).into()); args.unshift(&(index as u32).into()); - let method = js_get(&o, "splice")? - .0 - .dyn_into::() - .map_err(error::Export::GetSplice)?; - Reflect::apply(&method, &o, &args).map_err(error::Export::CallSplice)?; + let method = Reflect::get(&o, &"splice".into())?.dyn_into::()?; + Reflect::apply(&method, &o, &args)?; Ok(o.into()) } - pub(crate) fn import(&self, id: JsValue) -> Result<(ObjId, am::ObjType), error::ImportObj> { + pub(crate) fn import(&self, id: JsValue) -> Result { if let Some(s) = id.as_string() { - // valid formats are - // 123@aabbcc - // 123@aabccc/prop1/prop2/prop3 - // /prop1/prop2/prop3 - let mut components = s.split('/'); - let obj = components.next(); - let (id, obj_type) = if obj == Some("") { - (ROOT, am::ObjType::Map) + if let Some(post) = s.strip_prefix('/') { + let mut obj = ROOT; + let mut is_map = true; + let parts = post.split('/'); + for prop in parts { + if prop.is_empty() { + break; + } + let val = if is_map { + self.doc.get(obj, prop)? + } else { + self.doc.get(obj, am::Prop::Seq(prop.parse().unwrap()))? + }; + match val { + Some((am::Value::Object(ObjType::Map), id)) => { + is_map = true; + obj = id; + } + Some((am::Value::Object(ObjType::Table), id)) => { + is_map = true; + obj = id; + } + Some((am::Value::Object(_), id)) => { + is_map = false; + obj = id; + } + None => return Err(to_js_err(format!("invalid path '{}'", s))), + _ => return Err(to_js_err(format!("path '{}' is not an object", s))), + }; + } + Ok(obj) } else { - self.doc - .import(obj.unwrap_or_default()) - .map_err(error::ImportObj::BadImport)? - }; - self.import_path(id, obj_type, components) - .map_err(|e| error::ImportObj::InvalidPath(s.to_string(), e)) - } else { - Err(error::ImportObj::NotString) - } - } - - fn import_path<'a, I: Iterator>( - &self, - mut obj: ObjId, - mut obj_type: am::ObjType, - components: I, - ) -> Result<(ObjId, am::ObjType), error::ImportPath> { - for (i, prop) in components.enumerate() { - if prop.is_empty() { - break; + Ok(self.doc.import(&s)?) } - let is_map = matches!(obj_type, am::ObjType::Map | am::ObjType::Table); - let val = if is_map { - self.doc.get(obj, prop)? - } else { - let idx = prop - .parse() - .map_err(|_| error::ImportPath::IndexNotInteger(i, prop.to_string()))?; - self.doc.get(obj, am::Prop::Seq(idx))? - }; - match val { - Some((am::Value::Object(am::ObjType::Map), id)) => { - obj_type = am::ObjType::Map; - obj = id; - } - Some((am::Value::Object(am::ObjType::Table), id)) => { - obj_type = am::ObjType::Table; - obj = id; - } - Some((am::Value::Object(am::ObjType::List), id)) => { - obj_type = am::ObjType::List; - obj = id; - } - Some((am::Value::Object(am::ObjType::Text), id)) => { - obj_type = am::ObjType::Text; - obj = id; - } - None => return Err(error::ImportPath::NonExistentObject(i, prop.to_string())), - _ => return Err(error::ImportPath::NotAnObject), - }; + } else { + Err(to_js_err("invalid objid")) } - Ok((obj, obj_type)) } - pub(crate) fn import_prop(&self, prop: JsValue) -> Result { + pub(crate) fn import_prop(&self, prop: JsValue) -> Result { if let Some(s) = prop.as_string() { Ok(s.into()) } else if let Some(n) = prop.as_f64() { Ok((n as usize).into()) } else { - Err(error::InvalidProp) + Err(to_js_err(format!("invalid prop {:?}", prop))) } } @@ -1063,6 +813,7 @@ impl Automerge { Some("boolean") => value.as_bool().map(am::ScalarValue::Boolean), Some("int") => value.as_f64().map(|v| am::ScalarValue::Int(v as i64)), Some("uint") => value.as_f64().map(|v| am::ScalarValue::Uint(v as u64)), + // TODO: sym? Some("str") => value.as_string().map(|v| am::ScalarValue::Str(v.into())), Some("f64") => value.as_f64().map(am::ScalarValue::F64), Some("bytes") => Some(am::ScalarValue::Bytes( @@ -1108,21 +859,15 @@ impl Automerge { &self, value: &JsValue, datatype: Option, - ) -> Result<(Value<'static>, Vec<(Prop, JsValue)>), error::InvalidValue> { + ) -> Result<(Value<'static>, Vec<(Prop, JsValue)>), JsValue> { match self.import_scalar(value, &datatype) { Some(val) => Ok((val.into(), vec![])), None => { - if let Ok(js_obj) = import_obj(value, &datatype) { - Ok(( - js_obj.objtype().into(), - js_obj - .subvals() - .map(|(p, v)| (p.into_owned(), v)) - .collect::>(), - )) + if let Some((o, subvals)) = to_objtype(value, &None) { + Ok((o.into(), subvals)) } else { web_sys::console::log_2(&"Invalid value".into(), value); - Err(error::InvalidValue) + Err(to_js_err("invalid value")) } } } @@ -1133,24 +878,22 @@ impl Automerge { object: &JsValue, exposed: HashSet, meta: &JsValue, - ) -> Result<(), error::ApplyPatch> { + ) -> Result<(), JsValue> { for obj in exposed { let mut pointer = object.clone(); - if let Ok(obj_type) = self.doc.object_type(&obj) { - // only valid obj's should make it to this point ... - let path: Vec<_> = self - .doc - .path_to_object(&obj)? - .iter() - .map(|p| prop_to_js(&p.1)) - .collect(); - let value = self.export_object(&obj, obj_type.into(), None, meta)?; - for (i, prop) in path.iter().enumerate() { - if i + 1 < path.len() { - pointer = js_get(&pointer, prop)?.0; - } else { - js_set(&pointer, prop, &value)?; - } + let obj_type = self.doc.object_type(&obj).unwrap(); + let path: Vec<_> = self + .doc + .path_to_object(&obj)? + .iter() + .map(|p| prop_to_js(&p.1)) + .collect(); + let value = self.export_object(&obj, obj_type.into(), None, meta)?; + for (i, prop) in path.iter().enumerate() { + if i + 1 < path.len() { + pointer = Reflect::get(&pointer, prop)?; + } else { + Reflect::set(&pointer, prop, &value)?; } } } @@ -1158,16 +901,13 @@ impl Automerge { } } -pub(crate) fn alloc(value: &Value<'_>, text_rep: TextRepresentation) -> (Datatype, JsValue) { +pub(crate) fn alloc(value: &Value<'_>) -> (Datatype, JsValue) { match value { am::Value::Object(o) => match o { ObjType::Map => (Datatype::Map, Object::new().into()), ObjType::Table => (Datatype::Table, Object::new().into()), ObjType::List => (Datatype::List, Array::new().into()), - ObjType::Text => match text_rep { - TextRepresentation::String => (Datatype::Text, "".into()), - TextRepresentation::Array => (Datatype::Text, Array::new().into()), - }, + ObjType::Text => (Datatype::Text, "".into()), }, am::Value::Scalar(s) => match s.as_ref() { am::ScalarValue::Bytes(v) => (Datatype::Bytes, Uint8Array::from(v.as_slice()).into()), @@ -1190,17 +930,12 @@ pub(crate) fn alloc(value: &Value<'_>, text_rep: TextRepresentation) -> (Datatyp } } -fn set_hidden_value>( - o: &Object, - key: &Symbol, - value: V, -) -> Result<(), error::Export> { +fn set_hidden_value>(o: &Object, key: &Symbol, value: V) -> Result<(), JsValue> { let definition = Object::new(); - js_set(&definition, "value", &value.into()).map_err(|_| error::Export::SetHidden("value"))?; - js_set(&definition, "writable", false).map_err(|_| error::Export::SetHidden("writable"))?; - js_set(&definition, "enumerable", false).map_err(|_| error::Export::SetHidden("enumerable"))?; - js_set(&definition, "configurable", false) - .map_err(|_| error::Export::SetHidden("configurable"))?; + js_set(&definition, "value", &value.into())?; + js_set(&definition, "writable", false)?; + js_set(&definition, "enumerable", false)?; + js_set(&definition, "configurable", false)?; Object::define_property(o, &key.into(), &definition); Ok(()) } @@ -1219,260 +954,3 @@ fn prop_to_js(prop: &Prop) -> JsValue { Prop::Seq(index) => (*index as f64).into(), } } - -pub(crate) mod error { - use automerge::{AutomergeError, LoadChangeError}; - use wasm_bindgen::JsValue; - - #[derive(Debug, thiserror::Error)] - pub enum BadJSChanges { - #[error("the changes were not an array of Uint8Array")] - ChangesNotArray, - #[error("change {0} was not a Uint8Array")] - ElemNotUint8Array(usize), - #[error("error loading change {0}: {1}")] - BadChange(usize, LoadChangeError), - } - - #[derive(Debug, thiserror::Error)] - pub enum BadChangeHashes { - #[error("the change hashes were not an array of strings")] - NotArray, - #[error("could not decode hash {0}: {1}")] - BadElem(usize, BadChangeHash), - } - - impl From for JsValue { - fn from(e: BadChangeHashes) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum BadChangeHashSet { - #[error("not an object")] - NotObject, - #[error(transparent)] - GetProp(#[from] GetProp), - #[error("unable to getOwnProperties")] - ListProp, - #[error("unable to parse hash from {0:?}: {1}")] - BadHash(wasm_bindgen::JsValue, BadChangeHash), - } - - #[derive(Debug, thiserror::Error)] - pub enum BadChangeHash { - #[error("change hash was not a string")] - NotString, - #[error(transparent)] - Parse(#[from] automerge::ParseChangeHashError), - } - - impl From for JsValue { - fn from(e: BadChangeHash) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum BadSyncState { - #[error(transparent)] - GetProp(#[from] GetProp), - #[error("bad sharedHeads: {0}")] - BadSharedHeads(BadChangeHashes), - #[error("bad lastSentHeads: {0}")] - BadLastSentHeads(BadChangeHashes), - #[error("bad theirHeads: {0}")] - BadTheirHeads(BadChangeHashes), - #[error("bad theirNeed: {0}")] - BadTheirNeed(BadChangeHashes), - #[error("bad theirHave: {0}")] - BadTheirHave(BadHaves), - #[error("bad sentHashes: {0}")] - BadSentHashes(BadChangeHashSet), - #[error("inFlight not a boolean")] - InFlightNotBoolean, - } - - impl From for JsValue { - fn from(e: BadSyncState) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - #[error("unable to get property {property}: {error:?}")] - pub struct GetProp { - pub(super) property: String, - pub(super) error: wasm_bindgen::JsValue, - } - - impl From for JsValue { - fn from(e: GetProp) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - #[error("error setting property {property:?} on JS value: {error:?}")] - pub struct SetProp { - pub(super) property: JsValue, - pub(super) error: JsValue, - } - - impl From for JsValue { - fn from(e: SetProp) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum BadHave { - #[error("bad lastSync: {0}")] - BadLastSync(BadChangeHashes), - #[error("bad bloom: {0}")] - BadBloom(BadBloom), - #[error(transparent)] - GetHaveProp(#[from] GetProp), - } - - #[derive(Debug, thiserror::Error)] - pub enum BadHaves { - #[error("value was not an array")] - NotArray, - #[error("error loading have at index {0}: {1}")] - BadElem(usize, BadHave), - } - - #[derive(Debug, thiserror::Error)] - pub enum BadBloom { - #[error("the value was not a Uint8Array")] - NotU8Array, - #[error("unable to decode: {0}")] - Decode(#[from] automerge::sync::DecodeBloomError), - } - - #[derive(Debug, thiserror::Error)] - pub enum Export { - #[error(transparent)] - Set(#[from] SetProp), - #[error("unable to delete prop {prop}: {err:?}")] - Delete { prop: String, err: JsValue }, - #[error("unable to set hidden property {0}")] - SetHidden(&'static str), - #[error("data handler for type {0} did not return a valid object")] - InvalidDataHandler(String), - #[error("error calling data handler for type {0}: {1:?}")] - CallDataHandler(String, JsValue), - #[error(transparent)] - GetProp(#[from] GetProp), - #[error(transparent)] - InvalidDatatype(#[from] crate::value::InvalidDatatype), - #[error("unable to get the splice function: {0:?}")] - GetSplice(JsValue), - #[error("error calling splice: {0:?}")] - CallSplice(JsValue), - #[error(transparent)] - Automerge(#[from] AutomergeError), - } - - impl From for JsValue { - fn from(e: Export) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ApplyPatch { - #[error(transparent)] - Export(#[from] Export), - #[error("cannot delete from a seq")] - DeleteKeyFromSeq, - #[error("cannot put key in seq")] - PutKeyInSeq, - #[error("cannot increment a non-numeric value")] - IncrementNonNumeric, - #[error("cannot increment a key in a seq")] - IncrementKeyInSeq, - #[error("cannot increment index in a map")] - IncrementIndexInMap, - #[error("cannot insert into a map")] - InsertInMap, - #[error("cannot splice into a map")] - SpliceInMap, - #[error("cannot splice text into a seq")] - SpliceTextInSeq, - #[error("cannot splice text into a map")] - SpliceTextInMap, - #[error("cannot put a seq index in a map")] - PutIdxInMap, - #[error(transparent)] - GetProp(#[from] GetProp), - #[error(transparent)] - SetProp(#[from] SetProp), - #[error(transparent)] - Automerge(#[from] AutomergeError), - } - - impl From for JsValue { - fn from(e: ApplyPatch) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum BadSyncMessage { - #[error(transparent)] - GetProp(#[from] GetProp), - #[error("unable to read haves: {0}")] - BadHaves(#[from] BadHaves), - #[error("could not read changes: {0}")] - BadJSChanges(#[from] BadJSChanges), - #[error("could not read heads: {0}")] - BadHeads(BadChangeHashes), - #[error("could not read need: {0}")] - BadNeed(BadChangeHashes), - } - - impl From for JsValue { - fn from(e: BadSyncMessage) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ImportObj { - #[error("obj id was not a string")] - NotString, - #[error("invalid path {0}: {1}")] - InvalidPath(String, ImportPath), - #[error("unable to import object id: {0}")] - BadImport(AutomergeError), - } - - impl From for JsValue { - fn from(e: ImportObj) -> Self { - JsValue::from(format!("invalid object ID: {}", e)) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ImportPath { - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error("path component {0} ({1}) should be an integer to index a sequence")] - IndexNotInteger(usize, String), - #[error("path component {0} ({1}) referenced a nonexistent object")] - NonExistentObject(usize, String), - #[error("path did not refer to an object")] - NotAnObject, - } - - #[derive(Debug, thiserror::Error)] - #[error("given property was not a string or integer")] - pub struct InvalidProp; - - #[derive(Debug, thiserror::Error)] - #[error("given property was not a string or integer")] - pub struct InvalidValue; -} diff --git a/rust/automerge-wasm/src/lib.rs b/rust/automerge-wasm/src/lib.rs index 09072ca7..8428faee 100644 --- a/rust/automerge-wasm/src/lib.rs +++ b/rust/automerge-wasm/src/lib.rs @@ -9,6 +9,7 @@ rust_2018_idioms, unreachable_pub, bad_style, + const_err, dead_code, improper_ctypes, non_shorthand_field_patterns, @@ -27,12 +28,10 @@ #![allow(clippy::unused_unit)] use am::transaction::CommitOptions; use am::transaction::{Observed, Transactable, UnObserved}; -use am::ScalarValue; use automerge as am; -use automerge::{sync::SyncDoc, Change, ObjId, Prop, ReadDoc, TextEncoding, Value, ROOT}; +use automerge::{Change, ObjId, Prop, Value, ROOT}; use js_sys::{Array, Function, Object, Uint8Array}; use serde::ser::Serialize; -use std::borrow::Cow; use std::collections::HashMap; use std::collections::HashSet; use std::convert::TryInto; @@ -41,18 +40,15 @@ use wasm_bindgen::JsCast; mod interop; mod observer; -mod sequence_tree; mod sync; mod value; use observer::Observer; -use interop::{alloc, get_heads, import_obj, js_set, to_js_err, to_prop, AR, JS}; +use interop::{alloc, get_heads, js_get, js_set, to_js_err, to_objtype, to_prop, AR, JS}; use sync::SyncState; use value::Datatype; -use crate::interop::SubValIter; - #[allow(unused_macros)] macro_rules! log { ( $( $t:tt )* ) => { @@ -66,70 +62,44 @@ type AutoCommit = am::AutoCommitWithObs>; #[global_allocator] static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT; -/// How text is represented in materialized objects on the JS side -#[derive(Debug, Eq, PartialEq, Clone, Copy)] -#[wasm_bindgen] -pub enum TextRepresentation { - /// As an array of characters and objects - Array, - /// As a single JS string - String, -} - -impl std::default::Default for TextRepresentation { - fn default() -> Self { - TextRepresentation::Array - } -} - #[wasm_bindgen] #[derive(Debug)] pub struct Automerge { doc: AutoCommit, freeze: bool, external_types: HashMap, - text_rep: TextRepresentation, } #[wasm_bindgen] impl Automerge { - pub fn new( - actor: Option, - text_rep: TextRepresentation, - ) -> Result { - let mut doc = AutoCommit::default().with_encoding(TextEncoding::Utf16); + pub fn new(actor: Option) -> Result { + let mut doc = AutoCommit::default(); if let Some(a) = actor { - let a = automerge::ActorId::from(hex::decode(a)?.to_vec()); + let a = automerge::ActorId::from(hex::decode(a).map_err(to_js_err)?.to_vec()); doc.set_actor(a); } Ok(Automerge { doc, freeze: false, external_types: HashMap::default(), - text_rep, }) } #[allow(clippy::should_implement_trait)] - pub fn clone(&mut self, actor: Option) -> Result { + pub fn clone(&mut self, actor: Option) -> Result { let mut automerge = Automerge { doc: self.doc.clone(), freeze: self.freeze, external_types: self.external_types.clone(), - text_rep: self.text_rep, }; if let Some(s) = actor { - let actor = automerge::ActorId::from(hex::decode(s)?.to_vec()); + let actor = automerge::ActorId::from(hex::decode(s).map_err(to_js_err)?.to_vec()); automerge.doc.set_actor(actor); } Ok(automerge) } - pub fn fork( - &mut self, - actor: Option, - heads: JsValue, - ) -> Result { + pub fn fork(&mut self, actor: Option, heads: JsValue) -> Result { let heads: Result, _> = JS(heads).try_into(); let doc = if let Ok(heads) = heads { self.doc.fork_at(&heads)? @@ -140,11 +110,9 @@ impl Automerge { doc, freeze: self.freeze, external_types: self.external_types.clone(), - text_rep: self.text_rep, }; if let Some(s) = actor { - let actor = - automerge::ActorId::from(hex::decode(s).map_err(error::BadActorId::from)?.to_vec()); + let actor = automerge::ActorId::from(hex::decode(s).map_err(to_js_err)?.to_vec()); automerge.doc.set_actor(actor); } Ok(automerge) @@ -164,13 +132,10 @@ impl Automerge { commit_opts.set_time(time as i64); } let hash = self.doc.commit_with(commit_opts); - match hash { - Some(h) => JsValue::from_str(&hex::encode(h.0)), - None => JsValue::NULL, - } + JsValue::from_str(&hex::encode(hash.0)) } - pub fn merge(&mut self, other: &mut Automerge) -> Result { + pub fn merge(&mut self, other: &mut Automerge) -> Result { let heads = self.doc.merge(&mut other.doc)?; let heads: Array = heads .iter() @@ -183,9 +148,9 @@ impl Automerge { self.doc.rollback() as f64 } - pub fn keys(&self, obj: JsValue, heads: Option) -> Result { - let (obj, _) = self.import(obj)?; - let result = if let Some(heads) = get_heads(heads)? { + pub fn keys(&self, obj: JsValue, heads: Option) -> Result { + let obj = self.import(obj)?; + let result = if let Some(heads) = get_heads(heads) { self.doc .keys_at(&obj, &heads) .map(|s| JsValue::from_str(&s)) @@ -196,9 +161,9 @@ impl Automerge { Ok(result) } - pub fn text(&self, obj: JsValue, heads: Option) -> Result { - let (obj, _) = self.import(obj)?; - if let Some(heads) = get_heads(heads)? { + pub fn text(&self, obj: JsValue, heads: Option) -> Result { + let obj = self.import(obj)?; + if let Some(heads) = get_heads(heads) { Ok(self.doc.text_at(&obj, &heads)?) } else { Ok(self.doc.text(&obj)?) @@ -211,92 +176,55 @@ impl Automerge { start: f64, delete_count: f64, text: JsValue, - ) -> Result<(), error::Splice> { - let (obj, obj_type) = self.import(obj)?; + ) -> Result<(), JsValue> { + let obj = self.import(obj)?; let start = start as usize; let delete_count = delete_count as usize; - let vals = if let Some(t) = text.as_string() { - if obj_type == am::ObjType::Text && self.text_rep == TextRepresentation::String { - self.doc.splice_text(&obj, start, delete_count, &t)?; - return Ok(()); - } else { - t.chars() - .map(|c| ScalarValue::Str(c.to_string().into())) - .collect::>() - } + let mut vals = vec![]; + if let Some(t) = text.as_string() { + self.doc.splice_text(&obj, start, delete_count, &t)?; } else { - let mut vals = vec![]; if let Ok(array) = text.dyn_into::() { - for (index, i) in array.iter().enumerate() { + for i in array.iter() { let value = self .import_scalar(&i, &None) - .ok_or(error::Splice::ValueNotPrimitive(index))?; + .ok_or_else(|| to_js_err("expected scalar"))?; vals.push(value); } } - vals - }; - if !vals.is_empty() { - self.doc.splice(&obj, start, delete_count, vals)?; - } else { - // no vals given but we still need to call the text vs splice - // bc utf16 - match obj_type { - am::ObjType::List => { - self.doc.splice(&obj, start, delete_count, vals)?; + if !vals.is_empty() { + self.doc.splice(&obj, start, delete_count, vals)?; + } else { + for _ in 0..delete_count { + self.doc.delete(&obj, start)?; } - am::ObjType::Text => match self.text_rep { - TextRepresentation::String => { - self.doc.splice_text(&obj, start, delete_count, "")?; - } - TextRepresentation::Array => { - self.doc.splice(&obj, start, delete_count, vals)?; - } - }, - _ => {} } } Ok(()) } - pub fn push( - &mut self, - obj: JsValue, - value: JsValue, - datatype: JsValue, - ) -> Result<(), error::Insert> { - let (obj, _) = self.import(obj)?; + pub fn push(&mut self, obj: JsValue, value: JsValue, datatype: JsValue) -> Result<(), JsValue> { + let obj = self.import(obj)?; let value = self .import_scalar(&value, &datatype.as_string()) - .ok_or(error::Insert::ValueNotPrimitive)?; + .ok_or_else(|| to_js_err("invalid scalar value"))?; let index = self.doc.length(&obj); self.doc.insert(&obj, index, value)?; Ok(()) } #[wasm_bindgen(js_name = pushObject)] - pub fn push_object( - &mut self, - obj: JsValue, - value: JsValue, - ) -> Result, error::InsertObject> { - let (obj, _) = self.import(obj)?; - let imported_obj = import_obj(&value, &None)?; + pub fn push_object(&mut self, obj: JsValue, value: JsValue) -> Result, JsValue> { + let obj = self.import(obj)?; + let (objtype, subvals) = + to_objtype(&value, &None).ok_or_else(|| to_js_err("expected object"))?; let index = self.doc.length(&obj); - let opid = self - .doc - .insert_object(&obj, index, imported_obj.objtype())?; - if let Some(s) = imported_obj.text() { - match self.text_rep { - TextRepresentation::String => { - self.doc.splice_text(&opid, 0, 0, s)?; - } - TextRepresentation::Array => { - self.subset::(&opid, imported_obj.subvals())?; - } - } + let opid = self.doc.insert_object(&obj, index, objtype)?; + if objtype == am::ObjType::Text { + self.doc + .splice_text(&opid, 0, 0, &value.as_string().unwrap_or_default())?; } else { - self.subset::(&opid, imported_obj.subvals())?; + self.subset(&opid, subvals)?; } Ok(opid.to_string().into()) } @@ -307,11 +235,12 @@ impl Automerge { index: f64, value: JsValue, datatype: JsValue, - ) -> Result<(), error::Insert> { - let (obj, _) = self.import(obj)?; + ) -> Result<(), JsValue> { + let obj = self.import(obj)?; + let index = index as f64; let value = self .import_scalar(&value, &datatype.as_string()) - .ok_or(error::Insert::ValueNotPrimitive)?; + .ok_or_else(|| to_js_err("expected scalar value"))?; self.doc.insert(&obj, index as usize, value)?; Ok(()) } @@ -322,23 +251,17 @@ impl Automerge { obj: JsValue, index: f64, value: JsValue, - ) -> Result, error::InsertObject> { - let (obj, _) = self.import(obj)?; - let imported_obj = import_obj(&value, &None)?; - let opid = self - .doc - .insert_object(&obj, index as usize, imported_obj.objtype())?; - if let Some(s) = imported_obj.text() { - match self.text_rep { - TextRepresentation::String => { - self.doc.splice_text(&opid, 0, 0, s)?; - } - TextRepresentation::Array => { - self.subset::(&opid, imported_obj.subvals())?; - } - } + ) -> Result, JsValue> { + let obj = self.import(obj)?; + let index = index as f64; + let (objtype, subvals) = + to_objtype(&value, &None).ok_or_else(|| to_js_err("expected object"))?; + let opid = self.doc.insert_object(&obj, index as usize, objtype)?; + if objtype == am::ObjType::Text { + self.doc + .splice_text(&opid, 0, 0, &value.as_string().unwrap_or_default())?; } else { - self.subset::(&opid, imported_obj.subvals())?; + self.subset(&opid, subvals)?; } Ok(opid.to_string().into()) } @@ -349,12 +272,12 @@ impl Automerge { prop: JsValue, value: JsValue, datatype: JsValue, - ) -> Result<(), error::Insert> { - let (obj, _) = self.import(obj)?; + ) -> Result<(), JsValue> { + let obj = self.import(obj)?; let prop = self.import_prop(prop)?; let value = self .import_scalar(&value, &datatype.as_string()) - .ok_or(error::Insert::ValueNotPrimitive)?; + .ok_or_else(|| to_js_err("expected scalar value"))?; self.doc.put(&obj, prop, value)?; Ok(()) } @@ -365,37 +288,26 @@ impl Automerge { obj: JsValue, prop: JsValue, value: JsValue, - ) -> Result { - let (obj, _) = self.import(obj)?; + ) -> Result { + let obj = self.import(obj)?; let prop = self.import_prop(prop)?; - let imported_obj = import_obj(&value, &None)?; - let opid = self.doc.put_object(&obj, prop, imported_obj.objtype())?; - if let Some(s) = imported_obj.text() { - match self.text_rep { - TextRepresentation::String => { - self.doc.splice_text(&opid, 0, 0, s)?; - } - TextRepresentation::Array => { - self.subset::(&opid, imported_obj.subvals())?; - } - } + let (objtype, subvals) = + to_objtype(&value, &None).ok_or_else(|| to_js_err("expected object"))?; + let opid = self.doc.put_object(&obj, prop, objtype)?; + if objtype == am::ObjType::Text { + self.doc + .splice_text(&opid, 0, 0, &value.as_string().unwrap_or_default())?; } else { - self.subset::(&opid, imported_obj.subvals())?; + self.subset(&opid, subvals)?; } Ok(opid.to_string().into()) } - fn subset<'a, E, I>(&mut self, obj: &am::ObjId, vals: I) -> Result<(), E> - where - I: IntoIterator, JsValue)>, - E: From - + From - + From, - { + fn subset(&mut self, obj: &am::ObjId, vals: Vec<(am::Prop, JsValue)>) -> Result<(), JsValue> { for (p, v) in vals { - let (value, subvals) = self.import_value(v.as_ref(), None)?; + let (value, subvals) = self.import_value(&v, None)?; //let opid = self.0.set(id, p, value)?; - let opid = match (p.as_ref(), value) { + let opid = match (p, value) { (Prop::Map(s), Value::Object(objtype)) => { Some(self.doc.put_object(obj, s, objtype)?) } @@ -404,15 +316,15 @@ impl Automerge { None } (Prop::Seq(i), Value::Object(objtype)) => { - Some(self.doc.insert_object(obj, *i, objtype)?) + Some(self.doc.insert_object(obj, i, objtype)?) } (Prop::Seq(i), Value::Scalar(scalar)) => { - self.doc.insert(obj, *i, scalar.into_owned())?; + self.doc.insert(obj, i, scalar.into_owned())?; None } }; if let Some(opid) = opid { - self.subset::(&opid, SubValIter::Slice(subvals.as_slice().iter()))?; + self.subset(&opid, subvals)?; } } Ok(()) @@ -423,10 +335,12 @@ impl Automerge { obj: JsValue, prop: JsValue, value: JsValue, - ) -> Result<(), error::Increment> { - let (obj, _) = self.import(obj)?; + ) -> Result<(), JsValue> { + let obj = self.import(obj)?; let prop = self.import_prop(prop)?; - let value: f64 = value.as_f64().ok_or(error::Increment::ValueNotNumeric)?; + let value: f64 = value + .as_f64() + .ok_or_else(|| to_js_err("increment needs a numeric value"))?; self.doc.increment(&obj, prop, value as i64)?; Ok(()) } @@ -437,10 +351,10 @@ impl Automerge { obj: JsValue, prop: JsValue, heads: Option, - ) -> Result { - let (obj, _) = self.import(obj)?; + ) -> Result { + let obj = self.import(obj)?; let prop = to_prop(prop); - let heads = get_heads(heads)?; + let heads = get_heads(heads); if let Ok(prop) = prop { let value = if let Some(h) = heads { self.doc.get_at(&obj, prop, &h)? @@ -448,7 +362,7 @@ impl Automerge { self.doc.get(&obj, prop)? }; if let Some((value, id)) = value { - match alloc(&value, self.text_rep) { + match alloc(&value) { (datatype, js_value) if datatype.is_scalar() => Ok(js_value), _ => Ok(id.to_string().into()), } @@ -466,10 +380,10 @@ impl Automerge { obj: JsValue, prop: JsValue, heads: Option, - ) -> Result { - let (obj, _) = self.import(obj)?; + ) -> Result { + let obj = self.import(obj)?; let prop = to_prop(prop); - let heads = get_heads(heads)?; + let heads = get_heads(heads); if let Ok(prop) = prop { let value = if let Some(h) = heads { self.doc.get_at(&obj, prop, &h)? @@ -486,7 +400,7 @@ impl Automerge { } (Value::Scalar(_), _) => { let result = Array::new(); - let (datatype, value) = alloc(&value.0, self.text_rep); + let (datatype, value) = alloc(&value.0); result.push(&datatype.into()); result.push(&value); Ok(result.into()) @@ -506,19 +420,20 @@ impl Automerge { obj: JsValue, arg: JsValue, heads: Option, - ) -> Result { - let (obj, _) = self.import(obj)?; + ) -> Result { + let obj = self.import(obj)?; let result = Array::new(); let prop = to_prop(arg); if let Ok(prop) = prop { - let values = if let Some(heads) = get_heads(heads)? { + let values = if let Some(heads) = get_heads(heads) { self.doc.get_all_at(&obj, prop, &heads) } else { self.doc.get_all(&obj, prop) - }?; + } + .map_err(to_js_err)?; for (value, id) in values { let sub = Array::new(); - let (datatype, js_value) = alloc(&value, self.text_rep); + let (datatype, js_value) = alloc(&value); sub.push(&datatype.into()); if value.is_scalar() { sub.push(&js_value); @@ -546,7 +461,6 @@ impl Automerge { .as_bool() .ok_or_else(|| to_js_err("must pass a bool to enablePatches"))?; let old_enabled = self.doc.observer().enable(enable); - self.doc.observer().set_text_rep(self.text_rep); Ok(old_enabled.into()) } @@ -555,7 +469,7 @@ impl Automerge { &mut self, datatype: JsValue, function: JsValue, - ) -> Result<(), value::InvalidDatatype> { + ) -> Result<(), JsValue> { let datatype = Datatype::try_from(datatype)?; if let Ok(function) = function.dyn_into::() { self.external_types.insert(datatype, function); @@ -571,10 +485,8 @@ impl Automerge { object: JsValue, meta: JsValue, callback: JsValue, - ) -> Result { - let mut object = object - .dyn_into::() - .map_err(|_| error::ApplyPatch::NotObjectd)?; + ) -> Result { + let mut object = object.dyn_into::()?; let patches = self.doc.observer().take_patches(); let callback = callback.dyn_into::().ok(); @@ -598,10 +510,9 @@ impl Automerge { if !patches.is_empty() { let patches: Array = patches .into_iter() - .map(JsValue::try_from) + .map(|p| JsValue::try_from(p)) .collect::>()?; - c.call3(&JsValue::undefined(), &patches.into(), &before, &object) - .map_err(error::ApplyPatch::PatchCallback)?; + c.call3(&JsValue::undefined(), &patches.into(), &before, &object)?; } } @@ -611,7 +522,7 @@ impl Automerge { } #[wasm_bindgen(js_name = popPatches)] - pub fn pop_patches(&mut self) -> Result { + pub fn pop_patches(&mut self) -> Result { // transactions send out observer updates as they occur, not waiting for them to be // committed. // If we pop the patches then we won't be able to revert them. @@ -624,19 +535,19 @@ impl Automerge { Ok(result) } - pub fn length(&self, obj: JsValue, heads: Option) -> Result { - let (obj, _) = self.import(obj)?; - if let Some(heads) = get_heads(heads)? { + pub fn length(&self, obj: JsValue, heads: Option) -> Result { + let obj = self.import(obj)?; + if let Some(heads) = get_heads(heads) { Ok(self.doc.length_at(&obj, &heads) as f64) } else { Ok(self.doc.length(&obj) as f64) } } - pub fn delete(&mut self, obj: JsValue, prop: JsValue) -> Result<(), error::Get> { - let (obj, _) = self.import(obj)?; + pub fn delete(&mut self, obj: JsValue, prop: JsValue) -> Result<(), JsValue> { + let obj = self.import(obj)?; let prop = to_prop(prop)?; - self.doc.delete(&obj, prop)?; + self.doc.delete(&obj, prop).map_err(to_js_err)?; Ok(()) } @@ -651,21 +562,21 @@ impl Automerge { } #[wasm_bindgen(js_name = loadIncremental)] - pub fn load_incremental(&mut self, data: Uint8Array) -> Result { + pub fn load_incremental(&mut self, data: Uint8Array) -> Result { let data = data.to_vec(); - let len = self.doc.load_incremental(&data)?; + let len = self.doc.load_incremental(&data).map_err(to_js_err)?; Ok(len as f64) } #[wasm_bindgen(js_name = applyChanges)] - pub fn apply_changes(&mut self, changes: JsValue) -> Result<(), error::ApplyChangesError> { + pub fn apply_changes(&mut self, changes: JsValue) -> Result<(), JsValue> { let changes: Vec<_> = JS(changes).try_into()?; - self.doc.apply_changes(changes)?; + self.doc.apply_changes(changes).map_err(to_js_err)?; Ok(()) } #[wasm_bindgen(js_name = getChanges)] - pub fn get_changes(&mut self, have_deps: JsValue) -> Result { + pub fn get_changes(&mut self, have_deps: JsValue) -> Result { let deps: Vec<_> = JS(have_deps).try_into()?; let changes = self.doc.get_changes(&deps)?; let changes: Array = changes @@ -676,11 +587,8 @@ impl Automerge { } #[wasm_bindgen(js_name = getChangeByHash)] - pub fn get_change_by_hash( - &mut self, - hash: JsValue, - ) -> Result { - let hash = JS(hash).try_into()?; + pub fn get_change_by_hash(&mut self, hash: JsValue) -> Result { + let hash = serde_wasm_bindgen::from_value(hash).map_err(to_js_err)?; let change = self.doc.get_change_by_hash(&hash); if let Some(c) = change { Ok(Uint8Array::from(c.raw_bytes()).into()) @@ -690,13 +598,13 @@ impl Automerge { } #[wasm_bindgen(js_name = getChangesAdded)] - pub fn get_changes_added(&mut self, other: &mut Automerge) -> Array { + pub fn get_changes_added(&mut self, other: &mut Automerge) -> Result { let changes = self.doc.get_changes_added(&mut other.doc); let changes: Array = changes .iter() .map(|c| Uint8Array::from(c.raw_bytes())) .collect(); - changes + Ok(changes) } #[wasm_bindgen(js_name = getHeads)] @@ -716,11 +624,11 @@ impl Automerge { } #[wasm_bindgen(js_name = getLastLocalChange)] - pub fn get_last_local_change(&mut self) -> JsValue { + pub fn get_last_local_change(&mut self) -> Result { if let Some(change) = self.doc.get_last_local_change() { - Uint8Array::from(change.raw_bytes()).into() + Ok(Uint8Array::from(change.raw_bytes()).into()) } else { - JsValue::null() + Ok(JsValue::null()) } } @@ -729,8 +637,8 @@ impl Automerge { } #[wasm_bindgen(js_name = getMissingDeps)] - pub fn get_missing_deps(&mut self, heads: Option) -> Result { - let heads = get_heads(heads)?.unwrap_or_default(); + pub fn get_missing_deps(&mut self, heads: Option) -> Result { + let heads = get_heads(heads).unwrap_or_default(); let deps = self.doc.get_missing_deps(&heads); let deps: Array = deps .iter() @@ -744,26 +652,26 @@ impl Automerge { &mut self, state: &mut SyncState, message: Uint8Array, - ) -> Result<(), error::ReceiveSyncMessage> { + ) -> Result<(), JsValue> { let message = message.to_vec(); - let message = am::sync::Message::decode(message.as_slice())?; + let message = am::sync::Message::decode(message.as_slice()).map_err(to_js_err)?; self.doc - .sync() - .receive_sync_message(&mut state.0, message)?; + .receive_sync_message(&mut state.0, message) + .map_err(to_js_err)?; Ok(()) } #[wasm_bindgen(js_name = generateSyncMessage)] - pub fn generate_sync_message(&mut self, state: &mut SyncState) -> JsValue { - if let Some(message) = self.doc.sync().generate_sync_message(&mut state.0) { - Uint8Array::from(message.encode().as_slice()).into() + pub fn generate_sync_message(&mut self, state: &mut SyncState) -> Result { + if let Some(message) = self.doc.generate_sync_message(&mut state.0) { + Ok(Uint8Array::from(message.encode().as_slice()).into()) } else { - JsValue::null() + Ok(JsValue::null()) } } #[wasm_bindgen(js_name = toJS)] - pub fn to_js(&mut self, meta: JsValue) -> Result { + pub fn to_js(&mut self, meta: JsValue) -> Result { self.export_object(&ROOT, Datatype::Map, None, &meta) } @@ -772,78 +680,58 @@ impl Automerge { obj: JsValue, heads: Option, meta: JsValue, - ) -> Result { - let (obj, obj_type) = self.import(obj).unwrap_or((ROOT, am::ObjType::Map)); - let heads = get_heads(heads)?; + ) -> Result { + let obj = self.import(obj).unwrap_or(ROOT); + let heads = get_heads(heads); + let obj_type = self + .doc + .object_type(&obj) + .ok_or_else(|| to_js_err(format!("invalid obj {}", obj)))?; let _patches = self.doc.observer().take_patches(); // throw away patches - Ok(self.export_object(&obj, obj_type.into(), heads.as_ref(), &meta)?) - } - - #[wasm_bindgen(js_name = emptyChange)] - pub fn empty_change(&mut self, message: Option, time: Option) -> JsValue { - let time = time.map(|f| f as i64); - let options = CommitOptions { message, time }; - let hash = self.doc.empty_change(options); - JsValue::from_str(&hex::encode(hash)) + self.export_object(&obj, obj_type.into(), heads.as_ref(), &meta) } } #[wasm_bindgen(js_name = create)] -pub fn init(text_v2: bool, actor: Option) -> Result { +pub fn init(actor: Option) -> Result { console_error_panic_hook::set_once(); - let text_rep = if text_v2 { - TextRepresentation::String - } else { - TextRepresentation::Array - }; - Automerge::new(actor, text_rep) + Automerge::new(actor) } #[wasm_bindgen(js_name = load)] -pub fn load( - data: Uint8Array, - text_v2: bool, - actor: Option, -) -> Result { +pub fn load(data: Uint8Array, actor: Option) -> Result { let data = data.to_vec(); - let text_rep = if text_v2 { - TextRepresentation::String - } else { - TextRepresentation::Array - }; - let mut doc = am::AutoCommitWithObs::::load(&data)? - .with_observer(Observer::default().with_text_rep(text_rep)) - .with_encoding(TextEncoding::Utf16); + let mut doc = am::AutoCommitWithObs::::load(&data) + .map_err(to_js_err)? + .with_observer(Observer::default()); if let Some(s) = actor { - let actor = - automerge::ActorId::from(hex::decode(s).map_err(error::BadActorId::from)?.to_vec()); + let actor = automerge::ActorId::from(hex::decode(s).map_err(to_js_err)?.to_vec()); doc.set_actor(actor); } Ok(Automerge { doc, freeze: false, external_types: HashMap::default(), - text_rep, }) } #[wasm_bindgen(js_name = encodeChange)] -pub fn encode_change(change: JsValue) -> Result { +pub fn encode_change(change: JsValue) -> Result { // Alex: Technically we should be using serde_wasm_bindgen::from_value instead of into_serde. // Unfortunately serde_wasm_bindgen::from_value fails for some inscrutable reason, so instead // we use into_serde (sorry to future me). #[allow(deprecated)] - let change: am::ExpandedChange = change.into_serde()?; + let change: am::ExpandedChange = change.into_serde().map_err(to_js_err)?; let change: Change = change.into(); Ok(Uint8Array::from(change.raw_bytes())) } #[wasm_bindgen(js_name = decodeChange)] -pub fn decode_change(change: Uint8Array) -> Result { - let change = Change::from_bytes(change.to_vec())?; +pub fn decode_change(change: Uint8Array) -> Result { + let change = Change::from_bytes(change.to_vec()).map_err(to_js_err)?; let change: am::ExpandedChange = change.decode(); let serializer = serde_wasm_bindgen::Serializer::json_compatible(); - Ok(change.serialize(&serializer)?) + change.serialize(&serializer).map_err(to_js_err) } #[wasm_bindgen(js_name = initSyncState)] @@ -853,7 +741,7 @@ pub fn init_sync_state() -> SyncState { // this is needed to be compatible with the automerge-js api #[wasm_bindgen(js_name = importSyncState)] -pub fn import_sync_state(state: JsValue) -> Result { +pub fn import_sync_state(state: JsValue) -> Result { Ok(SyncState(JS(state).try_into()?)) } @@ -864,292 +752,46 @@ pub fn export_sync_state(state: &SyncState) -> JsValue { } #[wasm_bindgen(js_name = encodeSyncMessage)] -pub fn encode_sync_message(message: JsValue) -> Result { - let message: am::sync::Message = JS(message).try_into()?; - Ok(Uint8Array::from(message.encode().as_slice())) +pub fn encode_sync_message(message: JsValue) -> Result { + let heads = js_get(&message, "heads")?.try_into()?; + let need = js_get(&message, "need")?.try_into()?; + let changes = js_get(&message, "changes")?.try_into()?; + let have = js_get(&message, "have")?.try_into()?; + Ok(Uint8Array::from( + am::sync::Message { + heads, + need, + have, + changes, + } + .encode() + .as_slice(), + )) } #[wasm_bindgen(js_name = decodeSyncMessage)] -pub fn decode_sync_message(msg: Uint8Array) -> Result { +pub fn decode_sync_message(msg: Uint8Array) -> Result { let data = msg.to_vec(); - let msg = am::sync::Message::decode(&data)?; + let msg = am::sync::Message::decode(&data).map_err(to_js_err)?; let heads = AR::from(msg.heads.as_slice()); let need = AR::from(msg.need.as_slice()); let changes = AR::from(msg.changes.as_slice()); let have = AR::from(msg.have.as_slice()); let obj = Object::new().into(); - // SAFETY: we just created this object - js_set(&obj, "heads", heads).unwrap(); - js_set(&obj, "need", need).unwrap(); - js_set(&obj, "have", have).unwrap(); - js_set(&obj, "changes", changes).unwrap(); + js_set(&obj, "heads", heads)?; + js_set(&obj, "need", need)?; + js_set(&obj, "have", have)?; + js_set(&obj, "changes", changes)?; Ok(obj) } #[wasm_bindgen(js_name = encodeSyncState)] -pub fn encode_sync_state(state: &SyncState) -> Uint8Array { - Uint8Array::from(state.0.encode().as_slice()) +pub fn encode_sync_state(state: &SyncState) -> Result { + //let state = state.0.clone(); + Ok(Uint8Array::from(state.0.encode().as_slice())) } #[wasm_bindgen(js_name = decodeSyncState)] -pub fn decode_sync_state(data: Uint8Array) -> Result { +pub fn decode_sync_state(data: Uint8Array) -> Result { SyncState::decode(data) } - -pub mod error { - use automerge::AutomergeError; - use wasm_bindgen::JsValue; - - use crate::interop::{ - self, - error::{BadChangeHashes, BadJSChanges}, - }; - - #[derive(Debug, thiserror::Error)] - #[error("could not parse Actor ID as a hex string: {0}")] - pub struct BadActorId(#[from] hex::FromHexError); - - impl From for JsValue { - fn from(s: BadActorId) -> Self { - JsValue::from(s.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ApplyChangesError { - #[error(transparent)] - DecodeChanges(#[from] BadJSChanges), - #[error("error applying changes: {0}")] - Apply(#[from] AutomergeError), - } - - impl From for JsValue { - fn from(e: ApplyChangesError) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Fork { - #[error(transparent)] - BadActor(#[from] BadActorId), - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error(transparent)] - BadChangeHashes(#[from] BadChangeHashes), - } - - impl From for JsValue { - fn from(f: Fork) -> Self { - JsValue::from(f.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - #[error(transparent)] - pub struct Merge(#[from] AutomergeError); - - impl From for JsValue { - fn from(e: Merge) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Get { - #[error("invalid object ID: {0}")] - ImportObj(#[from] interop::error::ImportObj), - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error("bad heads: {0}")] - BadHeads(#[from] interop::error::BadChangeHashes), - #[error(transparent)] - InvalidProp(#[from] interop::error::InvalidProp), - } - - impl From for JsValue { - fn from(e: Get) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Splice { - #[error("invalid object ID: {0}")] - ImportObj(#[from] interop::error::ImportObj), - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error("value at {0} in values to insert was not a primitive")] - ValueNotPrimitive(usize), - } - - impl From for JsValue { - fn from(e: Splice) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Insert { - #[error("invalid object id: {0}")] - ImportObj(#[from] interop::error::ImportObj), - #[error("the value to insert was not a primitive")] - ValueNotPrimitive, - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error(transparent)] - InvalidProp(#[from] interop::error::InvalidProp), - #[error(transparent)] - InvalidValue(#[from] interop::error::InvalidValue), - } - - impl From for JsValue { - fn from(e: Insert) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum InsertObject { - #[error("invalid object id: {0}")] - ImportObj(#[from] interop::error::ImportObj), - #[error("the value to insert must be an object")] - ValueNotObject, - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error(transparent)] - InvalidProp(#[from] interop::error::InvalidProp), - #[error(transparent)] - InvalidValue(#[from] interop::error::InvalidValue), - } - - impl From for JsValue { - fn from(e: InsertObject) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Increment { - #[error("invalid object id: {0}")] - ImportObj(#[from] interop::error::ImportObj), - #[error(transparent)] - InvalidProp(#[from] interop::error::InvalidProp), - #[error("value was not numeric")] - ValueNotNumeric, - #[error(transparent)] - Automerge(#[from] AutomergeError), - } - - impl From for JsValue { - fn from(e: Increment) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum BadSyncMessage { - #[error("could not decode sync message: {0}")] - ReadMessage(#[from] automerge::sync::ReadMessageError), - } - - impl From for JsValue { - fn from(e: BadSyncMessage) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ApplyPatch { - #[error(transparent)] - Interop(#[from] interop::error::ApplyPatch), - #[error(transparent)] - Export(#[from] interop::error::Export), - #[error("patch was not an object")] - NotObjectd, - #[error("error calling patch callback: {0:?}")] - PatchCallback(JsValue), - } - - impl From for JsValue { - fn from(e: ApplyPatch) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - #[error("unable to build patches: {0}")] - pub struct PopPatches(#[from] interop::error::Export); - - impl From for JsValue { - fn from(e: PopPatches) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Materialize { - #[error(transparent)] - Export(#[from] interop::error::Export), - #[error("bad heads: {0}")] - Heads(#[from] interop::error::BadChangeHashes), - } - - impl From for JsValue { - fn from(e: Materialize) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum ReceiveSyncMessage { - #[error(transparent)] - Decode(#[from] automerge::sync::ReadMessageError), - #[error(transparent)] - Automerge(#[from] AutomergeError), - } - - impl From for JsValue { - fn from(e: ReceiveSyncMessage) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum Load { - #[error(transparent)] - Automerge(#[from] AutomergeError), - #[error(transparent)] - BadActor(#[from] BadActorId), - } - - impl From for JsValue { - fn from(e: Load) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - #[error("Unable to read JS change: {0}")] - pub struct EncodeChange(#[from] serde_json::Error); - - impl From for JsValue { - fn from(e: EncodeChange) -> Self { - JsValue::from(e.to_string()) - } - } - - #[derive(Debug, thiserror::Error)] - pub enum DecodeChange { - #[error(transparent)] - Load(#[from] automerge::LoadChangeError), - #[error(transparent)] - Serialize(#[from] serde_wasm_bindgen::Error), - } - - impl From for JsValue { - fn from(e: DecodeChange) -> Self { - JsValue::from(e.to_string()) - } - } -} diff --git a/rust/automerge-wasm/src/observer.rs b/rust/automerge-wasm/src/observer.rs index 2351c762..9770ad97 100644 --- a/rust/automerge-wasm/src/observer.rs +++ b/rust/automerge-wasm/src/observer.rs @@ -1,22 +1,15 @@ #![allow(dead_code)] -use std::borrow::Cow; - -use crate::{ - interop::{self, alloc, js_set}, - TextRepresentation, -}; -use automerge::{ObjId, OpObserver, Prop, ReadDoc, ScalarValue, Value}; +use crate::interop::{alloc, js_set}; +use automerge::{Automerge, ObjId, OpObserver, Prop, SequenceTree, Value}; use js_sys::{Array, Object}; +use ropey::Rope; use wasm_bindgen::prelude::*; -use crate::sequence_tree::SequenceTree; - #[derive(Debug, Clone, Default)] pub(crate) struct Observer { enabled: bool, patches: Vec, - text_rep: TextRepresentation, } impl Observer { @@ -31,25 +24,6 @@ impl Observer { self.enabled = enable; old_enabled } - - fn get_path(&mut self, doc: &R, obj: &ObjId) -> Option> { - match doc.parents(obj) { - Ok(parents) => parents.visible_path(), - Err(e) => { - automerge::log!("error generating patch : {:?}", e); - None - } - } - } - - pub(crate) fn with_text_rep(mut self, text_rep: TextRepresentation) -> Self { - self.text_rep = text_rep; - self - } - - pub(crate) fn set_text_rep(&mut self, text_rep: TextRepresentation) { - self.text_rep = text_rep; - } } #[derive(Debug, Clone)] @@ -78,7 +52,7 @@ pub(crate) enum Patch { obj: ObjId, path: Vec<(ObjId, Prop)>, index: usize, - value: SequenceTree, + value: Rope, }, Increment { obj: ObjId, @@ -100,9 +74,9 @@ pub(crate) enum Patch { } impl OpObserver for Observer { - fn insert( + fn insert( &mut self, - doc: &R, + doc: &Automerge, obj: ObjId, index: usize, tagged_value: (Value<'_>, ObjId), @@ -117,12 +91,13 @@ impl OpObserver for Observer { }) = self.patches.last_mut() { let range = *tail_index..=*tail_index + values.len(); + //if tail_obj == &obj && *tail_index + values.len() == index { if tail_obj == &obj && range.contains(&index) { values.insert(index - *tail_index, value); return; } } - if let Some(path) = self.get_path(doc, &obj) { + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { let mut values = SequenceTree::new(); values.push(value); let patch = Patch::Insert { @@ -136,22 +111,8 @@ impl OpObserver for Observer { } } - fn splice_text(&mut self, doc: &R, obj: ObjId, index: usize, value: &str) { + fn splice_text(&mut self, doc: &Automerge, obj: ObjId, index: usize, value: &str) { if self.enabled { - if self.text_rep == TextRepresentation::Array { - for (i, c) in value.chars().enumerate() { - self.insert( - doc, - obj.clone(), - index + i, - ( - Value::Scalar(Cow::Owned(ScalarValue::Str(c.to_string().into()))), - ObjId::Root, // We hope this is okay - ), - ); - } - return; - } if let Some(Patch::SpliceText { obj: tail_obj, index: tail_index, @@ -159,109 +120,77 @@ impl OpObserver for Observer { .. }) = self.patches.last_mut() { - let range = *tail_index..=*tail_index + prev_value.len(); + let range = *tail_index..=*tail_index + prev_value.len_chars(); if tail_obj == &obj && range.contains(&index) { - let i = index - *tail_index; - for (n, ch) in value.encode_utf16().enumerate() { - prev_value.insert(i + n, ch) - } + prev_value.insert(index - *tail_index, value); return; } } - if let Some(path) = self.get_path(doc, &obj) { - let mut v = SequenceTree::new(); - for ch in value.encode_utf16() { - v.push(ch) - } + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { let patch = Patch::SpliceText { path, obj, index, - value: v, + value: Rope::from_str(value), }; self.patches.push(patch); } } } - fn delete_seq(&mut self, doc: &R, obj: ObjId, index: usize, length: usize) { + fn delete(&mut self, doc: &Automerge, obj: ObjId, prop: Prop) { if self.enabled { match self.patches.last_mut() { - Some(Patch::SpliceText { - obj: tail_obj, - index: tail_index, - value, - .. - }) => { - let range = *tail_index..*tail_index + value.len(); - if tail_obj == &obj - && range.contains(&index) - && range.contains(&(index + length - 1)) - { - for _ in 0..length { - value.remove(index - *tail_index); - } - return; - } - } Some(Patch::Insert { obj: tail_obj, index: tail_index, values, .. }) => { - let range = *tail_index..*tail_index + values.len(); - if tail_obj == &obj - && range.contains(&index) - && range.contains(&(index + length - 1)) - { - for _ in 0..length { + if let Prop::Seq(index) = prop { + let range = *tail_index..*tail_index + values.len(); + if tail_obj == &obj && range.contains(&index) { values.remove(index - *tail_index); + return; } - return; } } - Some(Patch::DeleteSeq { + Some(Patch::SpliceText { obj: tail_obj, index: tail_index, - length: tail_length, + value, .. }) => { - if tail_obj == &obj && index == *tail_index { - *tail_length += length; - return; + if let Prop::Seq(index) = prop { + let range = *tail_index..*tail_index + value.len_chars(); + if tail_obj == &obj && range.contains(&index) { + let start = index - *tail_index; + let end = start + 1; + value.remove(start..end); + return; + } } } _ => {} } - if let Some(path) = self.get_path(doc, &obj) { - let patch = Patch::DeleteSeq { - path, - obj, - index, - length, + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { + let patch = match prop { + Prop::Map(key) => Patch::DeleteMap { path, obj, key }, + Prop::Seq(index) => Patch::DeleteSeq { + path, + obj, + index, + length: 1, + }, }; self.patches.push(patch) } } } - fn delete_map(&mut self, doc: &R, obj: ObjId, key: &str) { - if self.enabled { - if let Some(path) = self.get_path(doc, &obj) { - let patch = Patch::DeleteMap { - path, - obj, - key: key.to_owned(), - }; - self.patches.push(patch) - } - } - } - - fn put( + fn put( &mut self, - doc: &R, + doc: &Automerge, obj: ObjId, prop: Prop, tagged_value: (Value<'_>, ObjId), @@ -269,7 +198,7 @@ impl OpObserver for Observer { ) { if self.enabled { let expose = false; - if let Some(path) = self.get_path(doc, &obj) { + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { let value = (tagged_value.0.to_owned(), tagged_value.1); let patch = match prop { Prop::Map(key) => Patch::PutMap { @@ -292,9 +221,9 @@ impl OpObserver for Observer { } } - fn expose( + fn expose( &mut self, - doc: &R, + doc: &Automerge, obj: ObjId, prop: Prop, tagged_value: (Value<'_>, ObjId), @@ -302,7 +231,7 @@ impl OpObserver for Observer { ) { if self.enabled { let expose = true; - if let Some(path) = self.get_path(doc, &obj) { + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { let value = (tagged_value.0.to_owned(), tagged_value.1); let patch = match prop { Prop::Map(key) => Patch::PutMap { @@ -325,15 +254,11 @@ impl OpObserver for Observer { } } - fn increment( - &mut self, - doc: &R, - obj: ObjId, - prop: Prop, - tagged_value: (i64, ObjId), - ) { + fn flag_conflict(&mut self, _doc: &Automerge, _obj: ObjId, _prop: Prop) {} + + fn increment(&mut self, doc: &Automerge, obj: ObjId, prop: Prop, tagged_value: (i64, ObjId)) { if self.enabled { - if let Some(path) = self.get_path(doc, &obj) { + if let Some(path) = doc.parents(&obj).ok().and_then(|mut p| p.visible_path()) { let value = tagged_value.0; self.patches.push(Patch::Increment { path, @@ -345,12 +270,6 @@ impl OpObserver for Observer { } } - fn text_as_seq(&self) -> bool { - self.text_rep == TextRepresentation::Array - } -} - -impl automerge::op_observer::BranchableObserver for Observer { fn merge(&mut self, other: &Self) { self.patches.extend_from_slice(other.patches.as_slice()) } @@ -359,7 +278,6 @@ impl automerge::op_observer::BranchableObserver for Observer { Observer { patches: vec![], enabled: self.enabled, - text_rep: self.text_rep, } } } @@ -407,7 +325,7 @@ impl Patch { } impl TryFrom for JsValue { - type Error = interop::error::Export; + type Error = JsValue; fn try_from(p: Patch) -> Result { let result = Object::new(); @@ -421,11 +339,7 @@ impl TryFrom for JsValue { "path", export_path(path.as_slice(), &Prop::Map(key)), )?; - js_set( - &result, - "value", - alloc(&value.0, TextRepresentation::String).1, - )?; + js_set(&result, "value", alloc(&value.0).1)?; Ok(result.into()) } Patch::PutSeq { @@ -437,11 +351,7 @@ impl TryFrom for JsValue { "path", export_path(path.as_slice(), &Prop::Seq(index)), )?; - js_set( - &result, - "value", - alloc(&value.0, TextRepresentation::String).1, - )?; + js_set(&result, "value", alloc(&value.0).1)?; Ok(result.into()) } Patch::Insert { @@ -459,10 +369,7 @@ impl TryFrom for JsValue { js_set( &result, "values", - values - .iter() - .map(|v| alloc(&v.0, TextRepresentation::String).1) - .collect::(), + values.iter().map(|v| alloc(&v.0).1).collect::(), )?; Ok(result.into()) } @@ -475,8 +382,7 @@ impl TryFrom for JsValue { "path", export_path(path.as_slice(), &Prop::Seq(index)), )?; - let bytes: Vec = value.iter().cloned().collect(); - js_set(&result, "value", String::from_utf16_lossy(bytes.as_slice()))?; + js_set(&result, "value", value.to_string())?; Ok(result.into()) } Patch::Increment { diff --git a/rust/automerge-wasm/src/sync.rs b/rust/automerge-wasm/src/sync.rs index c4fd4a86..94f65041 100644 --- a/rust/automerge-wasm/src/sync.rs +++ b/rust/automerge-wasm/src/sync.rs @@ -5,7 +5,7 @@ use std::collections::{BTreeSet, HashMap}; use std::convert::TryInto; use wasm_bindgen::prelude::*; -use crate::interop::{self, to_js_err, AR, JS}; +use crate::interop::{to_js_err, AR, JS}; #[wasm_bindgen] #[derive(Debug)] @@ -24,10 +24,7 @@ impl SyncState { } #[wasm_bindgen(setter, js_name = lastSentHeads)] - pub fn set_last_sent_heads( - &mut self, - heads: JsValue, - ) -> Result<(), interop::error::BadChangeHashes> { + pub fn set_last_sent_heads(&mut self, heads: JsValue) -> Result<(), JsValue> { let heads: Vec = JS(heads).try_into()?; self.0.last_sent_heads = heads; Ok(()) @@ -47,19 +44,10 @@ impl SyncState { SyncState(self.0.clone()) } - pub(crate) fn decode(data: Uint8Array) -> Result { + pub(crate) fn decode(data: Uint8Array) -> Result { let data = data.to_vec(); - let s = am::sync::State::decode(&data)?; + let s = am::sync::State::decode(&data); + let s = s.map_err(to_js_err)?; Ok(SyncState(s)) } } - -#[derive(Debug, thiserror::Error)] -#[error(transparent)] -pub struct DecodeSyncStateErr(#[from] automerge::sync::DecodeStateError); - -impl From for JsValue { - fn from(e: DecodeSyncStateErr) -> Self { - JsValue::from(e.to_string()) - } -} diff --git a/rust/automerge-wasm/src/value.rs b/rust/automerge-wasm/src/value.rs index 643e2881..8008700a 100644 --- a/rust/automerge-wasm/src/value.rs +++ b/rust/automerge-wasm/src/value.rs @@ -1,3 +1,4 @@ +use crate::to_js_err; use automerge::{ObjType, ScalarValue, Value}; use wasm_bindgen::prelude::*; @@ -108,10 +109,12 @@ impl From for String { } impl TryFrom for Datatype { - type Error = InvalidDatatype; + type Error = JsValue; fn try_from(datatype: JsValue) -> Result { - let datatype = datatype.as_string().ok_or(InvalidDatatype::NotString)?; + let datatype = datatype + .as_string() + .ok_or_else(|| to_js_err("datatype is not a string"))?; match datatype.as_str() { "map" => Ok(Datatype::Map), "table" => Ok(Datatype::Table), @@ -128,10 +131,9 @@ impl TryFrom for Datatype { "null" => Ok(Datatype::Null), d => { if d.starts_with("unknown") { - // TODO: handle "unknown{}", - Err(InvalidDatatype::UnknownNotImplemented) + todo!() // handle "unknown{}", } else { - Err(InvalidDatatype::Unknown(d.to_string())) + Err(to_js_err(format!("unknown datatype {}", d))) } } } @@ -143,19 +145,3 @@ impl From for JsValue { String::from(d).into() } } - -#[derive(Debug, thiserror::Error)] -pub enum InvalidDatatype { - #[error("unknown datatype")] - Unknown(String), - #[error("datatype is not a string")] - NotString, - #[error("cannot handle unknown datatype")] - UnknownNotImplemented, -} - -impl From for JsValue { - fn from(e: InvalidDatatype) -> Self { - JsValue::from(e.to_string()) - } -} diff --git a/rust/automerge-wasm/test/apply.ts b/rust/automerge-wasm/test/apply.ts index 453b4c26..c96ad75c 100644 --- a/rust/automerge-wasm/test/apply.ts +++ b/rust/automerge-wasm/test/apply.ts @@ -24,10 +24,10 @@ describe('Automerge', () => { describe('Patch Apply', () => { it('apply nested sets on maps', () => { const start = { hello: { mellow: { yellow: "world", x: 1 }, y : 2 } } - const doc1 = create(true) + const doc1 = create() doc1.putObject("/", "hello", start.hello); let mat = doc1.materialize("/") - const doc2 = create(true) + const doc2 = create() doc2.enablePatches(true) doc2.merge(doc1) @@ -47,10 +47,10 @@ describe('Automerge', () => { it('apply patches on lists', () => { const start = { list: [1,2,3,4] } - const doc1 = create(true) + const doc1 = create() doc1.putObject("/", "list", start.list); let mat = doc1.materialize("/") - const doc2 = create(true) + const doc2 = create() doc2.enablePatches(true) doc2.merge(doc1) mat = doc1.materialize("/") @@ -78,7 +78,7 @@ describe('Automerge', () => { ] ] } - const doc1 = create(true) + const doc1 = create() doc1.enablePatches(true) doc1.putObject("/", "list", start.list); let base = doc1.applyPatches({}) @@ -99,7 +99,7 @@ describe('Automerge', () => { }) it('large inserts should make one splice patch', () => { - const doc1 = create(true) + const doc1 = create() doc1.enablePatches(true) doc1.putObject("/", "list", "abc"); const patches = doc1.popPatches() @@ -109,7 +109,7 @@ describe('Automerge', () => { }) it('it should allow registering type wrappers', () => { - const doc1 = create(true) + const doc1 = create() doc1.enablePatches(true) doc1.registerDatatype("counter", (n: number) => new Counter(n)) const doc2 = doc1.fork() @@ -133,7 +133,7 @@ describe('Automerge', () => { }) it('text can be managed as an array or a string', () => { - const doc1 = create(true, "aaaa") + const doc1 = create("aaaa") doc1.enablePatches(true) doc1.putObject("/", "notes", "hello world") @@ -142,7 +142,7 @@ describe('Automerge', () => { assert.deepEqual( mat, { notes: "hello world" } ) - const doc2 = create(true) + const doc2 = create() let apply : any = doc2.materialize("/") doc2.enablePatches(true) apply = doc2.applyPatches(apply) @@ -163,8 +163,8 @@ describe('Automerge', () => { }) it('should set the OBJECT_ID property on lists, maps, and text objects and not on scalars', () => { - const doc1 = create(true, 'aaaa') - const mat: any = doc1.materialize("/") + const doc1 = create('aaaa') + let mat: any = doc1.materialize("/") doc1.enablePatches(true) doc1.registerDatatype("counter", (n: number) => new Counter(n)) doc1.put("/", "string", "string", "str") @@ -193,12 +193,12 @@ describe('Automerge', () => { }) it('should set the root OBJECT_ID to "_root"', () => { - const doc1 = create(true, 'aaaa') - const mat: any = doc1.materialize("/") + const doc1 = create('aaaa') + let mat: any = doc1.materialize("/") assert.equal(_obj(mat), "_root") doc1.enablePatches(true) doc1.put("/", "key", "value") - const applied = doc1.applyPatches(mat) + let applied = doc1.applyPatches(mat) assert.equal(_obj(applied), "_root") }) diff --git a/rust/automerge-wasm/test/readme.ts b/rust/automerge-wasm/test/readme.ts index e5823556..18c55055 100644 --- a/rust/automerge-wasm/test/readme.ts +++ b/rust/automerge-wasm/test/readme.ts @@ -6,13 +6,13 @@ import { create, load, initSyncState } from '..' describe('Automerge', () => { describe('Readme Examples', () => { it('Using the Library and Creating a Document', () => { - const doc = create(true) + const doc = create() const sync = initSyncState() doc.free() sync.free() }) it('Automerge Scalar Types (1)', () => { - const doc = create(true) + const doc = create() doc.put("/", "prop1", 100) // int doc.put("/", "prop2", 3.14) // f64 doc.put("/", "prop3", "hello world") @@ -32,7 +32,7 @@ describe('Automerge', () => { }) }) it('Automerge Scalar Types (2)', () => { - const doc = create(true) + const doc = create() doc.put("/", "prop1", 100, "int") doc.put("/", "prop2", 100, "uint") doc.put("/", "prop3", 100.5, "f64") @@ -45,7 +45,7 @@ describe('Automerge', () => { doc.put("/", "prop10", null, "null") }) it('Automerge Object Types (1)', () => { - const doc = create(true) + const doc = create() // you can create an object by passing in the inital state - if blank pass in `{}` // the return value is the Object Id @@ -64,7 +64,7 @@ describe('Automerge', () => { const notes = doc.putObject("/", "notes", "Hello world!") }) it('Automerge Object Types (2)', () => { - const doc = create(true) + const doc = create() const config = doc.putObject("/", "config", { align: "left", archived: false, cycles: [10, 19, 21] }) @@ -85,7 +85,7 @@ describe('Automerge', () => { }) }) it('Maps (1)', () => { - const doc = create(true) + const doc = create() const mymap = doc.putObject("_root", "mymap", { foo: "bar"}) // make a new map with the foo key @@ -99,7 +99,7 @@ describe('Automerge', () => { assert.deepEqual(doc.materialize("_root"), { mymap: { bytes: new Uint8Array([1,2,3]), foo: "bar", sub: {} }}) }) it('Lists (1)', () => { - const doc = create(true) + const doc = create() const items = doc.putObject("_root", "items", [10,"box"]) // init a new list with two elements doc.push(items, true) // push `true` to the end of the list @@ -113,14 +113,14 @@ describe('Automerge', () => { assert.deepEqual(doc.length(items),6) }) it('Text (1)', () => { - const doc = create(true, "aaaaaa") + const doc = create("aaaaaa") const notes = doc.putObject("_root", "notes", "Hello world") doc.splice(notes, 6, 5, "everyone") assert.deepEqual(doc.text(notes), "Hello everyone") }) it('Querying Data (1)', () => { - const doc1 = create(true, "aabbcc") + const doc1 = create("aabbcc") doc1.put("_root", "key1", "val1") const key2 = doc1.putObject("_root", "key2", []) @@ -140,7 +140,7 @@ describe('Automerge', () => { assert.deepEqual(doc1.getAll("_root","key3"),[[ "str", "doc1val", "3@aabbcc"], ["str", "doc2val", "3@ffaaff"]]) }) it('Counters (1)', () => { - const doc1 = create(true, "aaaaaa") + const doc1 = create("aaaaaa") doc1.put("_root", "number", 0) doc1.put("_root", "total", 0, "counter") @@ -156,7 +156,7 @@ describe('Automerge', () => { assert.deepEqual(doc1.materialize("_root"), { number: 10, total: 33 }) }) it('Transactions (1)', () => { - const doc = create(true) + const doc = create() doc.put("_root", "key", "val1") @@ -178,7 +178,7 @@ describe('Automerge', () => { assert.deepEqual(doc.pendingOps(),0) }) it('Viewing Old Versions of the Document (1)', () => { - const doc = create(true) + const doc = create() doc.put("_root", "key", "val1") const heads1 = doc.getHeads() @@ -194,7 +194,7 @@ describe('Automerge', () => { assert.deepEqual(doc.get("_root","key",[]), undefined) }) it('Forking And Merging (1)', () => { - const doc1 = create(true) + const doc1 = create() doc1.put("_root", "key1", "val1") const doc2 = doc1.fork() @@ -208,13 +208,13 @@ describe('Automerge', () => { assert.deepEqual(doc2.materialize("_root"), { key1: "val1", key3: "val3" }) }) it('Saving And Loading (1)', () => { - const doc1 = create(true) + const doc1 = create() doc1.put("_root", "key1", "value1") const save1 = doc1.save() - const doc2 = load(save1, true) + const doc2 = load(save1) doc2.materialize("_root") // returns { key1: "value1" } @@ -230,9 +230,9 @@ describe('Automerge', () => { doc2.loadIncremental(saveIncremental) - const doc3 = load(save2, true) + const doc3 = load(save2) - const doc4 = load(save3, true) + const doc4 = load(save3) assert.deepEqual(doc1.materialize("_root"), { key1: "value1", key2: "value2" }) assert.deepEqual(doc2.materialize("_root"), { key1: "value1", key2: "value2" }) diff --git a/rust/automerge-wasm/test/test.ts b/rust/automerge-wasm/test/test.ts index bb4f71e3..4f83ad82 100644 --- a/rust/automerge-wasm/test/test.ts +++ b/rust/automerge-wasm/test/test.ts @@ -2,9 +2,8 @@ import { describe, it } from 'mocha'; import assert from 'assert' // @ts-ignore import { BloomFilter } from './helpers/sync' -import { create, load, SyncState, Automerge, encodeChange, decodeChange, initSyncState, decodeSyncMessage, decodeSyncState, encodeSyncState, encodeSyncMessage } from '..' +import { create, load, SyncState, Automerge, decodeChange, initSyncState, decodeSyncMessage, decodeSyncState, encodeSyncState, encodeSyncMessage } from '..' import { Value, DecodedSyncMessage, Hash } from '..'; -import {kill} from 'process'; function sync(a: Automerge, b: Automerge, aSyncState = initSyncState(), bSyncState = initSyncState()) { const MAX_ITER = 10 @@ -30,25 +29,25 @@ describe('Automerge', () => { describe('basics', () => { it('should create, clone and free', () => { - const doc1 = create(true) + const doc1 = create() const doc2 = doc1.clone() doc2.free() }) it('should be able to start and commit', () => { - const doc = create(true) + const doc = create() doc.commit() }) it('getting a nonexistent prop does not throw an error', () => { - const doc = create(true) + const doc = create() const root = "_root" const result = doc.getWithType(root, "hello") assert.deepEqual(result, undefined) }) it('should be able to set and get a simple value', () => { - const doc: Automerge = create(true, "aabbcc") + const doc: Automerge = create("aabbcc") const root = "_root" let result @@ -106,7 +105,7 @@ describe('Automerge', () => { }) it('should be able to use bytes', () => { - const doc = create(true) + const doc = create() doc.put("_root", "data1", new Uint8Array([10, 11, 12])); doc.put("_root", "data2", new Uint8Array([13, 14, 15]), "bytes"); const value1 = doc.getWithType("_root", "data1") @@ -116,7 +115,7 @@ describe('Automerge', () => { }) it('should be able to make subobjects', () => { - const doc = create(true) + const doc = create() const root = "_root" let result @@ -132,7 +131,7 @@ describe('Automerge', () => { }) it('should be able to make lists', () => { - const doc = create(true) + const doc = create() const root = "_root" const sublist = doc.putObject(root, "numbers", []) @@ -154,7 +153,7 @@ describe('Automerge', () => { }) it('lists have insert, set, splice, and push ops', () => { - const doc = create(true) + const doc = create() const root = "_root" const sublist = doc.putObject(root, "letters", []) @@ -176,7 +175,7 @@ describe('Automerge', () => { }) it('should be able delete non-existent props', () => { - const doc = create(true) + const doc = create() doc.put("_root", "foo", "bar") doc.put("_root", "bip", "bap") @@ -189,14 +188,12 @@ describe('Automerge', () => { const hash2 = doc.commit() assert.deepEqual(doc.keys("_root"), ["bip"]) - assert.ok(hash1) assert.deepEqual(doc.keys("_root", [hash1]), ["bip", "foo"]) - assert.ok(hash2) assert.deepEqual(doc.keys("_root", [hash2]), ["bip"]) }) it('should be able to del', () => { - const doc = create(true) + const doc = create() const root = "_root" doc.put(root, "xxx", "xxx"); @@ -206,7 +203,7 @@ describe('Automerge', () => { }) it('should be able to use counters', () => { - const doc = create(true) + const doc = create() const root = "_root" doc.put(root, "counter", 10, "counter"); @@ -218,7 +215,7 @@ describe('Automerge', () => { }) it('should be able to splice text', () => { - const doc = create(true) + const doc = create() const root = "_root"; const text = doc.putObject(root, "text", ""); @@ -233,8 +230,8 @@ describe('Automerge', () => { assert.deepEqual(doc.getWithType(text, 12), ["str", "?"]) }) - it.skip('should NOT be able to insert objects into text', () => { - const doc = create(true) + it('should NOT be able to insert objects into text', () => { + const doc = create() const text = doc.putObject("/", "text", "Hello world"); assert.throws(() => { doc.insertObject(text, 6, { hello: "world" }); @@ -242,7 +239,7 @@ describe('Automerge', () => { }) it('should be able save all or incrementally', () => { - const doc = create(true) + const doc = create() doc.put("_root", "foo", 1) @@ -263,9 +260,9 @@ describe('Automerge', () => { assert.notDeepEqual(saveA, saveB); - const docA = load(saveA, true); - const docB = load(saveB, true); - const docC = load(saveMidway, true) + const docA = load(saveA); + const docB = load(saveB); + const docC = load(saveMidway) docC.loadIncremental(save3) assert.deepEqual(docA.keys("_root"), docB.keys("_root")); @@ -274,7 +271,7 @@ describe('Automerge', () => { }) it('should be able to splice text', () => { - const doc = create(true) + const doc = create() const text = doc.putObject("_root", "text", ""); doc.splice(text, 0, 0, "hello world"); const hash1 = doc.commit(); @@ -282,20 +279,17 @@ describe('Automerge', () => { const hash2 = doc.commit(); assert.strictEqual(doc.text(text), "hello big bad world") assert.strictEqual(doc.length(text), 19) - assert.ok(hash1) assert.strictEqual(doc.text(text, [hash1]), "hello world") assert.strictEqual(doc.length(text, [hash1]), 11) - assert.ok(hash2) assert.strictEqual(doc.text(text, [hash2]), "hello big bad world") - assert.ok(hash2) assert.strictEqual(doc.length(text, [hash2]), 19) }) it('local inc increments all visible counters in a map', () => { - const doc1 = create(true, "aaaa") + const doc1 = create("aaaa") doc1.put("_root", "hello", "world") - const doc2 = load(doc1.save(), true, "bbbb"); - const doc3 = load(doc1.save(), true, "cccc"); + const doc2 = load(doc1.save(), "bbbb"); + const doc3 = load(doc1.save(), "cccc"); const heads = doc1.getHeads() doc1.put("_root", "cnt", 20) doc2.put("_root", "cnt", 0, "counter") @@ -316,16 +310,16 @@ describe('Automerge', () => { ]) const save1 = doc1.save() - const doc4 = load(save1, true) + const doc4 = load(save1) assert.deepEqual(doc4.save(), save1); }) it('local inc increments all visible counters in a sequence', () => { - const doc1 = create(true, "aaaa") + const doc1 = create("aaaa") const seq = doc1.putObject("_root", "seq", []) doc1.insert(seq, 0, "hello") - const doc2 = load(doc1.save(), true, "bbbb"); - const doc3 = load(doc1.save(), true, "cccc"); + const doc2 = load(doc1.save(), "bbbb"); + const doc3 = load(doc1.save(), "cccc"); const heads = doc1.getHeads() doc1.put(seq, 0, 20) doc2.put(seq, 0, 0, "counter") @@ -346,12 +340,12 @@ describe('Automerge', () => { ]) const save = doc1.save() - const doc4 = load(save, true) + const doc4 = load(save) assert.deepEqual(doc4.save(), save); }) it('paths can be used instead of objids', () => { - const doc = create(true, "aaaa") + const doc = create("aaaa") doc.putObject("_root", "list", [{ foo: "bar" }, [1, 2, 3]]) assert.deepEqual(doc.materialize("/"), { list: [{ foo: "bar" }, [1, 2, 3]] }) assert.deepEqual(doc.materialize("/list"), [{ foo: "bar" }, [1, 2, 3]]) @@ -359,8 +353,8 @@ describe('Automerge', () => { }) it('should be able to fetch changes by hash', () => { - const doc1 = create(true, "aaaa") - const doc2 = create(true, "bbbb") + const doc1 = create("aaaa") + const doc2 = create("bbbb") doc1.put("/", "a", "b") doc2.put("/", "b", "c") const head1 = doc1.getHeads() @@ -373,7 +367,7 @@ describe('Automerge', () => { }) it('recursive sets are possible', () => { - const doc = create(true, "aaaa") + const doc = create("aaaa") const l1 = doc.putObject("_root", "list", [{ foo: "bar" }, [1, 2, 3]]) const l2 = doc.insertObject(l1, 0, { zip: ["a", "b"] }) doc.putObject("_root", "info1", "hello world") // 'text' object @@ -391,7 +385,7 @@ describe('Automerge', () => { }) it('only returns an object id when objects are created', () => { - const doc = create(true, "aaaa") + const doc = create("aaaa") const r1 = doc.put("_root", "foo", "bar") const r2 = doc.putObject("_root", "list", []) const r3 = doc.put("_root", "counter", 10, "counter") @@ -413,13 +407,13 @@ describe('Automerge', () => { }) it('objects without properties are preserved', () => { - const doc1 = create(true, "aaaa") + const doc1 = create("aaaa") const a = doc1.putObject("_root", "a", {}); const b = doc1.putObject("_root", "b", {}); const c = doc1.putObject("_root", "c", {}); doc1.put(c, "d", "dd"); const saved = doc1.save(); - const doc2 = load(saved, true); + const doc2 = load(saved); assert.deepEqual(doc2.getWithType("_root", "a"), ["map", a]) assert.deepEqual(doc2.keys(a), []) assert.deepEqual(doc2.getWithType("_root", "b"), ["map", b]) @@ -430,7 +424,7 @@ describe('Automerge', () => { }) it('should allow you to fork at a heads', () => { - const A = create(true, "aaaaaa") + const A = create("aaaaaa") A.put("/", "key1", "val1"); A.put("/", "key2", "val2"); const heads1 = A.getHeads(); @@ -445,7 +439,7 @@ describe('Automerge', () => { }) it('should handle merging text conflicts then saving & loading', () => { - const A = create(true, "aabbcc") + const A = create("aabbcc") const At = A.putObject('_root', 'text', "") A.splice(At, 0, 0, 'hello') @@ -462,7 +456,7 @@ describe('Automerge', () => { const binary = A.save() - const C = load(binary, true) + const C = load(binary) assert.deepEqual(C.getWithType('_root', 'text'), ['text', '1@aabbcc']) assert.deepEqual(C.text(At), 'hell! world') @@ -471,7 +465,7 @@ describe('Automerge', () => { describe('patch generation', () => { it('should include root object key updates', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.put('_root', 'hello', 'world') doc2.enablePatches(true) doc2.loadIncremental(doc1.saveIncremental()) @@ -481,7 +475,7 @@ describe('Automerge', () => { }) it('should include nested object creation', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.putObject('_root', 'birds', { friday: { robins: 3 } }) doc2.enablePatches(true) doc2.loadIncremental(doc1.saveIncremental()) @@ -493,7 +487,7 @@ describe('Automerge', () => { }) it('should delete map keys', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.put('_root', 'favouriteBird', 'Robin') doc2.enablePatches(true) doc2.loadIncremental(doc1.saveIncremental()) @@ -506,7 +500,7 @@ describe('Automerge', () => { }) it('should include list element insertion', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.putObject('_root', 'birds', ['Goldfinch', 'Chaffinch']) doc2.enablePatches(true) doc2.loadIncremental(doc1.saveIncremental()) @@ -517,7 +511,7 @@ describe('Automerge', () => { }) it('should insert nested maps into a list', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.putObject('_root', 'birds', []) doc2.loadIncremental(doc1.saveIncremental()) doc1.insertObject('1@aaaa', 0, { species: 'Goldfinch', count: 3 }) @@ -531,7 +525,7 @@ describe('Automerge', () => { }) it('should calculate list indexes based on visible elements', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.putObject('_root', 'birds', ['Goldfinch', 'Chaffinch']) doc2.loadIncremental(doc1.saveIncremental()) doc1.delete('1@aaaa', 0) @@ -547,7 +541,7 @@ describe('Automerge', () => { }) it('should handle concurrent insertions at the head of a list', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc'), doc4 = create(true, 'dddd') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc'), doc4 = create('dddd') doc1.putObject('_root', 'values', []) const change1 = doc1.saveIncremental() doc2.loadIncremental(change1) @@ -573,7 +567,7 @@ describe('Automerge', () => { }) it('should handle concurrent insertions beyond the head', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc'), doc4 = create(true, 'dddd') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc'), doc4 = create('dddd') doc1.putObject('_root', 'values', ['a', 'b']) const change1 = doc1.saveIncremental() doc2.loadIncremental(change1) @@ -599,7 +593,7 @@ describe('Automerge', () => { }) it('should handle conflicts on root object keys', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc'), doc4 = create(true, 'dddd') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc'), doc4 = create('dddd') doc1.put('_root', 'bird', 'Greenfinch') doc2.put('_root', 'bird', 'Goldfinch') const change1 = doc1.saveIncremental(), change2 = doc2.saveIncremental() @@ -621,7 +615,7 @@ describe('Automerge', () => { }) it('should handle three-way conflicts', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc') doc1.put('_root', 'bird', 'Greenfinch') doc2.put('_root', 'bird', 'Chaffinch') doc3.put('_root', 'bird', 'Goldfinch') @@ -655,7 +649,7 @@ describe('Automerge', () => { }) it('should allow a conflict to be resolved', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc') doc1.put('_root', 'bird', 'Greenfinch') doc2.put('_root', 'bird', 'Chaffinch') doc3.enablePatches(true) @@ -673,7 +667,7 @@ describe('Automerge', () => { }) it('should handle a concurrent map key overwrite and delete', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.put('_root', 'bird', 'Greenfinch') doc2.loadIncremental(doc1.saveIncremental()) doc1.put('_root', 'bird', 'Goldfinch') @@ -696,7 +690,7 @@ describe('Automerge', () => { }) it('should handle a conflict on a list element', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc'), doc4 = create(true, 'dddd') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc'), doc4 = create('dddd') doc1.putObject('_root', 'birds', ['Thrush', 'Magpie']) const change1 = doc1.saveIncremental() doc2.loadIncremental(change1) @@ -723,7 +717,7 @@ describe('Automerge', () => { }) it('should handle a concurrent list element overwrite and delete', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc'), doc4 = create(true, 'dddd') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc'), doc4 = create('dddd') doc1.putObject('_root', 'birds', ['Parakeet', 'Magpie', 'Thrush']) const change1 = doc1.saveIncremental() doc2.loadIncremental(change1) @@ -756,7 +750,7 @@ describe('Automerge', () => { }) it('should handle deletion of a conflict value', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), doc3 = create(true, 'cccc') + const doc1 = create('aaaa'), doc2 = create('bbbb'), doc3 = create('cccc') doc1.put('_root', 'bird', 'Robin') doc2.put('_root', 'bird', 'Wren') const change1 = doc1.saveIncremental(), change2 = doc2.saveIncremental() @@ -779,7 +773,7 @@ describe('Automerge', () => { }) it('should handle conflicting nested objects', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc1.putObject('_root', 'birds', ['Parakeet']) doc2.putObject('_root', 'birds', { 'Sparrowhawk': 1 }) const change1 = doc1.saveIncremental(), change2 = doc2.saveIncremental() @@ -797,7 +791,7 @@ describe('Automerge', () => { }) it('should support date objects', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb'), now = new Date() + const doc1 = create('aaaa'), doc2 = create('bbbb'), now = new Date() doc1.put('_root', 'createdAt', now) doc2.enablePatches(true) doc2.loadIncremental(doc1.saveIncremental()) @@ -808,7 +802,7 @@ describe('Automerge', () => { }) it('should capture local put ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) doc1.put('_root', 'key1', 1) doc1.put('_root', 'key1', 2) @@ -826,7 +820,7 @@ describe('Automerge', () => { }) it('should capture local insert ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) const list = doc1.putObject('_root', 'list', []) doc1.insert(list, 0, 1) @@ -842,7 +836,7 @@ describe('Automerge', () => { }) it('should capture local push ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) const list = doc1.putObject('_root', 'list', []) doc1.push(list, 1) @@ -856,7 +850,7 @@ describe('Automerge', () => { }) it('should capture local splice ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) const list = doc1.putObject('_root', 'list', []) doc1.splice(list, 0, 0, [1, 2, 3, 4]) @@ -869,7 +863,7 @@ describe('Automerge', () => { }) it('should capture local increment ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) doc1.put('_root', 'counter', 2, 'counter') doc1.increment('_root', 'counter', 4) @@ -882,7 +876,7 @@ describe('Automerge', () => { it('should capture local delete ops', () => { - const doc1 = create(true, 'aaaa') + const doc1 = create('aaaa') doc1.enablePatches(true) doc1.put('_root', 'key1', 1) doc1.put('_root', 'key2', 2) @@ -897,7 +891,7 @@ describe('Automerge', () => { }) it('should support counters in a map', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc2.enablePatches(true) doc1.put('_root', 'starlings', 2, 'counter') doc2.loadIncremental(doc1.saveIncremental()) @@ -911,7 +905,7 @@ describe('Automerge', () => { }) it('should support counters in a list', () => { - const doc1 = create(true, 'aaaa'), doc2 = create(true, 'bbbb') + const doc1 = create('aaaa'), doc2 = create('bbbb') doc2.enablePatches(true) const list = doc1.putObject('_root', 'list', []) doc2.loadIncremental(doc1.saveIncremental()) @@ -935,7 +929,7 @@ describe('Automerge', () => { describe('sync', () => { it('should send a sync message implying no local data', () => { - const doc = create(true) + const doc = create() const s1 = initSyncState() const m1 = doc.generateSyncMessage(s1) if (m1 === null) { throw new RangeError("message should not be null") } @@ -949,7 +943,7 @@ describe('Automerge', () => { }) it('should not reply if we have no data as well', () => { - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() const m1 = n1.generateSyncMessage(s1) if (m1 === null) { throw new RangeError("message should not be null") } @@ -959,7 +953,7 @@ describe('Automerge', () => { }) it('repos with equal heads do not need a reply message', () => { - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() // make two nodes with the same changes @@ -984,7 +978,7 @@ describe('Automerge', () => { }) it('n1 should offer all changes to n2 when starting from nothing', () => { - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() // make changes for n1 that n2 should request const list = n1.putObject("_root", "n", []) @@ -1000,7 +994,7 @@ describe('Automerge', () => { }) it('should sync peers where one has commits the other does not', () => { - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() // make changes for n1 that n2 should request const list = n1.putObject("_root", "n", []) @@ -1017,7 +1011,7 @@ describe('Automerge', () => { it('should work with prior sync state', () => { // create & synchronize two nodes - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 5; i++) { @@ -1040,7 +1034,7 @@ describe('Automerge', () => { it('should not generate messages once synced', () => { // create & synchronize two nodes - const n1 = create(true, 'abc123'), n2 = create(true, 'def456') + const n1 = create('abc123'), n2 = create('def456') const s1 = initSyncState(), s2 = initSyncState() let message @@ -1088,7 +1082,7 @@ describe('Automerge', () => { it('should allow simultaneous messages during synchronization', () => { // create & synchronize two nodes - const n1 = create(true, 'abc123'), n2 = create(true, 'def456') + const n1 = create('abc123'), n2 = create('def456') const s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 5; i++) { @@ -1167,7 +1161,7 @@ describe('Automerge', () => { }) it('should assume sent changes were received until we hear otherwise', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() let message = null @@ -1198,7 +1192,7 @@ describe('Automerge', () => { it('should work regardless of who initiates the exchange', () => { // create & synchronize two nodes - const n1 = create(true), n2 = create(true) + const n1 = create(), n2 = create() const s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 5; i++) { @@ -1226,7 +1220,7 @@ describe('Automerge', () => { // lastSync is undefined. // create two peers both with divergent commits - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') //const s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 10; i++) { @@ -1259,7 +1253,7 @@ describe('Automerge', () => { // lastSync is c9. // create two peers both with divergent commits - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 10; i++) { @@ -1288,7 +1282,7 @@ describe('Automerge', () => { }) it('should ensure non-empty state after sync', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 3; i++) { @@ -1307,7 +1301,7 @@ describe('Automerge', () => { // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 // n2 has changes {c0, c1, c2}, n1's lastSync is c5, and n2's lastSync is c2. // we want to successfully sync (n1) with (r), even though (n1) believes it's talking to (n2) - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState() const s2 = initSyncState() @@ -1356,7 +1350,7 @@ describe('Automerge', () => { }) it('should re-sync after one node experiences data loss without disconnecting', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() // n1 makes three changes, which we sync to n2 @@ -1370,7 +1364,7 @@ describe('Automerge', () => { assert.deepStrictEqual(n1.getHeads(), n2.getHeads()) assert.deepStrictEqual(n1.materialize(), n2.materialize()) - const n2AfterDataLoss = create(true, '89abcdef') + const n2AfterDataLoss = create('89abcdef') // "n2" now has no data, but n1 still thinks it does. Note we don't do // decodeSyncState(encodeSyncState(s1)) in order to simulate data loss without disconnecting @@ -1380,7 +1374,7 @@ describe('Automerge', () => { }) it('should handle changes concurrent to the last sync heads', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef'), n3 = create(true, 'fedcba98') + const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('fedcba98') const s12 = initSyncState(), s21 = initSyncState(), s23 = initSyncState(), s32 = initSyncState() // Change 1 is known to all three nodes @@ -1416,7 +1410,7 @@ describe('Automerge', () => { }) it('should handle histories with lots of branching and merging', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef'), n3 = create(true, 'fedcba98') + const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('fedcba98') n1.put("_root", "x", 0); n1.commit("", 0) const change1 = n1.getLastLocalChange() if (change1 === null) throw new RangeError("no local change") @@ -1447,7 +1441,7 @@ describe('Automerge', () => { sync(n1, n2, s1, s2) // Having n3's last change concurrent to the last sync heads forces us into the slower code path - const change3 = n3.getLastLocalChange() + const change3 = n2.getLastLocalChange() if (change3 === null) throw new RangeError("no local change") n2.applyChanges([change3]) n1.put("_root", "n1", "final"); n1.commit("", 0) @@ -1464,7 +1458,7 @@ describe('Automerge', () => { // `-- n2 // where n2 is a false positive in the Bloom filter containing {n1}. // lastSync is c9. - let n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + let n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 10; i++) { @@ -1499,8 +1493,8 @@ describe('Automerge', () => { // `-- n2c1 <-- n2c2 // where n2c1 is a false positive in the Bloom filter containing {n1c1, n1c2}. // lastSync is c9. - n1 = create(true, '01234567') - n2 = create(true, '89abcdef') + n1 = create('01234567') + n2 = create('89abcdef') s1 = initSyncState() s2 = initSyncState() for (let i = 0; i < 10; i++) { @@ -1569,7 +1563,7 @@ describe('Automerge', () => { assert.strictEqual(decodeSyncMessage(m2).changes.length, 1) // only n2c2; change n2c1 is not sent // n3 is a node that doesn't have the missing change. Nevertheless n1 is going to ask n3 for it - const n3 = create(true, 'fedcba98'), s13 = initSyncState(), s31 = initSyncState() + const n3 = create('fedcba98'), s13 = initSyncState(), s31 = initSyncState() sync(n1, n3, s13, s31) assert.deepStrictEqual(n1.getHeads(), [n1hash2]) assert.deepStrictEqual(n3.getHeads(), [n1hash2]) @@ -1582,7 +1576,7 @@ describe('Automerge', () => { // `-- n2c1 <-- n2c2 <-- n2c3 // where n2c2 is a false positive in the Bloom filter containing {n1c1, n1c2, n1c3}. // lastSync is c4. - let n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + let n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() let n1hash3, n2hash3 @@ -1635,8 +1629,8 @@ describe('Automerge', () => { // `-- n2c1 <-- n2c2 <-- n2c3 // where n2c1 and n2c2 are both false positives in the Bloom filter containing {c5}. // lastSync is c4. - const n1 = create(true, '01234567') - let n2 = create(true, '89abcdef') + const n1 = create('01234567') + let n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() for (let i = 0; i < 5; i++) { @@ -1676,7 +1670,7 @@ describe('Automerge', () => { // c0 <-- c1 <-- c2 <-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 <-- c9 <-+ // `-- n2 // where n2 causes a false positive in the Bloom filter containing {n1}. - let n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + let n1 = create('01234567'), n2 = create('89abcdef') let s1 = initSyncState(), s2 = initSyncState() let message @@ -1736,7 +1730,7 @@ describe('Automerge', () => { // n1 has {c0, c1, c2, n1c1, n1c2, n1c3, n2c1, n2c2}; // n2 has {c0, c1, c2, n1c1, n1c2, n2c1, n2c2, n2c3}; // n3 has {c0, c1, c2, n3c1, n3c2, n3c3}. - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef'), n3 = create(true, '76543210') + const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('76543210') let s13 = initSyncState() const s12 = initSyncState() const s21 = initSyncState() @@ -1808,7 +1802,7 @@ describe('Automerge', () => { }) it('should allow any change to be requested', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() let message = null @@ -1836,7 +1830,7 @@ describe('Automerge', () => { }) it('should ignore requests for a nonexistent change', () => { - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef') + const n1 = create('01234567'), n2 = create('89abcdef') const s1 = initSyncState(), s2 = initSyncState() let message = null @@ -1859,7 +1853,7 @@ describe('Automerge', () => { // ,-- c1 <-- c2 // c0 <-+ // `-- c3 <-- c4 <-- c5 <-- c6 <-- c7 <-- c8 - const n1 = create(true, '01234567'), n2 = create(true, '89abcdef'), n3 = create(true, '76543210') + const n1 = create('01234567'), n2 = create('89abcdef'), n3 = create('76543210') let s1 = initSyncState(), s2 = initSyncState() let msg @@ -1929,245 +1923,5 @@ describe('Automerge', () => { assert.deepStrictEqual(s1.sharedHeads, [c2, c8].sort()) }) }) - - it('can handle overlappying splices', () => { - const doc = create(true) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - doc.putObject("/", "text", "abcdefghij") - doc.splice("/text", 2, 2, "00") - doc.splice("/text", 3, 5, "11") - mat = doc.applyPatches(mat) - assert.deepEqual(mat.text, "ab011ij") - }) - - it('can handle utf16 text', () => { - const doc = create(true) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - - doc.putObject("/", "width1", "AAAAAA") - doc.putObject("/", "width2", "🐻🐻🐻🐻🐻🐻") - doc.putObject("/", "mixed", "A🐻A🐻A🐻") - - assert.deepEqual(doc.length("/width1"), 6); - assert.deepEqual(doc.length("/width2"), 12); - assert.deepEqual(doc.length("/mixed"), 9); - - const heads1 = doc.getHeads(); - - mat = doc.applyPatches(mat) - - const remote = load(doc.save(), true) - remote.enablePatches(true) - let r_mat : any = remote.materialize("/") - - assert.deepEqual(mat, { width1: "AAAAAA", width2: "🐻🐻🐻🐻🐻🐻", mixed: "A🐻A🐻A🐻" }) - assert.deepEqual(mat.width1.slice(2,4), "AA") - assert.deepEqual(mat.width2.slice(2,4), "🐻") - assert.deepEqual(mat.mixed.slice(1,4), "🐻A") - - assert.deepEqual(r_mat, { width1: "AAAAAA", width2: "🐻🐻🐻🐻🐻🐻", mixed: "A🐻A🐻A🐻" }) - assert.deepEqual(r_mat.width1.slice(2,4), "AA") - assert.deepEqual(r_mat.width2.slice(2,4), "🐻") - assert.deepEqual(r_mat.mixed.slice(1,4), "🐻A") - - doc.splice("/width1", 2, 2, "🐻") - doc.splice("/width2", 2, 2, "A🐻A") - doc.splice("/mixed", 3, 3, "X") - - mat = doc.applyPatches(mat) - remote.loadIncremental(doc.saveIncremental()); - r_mat = remote.applyPatches(r_mat) - - assert.deepEqual(mat.width1, "AA🐻AA") - assert.deepEqual(mat.width2, "🐻A🐻A🐻🐻🐻🐻") - assert.deepEqual(mat.mixed, "A🐻XA🐻") - - assert.deepEqual(r_mat.width1, "AA🐻AA") - assert.deepEqual(r_mat.width2, "🐻A🐻A🐻🐻🐻🐻") - assert.deepEqual(r_mat.mixed, "A🐻XA🐻") - assert.deepEqual(remote.length("/width1"), 6); - assert.deepEqual(remote.length("/width2"), 14); - assert.deepEqual(remote.length("/mixed"), 7); - - // when indexing in the middle of a multibyte char it indexes at the char before - doc.splice("/width2", 4, 1, "X") - mat = doc.applyPatches(mat) - remote.loadIncremental(doc.saveIncremental()); - r_mat = remote.applyPatches(r_mat) - - assert.deepEqual(mat.width2, "🐻AXA🐻🐻🐻🐻") - - assert.deepEqual(doc.length("/width1", heads1), 6); - assert.deepEqual(doc.length("/width2", heads1), 12); - assert.deepEqual(doc.length("/mixed", heads1), 9); - - assert.deepEqual(doc.get("/mixed", 0), 'A'); - assert.deepEqual(doc.get("/mixed", 1), '🐻'); - assert.deepEqual(doc.get("/mixed", 2), '🐻'); - assert.deepEqual(doc.get("/mixed", 3), 'X'); - assert.deepEqual(doc.get("/mixed", 1, heads1), '🐻'); - assert.deepEqual(doc.get("/mixed", 2, heads1), '🐻'); - assert.deepEqual(doc.get("/mixed", 3, heads1), 'A'); - assert.deepEqual(doc.get("/mixed", 4, heads1), '🐻'); - }) - - it('can handle non-characters embedded in text', () => { - const change : any = { - ops: [ - { action: 'makeText', obj: '_root', key: 'bad_text', pred: [] }, - { action: 'set', obj: '1@aaaa', elemId: '_head', insert: true, value: 'A', pred: [] }, - { action: 'set', obj: '1@aaaa', elemId: '2@aaaa', insert: true, value: 'BBBBB', pred: [] }, - { action: 'makeMap', obj: '1@aaaa', elemId: '3@aaaa', insert: true, pred: [] }, - { action: 'set', obj: '1@aaaa', elemId: '4@aaaa', insert: true, value: 'C', pred: [] } - ], - actor: 'aaaa', - seq: 1, - startOp: 1, - time: 0, - message: null, - deps: [] - } - const doc = load(encodeChange(change), true); - doc.enablePatches(true) - const mat : any = doc.materialize("/") - - // multi - char strings appear as a span of strings - // non strings appear as an object replacement unicode char - assert.deepEqual(mat.bad_text, 'ABBBBBC') - assert.deepEqual(doc.text("/bad_text"), 'ABBBBBC') - assert.deepEqual(doc.materialize("/bad_text"), 'ABBBBBC') - - // deleting in the middle of a multi-byte character will delete the whole thing - const doc1 = doc.fork() - doc1.splice("/bad_text", 3, 3, "X"); - assert.deepEqual(doc1.text("/bad_text"), 'AXC') - - // deleting in the middle of a multi-byte character will delete the whole thing - // and characters past its end - const doc2 = doc.fork() - doc2.splice("/bad_text", 3, 4, "X"); - assert.deepEqual(doc2.text("/bad_text"), 'AXC') - - const doc3 = doc.fork() - doc3.splice("/bad_text", 3, 5, "X"); - assert.deepEqual(doc3.text("/bad_text"), 'AX') - - // inserting in the middle of a mutli-bytes span inserts after - const doc4 = doc.fork() - doc4.splice("/bad_text", 3, 0, "X"); - assert.deepEqual(doc4.text("/bad_text"), 'ABBBBBXC') - - // deleting into the middle of a multi-byte span deletes the whole thing - const doc5 = doc.fork() - doc5.splice("/bad_text", 0, 2, "X"); - assert.deepEqual(doc5.text("/bad_text"), 'XC') - - // you can access elements in the text by text index - assert.deepEqual(doc5.getAll("/bad_text", 1), [['map', '4@aaaa' ]]) - assert.deepEqual(doc5.getAll("/bad_text", 2, doc.getHeads()), [['str', 'BBBBB', '3@aaaa' ]]) - }) - }) - - describe("the legacy text implementation", () => { - const root = "_root" - class FakeText { - elems: Array - constructor(elems: string | Array) { - if (typeof elems === "string") { - this.elems = Array.from(elems) - } else { - this.elems = elems - } - } - } - it("should materialize old style text", () => { - let doc = create(false); - doc.registerDatatype("text", (e: any) => new FakeText(e)) - doc.enablePatches(true) - let txt = doc.putObject(root, "text", "") - doc.splice(txt, 0, 0, "hello") - let mat: any = doc.materialize() - assert.deepEqual(mat.text, new FakeText("hello")) - }) - - it("should apply patches to old style text", () => { - let doc = create(false); - doc.registerDatatype("text", (e: any) => new FakeText(e)) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - doc.putObject("/", "text", "abcdefghij") - doc.splice("/text", 2, 2, "00") - doc.splice("/text", 3, 5, "11") - mat = doc.applyPatches(mat) - assert.deepEqual(mat.text, new FakeText("ab011ij")) - }) - - it("should apply list patches to old style text", () => { - let doc = create(false); - doc.registerDatatype("text", (e: any) => new FakeText(e)) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - doc.putObject("/", "text", "abc") - doc.insert("/text", 0, "0") - doc.insert("/text", 1, "1") - mat = doc.applyPatches(mat) - assert.deepEqual(mat.text, new FakeText("01abc")) - }) - - it("should allow inserting using list methods", () => { - let doc = create(false); - doc.registerDatatype("text", (e: any) => new FakeText(e)) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - const txt = doc.putObject("/", "text", "abc") - doc.insert(txt, 3, "d") - doc.insert(txt, 0, "0") - mat = doc.applyPatches(mat) - assert.deepEqual(mat.text, new FakeText("0abcd")) - }) - - it("should allow inserting objects in old style text", () => { - let doc = create(false); - doc.registerDatatype("text", (e: any) => new FakeText(e)) - doc.enablePatches(true) - let mat : any = doc.materialize("/") - const txt = doc.putObject("/", "text", "abc") - doc.insertObject(txt, 0, {"key": "value"}) - doc.insertObject(txt, 2, ["elem"]) - doc.insert(txt, 2, "m") - mat = doc.applyPatches(mat) - assert.deepEqual(mat.text, new FakeText([ - {"key": "value"}, "a", "m", ["elem"], "b", "c" - ])) - }) - - class RawString { - val: string; - constructor(s: string) { - this.val = s - } - } - - it("should allow registering a different type for strings", () => { - let doc = create(false); - doc.registerDatatype("str", (e: any) => new RawString(e)) - doc.enablePatches(true) - doc.put("/", "key", "value") - let mat: any = doc.materialize() - assert.deepStrictEqual(mat.key, new RawString("value")) - }) - - it("should generate patches correctly for raw strings", () => { - let doc = create(false); - doc.registerDatatype("str", (e: any) => new RawString(e)) - doc.enablePatches(true) - let mat: any = doc.materialize() - doc.put("/", "key", "value") - mat = doc.applyPatches(mat) - assert.deepStrictEqual(mat.key, new RawString("value")) - }) - }) }) diff --git a/rust/automerge/Cargo.toml b/rust/automerge/Cargo.toml index 0c10cc2b..8872dcdc 100644 --- a/rust/automerge/Cargo.toml +++ b/rust/automerge/Cargo.toml @@ -1,13 +1,12 @@ [package] name = "automerge" -version = "0.3.0" +version = "0.2.0" edition = "2021" license = "MIT" repository = "https://github.com/automerge/automerge-rs" documentation = "https://automerge.org/automerge-rs/automerge/" rust-version = "1.57.0" description = "A JSON-like data structure (a CRDT) that can be modified concurrently by different users, and merged again automatically" -readme = "./README.md" [features] optree-visualisation = ["dot", "rand"] @@ -43,11 +42,10 @@ pretty_assertions = "1.0.0" proptest = { version = "^1.0.0", default-features = false, features = ["std"] } serde_json = { version = "^1.0.73", features=["float_roundtrip"], default-features=true } maplit = { version = "^1.0" } -criterion = "0.4.0" +criterion = "0.3.5" test-log = { version = "0.2.10", features=["trace"], default-features = false} tracing-subscriber = {version = "0.3.9", features = ["fmt", "env-filter"] } automerge-test = { path = "../automerge-test" } -prettytable = "0.10.0" [[bench]] name = "range" diff --git a/rust/automerge/README.md b/rust/automerge/README.md deleted file mode 100644 index 97dbe4f8..00000000 --- a/rust/automerge/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Automerge - -Automerge is a library of data structures for building collaborative -[local-first](https://www.inkandswitch.com/local-first/) applications. This is -the Rust implementation. See [automerge.org](https://automerge.org/) diff --git a/rust/automerge/benches/range.rs b/rust/automerge/benches/range.rs index 008ae159..aec5c293 100644 --- a/rust/automerge/benches/range.rs +++ b/rust/automerge/benches/range.rs @@ -1,4 +1,4 @@ -use automerge::{transaction::Transactable, Automerge, ReadDoc, ROOT}; +use automerge::{transaction::Transactable, Automerge, ROOT}; use criterion::{black_box, criterion_group, criterion_main, Criterion}; fn doc(n: u64) -> Automerge { @@ -16,20 +16,36 @@ fn range(doc: &Automerge) { range.for_each(drop); } +fn range_rev(doc: &Automerge) { + let range = doc.values(ROOT).rev(); + range.for_each(drop); +} + fn range_at(doc: &Automerge) { let range = doc.values_at(ROOT, &doc.get_heads()); range.for_each(drop); } +fn range_at_rev(doc: &Automerge) { + let range = doc.values_at(ROOT, &doc.get_heads()).rev(); + range.for_each(drop); +} + fn criterion_benchmark(c: &mut Criterion) { let n = 100_000; let doc = doc(n); c.bench_function(&format!("range {}", n), |b| { b.iter(|| range(black_box(&doc))) }); + c.bench_function(&format!("range rev {}", n), |b| { + b.iter(|| range_rev(black_box(&doc))) + }); c.bench_function(&format!("range_at {}", n), |b| { b.iter(|| range_at(black_box(&doc))) }); + c.bench_function(&format!("range_at rev {}", n), |b| { + b.iter(|| range_at_rev(black_box(&doc))) + }); } criterion_group!(benches, criterion_benchmark); diff --git a/rust/automerge/benches/sync.rs b/rust/automerge/benches/sync.rs index 13965792..483fd2b4 100644 --- a/rust/automerge/benches/sync.rs +++ b/rust/automerge/benches/sync.rs @@ -1,8 +1,4 @@ -use automerge::{ - sync::{self, SyncDoc}, - transaction::Transactable, - Automerge, ROOT, -}; +use automerge::{sync, transaction::Transactable, Automerge, ROOT}; use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion}; #[derive(Default)] diff --git a/rust/automerge/examples/quickstart.rs b/rust/automerge/examples/quickstart.rs index fcb23d5e..76ef0470 100644 --- a/rust/automerge/examples/quickstart.rs +++ b/rust/automerge/examples/quickstart.rs @@ -2,7 +2,7 @@ use automerge::transaction::CommitOptions; use automerge::transaction::Transactable; use automerge::AutomergeError; use automerge::ObjType; -use automerge::{Automerge, ReadDoc, ROOT}; +use automerge::{Automerge, ROOT}; // Based on https://automerge.github.io/docs/quickstart fn main() { diff --git a/rust/automerge/examples/watch.rs b/rust/automerge/examples/watch.rs index 4cd8f4ea..1618d6c4 100644 --- a/rust/automerge/examples/watch.rs +++ b/rust/automerge/examples/watch.rs @@ -3,7 +3,6 @@ use automerge::transaction::Transactable; use automerge::Automerge; use automerge::AutomergeError; use automerge::Patch; -use automerge::ReadDoc; use automerge::VecOpObserver; use automerge::ROOT; diff --git a/rust/automerge/fuzz/.gitignore b/rust/automerge/fuzz/.gitignore deleted file mode 100644 index 2eb15f8e..00000000 --- a/rust/automerge/fuzz/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target -corpus -coverage diff --git a/rust/automerge/fuzz/Cargo.toml b/rust/automerge/fuzz/Cargo.toml deleted file mode 100644 index 3461e9f3..00000000 --- a/rust/automerge/fuzz/Cargo.toml +++ /dev/null @@ -1,29 +0,0 @@ -[package] -name = "automerge-fuzz" -version = "0.0.0" -publish = false -edition = "2021" - -[package.metadata] -cargo-fuzz = true - -[dependencies] -libfuzzer-sys = "0.4" -leb128 = "^0.2.5" -sha2 = "^0.10.0" - -[dependencies.automerge] -path = ".." - -# Prevent this from interfering with workspaces -[workspace] -members = ["."] - -[profile.release] -debug = 1 - -[[bin]] -name = "load" -path = "fuzz_targets/load.rs" -test = false -doc = false \ No newline at end of file diff --git a/rust/automerge/fuzz/fuzz_targets/load.rs b/rust/automerge/fuzz/fuzz_targets/load.rs deleted file mode 100644 index 0dea2624..00000000 --- a/rust/automerge/fuzz/fuzz_targets/load.rs +++ /dev/null @@ -1,37 +0,0 @@ -#![no_main] - -use sha2::{Sha256, Digest}; -use automerge::{Automerge}; -use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; -use libfuzzer_sys::fuzz_target; - -#[derive(Debug)] -struct DocumentChunk { - bytes: Vec, -} - -fn add_header(typ: u8, data: &[u8]) -> Vec { - let mut input = vec![u8::from(typ)]; - leb128::write::unsigned(&mut input, data.len() as u64).unwrap(); - input.extend(data.as_ref()); - let hash_result = Sha256::digest(input.clone()); - let array: [u8; 32] = hash_result.into(); - - let mut out = vec![133, 111, 74, 131, array[0], array[1], array[2], array[3]]; - out.extend(input); - out -} - -impl<'a> Arbitrary<'a> for DocumentChunk -{ - fn arbitrary(u: &mut Unstructured<'a>) -> Result { - let input = u.bytes(u.len())?; - let contents = add_header(0, input); - - return Ok(DocumentChunk{bytes: contents}) - } -} - -fuzz_target!(|doc: DocumentChunk| { - Automerge::load(&doc.bytes); -}); diff --git a/rust/automerge/src/autocommit.rs b/rust/automerge/src/autocommit.rs index ae28596e..e9f6ec79 100644 --- a/rust/automerge/src/autocommit.rs +++ b/rust/automerge/src/autocommit.rs @@ -1,54 +1,17 @@ use std::ops::RangeBounds; use crate::exid::ExId; -use crate::op_observer::{BranchableObserver, OpObserver}; -use crate::sync::SyncDoc; +use crate::op_observer::OpObserver; use crate::transaction::{CommitOptions, Transactable}; use crate::{ - sync, Keys, KeysAt, ListRange, ListRangeAt, MapRange, MapRangeAt, ObjType, Parents, ReadDoc, - ScalarValue, + sync, Keys, KeysAt, ListRange, ListRangeAt, MapRange, MapRangeAt, ObjType, Parents, ScalarValue, }; use crate::{ transaction::{Observation, Observed, TransactionInner, UnObserved}, - ActorId, Automerge, AutomergeError, Change, ChangeHash, Prop, TextEncoding, Value, Values, + ActorId, Automerge, AutomergeError, Change, ChangeHash, Prop, Value, Values, }; /// An automerge document that automatically manages transactions. -/// -/// An `AutoCommit` can optionally manage an [`OpObserver`]. This observer will be notified of all -/// changes made by both remote and local changes. The type parameter `O` tracks whether this -/// document is observed or not. -/// -/// ## Creating, loading, merging and forking documents -/// -/// A new document can be created with [`Self::new`], which will create a document with a random -/// [`ActorId`]. Existing documents can be loaded with [`Self::load`]. -/// -/// If you have two documents and you want to merge the changes from one into the other you can use -/// [`Self::merge`]. -/// -/// If you have a document you want to split into two concurrent threads of execution you can use -/// [`Self::fork`]. If you want to split a document from ealier in its history you can use -/// [`Self::fork_at`]. -/// -/// ## Reading values -/// -/// [`Self`] implements [`ReadDoc`], which provides methods for reading values from the document. -/// -/// ## Modifying a document -/// -/// This type implements [`Transactable`] directly, so you can modify it using methods from [`Transactable`]. -/// -/// ## Synchronization -/// -/// To synchronise call [`Self::sync`] which returns an implementation of [`SyncDoc`] -/// -/// ## Observers -/// -/// An `AutoCommit` can optionally manage an [`OpObserver`]. [`Self::new`] will return a document -/// with no observer but you can set an observer using [`Self::with_observer`]. The observer must -/// implement both [`OpObserver`] and [`BranchableObserver`]. If you have an observed autocommit -/// then you can obtain a mutable reference to the observer with [`Self::observer`] #[derive(Debug, Clone)] pub struct AutoCommitWithObs { doc: Automerge, @@ -56,12 +19,19 @@ pub struct AutoCommitWithObs { observation: Obs, } -/// An autocommit document with no observer -/// -/// See [`AutoCommitWithObs`] pub type AutoCommit = AutoCommitWithObs; -impl Default for AutoCommitWithObs> { +impl AutoCommitWithObs { + pub fn unobserved() -> AutoCommitWithObs { + AutoCommitWithObs { + doc: Automerge::new(), + transaction: None, + observation: UnObserved::new(), + } + } +} + +impl Default for AutoCommitWithObs> { fn default() -> Self { let op_observer = O::default(); AutoCommitWithObs { @@ -91,7 +61,7 @@ impl AutoCommit { } } -impl AutoCommitWithObs> { +impl AutoCommitWithObs> { pub fn observer(&mut self) -> &mut Obs { self.ensure_transaction_closed(); self.observation.observer() @@ -119,7 +89,7 @@ impl AutoCommitWithObs { } impl AutoCommitWithObs { - pub fn with_observer( + pub fn with_observer( self, op_observer: Obs2, ) -> AutoCommitWithObs> { @@ -155,19 +125,9 @@ impl AutoCommitWithObs { self.doc.get_actor() } - /// Change the text encoding of this view of the document - /// - /// This is a cheap operation, it just changes the way indexes are calculated - pub fn with_encoding(mut self, encoding: TextEncoding) -> Self { - self.doc = self.doc.with_encoding(encoding); - self - } - fn ensure_transaction_open(&mut self) { if self.transaction.is_none() { - let args = self.doc.transaction_args(); - let inner = TransactionInner::new(args); - self.transaction = Some((self.observation.branch(), inner)) + self.transaction = Some((self.observation.branch(), self.doc.transaction_inner())); } } @@ -178,13 +138,6 @@ impl AutoCommitWithObs { } } - /// Load an incremental save of a document. - /// - /// Unlike `load` this imports changes into an existing document. It will work with both the - /// output of [`Self::save`] and [`Self::save_incremental`] - /// - /// The return value is the number of ops which were applied, this is not useful and will - /// change in future. pub fn load_incremental(&mut self, data: &[u8]) -> Result { self.ensure_transaction_closed(); // TODO - would be nice to pass None here instead of &mut () @@ -221,24 +174,17 @@ impl AutoCommitWithObs { } } - /// Save the entirety of this document in a compact form. pub fn save(&mut self) -> Vec { self.ensure_transaction_closed(); self.doc.save() } - /// Save this document, but don't run it through DEFLATE afterwards pub fn save_nocompress(&mut self) -> Vec { self.ensure_transaction_closed(); self.doc.save_nocompress() } - /// Save the changes since the last call to [Self::save`] - /// - /// The output of this will not be a compressed document format, but a series of individual - /// changes. This is useful if you know you have only made a small change since the last `save` - /// and you want to immediately send it somewhere (e.g. you've inserted a single character in a - /// text object). + // should this return an empty vec instead of None? pub fn save_incremental(&mut self) -> Vec { self.ensure_transaction_closed(); self.doc.save_incremental() @@ -249,7 +195,6 @@ impl AutoCommitWithObs { self.doc.get_missing_deps(heads) } - /// Get the last change made by this documents actor ID pub fn get_last_local_change(&mut self) -> Option<&Change> { self.ensure_transaction_closed(); self.doc.get_last_local_change() @@ -268,24 +213,40 @@ impl AutoCommitWithObs { self.doc.get_change_by_hash(hash) } - /// Get changes in `other` that are not in `self pub fn get_changes_added<'a>(&mut self, other: &'a mut Self) -> Vec<&'a Change> { self.ensure_transaction_closed(); other.ensure_transaction_closed(); self.doc.get_changes_added(&other.doc) } - #[doc(hidden)] - pub fn import(&self, s: &str) -> Result<(ExId, ObjType), AutomergeError> { + pub fn import(&self, s: &str) -> Result { self.doc.import(s) } - #[doc(hidden)] pub fn dump(&mut self) { self.ensure_transaction_closed(); self.doc.dump() } + pub fn generate_sync_message(&mut self, sync_state: &mut sync::State) -> Option { + self.ensure_transaction_closed(); + self.doc.generate_sync_message(sync_state) + } + + pub fn receive_sync_message( + &mut self, + sync_state: &mut sync::State, + message: sync::Message, + ) -> Result<(), AutomergeError> { + self.ensure_transaction_closed(); + if let Some(observer) = self.observation.observer() { + self.doc + .receive_sync_message_with(sync_state, message, Some(observer)) + } else { + self.doc.receive_sync_message(sync_state, message) + } + } + /// Return a graphviz representation of the opset. /// /// # Arguments @@ -305,17 +266,12 @@ impl AutoCommitWithObs { self.doc.get_heads() } - /// Commit any uncommitted changes - /// - /// Returns `None` if there were no operations to commit - pub fn commit(&mut self) -> Option { + pub fn commit(&mut self) -> ChangeHash { self.commit_with(CommitOptions::default()) } /// Commit the current operations with some options. /// - /// Returns `None` if there were no operations to commit - /// /// ``` /// # use automerge::transaction::CommitOptions; /// # use automerge::transaction::Transactable; @@ -329,7 +285,7 @@ impl AutoCommitWithObs { /// i64; /// doc.commit_with(CommitOptions::default().with_message("Create todos list").with_time(now)); /// ``` - pub fn commit_with(&mut self, options: CommitOptions) -> Option { + pub fn commit_with(&mut self, options: CommitOptions) -> ChangeHash { // ensure that even no changes triggers a change self.ensure_transaction_open(); let (current, tx) = self.transaction.take().unwrap(); @@ -337,46 +293,20 @@ impl AutoCommitWithObs { tx.commit(&mut self.doc, options.message, options.time) } - /// Remove any changes that have been made in the current transaction from the document pub fn rollback(&mut self) -> usize { self.transaction .take() .map(|(_, tx)| tx.rollback(&mut self.doc)) .unwrap_or(0) } - - /// Generate an empty change - /// - /// The main reason to do this is if you wish to create a "merge commit" which has all the - /// current heads of the documents as dependencies but you have no new operations to create. - /// - /// Because this structure is an "autocommit" there may actually be outstanding operations to - /// submit. If this is the case this function will create two changes, one with the outstanding - /// operations and a new one with no operations. The returned `ChangeHash` will always be the - /// hash of the empty change. - pub fn empty_change(&mut self, options: CommitOptions) -> ChangeHash { - self.ensure_transaction_closed(); - let args = self.doc.transaction_args(); - TransactionInner::empty(&mut self.doc, args, options.message, options.time) - } - - /// An implementation of [`crate::sync::SyncDoc`] for this autocommit - /// - /// This ensures that any outstanding transactions for this document are committed before - /// taking part in the sync protocol - pub fn sync(&mut self) -> impl SyncDoc + '_ { - self.ensure_transaction_closed(); - SyncWrapper { inner: self } - } } -impl ReadDoc for AutoCommitWithObs { - fn parents>(&self, obj: O) -> Result, AutomergeError> { - self.doc.parents(obj) - } - - fn path_to_object>(&self, obj: O) -> Result, AutomergeError> { - self.doc.path_to_object(obj) +impl Transactable for AutoCommitWithObs { + fn pending_ops(&self) -> usize { + self.transaction + .as_ref() + .map(|(_, t)| t.pending_ops()) + .unwrap_or(0) } fn keys>(&self, obj: O) -> Keys<'_, '_> { @@ -437,73 +367,10 @@ impl ReadDoc for AutoCommitWithObs { self.doc.length_at(obj, heads) } - fn object_type>(&self, obj: O) -> Result { + fn object_type>(&self, obj: O) -> Option { self.doc.object_type(obj) } - fn text>(&self, obj: O) -> Result { - self.doc.text(obj) - } - - fn text_at>( - &self, - obj: O, - heads: &[ChangeHash], - ) -> Result { - self.doc.text_at(obj, heads) - } - - fn get, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - self.doc.get(obj, prop) - } - - fn get_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_at(obj, prop, heads) - } - - fn get_all, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_all(obj, prop) - } - - fn get_all_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_all_at(obj, prop, heads) - } - - fn get_missing_deps(&self, heads: &[ChangeHash]) -> Vec { - self.doc.get_missing_deps(heads) - } - - fn get_change_by_hash(&self, hash: &ChangeHash) -> Option<&Change> { - self.doc.get_change_by_hash(hash) - } -} - -impl Transactable for AutoCommitWithObs { - fn pending_ops(&self) -> usize { - self.transaction - .as_ref() - .map(|(_, t)| t.pending_ops()) - .unwrap_or(0) - } - fn put, P: Into, V: Into>( &mut self, obj: O, @@ -621,52 +488,79 @@ impl Transactable for AutoCommitWithObs { ) } + fn splice_text_utf16>( + &mut self, + obj: O, + pos: usize, + del: usize, + text: &str, + ) -> Result<(), AutomergeError> { + self.ensure_transaction_open(); + let (current, tx) = self.transaction.as_mut().unwrap(); + tx.splice_text_utf16( + &mut self.doc, + current.observer(), + obj.as_ref(), + pos, + del, + text, + ) + } + + fn text>(&self, obj: O) -> Result { + self.doc.text(obj) + } + + fn text_at>( + &self, + obj: O, + heads: &[ChangeHash], + ) -> Result { + self.doc.text_at(obj, heads) + } + + // TODO - I need to return these OpId's here **only** to get + // the legacy conflicts format of { [opid]: value } + // Something better? + fn get, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + self.doc.get(obj, prop) + } + + fn get_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_at(obj, prop, heads) + } + + fn get_all, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_all(obj, prop) + } + + fn get_all_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_all_at(obj, prop, heads) + } + + fn parents>(&self, obj: O) -> Result, AutomergeError> { + self.doc.parents(obj) + } + fn base_heads(&self) -> Vec { self.doc.get_heads() } } - -// A wrapper we return from `AutoCommit::sync` to ensure that transactions are closed before we -// start syncing -struct SyncWrapper<'a, Obs: Observation> { - inner: &'a mut AutoCommitWithObs, -} - -impl<'a, Obs: Observation> SyncDoc for SyncWrapper<'a, Obs> { - fn generate_sync_message(&self, sync_state: &mut sync::State) -> Option { - self.inner.doc.generate_sync_message(sync_state) - } - - fn receive_sync_message( - &mut self, - sync_state: &mut sync::State, - message: sync::Message, - ) -> Result<(), AutomergeError> { - self.inner.ensure_transaction_closed(); - if let Some(observer) = self.inner.observation.observer() { - self.inner - .doc - .receive_sync_message_with(sync_state, message, observer) - } else { - self.inner.doc.receive_sync_message(sync_state, message) - } - } - - fn receive_sync_message_with( - &mut self, - sync_state: &mut sync::State, - message: sync::Message, - op_observer: &mut Obs2, - ) -> Result<(), AutomergeError> { - if let Some(our_observer) = self.inner.observation.observer() { - let mut composed = crate::op_observer::compose(our_observer, op_observer); - self.inner - .doc - .receive_sync_message_with(sync_state, message, &mut composed) - } else { - self.inner - .doc - .receive_sync_message_with(sync_state, message, op_observer) - } - } -} diff --git a/rust/automerge/src/automerge.rs b/rust/automerge/src/automerge.rs index 0dd82253..068b6387 100644 --- a/rust/automerge/src/automerge.rs +++ b/rust/automerge/src/automerge.rs @@ -4,29 +4,28 @@ use std::fmt::Debug; use std::num::NonZeroU64; use std::ops::RangeBounds; -use crate::change_graph::ChangeGraph; +use crate::clock::ClockData; +use crate::clocks::Clocks; use crate::columnar::Key as EncodedKey; use crate::exid::ExId; use crate::keys::Keys; -use crate::op_observer::{BranchableObserver, OpObserver}; +use crate::op_observer::OpObserver; use crate::op_set::OpSet; use crate::parents::Parents; -use crate::storage::{self, load, CompressConfig, VerificationMode}; +use crate::storage::{self, load, CompressConfig}; use crate::transaction::{ - self, CommitOptions, Failure, Observed, Success, Transaction, TransactionArgs, UnObserved, + self, CommitOptions, Failure, Observed, Success, Transaction, TransactionInner, UnObserved, }; use crate::types::{ - ActorId, ChangeHash, Clock, ElemId, Export, Exportable, Key, ListEncoding, ObjId, Op, OpId, - OpType, ScalarValue, TextEncoding, Value, + ActorId, ChangeHash, Clock, ElemId, Export, Exportable, Key, ObjId, Op, OpId, OpType, + ScalarValue, Value, }; use crate::{ query, AutomergeError, Change, KeysAt, ListRange, ListRangeAt, MapRange, MapRangeAt, ObjType, - Prop, ReadDoc, Values, + Prop, Values, }; use serde::Serialize; -mod current_state; - #[cfg(test)] mod tests; @@ -36,71 +35,29 @@ pub(crate) enum Actor { Cached(usize), } -/// What to do when loading a document partially succeeds -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub enum OnPartialLoad { - /// Ignore the error and return the loaded changes - Ignore, - /// Fail the entire load - Error, -} - -/// An automerge document which does not manage transactions for you. -/// -/// ## Creating, loading, merging and forking documents -/// -/// A new document can be created with [`Self::new`], which will create a document with a random -/// [`ActorId`]. Existing documents can be loaded with [`Self::load`], or [`Self::load_with`]. -/// -/// If you have two documents and you want to merge the changes from one into the other you can use -/// [`Self::merge`] or [`Self::merge_with`]. -/// -/// If you have a document you want to split into two concurrent threads of execution you can use -/// [`Self::fork`]. If you want to split a document from ealier in its history you can use -/// [`Self::fork_at`]. -/// -/// ## Reading values -/// -/// [`Self`] implements [`ReadDoc`], which provides methods for reading values from the document. -/// -/// ## Modifying a document (Transactions) -/// -/// [`Automerge`] provides an interface for viewing and modifying automerge documents which does -/// not manage transactions for you. To create changes you use either [`Automerge::transaction`] or -/// [`Automerge::transact`] (or the `_with` variants). -/// -/// ## Sync -/// -/// This type implements [`crate::sync::SyncDoc`] -/// -/// ## Observers -/// -/// Many of the methods on this type have an `_with` or `_observed` variant -/// which allow you to pass in an [`OpObserver`] to observe any changes which -/// occur. +/// An automerge document. #[derive(Debug, Clone)] pub struct Automerge { /// The list of unapplied changes that are not causally ready. - queue: Vec, + pub(crate) queue: Vec, /// The history of changes that form this document, topologically sorted too. - history: Vec, + pub(crate) history: Vec, /// Mapping from change hash to index into the history list. - history_index: HashMap, - /// Graph of changes - change_graph: ChangeGraph, + pub(crate) history_index: HashMap, + /// Mapping from change hash to vector clock at this state. + pub(crate) clocks: HashMap, /// Mapping from actor index to list of seqs seen for them. - states: HashMap>, + pub(crate) states: HashMap>, /// Current dependencies of this document (heads hashes). - deps: HashSet, + pub(crate) deps: HashSet, /// Heads at the last save. - saved: Vec, + pub(crate) saved: Vec, /// The set of operations that form this document. - ops: OpSet, + pub(crate) ops: OpSet, /// The current actor. - actor: Actor, + pub(crate) actor: Actor, /// The maximum operation counter this document has seen. - max_op: u64, - text_encoding: TextEncoding, + pub(crate) max_op: u64, } impl Automerge { @@ -110,69 +67,16 @@ impl Automerge { queue: vec![], history: vec![], history_index: HashMap::new(), - change_graph: ChangeGraph::new(), + clocks: HashMap::new(), states: HashMap::new(), ops: Default::default(), deps: Default::default(), saved: Default::default(), actor: Actor::Unused(ActorId::random()), max_op: 0, - text_encoding: Default::default(), } } - pub(crate) fn ops_mut(&mut self) -> &mut OpSet { - &mut self.ops - } - - pub(crate) fn ops(&self) -> &OpSet { - &self.ops - } - - /// Whether this document has any operations - pub fn is_empty(&self) -> bool { - self.history.is_empty() && self.queue.is_empty() - } - - pub(crate) fn actor_id(&self) -> ActorId { - match &self.actor { - Actor::Unused(id) => id.clone(), - Actor::Cached(idx) => self.ops.m.actors[*idx].clone(), - } - } - - /// Remove the current actor from the opset if it has no ops - /// - /// If the current actor ID has no ops in the opset then remove it from the cache of actor IDs. - /// This us used when rolling back a transaction. If the rolled back ops are the only ops for - /// the current actor then we want to remove that actor from the opset so it doesn't end up in - /// any saved version of the document. - /// - /// # Panics - /// - /// If the last actor in the OpSet is not the actor ID of this document - pub(crate) fn rollback_last_actor(&mut self) { - if let Actor::Cached(actor_idx) = self.actor { - if self.states.get(&actor_idx).is_none() && self.ops.m.actors.len() > 0 { - assert!(self.ops.m.actors.len() == actor_idx + 1); - let actor = self.ops.m.actors.remove_last(); - self.actor = Actor::Unused(actor); - } - } - } - - pub(crate) fn text_encoding(&self) -> TextEncoding { - self.text_encoding - } - - /// Change the text encoding of this view of the document - /// - /// This is a cheap operation, it just changes the way indexes are calculated - pub fn with_encoding(mut self, encoding: TextEncoding) -> Self { - self.text_encoding = encoding; - self - } - /// Set the actor id for this document. pub fn with_actor(mut self, actor: ActorId) -> Self { self.actor = Actor::Unused(actor); @@ -210,20 +114,25 @@ impl Automerge { /// Start a transaction. pub fn transaction(&mut self) -> Transaction<'_, UnObserved> { - let args = self.transaction_args(); - Transaction::new(self, args, UnObserved) + Transaction { + inner: Some(self.transaction_inner()), + doc: self, + observation: Some(UnObserved), + } } - /// Start a transaction with an observer - pub fn transaction_with_observer( + pub fn transaction_with_observer( &mut self, op_observer: Obs, ) -> Transaction<'_, Observed> { - let args = self.transaction_args(); - Transaction::new(self, args, Observed::new(op_observer)) + Transaction { + inner: Some(self.transaction_inner()), + doc: self, + observation: Some(Observed::new(op_observer)), + } } - pub(crate) fn transaction_args(&mut self) -> TransactionArgs { + pub(crate) fn transaction_inner(&mut self) -> TransactionInner { let actor = self.get_actor_index(); let seq = self.states.get(&actor).map_or(0, |v| v.len()) as u64 + 1; let mut deps = self.get_heads(); @@ -233,13 +142,15 @@ impl Automerge { deps.push(last_hash); } } - // SAFETY: this unwrap is safe as we always add 1 - let start_op = NonZeroU64::new(self.max_op + 1).unwrap(); - TransactionArgs { - actor_index: actor, + TransactionInner { + actor, seq, - start_op, + // SAFETY: this unwrap is safe as we always add 1 + start_op: NonZeroU64::new(self.max_op + 1).unwrap(), + time: 0, + message: None, + operations: vec![], deps, } } @@ -262,6 +173,7 @@ impl Automerge { self.transact_with_impl(Some(c), f) } + /// Like [`Self::transact`] but with a function for generating the commit options. fn transact_with_impl( &mut self, c: Option, @@ -299,7 +211,7 @@ impl Automerge { pub fn transact_observed(&mut self, f: F) -> transaction::Result where F: FnOnce(&mut Transaction<'_, Observed>) -> Result, - Obs: OpObserver + BranchableObserver + Default, + Obs: OpObserver + Default, { self.transact_observed_with_impl(None::<&dyn Fn(&O) -> CommitOptions>, f) } @@ -313,7 +225,7 @@ impl Automerge { where F: FnOnce(&mut Transaction<'_, Observed>) -> Result, C: FnOnce(&O) -> CommitOptions, - Obs: OpObserver + BranchableObserver + Default, + Obs: OpObserver + Default, { self.transact_observed_with_impl(Some(c), f) } @@ -326,7 +238,7 @@ impl Automerge { where F: FnOnce(&mut Transaction<'_, Observed>) -> Result, C: FnOnce(&O) -> CommitOptions, - Obs: OpObserver + BranchableObserver + Default, + Obs: OpObserver + Default, { let observer = Obs::default(); let mut tx = self.transaction_with_observer(observer); @@ -352,27 +264,14 @@ impl Automerge { } } - /// Generate an empty change - /// - /// The main reason to do this is if you want to create a "merge commit", which is a change - /// that has all the current heads of the document as dependencies. - pub fn empty_commit(&mut self, opts: CommitOptions) -> ChangeHash { - let args = self.transaction_args(); - Transaction::empty(self, args, opts) - } - /// Fork this document at the current point for use by a different actor. - /// - /// This will create a new actor ID for the forked document pub fn fork(&self) -> Self { let mut f = self.clone(); f.set_actor(ActorId::random()); f } - /// Fork this document at the given heads - /// - /// This will create a new actor ID for the forked document + /// Fork this document at the give heads pub fn fork_at(&self, heads: &[ChangeHash]) -> Result { let mut seen = heads.iter().cloned().collect::>(); let mut heads = heads.to_vec(); @@ -397,14 +296,191 @@ impl Automerge { Ok(f) } - pub(crate) fn exid_to_obj(&self, id: &ExId) -> Result<(ObjId, ObjType), AutomergeError> { + // KeysAt::() + // LenAt::() + // PropAt::() + // NthAt::() + + /// Get the parents of an object in the document tree. + /// + /// ### Errors + /// + /// Returns an error when the id given is not the id of an object in this document. + /// This function does not get the parents of scalar values contained within objects. + /// + /// ### Experimental + /// + /// This function may in future be changed to allow getting the parents from the id of a scalar + /// value. + pub fn parents>(&self, obj: O) -> Result, AutomergeError> { + let obj_id = self.exid_to_obj(obj.as_ref())?; + Ok(self.ops.parents(obj_id)) + } + + pub fn path_to_object>( + &self, + obj: O, + ) -> Result, AutomergeError> { + Ok(self.parents(obj.as_ref().clone())?.path()) + } + + /// Get the keys of the object `obj`. + /// + /// For a map this returns the keys of the map. + /// For a list this returns the element ids (opids) encoded as strings. + pub fn keys>(&self, obj: O) -> Keys<'_, '_> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + let iter_keys = self.ops.keys(obj); + Keys::new(self, iter_keys) + } else { + Keys::new(self, None) + } + } + + /// Historical version of [`keys`](Self::keys). + pub fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + if let Ok(clock) = self.clock_at(heads) { + return KeysAt::new(self, self.ops.keys_at(obj, clock)); + } + } + KeysAt::new(self, None) + } + + /// Iterate over the keys and values of the map `obj` in the given range. + pub fn map_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> MapRange<'_, R> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + MapRange::new(self, self.ops.map_range(obj, range)) + } else { + MapRange::new(self, None) + } + } + + /// Historical version of [`map_range`](Self::map_range). + pub fn map_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> MapRangeAt<'_, R> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + if let Ok(clock) = self.clock_at(heads) { + let iter_range = self.ops.map_range_at(obj, range, clock); + return MapRangeAt::new(self, iter_range); + } + } + MapRangeAt::new(self, None) + } + + /// Iterate over the indexes and values of the list `obj` in the given range. + pub fn list_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> ListRange<'_, R> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + ListRange::new(self, self.ops.list_range(obj, range)) + } else { + ListRange::new(self, None) + } + } + + /// Historical version of [`list_range`](Self::list_range). + pub fn list_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> ListRangeAt<'_, R> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + if let Ok(clock) = self.clock_at(heads) { + let iter_range = self.ops.list_range_at(obj, range, clock); + return ListRangeAt::new(self, iter_range); + } + } + ListRangeAt::new(self, None) + } + + pub fn values>(&self, obj: O) -> Values<'_> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + match self.ops.object_type(&obj) { + Some(t) if t.is_sequence() => Values::new(self, self.ops.list_range(obj, ..)), + Some(_) => Values::new(self, self.ops.map_range(obj, ..)), + None => Values::empty(self), + } + } else { + Values::empty(self) + } + } + + pub fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_> { + if let Ok(obj) = self.exid_to_obj(obj.as_ref()) { + if let Ok(clock) = self.clock_at(heads) { + return match self.ops.object_type(&obj) { + Some(ObjType::Map) | Some(ObjType::Table) => { + let iter_range = self.ops.map_range_at(obj, .., clock); + Values::new(self, iter_range) + } + Some(ObjType::List) | Some(ObjType::Text) => { + let iter_range = self.ops.list_range_at(obj, .., clock); + Values::new(self, iter_range) + } + None => Values::empty(self), + }; + } + } + Values::empty(self) + } + + /// Get the length of the given object. + pub fn length>(&self, obj: O) -> usize { + if let Ok(inner_obj) = self.exid_to_obj(obj.as_ref()) { + match self.ops.object_type(&inner_obj) { + Some(ObjType::Map) | Some(ObjType::Table) => self.keys(obj).count(), + Some(ObjType::List) | Some(ObjType::Text) => { + self.ops.search(&inner_obj, query::Len::new()).len + } + None => 0, + } + } else { + 0 + } + } + + /// Historical version of [`length`](Self::length). + pub fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize { + if let Ok(inner_obj) = self.exid_to_obj(obj.as_ref()) { + if let Ok(clock) = self.clock_at(heads) { + return match self.ops.object_type(&inner_obj) { + Some(ObjType::Map) | Some(ObjType::Table) => self.keys_at(obj, heads).count(), + Some(ObjType::List) | Some(ObjType::Text) => { + self.ops.search(&inner_obj, query::LenAt::new(clock)).len + } + None => 0, + }; + } + } + 0 + } + + /// Get the type of this object, if it is an object. + pub fn object_type>(&self, obj: O) -> Option { + let obj = self.exid_to_obj(obj.as_ref()).ok()?; + self.ops.object_type(&obj) + } + + pub(crate) fn exid_to_obj(&self, id: &ExId) -> Result { match id { - ExId::Root => Ok((ObjId::root(), ObjType::Map)), + ExId::Root => Ok(ObjId::root()), ExId::Id(ctr, actor, idx) => { // do a direct get here b/c this could be foriegn and not be within the array // bounds let obj = if self.ops.m.actors.cache.get(*idx) == Some(actor) { - ObjId(OpId::new(*ctr, *idx)) + ObjId(OpId(*ctr, *idx)) } else { // FIXME - make a real error let idx = self @@ -413,10 +489,10 @@ impl Automerge { .actors .lookup(actor) .ok_or(AutomergeError::Fail)?; - ObjId(OpId::new(*ctr, idx)) + ObjId(OpId(*ctr, idx)) }; - if let Some(obj_type) = self.ops.object_type(&obj) { - Ok((obj, obj_type)) + if self.ops.object_type(&obj).is_some() { + Ok(obj) } else { Err(AutomergeError::NotAnObject) } @@ -428,29 +504,142 @@ impl Automerge { self.ops.id_to_exid(id) } + /// Get the string represented by the given text object. + pub fn text>(&self, obj: O) -> Result { + let obj = self.exid_to_obj(obj.as_ref())?; + let query = self.ops.search(&obj, query::ListVals::new()); + let mut buffer = String::new(); + for q in &query.ops { + buffer.push_str(q.to_str()); + } + Ok(buffer) + } + + /// Historical version of [`text`](Self::text). + pub fn text_at>( + &self, + obj: O, + heads: &[ChangeHash], + ) -> Result { + let obj = self.exid_to_obj(obj.as_ref())?; + let clock = self.clock_at(heads)?; + let query = self.ops.search(&obj, query::ListValsAt::new(clock)); + let mut buffer = String::new(); + for q in &query.ops { + if let OpType::Put(ScalarValue::Str(s)) = &q.action { + buffer.push_str(s); + } else { + buffer.push('\u{fffc}'); + } + } + Ok(buffer) + } + + // TODO - I need to return these OpId's here **only** to get + // the legacy conflicts format of { [opid]: value } + // Something better? + /// Get a value out of the document. + /// + /// Returns both the value and the id of the operation that created it, useful for handling + /// conflicts and serves as the object id if the value is an object. + pub fn get, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + Ok(self.get_all(obj, prop.into())?.last().cloned()) + } + + /// Historical version of [`get`](Self::get). + pub fn get_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + Ok(self.get_all_at(obj, prop, heads)?.last().cloned()) + } + + /// Get all conflicting values out of the document at this prop that conflict. + /// + /// Returns both the value and the id of the operation that created it, useful for handling + /// conflicts and serves as the object id if the value is an object. + pub fn get_all, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + let obj = self.exid_to_obj(obj.as_ref())?; + let mut result = match prop.into() { + Prop::Map(p) => { + let prop = self.ops.m.props.lookup(&p); + if let Some(p) = prop { + self.ops + .search(&obj, query::Prop::new(p)) + .ops + .into_iter() + .map(|o| (o.value(), self.id_to_exid(o.id))) + .collect() + } else { + vec![] + } + } + Prop::Seq(n) => self + .ops + .search(&obj, query::Nth::new(n)) + .ops + .into_iter() + .map(|o| (o.value(), self.id_to_exid(o.id))) + .collect(), + }; + result.sort_by(|a, b| b.1.cmp(&a.1)); + Ok(result) + } + + /// Historical version of [`get_all`](Self::get_all). + pub fn get_all_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + let prop = prop.into(); + let obj = self.exid_to_obj(obj.as_ref())?; + let clock = self.clock_at(heads)?; + let result = match prop { + Prop::Map(p) => { + let prop = self.ops.m.props.lookup(&p); + if let Some(p) = prop { + self.ops + .search(&obj, query::PropAt::new(p, clock)) + .ops + .into_iter() + .map(|o| (o.clone_value(), self.id_to_exid(o.id))) + .collect() + } else { + vec![] + } + } + Prop::Seq(n) => self + .ops + .search(&obj, query::NthAt::new(n, clock)) + .ops + .into_iter() + .map(|o| (o.clone_value(), self.id_to_exid(o.id))) + .collect(), + }; + Ok(result) + } + /// Load a document. pub fn load(data: &[u8]) -> Result { - Self::load_with::<()>(data, OnPartialLoad::Error, VerificationMode::Check, None) + Self::load_with::<()>(data, None) } - /// Load a document without verifying the head hashes - /// - /// This is useful for debugging as it allows you to examine a corrupted document. - pub fn load_unverified_heads(data: &[u8]) -> Result { - Self::load_with::<()>( - data, - OnPartialLoad::Error, - VerificationMode::DontCheck, - None, - ) - } - - /// Load a document with an observer + /// Load a document. #[tracing::instrument(skip(data, observer), err)] pub fn load_with( data: &[u8], - on_error: OnPartialLoad, - mode: VerificationMode, mut observer: Option<&mut Obs>, ) -> Result { if data.is_empty() { @@ -464,7 +653,6 @@ impl Automerge { return Err(load::Error::BadChecksum.into()); } - let mut change: Option = None; let mut am = match first_chunk { storage::Chunk::Document(d) => { tracing::trace!("first chunk is document chunk, inflating"); @@ -473,18 +661,21 @@ impl Automerge { result: op_set, changes, heads, - } = storage::load::reconstruct_document(&d, mode, OpSet::builder()) - .map_err(|e| load::Error::InflateDocument(Box::new(e)))?; + } = match &mut observer { + Some(o) => storage::load::reconstruct_document(&d, OpSet::observed_builder(*o)), + None => storage::load::reconstruct_document(&d, OpSet::builder()), + } + .map_err(|e| load::Error::InflateDocument(Box::new(e)))?; let mut hashes_by_index = HashMap::new(); let mut actor_to_history: HashMap> = HashMap::new(); - let mut change_graph = ChangeGraph::new(); + let mut clocks = Clocks::new(); for (index, change) in changes.iter().enumerate() { // SAFETY: This should be fine because we just constructed an opset containing // all the changes let actor_index = op_set.m.actors.lookup(change.actor_id()).unwrap(); actor_to_history.entry(actor_index).or_default().push(index); hashes_by_index.insert(index, change.hash()); - change_graph.add_change(change, actor_index)?; + clocks.add_change(change, actor_index)?; } let history_index = hashes_by_index.into_iter().map(|(k, v)| (v, k)).collect(); Self { @@ -492,84 +683,57 @@ impl Automerge { history: changes, history_index, states: actor_to_history, - change_graph, + clocks: clocks.into(), ops: op_set, deps: heads.into_iter().collect(), saved: Default::default(), actor: Actor::Unused(ActorId::random()), max_op, - text_encoding: Default::default(), } } storage::Chunk::Change(stored_change) => { - tracing::trace!("first chunk is change chunk"); - change = Some( - Change::new_from_unverified(stored_change.into_owned(), None) - .map_err(|e| load::Error::InvalidChangeColumns(Box::new(e)))?, - ); - Self::new() + tracing::trace!("first chunk is change chunk, applying"); + let change = Change::new_from_unverified(stored_change.into_owned(), None) + .map_err(|e| load::Error::InvalidChangeColumns(Box::new(e)))?; + let mut am = Self::new(); + am.apply_change(change, &mut observer); + am } storage::Chunk::CompressedChange(stored_change, compressed) => { - tracing::trace!("first chunk is compressed change"); - change = Some( - Change::new_from_unverified( - stored_change.into_owned(), - Some(compressed.into_owned()), - ) - .map_err(|e| load::Error::InvalidChangeColumns(Box::new(e)))?, - ); - Self::new() + tracing::trace!("first chunk is compressed change, decompressing and applying"); + let change = Change::new_from_unverified( + stored_change.into_owned(), + Some(compressed.into_owned()), + ) + .map_err(|e| load::Error::InvalidChangeColumns(Box::new(e)))?; + let mut am = Self::new(); + am.apply_change(change, &mut observer); + am } }; - tracing::trace!("loading change chunks"); + tracing::trace!("first chunk loaded, loading remaining chunks"); match load::load_changes(remaining.reset()) { load::LoadedChanges::Complete(c) => { - am.apply_changes(change.into_iter().chain(c))?; - if !am.queue.is_empty() { - return Err(AutomergeError::MissingDeps); + for change in c { + am.apply_change(change, &mut observer); } } - load::LoadedChanges::Partial { error, .. } => { - if on_error == OnPartialLoad::Error { - return Err(error.into()); - } - } - } - if let Some(observer) = &mut observer { - current_state::observe_current_state(&am, *observer); + load::LoadedChanges::Partial { error, .. } => return Err(error.into()), } Ok(am) } /// Load an incremental save of a document. - /// - /// Unlike `load` this imports changes into an existing document. It will work with both the - /// output of [`Self::save`] and [`Self::save_incremental`] - /// - /// The return value is the number of ops which were applied, this is not useful and will - /// change in future. pub fn load_incremental(&mut self, data: &[u8]) -> Result { self.load_incremental_with::<()>(data, None) } - /// Like [`Self::load_incremental`] but with an observer + /// Load an incremental save of a document. pub fn load_incremental_with( &mut self, data: &[u8], op_observer: Option<&mut Obs>, ) -> Result { - if self.is_empty() { - let mut doc = - Self::load_with::<()>(data, OnPartialLoad::Ignore, VerificationMode::Check, None)?; - doc = doc - .with_encoding(self.text_encoding) - .with_actor(self.actor_id()); - if let Some(obs) = op_observer { - current_state::observe_current_state(&doc, obs); - } - *self = doc; - return Ok(self.ops.len()); - } let changes = match load::load_changes(storage::parse::Input::new(data)) { load::LoadedChanges::Complete(c) => c, load::LoadedChanges::Partial { error, loaded, .. } => { @@ -594,9 +758,6 @@ impl Automerge { } /// Apply changes to this document. - /// - /// This is idemptotent in the sense that if a change has already been applied it will be - /// ignored. pub fn apply_changes( &mut self, changes: impl IntoIterator, @@ -604,17 +765,12 @@ impl Automerge { self.apply_changes_with::<_, ()>(changes, None) } - /// Like [`Self::apply_changes`] but with an observer + /// Apply changes to this document. pub fn apply_changes_with, Obs: OpObserver>( &mut self, changes: I, mut op_observer: Option<&mut Obs>, ) -> Result<(), AutomergeError> { - // Record this so we can avoid observing each individual change and instead just observe - // the final state after all the changes have been applied. We can only do this for an - // empty document right now, once we have logic to produce the diffs between arbitrary - // states of the OpSet we can make this cleaner. - let empty_at_start = self.is_empty(); for c in changes { if !self.history_index.contains_key(&c.hash()) { if self.duplicate_seq(&c) { @@ -624,11 +780,7 @@ impl Automerge { )); } if self.is_causally_ready(&c) { - if empty_at_start { - self.apply_change::<()>(c, &mut None); - } else { - self.apply_change(c, &mut op_observer); - } + self.apply_change(c, &mut op_observer); } else { self.queue.push(c); } @@ -636,16 +788,7 @@ impl Automerge { } while let Some(c) = self.pop_next_causally_ready_change() { if !self.history_index.contains_key(&c.hash()) { - if empty_at_start { - self.apply_change::<()>(c, &mut None); - } else { - self.apply_change(c, &mut op_observer); - } - } - } - if empty_at_start { - if let Some(observer) = &mut op_observer { - current_state::observe_current_state(self, *observer); + self.apply_change(c, &mut op_observer); } } Ok(()) @@ -698,32 +841,29 @@ impl Automerge { .iter_ops() .enumerate() .map(|(i, c)| { - let id = OpId::new(change.start_op().get() + i as u64, actor); + let id = OpId(change.start_op().get() + i as u64, actor); let key = match &c.key { EncodedKey::Prop(n) => Key::Map(self.ops.m.props.cache(n.to_string())), EncodedKey::Elem(e) if e.is_head() => Key::Seq(ElemId::head()), EncodedKey::Elem(ElemId(o)) => { - Key::Seq(ElemId(OpId::new(o.counter(), actors[o.actor()]))) + Key::Seq(ElemId(OpId::new(actors[o.actor()], o.counter()))) } }; let obj = if c.obj.is_root() { ObjId::root() } else { - ObjId(OpId::new( - c.obj.opid().counter(), - actors[c.obj.opid().actor()], - )) + ObjId(OpId(c.obj.opid().counter(), actors[c.obj.opid().actor()])) }; let pred = c .pred .iter() - .map(|p| OpId::new(p.counter(), actors[p.actor()])); + .map(|p| OpId::new(actors[p.actor()], p.counter())); let pred = self.ops.m.sorted_opids(pred); ( obj, Op { id, - action: OpType::from_action_and_value(c.action, c.val), + action: OpType::from_index_and_value(c.action, c.val).unwrap(), key, succ: Default::default(), pred, @@ -757,16 +897,12 @@ impl Automerge { } /// Save the entirety of this document in a compact form. - /// - /// This takes a mutable reference to self because it saves the heads of the last save so that - /// `save_incremental` can be used to produce only the changes since the last `save`. This API - /// will be changing in future. pub fn save(&mut self) -> Vec { let heads = self.get_heads(); let c = self.history.iter(); let bytes = crate::storage::save::save_document( c, - self.ops.iter().map(|(objid, _, op)| (objid, op)), + self.ops.iter(), &self.ops.m.actors, &self.ops.m.props, &heads, @@ -776,13 +912,12 @@ impl Automerge { bytes } - /// Save this document, but don't run it through DEFLATE afterwards pub fn save_nocompress(&mut self) -> Vec { let heads = self.get_heads(); let c = self.history.iter(); let bytes = crate::storage::save::save_document( c, - self.ops.iter().map(|(objid, _, op)| (objid, op)), + self.ops.iter(), &self.ops.m.actors, &self.ops.m.props, &heads, @@ -792,12 +927,7 @@ impl Automerge { bytes } - /// Save the changes since the last call to [Self::save`] - /// - /// The output of this will not be a compressed document format, but a series of individual - /// changes. This is useful if you know you have only made a small change since the last `save` - /// and you want to immediately send it somewhere (e.g. you've inserted a single character in a - /// text object). + /// Save the changes since last save in a compact form. pub fn save_incremental(&mut self) -> Vec { let changes = self .get_changes(self.saved.as_slice()) @@ -825,16 +955,51 @@ impl Automerge { .filter(|hash| self.history_index.contains_key(hash)) .copied() .collect::>(); + let heads_clock = self.clock_at(&heads)?; - self.change_graph.remove_ancestors(changes, &heads); + // keep the hashes that are concurrent or after the heads + changes.retain(|hash| { + self.clocks + .get(hash) + .unwrap() + .partial_cmp(&heads_clock) + .map_or(true, |o| o == Ordering::Greater) + }); Ok(()) } + /// Get the hashes of the changes in this document that aren't transitive dependencies of the + /// given `heads`. + pub fn get_missing_deps(&self, heads: &[ChangeHash]) -> Vec { + let in_queue: HashSet<_> = self.queue.iter().map(|change| change.hash()).collect(); + let mut missing = HashSet::new(); + + for head in self.queue.iter().flat_map(|change| change.deps()) { + if !self.history_index.contains_key(head) { + missing.insert(head); + } + } + + for head in heads { + if !self.history_index.contains_key(head) { + missing.insert(head); + } + } + + let mut missing = missing + .into_iter() + .filter(|hash| !in_queue.contains(hash)) + .copied() + .collect::>(); + missing.sort(); + missing + } + /// Get the changes since `have_deps` in this document using a clock internally. fn get_changes_clock(&self, have_deps: &[ChangeHash]) -> Result, AutomergeError> { // get the clock for the given deps - let clock = self.clock_at(have_deps); + let clock = self.clock_at(have_deps)?; // get the documents current clock @@ -859,6 +1024,10 @@ impl Automerge { .collect()) } + pub fn get_changes(&self, have_deps: &[ChangeHash]) -> Result, AutomergeError> { + self.get_changes_clock(have_deps) + } + /// Get the last change this actor made to the document. pub fn get_last_local_change(&self) -> Option<&Change> { return self @@ -868,8 +1037,67 @@ impl Automerge { .find(|c| c.actor_id() == self.get_actor()); } - fn clock_at(&self, heads: &[ChangeHash]) -> Clock { - self.change_graph.clock_for_heads(heads) + fn clock_at(&self, heads: &[ChangeHash]) -> Result { + if let Some(first_hash) = heads.first() { + let mut clock = self + .clocks + .get(first_hash) + .ok_or(AutomergeError::MissingHash(*first_hash))? + .clone(); + + for hash in &heads[1..] { + let c = self + .clocks + .get(hash) + .ok_or(AutomergeError::MissingHash(*hash))?; + clock.merge(c); + } + + Ok(clock) + } else { + Ok(Clock::new()) + } + } + + /// Get a change by its hash. + pub fn get_change_by_hash(&self, hash: &ChangeHash) -> Option<&Change> { + self.history_index + .get(hash) + .and_then(|index| self.history.get(*index)) + } + + /// Get the changes that the other document added compared to this document. + #[tracing::instrument(skip(self, other))] + pub fn get_changes_added<'a>(&self, other: &'a Self) -> Vec<&'a Change> { + // Depth-first traversal from the heads through the dependency graph, + // until we reach a change that is already present in other + let mut stack: Vec<_> = other.get_heads(); + tracing::trace!(their_heads=?stack, "finding changes to merge"); + let mut seen_hashes = HashSet::new(); + let mut added_change_hashes = Vec::new(); + while let Some(hash) = stack.pop() { + if !seen_hashes.contains(&hash) && self.get_change_by_hash(&hash).is_none() { + seen_hashes.insert(hash); + added_change_hashes.push(hash); + if let Some(change) = other.get_change_by_hash(&hash) { + stack.extend(change.deps()); + } + } + } + // Return those changes in the reverse of the order in which the depth-first search + // found them. This is not necessarily a topological sort, but should usually be close. + added_change_hashes.reverse(); + added_change_hashes + .into_iter() + .filter_map(|h| other.get_change_by_hash(&h)) + .collect() + } + + /// Get the heads of this document. + pub fn get_heads(&self) -> Vec { + let mut deps: Vec<_> = self.deps.iter().copied().collect(); + deps.sort_unstable(); + deps } fn get_hash(&self, actor: usize, seq: u64) -> Result { @@ -895,10 +1123,24 @@ impl Automerge { .push(history_index); self.history_index.insert(change.hash(), history_index); - self.change_graph - .add_change(&change, actor_index) - .expect("Change's deps should already be in the document"); + let mut clock = Clock::new(); + for hash in change.deps() { + let c = self + .clocks + .get(hash) + .expect("Change's deps should already be in the document"); + clock.merge(c); + } + clock.include( + actor_index, + ClockData { + max_op: change.max_op(), + seq: change.seq(), + }, + ); + self.clocks.insert(change.hash(), clock); + self.history_index.insert(change.hash(), history_index); self.history.push(change); history_index @@ -911,10 +1153,9 @@ impl Automerge { self.deps.insert(change.hash()); } - #[doc(hidden)] - pub fn import(&self, s: &str) -> Result<(ExId, ObjType), AutomergeError> { + pub fn import(&self, s: &str) -> Result { if s == "_root" { - Ok((ExId::Root, ObjType::Map)) + Ok(ExId::Root) } else { let n = s .find('@') @@ -929,11 +1170,11 @@ impl Automerge { .actors .lookup(&actor) .ok_or_else(|| AutomergeError::InvalidObjId(s.to_owned()))?; - let obj = ExId::Id(counter, self.ops.m.actors.cache[actor].clone(), actor); - let obj_type = self - .object_type(&obj) - .map_err(|_| AutomergeError::InvalidObjId(s.to_owned()))?; - Ok((obj, obj_type)) + Ok(ExId::Id( + counter, + self.ops.m.actors.cache[actor].clone(), + actor, + )) } } @@ -955,7 +1196,7 @@ impl Automerge { "pred", "succ" ); - for (obj, _, op) in self.ops.iter() { + for (obj, op) in self.ops.iter() { let id = self.to_string(op.id); let obj = self.to_string(obj); let key = match op.key { @@ -990,12 +1231,8 @@ impl Automerge { /// visualised #[cfg(feature = "optree-visualisation")] pub fn visualise_optree(&self, objects: Option>) -> String { - let objects = objects.map(|os| { - os.iter() - .filter_map(|o| self.exid_to_obj(o).ok()) - .map(|o| o.0) - .collect() - }); + let objects = + objects.map(|os| os.iter().filter_map(|o| self.exid_to_obj(o).ok()).collect()); self.ops.visualise(objects) } @@ -1005,7 +1242,7 @@ impl Automerge { let succ = q.succ; let pos = q.pos; - self.ops.add_succ(obj, &succ, &op); + self.ops.add_succ(obj, succ.iter().copied(), &op); if !op.is_delete() { self.ops.insert(pos, obj, op.clone()); @@ -1019,19 +1256,14 @@ impl Automerge { op: Op, observer: &mut Obs, ) -> Op { + let q = self.ops.search(obj, query::SeekOpWithPatch::new(&op)); let obj_type = self.ops.object_type(obj); - let encoding = obj_type - .map(|o| ListEncoding::new(o, self.text_encoding)) - .unwrap_or_default(); - let q = self - .ops - .search(obj, query::SeekOpWithPatch::new(&op, encoding)); let query::SeekOpWithPatch { pos, succ, seen, - last_width, + seen16, values, had_value_before, .. @@ -1046,7 +1278,7 @@ impl Automerge { if op.insert { if obj_type == Some(ObjType::Text) { - observer.splice_text(self, ex_obj, seen, op.to_str()); + observer.splice_text(self, ex_obj, seen, seen16, op.to_str()); } else { let value = (op.value(), self.ops.id_to_exid(op.id)); observer.insert(self, ex_obj, seen, value); @@ -1057,10 +1289,7 @@ impl Automerge { let conflict = values.len() > 1; observer.expose(self, ex_obj, key, value, conflict); } else if had_value_before { - match key { - Prop::Map(k) => observer.delete_map(self, ex_obj, &k), - Prop::Seq(index) => observer.delete_seq(self, ex_obj, index, last_width), - } + observer.delete(self, ex_obj, key); } } else if let Some(value) = op.get_increment_value() { // only observe this increment if the counter is visible, i.e. the counter's @@ -1090,7 +1319,7 @@ impl Automerge { } } - self.ops.add_succ(obj, &succ, &op); + self.ops.add_succ(obj, succ.iter().copied(), &op); if !op.is_delete() { self.ops.insert(pos, obj, op.clone()); @@ -1098,340 +1327,6 @@ impl Automerge { op } - - /// Get the heads of this document. - pub fn get_heads(&self) -> Vec { - let mut deps: Vec<_> = self.deps.iter().copied().collect(); - deps.sort_unstable(); - deps - } - - pub fn get_changes(&self, have_deps: &[ChangeHash]) -> Result, AutomergeError> { - self.get_changes_clock(have_deps) - } - - /// Get changes in `other` that are not in `self - pub fn get_changes_added<'a>(&self, other: &'a Self) -> Vec<&'a Change> { - // Depth-first traversal from the heads through the dependency graph, - // until we reach a change that is already present in other - let mut stack: Vec<_> = other.get_heads(); - tracing::trace!(their_heads=?stack, "finding changes to merge"); - let mut seen_hashes = HashSet::new(); - let mut added_change_hashes = Vec::new(); - while let Some(hash) = stack.pop() { - if !seen_hashes.contains(&hash) && self.get_change_by_hash(&hash).is_none() { - seen_hashes.insert(hash); - added_change_hashes.push(hash); - if let Some(change) = other.get_change_by_hash(&hash) { - stack.extend(change.deps()); - } - } - } - // Return those changes in the reverse of the order in which the depth-first search - // found them. This is not necessarily a topological sort, but should usually be close. - added_change_hashes.reverse(); - added_change_hashes - .into_iter() - .filter_map(|h| other.get_change_by_hash(&h)) - .collect() - } -} - -impl ReadDoc for Automerge { - fn parents>(&self, obj: O) -> Result, AutomergeError> { - let (obj_id, _) = self.exid_to_obj(obj.as_ref())?; - Ok(self.ops.parents(obj_id)) - } - - fn path_to_object>(&self, obj: O) -> Result, AutomergeError> { - Ok(self.parents(obj.as_ref().clone())?.path()) - } - - fn keys>(&self, obj: O) -> Keys<'_, '_> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - let iter_keys = self.ops.keys(obj); - Keys::new(self, iter_keys) - } else { - Keys::new(self, None) - } - } - - fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - let clock = self.clock_at(heads); - return KeysAt::new(self, self.ops.keys_at(obj, clock)); - } - KeysAt::new(self, None) - } - - fn map_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> MapRange<'_, R> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - MapRange::new(self, self.ops.map_range(obj, range)) - } else { - MapRange::new(self, None) - } - } - - fn map_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> MapRangeAt<'_, R> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - let clock = self.clock_at(heads); - let iter_range = self.ops.map_range_at(obj, range, clock); - return MapRangeAt::new(self, iter_range); - } - MapRangeAt::new(self, None) - } - - fn list_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> ListRange<'_, R> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - ListRange::new(self, self.ops.list_range(obj, range)) - } else { - ListRange::new(self, None) - } - } - - fn list_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> ListRangeAt<'_, R> { - if let Ok((obj, _)) = self.exid_to_obj(obj.as_ref()) { - let clock = self.clock_at(heads); - let iter_range = self.ops.list_range_at(obj, range, clock); - return ListRangeAt::new(self, iter_range); - } - ListRangeAt::new(self, None) - } - - fn values>(&self, obj: O) -> Values<'_> { - if let Ok((obj, obj_type)) = self.exid_to_obj(obj.as_ref()) { - if obj_type.is_sequence() { - Values::new(self, self.ops.list_range(obj, ..)) - } else { - Values::new(self, self.ops.map_range(obj, ..)) - } - } else { - Values::empty(self) - } - } - - fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_> { - if let Ok((obj, obj_type)) = self.exid_to_obj(obj.as_ref()) { - let clock = self.clock_at(heads); - match obj_type { - ObjType::Map | ObjType::Table => { - let iter_range = self.ops.map_range_at(obj, .., clock); - Values::new(self, iter_range) - } - ObjType::List | ObjType::Text => { - let iter_range = self.ops.list_range_at(obj, .., clock); - Values::new(self, iter_range) - } - } - } else { - Values::empty(self) - } - } - - fn length>(&self, obj: O) -> usize { - if let Ok((inner_obj, obj_type)) = self.exid_to_obj(obj.as_ref()) { - if obj_type == ObjType::Map || obj_type == ObjType::Table { - self.keys(obj).count() - } else { - let encoding = ListEncoding::new(obj_type, self.text_encoding); - self.ops.search(&inner_obj, query::Len::new(encoding)).len - } - } else { - 0 - } - } - - fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize { - if let Ok((inner_obj, obj_type)) = self.exid_to_obj(obj.as_ref()) { - let clock = self.clock_at(heads); - if obj_type == ObjType::Map || obj_type == ObjType::Table { - self.keys_at(obj, heads).count() - } else { - let encoding = ListEncoding::new(obj_type, self.text_encoding); - self.ops - .search(&inner_obj, query::LenAt::new(clock, encoding)) - .len - } - } else { - 0 - } - } - - fn object_type>(&self, obj: O) -> Result { - let (_, obj_type) = self.exid_to_obj(obj.as_ref())?; - Ok(obj_type) - } - - fn text>(&self, obj: O) -> Result { - let obj = self.exid_to_obj(obj.as_ref())?.0; - let query = self.ops.search(&obj, query::ListVals::new()); - let mut buffer = String::new(); - for q in &query.ops { - buffer.push_str(q.to_str()); - } - Ok(buffer) - } - - fn text_at>( - &self, - obj: O, - heads: &[ChangeHash], - ) -> Result { - let obj = self.exid_to_obj(obj.as_ref())?.0; - let clock = self.clock_at(heads); - let query = self.ops.search(&obj, query::ListValsAt::new(clock)); - let mut buffer = String::new(); - for q in &query.ops { - if let OpType::Put(ScalarValue::Str(s)) = &q.action { - buffer.push_str(s); - } else { - buffer.push('\u{fffc}'); - } - } - Ok(buffer) - } - - fn get, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - Ok(self.get_all(obj, prop.into())?.last().cloned()) - } - - fn get_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - Ok(self.get_all_at(obj, prop, heads)?.last().cloned()) - } - - fn get_all, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - let obj = self.exid_to_obj(obj.as_ref())?.0; - let mut result = match prop.into() { - Prop::Map(p) => { - let prop = self.ops.m.props.lookup(&p); - if let Some(p) = prop { - self.ops - .search(&obj, query::Prop::new(p)) - .ops - .into_iter() - .map(|o| (o.value(), self.id_to_exid(o.id))) - .collect() - } else { - vec![] - } - } - Prop::Seq(n) => { - let obj_type = self.ops.object_type(&obj); - let encoding = obj_type - .map(|o| ListEncoding::new(o, self.text_encoding)) - .unwrap_or_default(); - self.ops - .search(&obj, query::Nth::new(n, encoding)) - .ops - .into_iter() - .map(|o| (o.value(), self.id_to_exid(o.id))) - .collect() - } - }; - result.sort_by(|a, b| b.1.cmp(&a.1)); - Ok(result) - } - - fn get_all_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - let prop = prop.into(); - let obj = self.exid_to_obj(obj.as_ref())?.0; - let clock = self.clock_at(heads); - let result = match prop { - Prop::Map(p) => { - let prop = self.ops.m.props.lookup(&p); - if let Some(p) = prop { - self.ops - .search(&obj, query::PropAt::new(p, clock)) - .ops - .into_iter() - .map(|o| (o.clone_value(), self.id_to_exid(o.id))) - .collect() - } else { - vec![] - } - } - Prop::Seq(n) => { - let obj_type = self.ops.object_type(&obj); - let encoding = obj_type - .map(|o| ListEncoding::new(o, self.text_encoding)) - .unwrap_or_default(); - self.ops - .search(&obj, query::NthAt::new(n, clock, encoding)) - .ops - .into_iter() - .map(|o| (o.clone_value(), self.id_to_exid(o.id))) - .collect() - } - }; - Ok(result) - } - - fn get_missing_deps(&self, heads: &[ChangeHash]) -> Vec { - let in_queue: HashSet<_> = self.queue.iter().map(|change| change.hash()).collect(); - let mut missing = HashSet::new(); - - for head in self.queue.iter().flat_map(|change| change.deps()) { - if !self.history_index.contains_key(head) { - missing.insert(head); - } - } - - for head in heads { - if !self.history_index.contains_key(head) { - missing.insert(head); - } - } - - let mut missing = missing - .into_iter() - .filter(|hash| !in_queue.contains(hash)) - .copied() - .collect::>(); - missing.sort(); - missing - } - - fn get_change_by_hash(&self, hash: &ChangeHash) -> Option<&Change> { - self.history_index - .get(hash) - .and_then(|index| self.history.get(*index)) - } } impl Default for Automerge { diff --git a/rust/automerge/src/automerge/current_state.rs b/rust/automerge/src/automerge/current_state.rs deleted file mode 100644 index 3f7f4afc..00000000 --- a/rust/automerge/src/automerge/current_state.rs +++ /dev/null @@ -1,915 +0,0 @@ -use std::{borrow::Cow, collections::HashSet, iter::Peekable}; - -use itertools::Itertools; - -use crate::{ - types::{ElemId, Key, ListEncoding, ObjId, Op, OpId}, - ObjType, OpObserver, OpType, ScalarValue, Value, -}; - -/// Traverse the "current" state of the document, notifying `observer` -/// -/// The "current" state of the document is the set of visible operations. This function will -/// traverse that set of operations and call the corresponding methods on the `observer` as it -/// encounters values. The `observer` methods will be called in the order in which they appear in -/// the document. That is to say that the observer will be notified of parent objects before the -/// objects they contain and elements of a sequence will be notified in the order they occur. -/// -/// Due to only notifying of visible operations the observer will only be called with `put`, -/// `insert`, and `splice`, operations. -pub(super) fn observe_current_state(doc: &crate::Automerge, observer: &mut O) { - // The OpSet already exposes operations in the order they appear in the document. - // `OpSet::iter_objs` iterates over the objects in causal order, this means that parent objects - // will always appear before their children. Furthermore, the operations within each object are - // ordered by key (which means by their position in a sequence for sequences). - // - // Effectively then we iterate over each object, then we group the operations in the object by - // key and for each key find the visible operations for that key. Then we notify the observer - // for each of those visible operations. - let mut visible_objs = HashSet::new(); - visible_objs.insert(ObjId::root()); - for (obj, typ, ops) in doc.ops().iter_objs() { - if !visible_objs.contains(obj) { - continue; - } - let ops_by_key = ops.group_by(|o| o.key); - let actions = ops_by_key - .into_iter() - .flat_map(|(key, key_ops)| key_actions(key, key_ops)); - if typ == ObjType::Text && !observer.text_as_seq() { - track_new_objs_and_notify( - &mut visible_objs, - doc, - obj, - typ, - observer, - text_actions(actions), - ) - } else if typ == ObjType::List { - track_new_objs_and_notify( - &mut visible_objs, - doc, - obj, - typ, - observer, - list_actions(actions), - ) - } else { - track_new_objs_and_notify(&mut visible_objs, doc, obj, typ, observer, actions) - } - } -} - -fn track_new_objs_and_notify, O: OpObserver>( - visible_objs: &mut HashSet, - doc: &crate::Automerge, - obj: &ObjId, - typ: ObjType, - observer: &mut O, - actions: I, -) { - let exid = doc.id_to_exid(obj.0); - for action in actions { - if let Some(obj) = action.made_object() { - visible_objs.insert(obj); - } - action.notify_observer(doc, &exid, obj, typ, observer); - } -} - -trait Action { - /// Notify an observer of whatever this action does - fn notify_observer( - self, - doc: &crate::Automerge, - exid: &crate::ObjId, - obj: &ObjId, - typ: ObjType, - observer: &mut O, - ); - - /// If this action created an object, return the ID of that object - fn made_object(&self) -> Option; -} - -fn key_actions<'a, I: Iterator>( - key: Key, - key_ops: I, -) -> impl Iterator> { - #[derive(Clone)] - enum CurrentOp<'a> { - Put { - value: Value<'a>, - id: OpId, - conflicted: bool, - }, - Insert(Value<'a>, OpId), - } - let current_ops = key_ops - .filter(|o| o.visible()) - .filter_map(|o| match o.action { - OpType::Make(obj_type) => { - let value = Value::Object(obj_type); - if o.insert { - Some(CurrentOp::Insert(value, o.id)) - } else { - Some(CurrentOp::Put { - value, - id: o.id, - conflicted: false, - }) - } - } - OpType::Put(ref value) => { - let value = Value::Scalar(Cow::Borrowed(value)); - if o.insert { - Some(CurrentOp::Insert(value, o.id)) - } else { - Some(CurrentOp::Put { - value, - id: o.id, - conflicted: false, - }) - } - } - _ => None, - }); - current_ops - .coalesce(|previous, current| match (previous, current) { - (CurrentOp::Put { .. }, CurrentOp::Put { value, id, .. }) => Ok(CurrentOp::Put { - value, - id, - conflicted: true, - }), - (previous, current) => Err((previous, current)), - }) - .map(move |op| match op { - CurrentOp::Put { - value, - id, - conflicted, - } => SimpleAction::Put { - prop: key, - tagged_value: (value, id), - conflict: conflicted, - }, - CurrentOp::Insert(val, id) => SimpleAction::Insert { - elem_id: ElemId(id), - tagged_value: (val, id), - }, - }) -} - -/// Either a "put" or "insert" action. i.e. not splicing for text values -enum SimpleAction<'a> { - Put { - prop: Key, - tagged_value: (Value<'a>, OpId), - conflict: bool, - }, - Insert { - elem_id: ElemId, - tagged_value: (Value<'a>, OpId), - }, -} - -impl<'a> Action for SimpleAction<'a> { - fn notify_observer( - self, - doc: &crate::Automerge, - exid: &crate::ObjId, - obj: &ObjId, - typ: ObjType, - observer: &mut O, - ) { - let encoding = match typ { - ObjType::Text => ListEncoding::Text(doc.text_encoding()), - _ => ListEncoding::List, - }; - match self { - Self::Put { - prop, - tagged_value, - conflict, - } => { - let tagged_value = (tagged_value.0, doc.id_to_exid(tagged_value.1)); - let prop = doc.ops().export_key(*obj, prop, encoding).unwrap(); - observer.put(doc, exid.clone(), prop, tagged_value, conflict); - } - Self::Insert { - elem_id, - tagged_value: (value, opid), - } => { - let index = doc - .ops() - .search(obj, crate::query::ElemIdPos::new(elem_id, encoding)) - .index() - .unwrap(); - let tagged_value = (value, doc.id_to_exid(opid)); - observer.insert(doc, doc.id_to_exid(obj.0), index, tagged_value); - } - } - } - - fn made_object(&self) -> Option { - match self { - Self::Put { - tagged_value: (Value::Object(_), id), - .. - } => Some((*id).into()), - Self::Insert { - tagged_value: (Value::Object(_), id), - .. - } => Some((*id).into()), - _ => None, - } - } -} - -/// An `Action` which splices for text values -enum TextAction<'a> { - Action(SimpleAction<'a>), - Splice { start: ElemId, chars: String }, -} - -impl<'a> Action for TextAction<'a> { - fn notify_observer( - self, - doc: &crate::Automerge, - exid: &crate::ObjId, - obj: &ObjId, - typ: ObjType, - observer: &mut O, - ) { - match self { - Self::Action(action) => action.notify_observer(doc, exid, obj, typ, observer), - Self::Splice { start, chars } => { - let index = doc - .ops() - .search( - obj, - crate::query::ElemIdPos::new( - start, - ListEncoding::Text(doc.text_encoding()), - ), - ) - .index() - .unwrap(); - observer.splice_text(doc, doc.id_to_exid(obj.0), index, chars.as_str()); - } - } - } - - fn made_object(&self) -> Option { - match self { - Self::Action(action) => action.made_object(), - _ => None, - } - } -} - -fn list_actions<'a, I: Iterator>>( - actions: I, -) -> impl Iterator> { - actions.map(|a| match a { - SimpleAction::Put { - prop: Key::Seq(elem_id), - tagged_value, - .. - } => SimpleAction::Insert { - elem_id, - tagged_value, - }, - a => a, - }) -} - -/// Condense consecutive `SimpleAction::Insert` actions into one `TextAction::Splice` -fn text_actions<'a, I>(actions: I) -> impl Iterator> -where - I: Iterator>, -{ - TextActions { - ops: actions.peekable(), - } -} - -struct TextActions<'a, I: Iterator>> { - ops: Peekable, -} - -impl<'a, I: Iterator>> Iterator for TextActions<'a, I> { - type Item = TextAction<'a>; - - fn next(&mut self) -> Option { - if let Some(SimpleAction::Insert { .. }) = self.ops.peek() { - let (start, value) = match self.ops.next() { - Some(SimpleAction::Insert { - tagged_value: (value, opid), - .. - }) => (opid, value), - _ => unreachable!(), - }; - let mut chars = match value { - Value::Scalar(Cow::Borrowed(ScalarValue::Str(s))) => s.to_string(), - _ => "\u{fffc}".to_string(), - }; - while let Some(SimpleAction::Insert { .. }) = self.ops.peek() { - if let Some(SimpleAction::Insert { - tagged_value: (value, _), - .. - }) = self.ops.next() - { - match value { - Value::Scalar(Cow::Borrowed(ScalarValue::Str(s))) => chars.push_str(s), - _ => chars.push('\u{fffc}'), - } - } - } - Some(TextAction::Splice { - start: ElemId(start), - chars, - }) - } else { - self.ops.next().map(TextAction::Action) - } - } -} - -#[cfg(test)] -mod tests { - use std::{borrow::Cow, fs}; - - use crate::{transaction::Transactable, Automerge, ObjType, OpObserver, Prop, ReadDoc, Value}; - - // Observer ops often carry a "tagged value", which is a value and the OpID of the op which - // created that value. For a lot of values (i.e. any scalar value) we don't care about the - // opid. This type implements `PartialEq` for the `Untagged` variant by ignoring the tag, which - // allows us to express tests which don't care about the tag. - #[derive(Clone, Debug)] - enum ObservedValue { - Tagged(crate::Value<'static>, crate::ObjId), - Untagged(crate::Value<'static>), - } - - impl<'a> From<(Value<'a>, crate::ObjId)> for ObservedValue { - fn from(value: (Value<'a>, crate::ObjId)) -> Self { - Self::Tagged(value.0.into_owned(), value.1) - } - } - - impl PartialEq for ObservedValue { - fn eq(&self, other: &ObservedValue) -> bool { - match (self, other) { - (Self::Tagged(v1, o1), Self::Tagged(v2, o2)) => equal_vals(v1, v2) && o1 == o2, - (Self::Untagged(v1), Self::Untagged(v2)) => equal_vals(v1, v2), - (Self::Tagged(v1, _), Self::Untagged(v2)) => equal_vals(v1, v2), - (Self::Untagged(v1), Self::Tagged(v2, _)) => equal_vals(v1, v2), - } - } - } - - /// Consider counters equal if they have the same current value - fn equal_vals(v1: &Value<'_>, v2: &Value<'_>) -> bool { - match (v1, v2) { - (Value::Scalar(v1), Value::Scalar(v2)) => match (v1.as_ref(), v2.as_ref()) { - (crate::ScalarValue::Counter(c1), crate::ScalarValue::Counter(c2)) => { - c1.current == c2.current - } - _ => v1 == v2, - }, - _ => v1 == v2, - } - } - - #[derive(Debug, Clone, PartialEq)] - enum ObserverCall { - Put { - obj: crate::ObjId, - prop: Prop, - value: ObservedValue, - conflict: bool, - }, - Insert { - obj: crate::ObjId, - index: usize, - value: ObservedValue, - }, - SpliceText { - obj: crate::ObjId, - index: usize, - chars: String, - }, - } - - // A Vec is pretty hard to look at in a test failure. This wrapper prints the - // calls out in a nice table so it's easier to see what's different - #[derive(Clone, PartialEq)] - struct Calls(Vec); - - impl std::fmt::Debug for Calls { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let mut table = prettytable::Table::new(); - table.set_format(*prettytable::format::consts::FORMAT_NO_BORDER_LINE_SEPARATOR); - table.set_titles(prettytable::row![ - "Op", "Object", "Property", "Value", "Conflict" - ]); - for call in &self.0 { - match call { - ObserverCall::Put { - obj, - prop, - value, - conflict, - } => { - table.add_row(prettytable::row![ - "Put", - format!("{}", obj), - prop, - match value { - ObservedValue::Tagged(v, o) => format!("{} ({})", v, o), - ObservedValue::Untagged(v) => format!("{}", v), - }, - conflict - ]); - } - ObserverCall::Insert { obj, index, value } => { - table.add_row(prettytable::row![ - "Insert", - format!("{}", obj), - index, - match value { - ObservedValue::Tagged(v, o) => format!("{} ({})", v, o), - ObservedValue::Untagged(v) => format!("{}", v), - }, - "" - ]); - } - ObserverCall::SpliceText { obj, index, chars } => { - table.add_row(prettytable::row![ - "SpliceText", - format!("{}", obj), - index, - chars, - "" - ]); - } - } - } - let mut out = Vec::new(); - table.print(&mut out).unwrap(); - write!(f, "\n{}\n", String::from_utf8(out).unwrap()) - } - } - - struct ObserverStub { - ops: Vec, - text_as_seq: bool, - } - - impl ObserverStub { - fn new() -> Self { - Self { - ops: Vec::new(), - text_as_seq: true, - } - } - - fn new_text_v2() -> Self { - Self { - ops: Vec::new(), - text_as_seq: false, - } - } - } - - impl OpObserver for ObserverStub { - fn insert( - &mut self, - _doc: &R, - objid: crate::ObjId, - index: usize, - tagged_value: (crate::Value<'_>, crate::ObjId), - ) { - self.ops.push(ObserverCall::Insert { - obj: objid, - index, - value: tagged_value.into(), - }); - } - - fn splice_text( - &mut self, - _doc: &R, - objid: crate::ObjId, - index: usize, - value: &str, - ) { - self.ops.push(ObserverCall::SpliceText { - obj: objid, - index, - chars: value.to_string(), - }); - } - - fn put( - &mut self, - _doc: &R, - objid: crate::ObjId, - prop: crate::Prop, - tagged_value: (crate::Value<'_>, crate::ObjId), - conflict: bool, - ) { - self.ops.push(ObserverCall::Put { - obj: objid, - prop, - value: tagged_value.into(), - conflict, - }); - } - - fn expose( - &mut self, - _doc: &R, - _objid: crate::ObjId, - _prop: crate::Prop, - _tagged_value: (crate::Value<'_>, crate::ObjId), - _conflict: bool, - ) { - panic!("expose not expected"); - } - - fn increment( - &mut self, - _doc: &R, - _objid: crate::ObjId, - _prop: crate::Prop, - _tagged_value: (i64, crate::ObjId), - ) { - panic!("increment not expected"); - } - - fn delete_map(&mut self, _doc: &R, _objid: crate::ObjId, _key: &str) { - panic!("delete not expected"); - } - - fn delete_seq( - &mut self, - _doc: &R, - _objid: crate::ObjId, - _index: usize, - _num: usize, - ) { - panic!("delete not expected"); - } - - fn text_as_seq(&self) -> bool { - self.text_as_seq - } - } - - #[test] - fn basic_test() { - let mut doc = crate::AutoCommit::new(); - doc.put(crate::ROOT, "key", "value").unwrap(); - let map = doc.put_object(crate::ROOT, "map", ObjType::Map).unwrap(); - doc.put(&map, "nested_key", "value").unwrap(); - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - doc.insert(&list, 0, "value").unwrap(); - let text = doc.put_object(crate::ROOT, "text", ObjType::Text).unwrap(); - doc.insert(&text, 0, "a").unwrap(); - - let mut obs = ObserverStub::new(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "key".into(), - value: ObservedValue::Untagged("value".into()), - conflict: false, - }, - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Put { - obj: crate::ROOT, - prop: "map".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::Map), map.clone()), - conflict: false, - }, - ObserverCall::Put { - obj: crate::ROOT, - prop: "text".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::Text), text.clone()), - conflict: false, - }, - ObserverCall::Put { - obj: map.clone(), - prop: "nested_key".into(), - value: ObservedValue::Untagged("value".into()), - conflict: false, - }, - ObserverCall::Insert { - obj: list, - index: 0, - value: ObservedValue::Untagged("value".into()), - }, - ObserverCall::Insert { - obj: text, - index: 0, - value: ObservedValue::Untagged("a".into()), - }, - ]) - ); - } - - #[test] - fn test_deleted_ops_omitted() { - let mut doc = crate::AutoCommit::new(); - doc.put(crate::ROOT, "key", "value").unwrap(); - doc.delete(crate::ROOT, "key").unwrap(); - let map = doc.put_object(crate::ROOT, "map", ObjType::Map).unwrap(); - doc.put(&map, "nested_key", "value").unwrap(); - doc.delete(&map, "nested_key").unwrap(); - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - doc.insert(&list, 0, "value").unwrap(); - doc.delete(&list, 0).unwrap(); - let text = doc.put_object(crate::ROOT, "text", ObjType::Text).unwrap(); - doc.insert(&text, 0, "a").unwrap(); - doc.delete(&text, 0).unwrap(); - - doc.put_object(crate::ROOT, "deleted_map", ObjType::Map) - .unwrap(); - doc.delete(crate::ROOT, "deleted_map").unwrap(); - doc.put_object(crate::ROOT, "deleted_list", ObjType::List) - .unwrap(); - doc.delete(crate::ROOT, "deleted_list").unwrap(); - doc.put_object(crate::ROOT, "deleted_text", ObjType::Text) - .unwrap(); - doc.delete(crate::ROOT, "deleted_text").unwrap(); - - let mut obs = ObserverStub::new(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Put { - obj: crate::ROOT, - prop: "map".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::Map), map.clone()), - conflict: false, - }, - ObserverCall::Put { - obj: crate::ROOT, - prop: "text".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::Text), text.clone()), - conflict: false, - }, - ]) - ); - } - - #[test] - fn test_text_spliced() { - let mut doc = crate::AutoCommit::new(); - let text = doc.put_object(crate::ROOT, "text", ObjType::Text).unwrap(); - doc.insert(&text, 0, "a").unwrap(); - doc.splice_text(&text, 1, 0, "bcdef").unwrap(); - doc.splice_text(&text, 2, 2, "g").unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "text".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::Text), text.clone()), - conflict: false, - }, - ObserverCall::SpliceText { - obj: text, - index: 0, - chars: "abgef".to_string() - } - ]) - ); - } - - #[test] - fn test_counters() { - let actor1 = crate::ActorId::from("aa".as_bytes()); - let actor2 = crate::ActorId::from("bb".as_bytes()); - let mut doc = crate::AutoCommit::new().with_actor(actor2); - - let mut doc2 = doc.fork().with_actor(actor1); - doc2.put(crate::ROOT, "key", "someval").unwrap(); - - doc.put(crate::ROOT, "key", crate::ScalarValue::Counter(1.into())) - .unwrap(); - doc.increment(crate::ROOT, "key", 2).unwrap(); - doc.increment(crate::ROOT, "key", 3).unwrap(); - - doc.merge(&mut doc2).unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ObserverCall::Put { - obj: crate::ROOT, - prop: "key".into(), - value: ObservedValue::Untagged(Value::Scalar(Cow::Owned( - crate::ScalarValue::Counter(6.into()) - ))), - conflict: true, - },]) - ); - } - - #[test] - fn test_multiple_list_insertions() { - let mut doc = crate::AutoCommit::new(); - - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - doc.insert(&list, 0, 1).unwrap(); - doc.insert(&list, 1, 2).unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Insert { - obj: list.clone(), - index: 0, - value: ObservedValue::Untagged(1.into()), - }, - ObserverCall::Insert { - obj: list, - index: 1, - value: ObservedValue::Untagged(2.into()), - }, - ]) - ); - } - - #[test] - fn test_concurrent_insertions_at_same_index() { - let mut doc = crate::AutoCommit::new().with_actor(crate::ActorId::from("aa".as_bytes())); - - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - - let mut doc2 = doc.fork().with_actor(crate::ActorId::from("bb".as_bytes())); - - doc.insert(&list, 0, 1).unwrap(); - doc2.insert(&list, 0, 2).unwrap(); - doc.merge(&mut doc2).unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Insert { - obj: list.clone(), - index: 0, - value: ObservedValue::Untagged(2.into()), - }, - ObserverCall::Insert { - obj: list, - index: 1, - value: ObservedValue::Untagged(1.into()), - }, - ]) - ); - } - - #[test] - fn test_insert_objects() { - let mut doc = crate::AutoCommit::new().with_actor(crate::ActorId::from("aa".as_bytes())); - - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - - let map = doc.insert_object(&list, 0, ObjType::Map).unwrap(); - doc.put(&map, "key", "value").unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Insert { - obj: list.clone(), - index: 0, - value: ObservedValue::Tagged(Value::Object(ObjType::Map), map.clone()), - }, - ObserverCall::Put { - obj: map, - prop: "key".into(), - value: ObservedValue::Untagged("value".into()), - conflict: false - }, - ]) - ); - } - - #[test] - fn test_insert_and_update() { - let mut doc = crate::AutoCommit::new(); - - let list = doc.put_object(crate::ROOT, "list", ObjType::List).unwrap(); - - doc.insert(&list, 0, "one").unwrap(); - doc.insert(&list, 1, "two").unwrap(); - doc.put(&list, 0, "three").unwrap(); - doc.put(&list, 1, "four").unwrap(); - - let mut obs = ObserverStub::new_text_v2(); - super::observe_current_state(doc.document(), &mut obs); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ - ObserverCall::Put { - obj: crate::ROOT, - prop: "list".into(), - value: ObservedValue::Tagged(Value::Object(ObjType::List), list.clone()), - conflict: false, - }, - ObserverCall::Insert { - obj: list.clone(), - index: 0, - value: ObservedValue::Untagged("three".into()), - }, - ObserverCall::Insert { - obj: list.clone(), - index: 1, - value: ObservedValue::Untagged("four".into()), - }, - ]) - ); - } - - #[test] - fn test_load_changes() { - fn fixture(name: &str) -> Vec { - fs::read("./tests/fixtures/".to_owned() + name).unwrap() - } - - let mut obs = ObserverStub::new(); - let _doc = Automerge::load_with( - &fixture("counter_value_is_ok.automerge"), - crate::OnPartialLoad::Error, - crate::storage::VerificationMode::Check, - Some(&mut obs), - ); - - assert_eq!( - Calls(obs.ops), - Calls(vec![ObserverCall::Put { - obj: crate::ROOT, - prop: "a".into(), - value: ObservedValue::Untagged(crate::ScalarValue::Counter(2000.into()).into()), - conflict: false, - },]) - ); - } -} diff --git a/rust/automerge/src/automerge/tests.rs b/rust/automerge/src/automerge/tests.rs index 3511c4ed..a304e377 100644 --- a/rust/automerge/src/automerge/tests.rs +++ b/rust/automerge/src/automerge/tests.rs @@ -1080,8 +1080,8 @@ fn delete_nothing_in_map_is_noop() { // deleting a missing key in a map should just be a noop assert!(tx.delete(ROOT, "a",).is_ok()); tx.commit(); - let last_change = doc.get_last_local_change(); - assert!(last_change.is_none()); + let last_change = doc.get_last_local_change().unwrap(); + assert_eq!(last_change.len(), 0); let bytes = doc.save(); assert!(Automerge::load(&bytes,).is_ok()); @@ -1324,27 +1324,15 @@ fn get_parent_objects() { assert_eq!( doc.parents(&map).unwrap().next(), - Some(Parent { - obj: ROOT, - prop: Prop::Map("a".into()), - visible: true - }) + Some((ROOT, Prop::Map("a".into()), true)) ); assert_eq!( doc.parents(&list).unwrap().next(), - Some(Parent { - obj: map, - prop: Prop::Map("b".into()), - visible: true - }) + Some((map, Prop::Map("b".into()), true)) ); assert_eq!( doc.parents(&text).unwrap().next(), - Some(Parent { - obj: list, - prop: Prop::Seq(0), - visible: true - }) + Some((list, Prop::Seq(0), true)) ); } @@ -1368,7 +1356,7 @@ fn get_path_to_object() { ] ); assert_eq!( - doc.path_to_object(text).unwrap(), + doc.path_to_object(&text).unwrap(), vec![ (ROOT, Prop::Map("a".into())), (map, Prop::Map("b".into())), @@ -1386,30 +1374,9 @@ fn parents_iterator() { let text = doc.put_object(&list, 0, ObjType::Text).unwrap(); let mut parents = doc.parents(text).unwrap(); - assert_eq!( - parents.next(), - Some(Parent { - obj: list, - prop: Prop::Seq(0), - visible: true - }) - ); - assert_eq!( - parents.next(), - Some(Parent { - obj: map, - prop: Prop::Map("b".into()), - visible: true - }) - ); - assert_eq!( - parents.next(), - Some(Parent { - obj: ROOT, - prop: Prop::Map("a".into()), - visible: true - }) - ); + assert_eq!(parents.next(), Some((list, Prop::Seq(0), true))); + assert_eq!(parents.next(), Some((map, Prop::Map("b".into()), true))); + assert_eq!(parents.next(), Some((ROOT, Prop::Map("a".into()), true))); assert_eq!(parents.next(), None); } @@ -1507,11 +1474,6 @@ fn observe_counter_change_application() { let changes = doc.get_changes(&[]).unwrap().into_iter().cloned(); let mut new_doc = AutoCommit::new().with_observer(VecOpObserver::default()); - // make a new change to the doc to stop the empty doc logic from skipping the intermediate - // patches. The is probably not really necessary, we could update this test to just test that - // the correct final state is emitted. For now though, we leave it as is. - new_doc.put(ROOT, "foo", "bar").unwrap(); - new_doc.observer().take_patches(); new_doc.apply_changes(changes).unwrap(); assert_eq!( new_doc.observer().take_patches(), @@ -1544,7 +1506,7 @@ fn observe_counter_change_application() { #[test] fn get_changes_heads_empty() { - let mut doc = AutoCommit::new(); + let mut doc = AutoCommit::unobserved(); doc.put(ROOT, "key1", 1).unwrap(); doc.commit(); doc.put(ROOT, "key2", 1).unwrap(); diff --git a/rust/automerge/src/autoserde.rs b/rust/automerge/src/autoserde.rs index ccfc6ae6..63b0848a 100644 --- a/rust/automerge/src/autoserde.rs +++ b/rust/automerge/src/autoserde.rs @@ -1,33 +1,18 @@ use serde::ser::{SerializeMap, SerializeSeq}; -use crate::{ObjId, ObjType, ReadDoc, Value}; +use crate::{Automerge, ObjId, ObjType, Value}; -/// A wrapper type which implements [`serde::Serialize`] for a [`ReadDoc`]. -/// -/// # Example -/// -/// ``` -/// # fn main() -> Result<(), Box> { -/// use automerge::{AutoCommit, AutomergeError, Value, transaction::Transactable}; -/// let mut doc = AutoCommit::new(); -/// doc.put(automerge::ROOT, "key", "value")?; -/// -/// let serialized = serde_json::to_string(&automerge::AutoSerde::from(&doc)).unwrap(); -/// -/// assert_eq!(serialized, r#"{"key":"value"}"#); -/// # Ok(()) -/// # } -/// ``` +/// A wrapper type which implements [`serde::Serialize`] for an [`Automerge`]. #[derive(Debug)] -pub struct AutoSerde<'a, R: crate::ReadDoc>(&'a R); +pub struct AutoSerde<'a>(&'a Automerge); -impl<'a, R: ReadDoc> From<&'a R> for AutoSerde<'a, R> { - fn from(a: &'a R) -> Self { +impl<'a> From<&'a Automerge> for AutoSerde<'a> { + fn from(a: &'a Automerge) -> Self { AutoSerde(a) } } -impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerde<'a, R> { +impl<'a> serde::Serialize for AutoSerde<'a> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, @@ -40,12 +25,12 @@ impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerde<'a, R> { } } -struct AutoSerdeMap<'a, R> { - doc: &'a R, +struct AutoSerdeMap<'a> { + doc: &'a Automerge, obj: ObjId, } -impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerdeMap<'a, R> { +impl<'a> serde::Serialize for AutoSerdeMap<'a> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, @@ -66,12 +51,12 @@ impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerdeMap<'a, R> { } } -struct AutoSerdeSeq<'a, R> { - doc: &'a R, +struct AutoSerdeSeq<'a> { + doc: &'a Automerge, obj: ObjId, } -impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerdeSeq<'a, R> { +impl<'a> serde::Serialize for AutoSerdeSeq<'a> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, @@ -92,13 +77,13 @@ impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerdeSeq<'a, R> { } } -struct AutoSerdeVal<'a, R> { - doc: &'a R, +struct AutoSerdeVal<'a> { + doc: &'a Automerge, val: Value<'a>, obj: ObjId, } -impl<'a, R: crate::ReadDoc> serde::Serialize for AutoSerdeVal<'a, R> { +impl<'a> serde::Serialize for AutoSerdeVal<'a> { fn serialize(&self, serializer: S) -> Result where S: serde::Serializer, diff --git a/rust/automerge/src/change.rs b/rust/automerge/src/change.rs index be467a84..198c68fb 100644 --- a/rust/automerge/src/change.rs +++ b/rust/automerge/src/change.rs @@ -278,7 +278,7 @@ impl From<&Change> for crate::ExpandedChange { let operations = c .iter_ops() .map(|o| crate::legacy::Op { - action: crate::types::OpType::from_action_and_value(o.action, o.val), + action: crate::types::OpType::from_index_and_value(o.action, o.val).unwrap(), insert: o.insert, key: match o.key { StoredKey::Elem(e) if e.is_head() => { @@ -356,7 +356,7 @@ pub(crate) mod gen { (0_u64..10) .prop_map(|num_ops| { (0..num_ops) - .map(|counter| OpId::new(counter, 0)) + .map(|counter| OpId::new(0, counter)) .collect::>() }) .prop_flat_map(move |opids| { diff --git a/rust/automerge/src/change_graph.rs b/rust/automerge/src/change_graph.rs deleted file mode 100644 index 01d269d8..00000000 --- a/rust/automerge/src/change_graph.rs +++ /dev/null @@ -1,344 +0,0 @@ -use std::collections::{BTreeMap, BTreeSet}; - -use crate::{ - clock::{Clock, ClockData}, - Change, ChangeHash, -}; - -/// The graph of changes -/// -/// This is a sort of adjacency list based representation, except that instead of using linked -/// lists, we keep all the edges and nodes in two vecs and reference them by index which plays nice -/// with the cache -#[derive(Debug, Clone)] -pub(crate) struct ChangeGraph { - nodes: Vec, - edges: Vec, - hashes: Vec, - nodes_by_hash: BTreeMap, -} - -#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] -struct NodeIdx(u32); - -#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] -struct EdgeIdx(u32); - -#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] -struct HashIdx(u32); - -#[derive(Debug, Clone)] -struct Edge { - // Edges are always child -> parent so we only store the target, the child is implicit - // as you get the edge from the child - target: NodeIdx, - next: Option, -} - -#[derive(Debug, Clone)] -struct ChangeNode { - hash_idx: HashIdx, - actor_index: usize, - seq: u64, - max_op: u64, - parents: Option, -} - -impl ChangeGraph { - pub(crate) fn new() -> Self { - Self { - nodes: Vec::new(), - edges: Vec::new(), - nodes_by_hash: BTreeMap::new(), - hashes: Vec::new(), - } - } - - pub(crate) fn add_change( - &mut self, - change: &Change, - actor_idx: usize, - ) -> Result<(), MissingDep> { - let hash = change.hash(); - if self.nodes_by_hash.contains_key(&hash) { - return Ok(()); - } - let parent_indices = change - .deps() - .iter() - .map(|h| self.nodes_by_hash.get(h).copied().ok_or(MissingDep(*h))) - .collect::, _>>()?; - let node_idx = self.add_node(actor_idx, change); - self.nodes_by_hash.insert(hash, node_idx); - for parent_idx in parent_indices { - self.add_parent(node_idx, parent_idx); - } - Ok(()) - } - - fn add_node(&mut self, actor_index: usize, change: &Change) -> NodeIdx { - let idx = NodeIdx(self.nodes.len() as u32); - let hash_idx = self.add_hash(change.hash()); - self.nodes.push(ChangeNode { - hash_idx, - actor_index, - seq: change.seq(), - max_op: change.max_op(), - parents: None, - }); - idx - } - - fn add_hash(&mut self, hash: ChangeHash) -> HashIdx { - let idx = HashIdx(self.hashes.len() as u32); - self.hashes.push(hash); - idx - } - - fn add_parent(&mut self, child_idx: NodeIdx, parent_idx: NodeIdx) { - let new_edge_idx = EdgeIdx(self.edges.len() as u32); - let new_edge = Edge { - target: parent_idx, - next: None, - }; - self.edges.push(new_edge); - - let child = &mut self.nodes[child_idx.0 as usize]; - if let Some(edge_idx) = child.parents { - let mut edge = &mut self.edges[edge_idx.0 as usize]; - while let Some(next) = edge.next { - edge = &mut self.edges[next.0 as usize]; - } - edge.next = Some(new_edge_idx); - } else { - child.parents = Some(new_edge_idx); - } - } - - fn parents(&self, node_idx: NodeIdx) -> impl Iterator + '_ { - let mut edge_idx = self.nodes[node_idx.0 as usize].parents; - std::iter::from_fn(move || { - let this_edge_idx = edge_idx?; - let edge = &self.edges[this_edge_idx.0 as usize]; - edge_idx = edge.next; - Some(edge.target) - }) - } - - pub(crate) fn clock_for_heads(&self, heads: &[ChangeHash]) -> Clock { - let mut clock = Clock::new(); - - self.traverse_ancestors(heads, |node, _hash| { - clock.include( - node.actor_index, - ClockData { - max_op: node.max_op, - seq: node.seq, - }, - ); - }); - - clock - } - - pub(crate) fn remove_ancestors( - &self, - changes: &mut BTreeSet, - heads: &[ChangeHash], - ) { - self.traverse_ancestors(heads, |_node, hash| { - changes.remove(hash); - }); - } - - /// Call `f` for each (node, hash) in the graph, starting from the given heads - /// - /// No guarantees are made about the order of traversal but each node will only be visited - /// once. - fn traverse_ancestors( - &self, - heads: &[ChangeHash], - mut f: F, - ) { - let mut to_visit = heads - .iter() - .filter_map(|h| self.nodes_by_hash.get(h)) - .copied() - .collect::>(); - - let mut visited = BTreeSet::new(); - - while let Some(idx) = to_visit.pop() { - if visited.contains(&idx) { - continue; - } else { - visited.insert(idx); - } - let node = &self.nodes[idx.0 as usize]; - let hash = &self.hashes[node.hash_idx.0 as usize]; - f(node, hash); - to_visit.extend(self.parents(idx)); - } - } -} - -#[derive(Debug, thiserror::Error)] -#[error("attempted to derive a clock for a change with dependencies we don't have")] -pub struct MissingDep(ChangeHash); - -#[cfg(test)] -mod tests { - use std::{ - num::NonZeroU64, - time::{SystemTime, UNIX_EPOCH}, - }; - - use crate::{ - clock::ClockData, - op_tree::OpSetMetadata, - storage::{change::ChangeBuilder, convert::op_as_actor_id}, - types::{Key, ObjId, Op, OpId, OpIds}, - ActorId, - }; - - use super::*; - - #[test] - fn clock_by_heads() { - let mut builder = TestGraphBuilder::new(); - let actor1 = builder.actor(); - let actor2 = builder.actor(); - let actor3 = builder.actor(); - let change1 = builder.change(&actor1, 10, &[]); - let change2 = builder.change(&actor2, 20, &[change1]); - let change3 = builder.change(&actor3, 30, &[change1]); - let change4 = builder.change(&actor1, 10, &[change2, change3]); - let graph = builder.build(); - - let mut expected_clock = Clock::new(); - expected_clock.include(builder.index(&actor1), ClockData { max_op: 50, seq: 2 }); - expected_clock.include(builder.index(&actor2), ClockData { max_op: 30, seq: 1 }); - expected_clock.include(builder.index(&actor3), ClockData { max_op: 40, seq: 1 }); - - let clock = graph.clock_for_heads(&[change4]); - assert_eq!(clock, expected_clock); - } - - #[test] - fn remove_ancestors() { - let mut builder = TestGraphBuilder::new(); - let actor1 = builder.actor(); - let actor2 = builder.actor(); - let actor3 = builder.actor(); - let change1 = builder.change(&actor1, 10, &[]); - let change2 = builder.change(&actor2, 20, &[change1]); - let change3 = builder.change(&actor3, 30, &[change1]); - let change4 = builder.change(&actor1, 10, &[change2, change3]); - let graph = builder.build(); - - let mut changes = vec![change1, change2, change3, change4] - .into_iter() - .collect::>(); - let heads = vec![change2]; - graph.remove_ancestors(&mut changes, &heads); - - let expected_changes = vec![change3, change4].into_iter().collect::>(); - - assert_eq!(changes, expected_changes); - } - - struct TestGraphBuilder { - actors: Vec, - changes: Vec, - seqs_by_actor: BTreeMap, - } - - impl TestGraphBuilder { - fn new() -> Self { - TestGraphBuilder { - actors: Vec::new(), - changes: Vec::new(), - seqs_by_actor: BTreeMap::new(), - } - } - - fn actor(&mut self) -> ActorId { - let actor = ActorId::random(); - self.actors.push(actor.clone()); - actor - } - - fn index(&self, actor: &ActorId) -> usize { - self.actors.iter().position(|a| a == actor).unwrap() - } - - /// Create a change with `num_new_ops` and `parents` for `actor` - /// - /// The `start_op` and `seq` of the change will be computed from the - /// previous changes for the same actor. - fn change( - &mut self, - actor: &ActorId, - num_new_ops: usize, - parents: &[ChangeHash], - ) -> ChangeHash { - let mut meta = OpSetMetadata::from_actors(self.actors.clone()); - let key = meta.props.cache("key".to_string()); - - let start_op = parents - .iter() - .map(|c| { - self.changes - .iter() - .find(|change| change.hash() == *c) - .unwrap() - .max_op() - }) - .max() - .unwrap_or(0) - + 1; - - let actor_idx = self.index(actor); - let ops = (0..num_new_ops) - .map(|opnum| Op { - id: OpId::new(start_op + opnum as u64, actor_idx), - action: crate::OpType::Put("value".into()), - key: Key::Map(key), - succ: OpIds::empty(), - pred: OpIds::empty(), - insert: false, - }) - .collect::>(); - - let root = ObjId::root(); - let timestamp = SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_millis() as i64; - let seq = self.seqs_by_actor.entry(actor.clone()).or_insert(1); - let change = Change::new( - ChangeBuilder::new() - .with_dependencies(parents.to_vec()) - .with_start_op(NonZeroU64::new(start_op).unwrap()) - .with_actor(actor.clone()) - .with_seq(*seq) - .with_timestamp(timestamp) - .build(ops.iter().map(|op| op_as_actor_id(&root, op, &meta))) - .unwrap(), - ); - *seq = seq.checked_add(1).unwrap(); - let hash = change.hash(); - self.changes.push(change); - hash - } - - fn build(&self) -> ChangeGraph { - let mut graph = ChangeGraph::new(); - for change in &self.changes { - let actor_idx = self.index(change.actor_id()); - graph.add_change(change, actor_idx).unwrap(); - } - graph - } - } -} diff --git a/rust/automerge/src/clock.rs b/rust/automerge/src/clock.rs index 64d00fcf..11890ffb 100644 --- a/rust/automerge/src/clock.rs +++ b/rust/automerge/src/clock.rs @@ -59,8 +59,8 @@ impl Clock { } pub(crate) fn covers(&self, id: &OpId) -> bool { - if let Some(data) = self.0.get(&id.actor()) { - data.max_op >= id.counter() + if let Some(data) = self.0.get(&id.1) { + data.max_op >= id.0 } else { false } @@ -71,6 +71,12 @@ impl Clock { self.0.get(actor_index) } + pub(crate) fn merge(&mut self, other: &Self) { + for (actor, data) in &other.0 { + self.include(*actor, *data); + } + } + fn is_greater(&self, other: &Self) -> bool { let mut has_greater = false; @@ -117,16 +123,16 @@ mod tests { clock.include(1, ClockData { max_op: 20, seq: 1 }); clock.include(2, ClockData { max_op: 10, seq: 2 }); - assert!(clock.covers(&OpId::new(10, 1))); - assert!(clock.covers(&OpId::new(20, 1))); - assert!(!clock.covers(&OpId::new(30, 1))); + assert!(clock.covers(&OpId(10, 1))); + assert!(clock.covers(&OpId(20, 1))); + assert!(!clock.covers(&OpId(30, 1))); - assert!(clock.covers(&OpId::new(5, 2))); - assert!(clock.covers(&OpId::new(10, 2))); - assert!(!clock.covers(&OpId::new(15, 2))); + assert!(clock.covers(&OpId(5, 2))); + assert!(clock.covers(&OpId(10, 2))); + assert!(!clock.covers(&OpId(15, 2))); - assert!(!clock.covers(&OpId::new(1, 3))); - assert!(!clock.covers(&OpId::new(100, 3))); + assert!(!clock.covers(&OpId(1, 3))); + assert!(!clock.covers(&OpId(100, 3))); } #[test] diff --git a/rust/automerge/src/clocks.rs b/rust/automerge/src/clocks.rs new file mode 100644 index 00000000..60fc5c71 --- /dev/null +++ b/rust/automerge/src/clocks.rs @@ -0,0 +1,44 @@ +use crate::{ + clock::{Clock, ClockData}, + Change, ChangeHash, +}; +use std::collections::HashMap; + +pub(crate) struct Clocks(HashMap); + +#[derive(Debug, thiserror::Error)] +#[error("attempted to derive a clock for a change with dependencies we don't have")] +pub struct MissingDep(ChangeHash); + +impl Clocks { + pub(crate) fn new() -> Self { + Self(HashMap::new()) + } + + pub(crate) fn add_change( + &mut self, + change: &Change, + actor_index: usize, + ) -> Result<(), MissingDep> { + let mut clock = Clock::new(); + for hash in change.deps() { + let c = self.0.get(hash).ok_or(MissingDep(*hash))?; + clock.merge(c); + } + clock.include( + actor_index, + ClockData { + max_op: change.max_op(), + seq: change.seq(), + }, + ); + self.0.insert(change.hash(), clock); + Ok(()) + } +} + +impl From for HashMap { + fn from(c: Clocks) -> Self { + c.0 + } +} diff --git a/rust/automerge/src/columnar/column_range/deps.rs b/rust/automerge/src/columnar/column_range/deps.rs index 1956acd1..df49192a 100644 --- a/rust/automerge/src/columnar/column_range/deps.rs +++ b/rust/automerge/src/columnar/column_range/deps.rs @@ -62,11 +62,7 @@ impl<'a> DepsIter<'a> { } None => return Ok(None), }; - // We cannot trust `num` because it is provided over the network, - // but in the common case it will be correct and small (so we - // use with_capacity to make sure the vector is precisely the right - // size). - let mut result = Vec::with_capacity(std::cmp::min(num, 100)); + let mut result = Vec::with_capacity(num); while result.len() < num { match self .deps diff --git a/rust/automerge/src/columnar/column_range/key.rs b/rust/automerge/src/columnar/column_range/key.rs index 70ea8e1e..5283fc39 100644 --- a/rust/automerge/src/columnar/column_range/key.rs +++ b/rust/automerge/src/columnar/column_range/key.rs @@ -167,11 +167,11 @@ impl<'a> KeyIter<'a> { Ok(Some(Key::Prop(string))) } (Some(None) | None, Some(Some(0)), Some(None) | None) => { - Ok(Some(Key::Elem(ElemId(OpId::new(0, 0))))) + Ok(Some(Key::Elem(ElemId(OpId(0, 0))))) } (Some(Some(actor)), Some(Some(ctr)), Some(None) | None) => match ctr.try_into() { //Ok(ctr) => Some(Ok(Key::Elem(ElemId(OpId(ctr, actor as usize))))), - Ok(ctr) => Ok(Some(Key::Elem(ElemId(OpId::new(ctr, actor as usize))))), + Ok(ctr) => Ok(Some(Key::Elem(ElemId(OpId::new(actor as usize, ctr))))), Err(_) => Err(DecodeColumnError::invalid_value( "counter", "negative value for counter", diff --git a/rust/automerge/src/columnar/column_range/obj_id.rs b/rust/automerge/src/columnar/column_range/obj_id.rs index d282563e..f6525b44 100644 --- a/rust/automerge/src/columnar/column_range/obj_id.rs +++ b/rust/automerge/src/columnar/column_range/obj_id.rs @@ -133,7 +133,7 @@ impl<'a> ObjIdIter<'a> { .map_err(|e| DecodeColumnError::decode_raw("counter", e))?; match (actor, counter) { (None | Some(None), None | Some(None)) => Ok(Some(ObjId::root())), - (Some(Some(a)), Some(Some(c))) => Ok(Some(ObjId(OpId::new(c, a as usize)))), + (Some(Some(a)), Some(Some(c))) => Ok(Some(ObjId(OpId(c, a as usize)))), (_, Some(Some(0))) => Ok(Some(ObjId::root())), (Some(None) | None, _) => Err(DecodeColumnError::unexpected_null("actor")), (_, Some(None) | None) => Err(DecodeColumnError::unexpected_null("counter")), @@ -166,7 +166,7 @@ impl ObjIdEncoder { } convert::ObjId::Op(o) => { self.actor.append_value(o.actor() as u64); - self.counter.append_value(o.counter()); + self.counter.append_value(o.counter() as u64); } } } diff --git a/rust/automerge/src/columnar/column_range/opid.rs b/rust/automerge/src/columnar/column_range/opid.rs index d2cdce79..592f6041 100644 --- a/rust/automerge/src/columnar/column_range/opid.rs +++ b/rust/automerge/src/columnar/column_range/opid.rs @@ -104,11 +104,11 @@ impl<'a> OpIdIter<'a> { .transpose() .map_err(|e| DecodeColumnError::decode_raw("counter", e))?; match (actor, counter) { - (Some(Some(a)), Some(Some(c))) => match u32::try_from(c) { - Ok(c) => Ok(Some(OpId::new(c as u64, a as usize))), + (Some(Some(a)), Some(Some(c))) => match c.try_into() { + Ok(c) => Ok(Some(OpId(c, a as usize))), Err(_) => Err(DecodeColumnError::invalid_value( "counter", - "negative or large value encountered", + "negative value encountered", )), }, (Some(None), _) => Err(DecodeColumnError::unexpected_null("actor")), diff --git a/rust/automerge/src/columnar/column_range/opid_list.rs b/rust/automerge/src/columnar/column_range/opid_list.rs index 6a9c8a38..03b92ccf 100644 --- a/rust/automerge/src/columnar/column_range/opid_list.rs +++ b/rust/automerge/src/columnar/column_range/opid_list.rs @@ -189,12 +189,7 @@ impl<'a> OpIdListIter<'a> { Some(None) => return Err(DecodeColumnError::unexpected_null("num")), None => return Ok(None), }; - - // We cannot trust `num` because it is provided over the network, - // but in the common case it will be correct and small (so we - // use with_capacity to make sure the vector is precisely the right - // size). - let mut p = Vec::with_capacity(std::cmp::min(num, 100) as usize); + let mut p = Vec::with_capacity(num as usize); for _ in 0..num { let actor = self .actor @@ -208,7 +203,7 @@ impl<'a> OpIdListIter<'a> { .map_err(|e| DecodeColumnError::decode_raw("counter", e))?; match (actor, counter) { (Some(Some(a)), Some(Some(ctr))) => match ctr.try_into() { - Ok(ctr) => p.push(OpId::new(ctr, a as usize)), + Ok(ctr) => p.push(OpId(ctr, a as usize)), Err(_e) => { return Err(DecodeColumnError::invalid_value( "counter", diff --git a/rust/automerge/src/columnar/column_range/value.rs b/rust/automerge/src/columnar/column_range/value.rs index 03a5aa60..43f63437 100644 --- a/rust/automerge/src/columnar/column_range/value.rs +++ b/rust/automerge/src/columnar/column_range/value.rs @@ -4,15 +4,10 @@ use crate::{ columnar::{ encoding::{ leb128::{lebsize, ulebsize}, - raw, DecodeColumnError, DecodeError, RawBytes, RawDecoder, RawEncoder, RleDecoder, - RleEncoder, Sink, + raw, DecodeColumnError, RawBytes, RawDecoder, RawEncoder, RleDecoder, RleEncoder, Sink, }, SpliceError, }, - storage::parse::{ - leb128::{leb128_i64, leb128_u64}, - Input, ParseResult, - }, ScalarValue, }; @@ -222,8 +217,18 @@ impl<'a> Iterator for ValueIter<'a> { ValueType::Null => Some(Ok(ScalarValue::Null)), ValueType::True => Some(Ok(ScalarValue::Boolean(true))), ValueType::False => Some(Ok(ScalarValue::Boolean(false))), - ValueType::Uleb => self.parse_input(val_meta, leb128_u64), - ValueType::Leb => self.parse_input(val_meta, leb128_i64), + ValueType::Uleb => self.parse_raw(val_meta, |mut bytes| { + let val = leb128::read::unsigned(&mut bytes).map_err(|e| { + DecodeColumnError::invalid_value("value", e.to_string()) + })?; + Ok(ScalarValue::Uint(val)) + }), + ValueType::Leb => self.parse_raw(val_meta, |mut bytes| { + let val = leb128::read::signed(&mut bytes).map_err(|e| { + DecodeColumnError::invalid_value("value", e.to_string()) + })?; + Ok(ScalarValue::Int(val)) + }), ValueType::String => self.parse_raw(val_meta, |bytes| { let val = std::str::from_utf8(bytes) .map_err(|e| DecodeColumnError::invalid_value("value", e.to_string()))? @@ -245,11 +250,17 @@ impl<'a> Iterator for ValueIter<'a> { let val = f64::from_le_bytes(raw); Ok(ScalarValue::F64(val)) }), - ValueType::Counter => self.parse_input(val_meta, |input| { - leb128_i64(input).map(|(i, n)| (i, ScalarValue::Counter(n.into()))) + ValueType::Counter => self.parse_raw(val_meta, |mut bytes| { + let val = leb128::read::signed(&mut bytes).map_err(|e| { + DecodeColumnError::invalid_value("value", e.to_string()) + })?; + Ok(ScalarValue::Counter(val.into())) }), - ValueType::Timestamp => self.parse_input(val_meta, |input| { - leb128_i64(input).map(|(i, n)| (i, ScalarValue::Timestamp(n))) + ValueType::Timestamp => self.parse_raw(val_meta, |mut bytes| { + let val = leb128::read::signed(&mut bytes).map_err(|e| { + DecodeColumnError::invalid_value("value", e.to_string()) + })?; + Ok(ScalarValue::Timestamp(val)) }), ValueType::Unknown(code) => self.parse_raw(val_meta, |bytes| { Ok(ScalarValue::Unknown { @@ -273,8 +284,8 @@ impl<'a> Iterator for ValueIter<'a> { } impl<'a> ValueIter<'a> { - fn parse_raw<'b, R, F: Fn(&'b [u8]) -> Result>( - &'b mut self, + fn parse_raw Result>( + &mut self, meta: ValueMeta, f: F, ) -> Option> { @@ -287,24 +298,11 @@ impl<'a> ValueIter<'a> { } Ok(bytes) => bytes, }; - Some(f(raw)) - } - - fn parse_input<'b, R, F: Fn(Input<'b>) -> ParseResult<'b, R, DecodeError>>( - &'b mut self, - meta: ValueMeta, - f: F, - ) -> Option> - where - R: Into, - { - self.parse_raw(meta, |raw| match f(Input::new(raw)) { - Err(e) => Err(DecodeColumnError::invalid_value("value", e.to_string())), - Ok((i, _)) if !i.is_empty() => { - Err(DecodeColumnError::invalid_value("value", "extra bytes")) - } - Ok((_, v)) => Ok(v.into()), - }) + let val = match f(raw) { + Ok(v) => v, + Err(e) => return Some(Err(e)), + }; + Some(Ok(val)) } pub(crate) fn done(&self) -> bool { diff --git a/rust/automerge/src/columnar/encoding.rs b/rust/automerge/src/columnar/encoding.rs index c9435448..bbdb34a8 100644 --- a/rust/automerge/src/columnar/encoding.rs +++ b/rust/automerge/src/columnar/encoding.rs @@ -46,8 +46,6 @@ pub(crate) enum DecodeError { FromInt(#[from] std::num::TryFromIntError), #[error("bad leb128")] BadLeb(#[from] ::leb128::read::Error), - #[error(transparent)] - BadLeb128(#[from] crate::storage::parse::leb128::Error), #[error("attempted to allocate {attempted} which is larger than the maximum of {maximum}")] OverlargeAllocation { attempted: usize, maximum: usize }, #[error("invalid string encoding")] diff --git a/rust/automerge/src/columnar/encoding/col_error.rs b/rust/automerge/src/columnar/encoding/col_error.rs index 089556b6..c8d5c5c0 100644 --- a/rust/automerge/src/columnar/encoding/col_error.rs +++ b/rust/automerge/src/columnar/encoding/col_error.rs @@ -1,5 +1,5 @@ #[derive(Clone, Debug)] -pub struct DecodeColumnError { +pub(crate) struct DecodeColumnError { path: Path, error: DecodeColErrorKind, } diff --git a/rust/automerge/src/columnar/encoding/leb128.rs b/rust/automerge/src/columnar/encoding/leb128.rs index cbb82c31..036cfba8 100644 --- a/rust/automerge/src/columnar/encoding/leb128.rs +++ b/rust/automerge/src/columnar/encoding/leb128.rs @@ -1,22 +1,29 @@ /// The number of bytes required to encode `val` as a LEB128 integer -pub(crate) fn lebsize(mut val: i64) -> u64 { - if val < 0 { - val = !val - } - // 1 extra for the sign bit - leb_bytes(1 + 64 - val.leading_zeros() as u64) +pub(crate) fn lebsize(val: i64) -> u64 { + let numbits = numbits_i64(val); + (numbits as f64 / 7.0).floor() as u64 + 1 } /// The number of bytes required to encode `val` as a uLEB128 integer pub(crate) fn ulebsize(val: u64) -> u64 { - if val == 0 { + if val <= 1 { return 1; } - leb_bytes(64 - val.leading_zeros() as u64) + let numbits = numbits_u64(val); + let mut numblocks = (numbits as f64 / 7.0).floor() as u64; + if numbits % 7 != 0 { + numblocks += 1; + } + numblocks } -fn leb_bytes(bits: u64) -> u64 { - (bits + 6) / 7 +fn numbits_i64(val: i64) -> u64 { + // Is this right? This feels like it's not right + (std::mem::size_of::() as u32 * 8 - val.abs().leading_zeros()) as u64 +} + +fn numbits_u64(val: u64) -> u64 { + (std::mem::size_of::() as u32 * 8 - val.leading_zeros()) as u64 } #[cfg(test)] @@ -44,7 +51,7 @@ mod tests { #[test] fn ulebsize_examples() { - let scenarios = vec![0, 1, 127, 128, 129, 169, u64::MAX]; + let scenarios = vec![0, 1, 127, 128, 129, 169]; for val in scenarios { let mut out = Vec::new(); leb128::write::unsigned(&mut out, val).unwrap(); @@ -55,23 +62,7 @@ mod tests { #[test] fn lebsize_examples() { - let scenarios = vec![ - 0, - 1, - -1, - 63, - 64, - -64, - -65, - 127, - 128, - -127, - -128, - -2097152, - 169, - i64::MIN, - i64::MAX, - ]; + let scenarios = vec![0, 1, -1, 127, 128, -127, -128, -2097152, 169]; for val in scenarios { let mut out = Vec::new(); leb128::write::signed(&mut out, val).unwrap(); diff --git a/rust/automerge/src/columnar/encoding/properties.rs b/rust/automerge/src/columnar/encoding/properties.rs index 30f1169d..a6345cad 100644 --- a/rust/automerge/src/columnar/encoding/properties.rs +++ b/rust/automerge/src/columnar/encoding/properties.rs @@ -139,7 +139,7 @@ pub(crate) fn option_splice_scenario< } pub(crate) fn opid() -> impl Strategy + Clone { - (0..(u32::MAX as usize), 0..(u32::MAX as u64)).prop_map(|(actor, ctr)| OpId::new(ctr, actor)) + (0..(i64::MAX as usize), 0..(i64::MAX as u64)).prop_map(|(actor, ctr)| OpId(ctr, actor)) } pub(crate) fn elemid() -> impl Strategy + Clone { diff --git a/rust/automerge/src/error.rs b/rust/automerge/src/error.rs index 62a7b72f..39f2e38c 100644 --- a/rust/automerge/src/error.rs +++ b/rust/automerge/src/error.rs @@ -1,4 +1,3 @@ -use crate::change::LoadError as LoadChangeError; use crate::storage::load::Error as LoadError; use crate::types::{ActorId, ScalarValue}; use crate::value::DataType; @@ -8,7 +7,7 @@ use thiserror::Error; #[derive(Error, Debug)] pub enum AutomergeError { #[error(transparent)] - ChangeGraph(#[from] crate::change_graph::MissingDep), + Clocks(#[from] crate::clocks::MissingDep), #[error("failed to load compressed data: {0}")] Deflate(#[source] std::io::Error), #[error("duplicate seq {0} found for actor {1}")] @@ -19,8 +18,6 @@ pub enum AutomergeError { Fail, #[error("invalid actor ID `{0}`")] InvalidActorId(String), - #[error(transparent)] - InvalidChangeHashBytes(#[from] InvalidChangeHashSlice), #[error("invalid UTF-8 character at {0}")] InvalidCharacter(usize), #[error("invalid hash {0}")] @@ -31,8 +28,6 @@ pub enum AutomergeError { InvalidObjId(String), #[error("invalid obj id format `{0}`")] InvalidObjIdFormat(String), - #[error("invalid op for object of type `{0}`")] - InvalidOp(ObjType), #[error("seq {0} is out of bounds")] InvalidSeq(u64), #[error("invalid type of value, expected `{expected}` but received `{unexpected}`")] @@ -42,18 +37,16 @@ pub enum AutomergeError { }, #[error(transparent)] Load(#[from] LoadError), - #[error(transparent)] - LoadChangeError(#[from] LoadChangeError), #[error("increment operations must be against a counter value")] MissingCounter, #[error("hash {0} does not correspond to a change in this document")] MissingHash(ChangeHash), - #[error("change's deps should already be in the document")] - MissingDeps, #[error("compressed chunk was not a change")] NonChangeCompressed, #[error("id was not an object id")] NotAnObject, + #[error("invalid op for object of type `{0}`")] + InvalidOp(ObjType), } impl PartialEq for AutomergeError { @@ -99,7 +92,7 @@ pub struct InvalidElementId(pub String); pub struct InvalidOpId(pub String); #[derive(Error, Debug)] -pub enum InvalidOpType { +pub(crate) enum InvalidOpType { #[error("unrecognized action index {0}")] UnknownAction(u64), #[error("non numeric argument for inc op")] diff --git a/rust/automerge/src/exid.rs b/rust/automerge/src/exid.rs index 3a5a2ca2..2c174e28 100644 --- a/rust/automerge/src/exid.rs +++ b/rust/automerge/src/exid.rs @@ -1,4 +1,3 @@ -use crate::storage::parse; use crate::ActorId; use serde::Serialize; use serde::Serializer; @@ -6,115 +5,12 @@ use std::cmp::{Ord, Ordering}; use std::fmt; use std::hash::{Hash, Hasher}; -/// An identifier for an object in a document -/// -/// This can be persisted using `to_bytes` and `TryFrom<&[u8]>` breaking changes to the -/// serialization format will be considered breaking changes for this library version. #[derive(Debug, Clone)] pub enum ExId { Root, Id(u64, ActorId, usize), } -const SERIALIZATION_VERSION_TAG: u8 = 0; -const TYPE_ROOT: u8 = 0; -const TYPE_ID: u8 = 1; - -impl ExId { - /// Serialize this object ID to a byte array. - /// - /// This serialization format is versioned and incompatible changes to it will be considered a - /// breaking change for the version of this library. - pub fn to_bytes(&self) -> Vec { - // The serialized format is - // - // .--------------------------------. - // | version | type | data | - // +--------------------------------+ - // | 4 bytes |4 bytes | variable | - // '--------------------------------' - // - // Version is currently always `0` - // - // `data` depends on the type - // - // * If the type is `TYPE_ROOT` (0) then there is no data - // * If the type is `TYPE_ID` (1) then the data is - // - // .-------------------------------------------------------. - // | actor ID len | actor ID bytes | counter | actor index | - // '-------------------------------------------------------' - // - // Where the actor ID len, counter, and actor index are all uLEB encoded - // integers. The actor ID bytes is just an array of bytes. - // - match self { - ExId::Root => { - let val: u8 = SERIALIZATION_VERSION_TAG | (TYPE_ROOT << 4); - vec![val] - } - ExId::Id(id, actor, counter) => { - let actor_bytes = actor.to_bytes(); - let mut bytes = Vec::with_capacity(actor_bytes.len() + 4 + 4); - let tag = SERIALIZATION_VERSION_TAG | (TYPE_ID << 4); - bytes.push(tag); - leb128::write::unsigned(&mut bytes, actor_bytes.len() as u64).unwrap(); - bytes.extend_from_slice(actor_bytes); - leb128::write::unsigned(&mut bytes, *counter as u64).unwrap(); - leb128::write::unsigned(&mut bytes, *id).unwrap(); - bytes - } - } - } -} - -#[derive(Debug, thiserror::Error)] -pub enum ObjIdFromBytesError { - #[error("no version tag")] - NoVersion, - #[error("invalid version tag")] - InvalidVersion(u8), - #[error("invalid type tag")] - InvalidType(u8), - #[error("invalid Actor ID length: {0}")] - ParseActorLen(String), - #[error("Not enough bytes in actor ID")] - ParseActor, - #[error("invalid counter: {0}")] - ParseCounter(String), - #[error("invalid actor index hint: {0}")] - ParseActorIdxHint(String), -} - -impl<'a> TryFrom<&'a [u8]> for ExId { - type Error = ObjIdFromBytesError; - - fn try_from(value: &'a [u8]) -> Result { - let i = parse::Input::new(value); - let (i, tag) = parse::take1::<()>(i).map_err(|_| ObjIdFromBytesError::NoVersion)?; - let version = tag & 0b1111; - if version != SERIALIZATION_VERSION_TAG { - return Err(ObjIdFromBytesError::InvalidVersion(version)); - } - let type_tag = tag >> 4; - match type_tag { - TYPE_ROOT => Ok(ExId::Root), - TYPE_ID => { - let (i, len) = parse::leb128_u64::(i) - .map_err(|e| ObjIdFromBytesError::ParseActorLen(e.to_string()))?; - let (i, actor) = parse::take_n::<()>(len as usize, i) - .map_err(|_| ObjIdFromBytesError::ParseActor)?; - let (i, counter) = parse::leb128_u64::(i) - .map_err(|e| ObjIdFromBytesError::ParseCounter(e.to_string()))?; - let (_i, actor_idx_hint) = parse::leb128_u64::(i) - .map_err(|e| ObjIdFromBytesError::ParseActorIdxHint(e.to_string()))?; - Ok(Self::Id(actor_idx_hint, actor.into(), counter as usize)) - } - other => Err(ObjIdFromBytesError::InvalidType(other)), - } - } -} - impl PartialEq for ExId { fn eq(&self, other: &Self) -> bool { match (self, other) { @@ -184,41 +80,3 @@ impl AsRef for ExId { self } } - -#[cfg(test)] -mod tests { - use super::ExId; - use proptest::prelude::*; - - use crate::ActorId; - - fn gen_actorid() -> impl Strategy { - proptest::collection::vec(any::(), 0..100).prop_map(ActorId::from) - } - - prop_compose! { - fn gen_non_root_objid()(actor in gen_actorid(), counter in any::(), idx in any::()) -> ExId { - ExId::Id(idx as u64, actor, counter) - } - } - - fn gen_obji() -> impl Strategy { - prop_oneof![Just(ExId::Root), gen_non_root_objid()] - } - - proptest! { - #[test] - fn objid_roundtrip(objid in gen_obji()) { - let bytes = objid.to_bytes(); - let objid2 = ExId::try_from(&bytes[..]).unwrap(); - assert_eq!(objid, objid2); - } - } - - #[test] - fn test_root_roundtrip() { - let bytes = ExId::Root.to_bytes(); - let objid2 = ExId::try_from(&bytes[..]).unwrap(); - assert_eq!(ExId::Root, objid2); - } -} diff --git a/rust/automerge/src/keys.rs b/rust/automerge/src/keys.rs index 838015ef..f8e0c676 100644 --- a/rust/automerge/src/keys.rs +++ b/rust/automerge/src/keys.rs @@ -1,9 +1,5 @@ use crate::{query, Automerge}; -/// An iterator over the keys of an object -/// -/// This is returned by [`crate::ReadDoc::keys`] and method. The returned item is either -/// the keys of a map, or the encoded element IDs of a sequence. #[derive(Debug)] pub struct Keys<'a, 'k> { keys: Option>, diff --git a/rust/automerge/src/keys_at.rs b/rust/automerge/src/keys_at.rs index fd747bbc..c957e175 100644 --- a/rust/automerge/src/keys_at.rs +++ b/rust/automerge/src/keys_at.rs @@ -1,9 +1,5 @@ use crate::{query, Automerge}; -/// An iterator over the keys of an object at a particular point in history -/// -/// This is returned by [`crate::ReadDoc::keys_at`] method. The returned item is either the keys of a map, -/// or the encoded element IDs of a sequence. #[derive(Debug)] pub struct KeysAt<'a, 'k> { keys: Option>, diff --git a/rust/automerge/src/lib.rs b/rust/automerge/src/lib.rs index cbb535af..15cee2a7 100644 --- a/rust/automerge/src/lib.rs +++ b/rust/automerge/src/lib.rs @@ -1,190 +1,3 @@ -//! # Automerge -//! -//! Automerge is a library of data structures for building collaborative, -//! [local-first](https://www.inkandswitch.com/local-first/) applications. The -//! idea of automerge is to provide a data structure which is quite general, -//! \- consisting of nested key/value maps and/or lists - which can be modified -//! entirely locally but which can at any time be merged with other instances of -//! the same data structure. -//! -//! In addition to the core data structure (which we generally refer to as a -//! "document"), we also provide an implementation of a sync protocol (in -//! [`crate::sync`]) which can be used over any reliable in-order transport; and -//! an efficient binary storage format. -//! -//! This crate is organised around two representations of a document - -//! [`Automerge`] and [`AutoCommit`]. The difference between the two is that -//! [`AutoCommit`] manages transactions for you. Both of these representations -//! implement [`ReadDoc`] for reading values from a document and -//! [`sync::SyncDoc`] for taking part in the sync protocol. [`AutoCommit`] -//! directly implements [`transaction::Transactable`] for making changes to a -//! document, whilst [`Automerge`] requires you to explicitly create a -//! [`transaction::Transaction`]. -//! -//! NOTE: The API this library provides for modifying data is quite low level -//! (somewhat analogous to directly creating JSON values rather than using -//! `serde` derive macros or equivalent). If you're writing a Rust application which uses automerge -//! you may want to look at [autosurgeon](https://github.com/automerge/autosurgeon). -//! -//! ## Data Model -//! -//! An automerge document is a map from strings to values -//! ([`Value`]) where values can be either -//! -//! * A nested composite value which is either -//! * A map from strings to values ([`ObjType::Map`]) -//! * A list of values ([`ObjType::List`]) -//! * A text object (a sequence of unicode characters) ([`ObjType::Text`]) -//! * A primitive value ([`ScalarValue`]) which is one of -//! * A string -//! * A 64 bit floating point number -//! * A signed 64 bit integer -//! * An unsigned 64 bit integer -//! * A boolean -//! * A counter object (a 64 bit integer which merges by addition) -//! ([`ScalarValue::Counter`]) -//! * A timestamp (a 64 bit integer which is milliseconds since the unix epoch) -//! -//! All composite values have an ID ([`ObjId`]) which is created when the value -//! is inserted into the document or is the root object ID [`ROOT`]. Values in -//! the document are then referred to by the pair (`object ID`, `key`). The -//! `key` is represented by the [`Prop`] type and is either a string for a maps, -//! or an index for sequences. -//! -//! ### Conflicts -//! -//! There are some things automerge cannot merge sensibly. For example, two -//! actors concurrently setting the key "name" to different values. In this case -//! automerge will pick a winning value in a random but deterministic way, but -//! the conflicting value is still available via the [`ReadDoc::get_all`] method. -//! -//! ### Change hashes and historical values -//! -//! Like git, points in the history of a document are identified by hash. Unlike -//! git there can be multiple hashes representing a particular point (because -//! automerge supports concurrent changes). These hashes can be obtained using -//! either [`Automerge::get_heads`] or [`AutoCommit::get_heads`] (note these -//! methods are not part of [`ReadDoc`] because in the case of [`AutoCommit`] it -//! requires a mutable reference to the document). -//! -//! These hashes can be used to read values from the document at a particular -//! point in history using the various `*_at` methods on [`ReadDoc`] which take a -//! slice of [`ChangeHash`] as an argument. -//! -//! ### Actor IDs -//! -//! Any change to an automerge document is made by an actor, represented by an -//! [`ActorId`]. An actor ID is any random sequence of bytes but each change by -//! the same actor ID must be sequential. This often means you will want to -//! maintain at least one actor ID per device. It is fine to generate a new -//! actor ID for each change, but be aware that each actor ID takes up space in -//! a document so if you expect a document to be long lived and/or to have many -//! changes then you should try to reuse actor IDs where possible. -//! -//! ### Text Encoding -//! -//! Both [`Automerge`] and [`AutoCommit`] provide a `with_encoding` method which -//! allows you to specify the [`crate::TextEncoding`] which is used for -//! interpreting the indexes passed to methods like [`ReadDoc::list_range`] or -//! [`transaction::Transactable::splice`]. The default encoding is UTF-8, but -//! you can switch to UTF-16. -//! -//! ## Sync Protocol -//! -//! See the [`sync`] module. -//! -//! ## Serde serialization -//! -//! Sometimes you just want to get the JSON value of an automerge document. For -//! this you can use [`AutoSerde`], which implements `serde::Serialize` for an -//! automerge document. -//! -//! ## Example -//! -//! Let's create a document representing an address book. -//! -//! ``` -//! use automerge::{ObjType, AutoCommit, transaction::Transactable, ReadDoc}; -//! -//! # fn main() -> Result<(), Box> { -//! let mut doc = AutoCommit::new(); -//! -//! // `put_object` creates a nested object in the root key/value map and -//! // returns the ID of the new object, in this case a list. -//! let contacts = doc.put_object(automerge::ROOT, "contacts", ObjType::List)?; -//! -//! // Now we can insert objects into the list -//! let alice = doc.insert_object(&contacts, 0, ObjType::Map)?; -//! -//! // Finally we can set keys in the "alice" map -//! doc.put(&alice, "name", "Alice")?; -//! doc.put(&alice, "email", "alice@example.com")?; -//! -//! // Create another contact -//! let bob = doc.insert_object(&contacts, 1, ObjType::Map)?; -//! doc.put(&bob, "name", "Bob")?; -//! doc.put(&bob, "email", "bob@example.com")?; -//! -//! // Now we save the address book, we can put this in a file -//! let data: Vec = doc.save(); -//! # Ok(()) -//! # } -//! ``` -//! -//! Now modify this document on two separate devices and merge the modifications. -//! -//! ``` -//! use std::borrow::Cow; -//! use automerge::{ObjType, AutoCommit, transaction::Transactable, ReadDoc}; -//! -//! # fn main() -> Result<(), Box> { -//! # let mut doc = AutoCommit::new(); -//! # let contacts = doc.put_object(automerge::ROOT, "contacts", ObjType::List)?; -//! # let alice = doc.insert_object(&contacts, 0, ObjType::Map)?; -//! # doc.put(&alice, "name", "Alice")?; -//! # doc.put(&alice, "email", "alice@example.com")?; -//! # let bob = doc.insert_object(&contacts, 1, ObjType::Map)?; -//! # doc.put(&bob, "name", "Bob")?; -//! # doc.put(&bob, "email", "bob@example.com")?; -//! # let saved: Vec = doc.save(); -//! -//! // Load the document on the first device and change alices email -//! let mut doc1 = AutoCommit::load(&saved)?; -//! let contacts = match doc1.get(automerge::ROOT, "contacts")? { -//! Some((automerge::Value::Object(ObjType::List), contacts)) => contacts, -//! _ => panic!("contacts should be a list"), -//! }; -//! let alice = match doc1.get(&contacts, 0)? { -//! Some((automerge::Value::Object(ObjType::Map), alice)) => alice, -//! _ => panic!("alice should be a map"), -//! }; -//! doc1.put(&alice, "email", "alicesnewemail@example.com")?; -//! -//! -//! // Load the document on the second device and change bobs name -//! let mut doc2 = AutoCommit::load(&saved)?; -//! let contacts = match doc2.get(automerge::ROOT, "contacts")? { -//! Some((automerge::Value::Object(ObjType::List), contacts)) => contacts, -//! _ => panic!("contacts should be a list"), -//! }; -//! let bob = match doc2.get(&contacts, 1)? { -//! Some((automerge::Value::Object(ObjType::Map), bob)) => bob, -//! _ => panic!("bob should be a map"), -//! }; -//! doc2.put(&bob, "name", "Robert")?; -//! -//! // Finally, we can merge the changes from the two devices -//! doc1.merge(&mut doc2)?; -//! let bobsname: Option = doc1.get(&bob, "name")?.map(|(v, _)| v); -//! assert_eq!(bobsname, Some(automerge::Value::Scalar(Cow::Owned("Robert".into())))); -//! -//! let alices_email: Option = doc1.get(&alice, "email")?.map(|(v, _)| v); -//! assert_eq!(alices_email, Some(automerge::Value::Scalar(Cow::Owned("alicesnewemail@example.com".into())))); -//! # Ok(()) -//! # } -//! ``` -//! - #![doc( html_logo_url = "https://raw.githubusercontent.com/automerge/automerge-rs/main/img/brandmark.svg", html_favicon_url = "https:///raw.githubusercontent.com/automerge/automerge-rs/main/img/favicon.ico" @@ -195,6 +8,7 @@ rust_2018_idioms, unreachable_pub, bad_style, + const_err, dead_code, improper_ctypes, non_shorthand_field_patterns, @@ -244,8 +58,8 @@ mod autocommit; mod automerge; mod autoserde; mod change; -mod change_graph; mod clock; +mod clocks; mod columnar; mod convert; mod error; @@ -258,12 +72,12 @@ mod list_range; mod list_range_at; mod map_range; mod map_range_at; -pub mod op_observer; +mod op_observer; mod op_set; mod op_tree; mod parents; mod query; -mod read; +mod sequence_tree; mod storage; pub mod sync; pub mod transaction; @@ -273,14 +87,14 @@ mod values; #[cfg(feature = "optree-visualisation")] mod visualisation; -pub use crate::automerge::{Automerge, OnPartialLoad}; +pub use crate::automerge::Automerge; pub use autocommit::{AutoCommit, AutoCommitWithObs}; pub use autoserde::AutoSerde; pub use change::{Change, LoadError as LoadChangeError}; pub use error::AutomergeError; pub use error::InvalidActorId; pub use error::InvalidChangeHashSlice; -pub use exid::{ExId as ObjId, ObjIdFromBytesError}; +pub use exid::ExId as ObjId; pub use keys::Keys; pub use keys_at::KeysAt; pub use legacy::Change as ExpandedChange; @@ -291,11 +105,10 @@ pub use map_range_at::MapRangeAt; pub use op_observer::OpObserver; pub use op_observer::Patch; pub use op_observer::VecOpObserver; -pub use parents::{Parent, Parents}; -pub use read::ReadDoc; -pub use types::{ActorId, ChangeHash, ObjType, OpType, ParseChangeHashError, Prop, TextEncoding}; +pub use parents::Parents; +pub use sequence_tree::SequenceTree; +pub use types::{ActorId, ChangeHash, ObjType, OpType, Prop}; pub use value::{ScalarValue, Value}; pub use values::Values; -/// The object ID for the root map of a document pub const ROOT: ObjId = ObjId::Root; diff --git a/rust/automerge/src/list_range.rs b/rust/automerge/src/list_range.rs index a043da72..ae7b2aa5 100644 --- a/rust/automerge/src/list_range.rs +++ b/rust/automerge/src/list_range.rs @@ -3,9 +3,6 @@ use crate::{exid::ExId, Value}; use crate::{query, Automerge}; use std::ops::RangeBounds; -/// An iterator over the elements of a list object -/// -/// This is returned by the [`crate::ReadDoc::list_range`] method #[derive(Debug)] pub struct ListRange<'a, R: RangeBounds> { range: Option>, diff --git a/rust/automerge/src/list_range_at.rs b/rust/automerge/src/list_range_at.rs index ce8f5a46..37db9677 100644 --- a/rust/automerge/src/list_range_at.rs +++ b/rust/automerge/src/list_range_at.rs @@ -3,9 +3,6 @@ use std::ops::RangeBounds; use crate::{query, Automerge}; -/// An iterator over the elements of a list object at a particular set of heads -/// -/// This is returned by the [`crate::ReadDoc::list_range_at`] method #[derive(Debug)] pub struct ListRangeAt<'a, R: RangeBounds> { range: Option>, diff --git a/rust/automerge/src/map_range.rs b/rust/automerge/src/map_range.rs index ad33ebf5..8029b84d 100644 --- a/rust/automerge/src/map_range.rs +++ b/rust/automerge/src/map_range.rs @@ -3,9 +3,6 @@ use std::ops::RangeBounds; use crate::{query, Automerge}; -/// An iterator over the keys and values of a map object -/// -/// This is returned by the [`crate::ReadDoc::map_range`] method #[derive(Debug)] pub struct MapRange<'a, R: RangeBounds> { range: Option>, diff --git a/rust/automerge/src/map_range_at.rs b/rust/automerge/src/map_range_at.rs index 8d008e89..b2eb3fb2 100644 --- a/rust/automerge/src/map_range_at.rs +++ b/rust/automerge/src/map_range_at.rs @@ -3,9 +3,6 @@ use std::ops::RangeBounds; use crate::{query, Automerge}; -/// An iterator over the keys and values of a map object as at a particuar heads -/// -/// This is returned by the [`crate::ReadDoc::map_range_at`] method #[derive(Debug)] pub struct MapRangeAt<'a, R: RangeBounds> { range: Option>, diff --git a/rust/automerge/src/op_observer.rs b/rust/automerge/src/op_observer.rs index 5b33c21f..476093e5 100644 --- a/rust/automerge/src/op_observer.rs +++ b/rust/automerge/src/op_observer.rs @@ -1,13 +1,10 @@ use crate::exid::ExId; +use crate::Automerge; use crate::Prop; -use crate::ReadDoc; use crate::Value; -mod compose; -pub use compose::compose; - /// An observer of operations applied to the document. -pub trait OpObserver { +pub trait OpObserver: Default + Clone { /// A new value has been inserted into the given object. /// /// - `doc`: a handle to the doc after the op has been inserted, can be used to query information @@ -15,16 +12,15 @@ pub trait OpObserver { /// - `index`: the index the new value has been inserted at. /// - `tagged_value`: the value that has been inserted and the id of the operation that did the /// insert. - fn insert( + fn insert( &mut self, - doc: &R, + doc: &Automerge, objid: ExId, index: usize, tagged_value: (Value<'_>, ExId), ); - /// Some text has been spliced into a text object - fn splice_text(&mut self, _doc: &R, _objid: ExId, _index: usize, _value: &str); + fn splice_text(&mut self, doc: &Automerge, objid: ExId, index: usize, index_utf16: usize, value: &str); /// A new value has been put into the given object. /// @@ -34,9 +30,9 @@ pub trait OpObserver { /// - `tagged_value`: the value that has been put into the object and the id of the operation /// that did the put. /// - `conflict`: whether this put conflicts with other operations. - fn put( + fn put( &mut self, - doc: &R, + doc: &Automerge, objid: ExId, prop: Prop, tagged_value: (Value<'_>, ExId), @@ -53,9 +49,9 @@ pub trait OpObserver { /// - `tagged_value`: the value that has been put into the object and the id of the operation /// that did the put. /// - `conflict`: whether this put conflicts with other operations. - fn expose( + fn expose( &mut self, - doc: &R, + doc: &Automerge, objid: ExId, prop: Prop, tagged_value: (Value<'_>, ExId), @@ -67,7 +63,7 @@ pub trait OpObserver { /// - `doc`: a handle to the doc after the op has been inserted, can be used to query information /// - `objid`: the object that has been put into. /// - `prop`: the prop that the value as been put at. - fn flag_conflict(&mut self, _doc: &R, _objid: ExId, _prop: Prop) {} + fn flag_conflict(&mut self, doc: &Automerge, objid: ExId, prop: Prop); /// A counter has been incremented. /// @@ -76,60 +72,23 @@ pub trait OpObserver { /// - `prop`: they prop that the chounter is at. /// - `tagged_value`: the amount the counter has been incremented by, and the the id of the /// increment operation. - fn increment( - &mut self, - doc: &R, - objid: ExId, - prop: Prop, - tagged_value: (i64, ExId), - ); + fn increment(&mut self, doc: &Automerge, objid: ExId, prop: Prop, tagged_value: (i64, ExId)); - /// A map value has beeen deleted. + /// A value has beeen deleted. /// /// - `doc`: a handle to the doc after the op has been inserted, can be used to query information /// - `objid`: the object that has been deleted in. - /// - `prop`: the prop to be deleted - fn delete(&mut self, doc: &R, objid: ExId, prop: Prop) { - match prop { - Prop::Map(k) => self.delete_map(doc, objid, &k), - Prop::Seq(i) => self.delete_seq(doc, objid, i, 1), - } - } + /// - `prop`: the prop of the value that has been deleted. + fn delete(&mut self, doc: &Automerge, objid: ExId, prop: Prop); - /// A map value has beeen deleted. - /// - /// - `doc`: a handle to the doc after the op has been inserted, can be used to query information - /// - `objid`: the object that has been deleted in. - /// - `key`: the map key to be deleted - fn delete_map(&mut self, doc: &R, objid: ExId, key: &str); - - /// A one or more list values have beeen deleted. - /// - /// - `doc`: a handle to the doc after the op has been inserted, can be used to query information - /// - `objid`: the object that has been deleted in. - /// - `index`: the index of the deletion - /// - `num`: the number of sequential elements deleted - fn delete_seq(&mut self, doc: &R, objid: ExId, index: usize, num: usize); - - /// Whether to call sequence methods or `splice_text` when encountering changes in text - /// - /// Returns `false` by default - fn text_as_seq(&self) -> bool { - false - } -} - -/// An observer which can be branched -/// -/// This is used when observing operations in a transaction. In this case `branch` will be called -/// at the beginning of the transaction to return a new observer and then `merge` will be called -/// with the branched observer as `other` when the transaction is comitted. -pub trait BranchableObserver { /// Branch of a new op_observer later to be merged /// - /// Called when creating a new transaction. Observer branch will be merged on `commit()` or - /// thrown away on `rollback()` - fn branch(&self) -> Self; + /// Called by AutoCommit when creating a new transaction. Observer branch + /// will be merged on `commit()` or thrown away on `rollback()` + /// + fn branch(&self) -> Self { + Self::default() + } /// Merge observed information from a transaction. /// @@ -140,20 +99,20 @@ pub trait BranchableObserver { } impl OpObserver for () { - fn insert( + fn insert( &mut self, - _doc: &R, + _doc: &Automerge, _objid: ExId, _index: usize, _tagged_value: (Value<'_>, ExId), ) { } - fn splice_text(&mut self, _doc: &R, _objid: ExId, _index: usize, _value: &str) {} + fn splice_text(&mut self, _doc: &Automerge, _objid: ExId, _index: usize, _index_utf16: usize, _value: &str) {} - fn put( + fn put( &mut self, - _doc: &R, + _doc: &Automerge, _objid: ExId, _prop: Prop, _tagged_value: (Value<'_>, ExId), @@ -161,9 +120,9 @@ impl OpObserver for () { ) { } - fn expose( + fn expose( &mut self, - _doc: &R, + _doc: &Automerge, _objid: ExId, _prop: Prop, _tagged_value: (Value<'_>, ExId), @@ -171,23 +130,20 @@ impl OpObserver for () { ) { } - fn increment( + fn flag_conflict(&mut self, _doc: &Automerge, _objid: ExId, _prop: Prop) {} + + fn increment( &mut self, - _doc: &R, + _doc: &Automerge, _objid: ExId, _prop: Prop, _tagged_value: (i64, ExId), ) { } - fn delete_map(&mut self, _doc: &R, _objid: ExId, _key: &str) {} + fn delete(&mut self, _doc: &Automerge, _objid: ExId, _prop: Prop) {} - fn delete_seq(&mut self, _doc: &R, _objid: ExId, _index: usize, _num: usize) {} -} - -impl BranchableObserver for () { fn merge(&mut self, _other: &Self) {} - fn branch(&self) -> Self {} } /// Capture operations into a [`Vec`] and store them as patches. @@ -205,14 +161,8 @@ impl VecOpObserver { } impl OpObserver for VecOpObserver { - fn insert( - &mut self, - doc: &R, - obj: ExId, - index: usize, - (value, id): (Value<'_>, ExId), - ) { - if let Ok(p) = doc.parents(&obj) { + fn insert(&mut self, doc: &Automerge, obj: ExId, index: usize, (value, id): (Value<'_>, ExId)) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Insert { obj, path: p.path(), @@ -222,8 +172,8 @@ impl OpObserver for VecOpObserver { } } - fn splice_text(&mut self, doc: &R, obj: ExId, index: usize, value: &str) { - if let Ok(p) = doc.parents(&obj) { + fn splice_text(&mut self, doc: &Automerge, obj: ExId, index: usize, _index_utf16: usize, value: &str) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Splice { obj, path: p.path(), @@ -233,15 +183,15 @@ impl OpObserver for VecOpObserver { } } - fn put( + fn put( &mut self, - doc: &R, + doc: &Automerge, obj: ExId, prop: Prop, (value, id): (Value<'_>, ExId), conflict: bool, ) { - if let Ok(p) = doc.parents(&obj) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Put { obj, path: p.path(), @@ -252,15 +202,15 @@ impl OpObserver for VecOpObserver { } } - fn expose( + fn expose( &mut self, - doc: &R, + doc: &Automerge, obj: ExId, prop: Prop, (value, id): (Value<'_>, ExId), conflict: bool, ) { - if let Ok(p) = doc.parents(&obj) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Expose { obj, path: p.path(), @@ -271,8 +221,10 @@ impl OpObserver for VecOpObserver { } } - fn increment(&mut self, doc: &R, obj: ExId, prop: Prop, tagged_value: (i64, ExId)) { - if let Ok(p) = doc.parents(&obj) { + fn flag_conflict(&mut self, mut _doc: &Automerge, _obj: ExId, _prop: Prop) {} + + fn increment(&mut self, doc: &Automerge, obj: ExId, prop: Prop, tagged_value: (i64, ExId)) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Increment { obj, path: p.path(), @@ -282,37 +234,19 @@ impl OpObserver for VecOpObserver { } } - fn delete_map(&mut self, doc: &R, obj: ExId, key: &str) { - if let Ok(p) = doc.parents(&obj) { + fn delete(&mut self, doc: &Automerge, obj: ExId, prop: Prop) { + if let Ok(mut p) = doc.parents(&obj) { self.patches.push(Patch::Delete { obj, path: p.path(), - prop: Prop::Map(key.to_owned()), - num: 1, + prop, }) } } - fn delete_seq(&mut self, doc: &R, obj: ExId, index: usize, num: usize) { - if let Ok(p) = doc.parents(&obj) { - self.patches.push(Patch::Delete { - obj, - path: p.path(), - prop: Prop::Seq(index), - num, - }) - } - } -} - -impl BranchableObserver for VecOpObserver { fn merge(&mut self, other: &Self) { self.patches.extend_from_slice(other.patches.as_slice()) } - - fn branch(&self) -> Self { - Self::default() - } } /// A notification to the application that something has changed in a document. @@ -386,7 +320,5 @@ pub enum Patch { obj: ExId, /// The prop that was deleted. prop: Prop, - /// number of items deleted (for seq) - num: usize, }, } diff --git a/rust/automerge/src/op_observer/compose.rs b/rust/automerge/src/op_observer/compose.rs deleted file mode 100644 index 92fe3b1e..00000000 --- a/rust/automerge/src/op_observer/compose.rs +++ /dev/null @@ -1,102 +0,0 @@ -use super::OpObserver; - -pub fn compose<'a, O1: OpObserver, O2: OpObserver>( - obs1: &'a mut O1, - obs2: &'a mut O2, -) -> impl OpObserver + 'a { - ComposeObservers { obs1, obs2 } -} - -struct ComposeObservers<'a, O1: OpObserver, O2: OpObserver> { - obs1: &'a mut O1, - obs2: &'a mut O2, -} - -impl<'a, O1: OpObserver, O2: OpObserver> OpObserver for ComposeObservers<'a, O1, O2> { - fn insert( - &mut self, - doc: &R, - objid: crate::ObjId, - index: usize, - tagged_value: (crate::Value<'_>, crate::ObjId), - ) { - self.obs1 - .insert(doc, objid.clone(), index, tagged_value.clone()); - self.obs2.insert(doc, objid, index, tagged_value); - } - - fn splice_text( - &mut self, - doc: &R, - objid: crate::ObjId, - index: usize, - value: &str, - ) { - self.obs1.splice_text(doc, objid.clone(), index, value); - self.obs2.splice_text(doc, objid, index, value); - } - - fn put( - &mut self, - doc: &R, - objid: crate::ObjId, - prop: crate::Prop, - tagged_value: (crate::Value<'_>, crate::ObjId), - conflict: bool, - ) { - self.obs1.put( - doc, - objid.clone(), - prop.clone(), - tagged_value.clone(), - conflict, - ); - self.obs2.put(doc, objid, prop, tagged_value, conflict); - } - - fn expose( - &mut self, - doc: &R, - objid: crate::ObjId, - prop: crate::Prop, - tagged_value: (crate::Value<'_>, crate::ObjId), - conflict: bool, - ) { - self.obs1.expose( - doc, - objid.clone(), - prop.clone(), - tagged_value.clone(), - conflict, - ); - self.obs2.expose(doc, objid, prop, tagged_value, conflict); - } - - fn increment( - &mut self, - doc: &R, - objid: crate::ObjId, - prop: crate::Prop, - tagged_value: (i64, crate::ObjId), - ) { - self.obs1 - .increment(doc, objid.clone(), prop.clone(), tagged_value.clone()); - self.obs2.increment(doc, objid, prop, tagged_value); - } - - fn delete_map(&mut self, doc: &R, objid: crate::ObjId, key: &str) { - self.obs1.delete_map(doc, objid.clone(), key); - self.obs2.delete_map(doc, objid, key); - } - - fn delete_seq( - &mut self, - doc: &R, - objid: crate::ObjId, - index: usize, - num: usize, - ) { - self.obs2.delete_seq(doc, objid.clone(), index, num); - self.obs2.delete_seq(doc, objid, index, num); - } -} diff --git a/rust/automerge/src/op_set.rs b/rust/automerge/src/op_set.rs index aab8ce74..4af37793 100644 --- a/rust/automerge/src/op_set.rs +++ b/rust/automerge/src/op_set.rs @@ -4,8 +4,8 @@ use crate::indexed_cache::IndexedCache; use crate::op_tree::{self, OpTree}; use crate::parents::Parents; use crate::query::{self, OpIdVisSearch, TreeQuery}; -use crate::types::{self, ActorId, Key, ListEncoding, ObjId, Op, OpId, OpIds, OpType, Prop}; -use crate::ObjType; +use crate::types::{self, ActorId, Key, ObjId, Op, OpId, OpIds, OpType, Prop}; +use crate::{ObjType, OpObserver}; use fxhash::FxBuildHasher; use std::borrow::Borrow; use std::cmp::Ordering; @@ -13,7 +13,7 @@ use std::collections::HashMap; use std::ops::RangeBounds; mod load; -pub(crate) use load::OpSetBuilder; +pub(crate) use load::{ObservedOpSetBuilder, OpSetBuilder}; pub(crate) type OpSet = OpSetInternal; @@ -32,6 +32,12 @@ impl OpSetInternal { OpSetBuilder::new() } + /// Create a builder which passes each operation to `observer`. This will be significantly + /// slower than `OpSetBuilder` + pub(crate) fn observed_builder(observer: &mut O) -> ObservedOpSetBuilder<'_, O> { + ObservedOpSetBuilder::new(observer) + } + pub(crate) fn new() -> Self { let mut trees: HashMap<_, _, _> = Default::default(); trees.insert(ObjId::root(), OpTree::new()); @@ -49,16 +55,12 @@ impl OpSetInternal { if id == types::ROOT { ExId::Root } else { - ExId::Id( - id.counter(), - self.m.actors.cache[id.actor()].clone(), - id.actor(), - ) + ExId::Id(id.0, self.m.actors.cache[id.1].clone(), id.1) } } pub(crate) fn iter(&self) -> Iter<'_> { - let mut objs: Vec<_> = self.trees.iter().map(|t| (t.0, t.1.objtype, t.1)).collect(); + let mut objs: Vec<_> = self.trees.iter().collect(); objs.sort_by(|a, b| self.m.lamport_cmp((a.0).0, (b.0).0)); Iter { opset: self, @@ -67,44 +69,27 @@ impl OpSetInternal { } } - /// Iterate over objects in the opset in causal order - pub(crate) fn iter_objs( - &self, - ) -> impl Iterator)> + '_ { - let mut objs: Vec<_> = self.trees.iter().map(|t| (t.0, t.1.objtype, t.1)).collect(); - objs.sort_by(|a, b| self.m.lamport_cmp((a.0).0, (b.0).0)); - IterObjs { - trees: objs.into_iter(), - } - } - pub(crate) fn parents(&self, obj: ObjId) -> Parents<'_> { Parents { obj, ops: self } } - pub(crate) fn parent_object(&self, obj: &ObjId) -> Option { + pub(crate) fn parent_object(&self, obj: &ObjId) -> Option<(ObjId, Key, bool)> { let parent = self.trees.get(obj)?.parent?; let query = self.search(&parent, OpIdVisSearch::new(obj.0)); let key = query.key().unwrap(); let visible = query.visible; - Some(Parent { - obj: parent, - key, - visible, - }) + Some((parent, key, visible)) } - pub(crate) fn export_key(&self, obj: ObjId, key: Key, encoding: ListEncoding) -> Option { + pub(crate) fn export_key(&self, obj: ObjId, key: Key) -> Prop { match key { - Key::Map(m) => self.m.props.safe_get(m).map(|s| Prop::Map(s.to_string())), + Key::Map(m) => Prop::Map(self.m.props.get(m).into()), Key::Seq(opid) => { - if opid.is_head() { - Some(Prop::Seq(0)) - } else { - self.search(&obj, query::ElemIdPos::new(opid, encoding)) - .index() - .map(Prop::Seq) - } + let i = self + .search(&obj, query::ElemIdPos::new(opid)) + .index() + .unwrap(); + Prop::Seq(i) } } } @@ -175,16 +160,12 @@ impl OpSetInternal { } } - pub(crate) fn search<'a, 'b: 'a, Q>(&'b self, obj: &ObjId, mut query: Q) -> Q + pub(crate) fn search<'a, 'b: 'a, Q>(&'b self, obj: &ObjId, query: Q) -> Q where Q: TreeQuery<'a>, { if let Some(tree) = self.trees.get(obj) { - if query.can_shortcut_search(tree) { - query - } else { - tree.internal.search(query, &self.m) - } + tree.internal.search(query, &self.m) } else { query } @@ -195,17 +176,20 @@ impl OpSetInternal { F: Fn(&mut Op), { if let Some(tree) = self.trees.get_mut(obj) { - tree.last_insert = None; tree.internal.update(index, f) } } /// Add `op` as a successor to each op at `op_indices` in `obj` - pub(crate) fn add_succ(&mut self, obj: &ObjId, op_indices: &[usize], op: &Op) { + pub(crate) fn add_succ>( + &mut self, + obj: &ObjId, + op_indices: I, + op: &Op, + ) { if let Some(tree) = self.trees.get_mut(obj) { - tree.last_insert = None; for i in op_indices { - tree.internal.update(*i, |old_op| { + tree.internal.update(i, |old_op| { old_op.add_succ(op, |left, right| self.m.lamport_cmp(*left, *right)) }); } @@ -216,7 +200,6 @@ impl OpSetInternal { // this happens on rollback - be sure to go back to the old state let tree = self.trees.get_mut(obj).unwrap(); self.length -= 1; - tree.last_insert = None; let op = tree.internal.remove(index); if let OpType::Make(_) = &op.action { self.trees.remove(&op.id.into()); @@ -228,12 +211,6 @@ impl OpSetInternal { self.length } - pub(crate) fn hint(&mut self, obj: &ObjId, index: usize, pos: usize) { - if let Some(tree) = self.trees.get_mut(obj) { - tree.last_insert = Some((index, pos)) - } - } - #[tracing::instrument(skip(self, index))] pub(crate) fn insert(&mut self, index: usize, obj: &ObjId, element: Op) { if let OpType::Make(typ) = element.action { @@ -242,14 +219,13 @@ impl OpSetInternal { OpTree { internal: Default::default(), objtype: typ, - last_insert: None, parent: Some(*obj), }, ); } if let Some(tree) = self.trees.get_mut(obj) { - tree.last_insert = None; + //let tree = self.trees.get_mut(&element.obj).unwrap(); tree.internal.insert(index, element); self.length += 1; } else { @@ -257,6 +233,100 @@ impl OpSetInternal { } } + /* + pub(crate) fn insert_op(&mut self, obj: &ObjId, op: Op) -> Op { + let q = self.search(obj, query::SeekOp::new(&op)); + + let succ = q.succ; + let pos = q.pos; + + self.add_succ(obj, succ.iter().copied(), &op); + + if !op.is_delete() { + self.insert(pos, obj, op.clone()); + } + op + } + + pub(crate) fn insert_op_with_observer( + &mut self, + obj: &ObjId, + op: Op, + observer: &mut Obs, + ) -> Op { + let q = self.search(obj, query::SeekOpWithPatch::new(&op)); + let obj_type = self.object_type(obj); + + let query::SeekOpWithPatch { + pos, + succ, + seen, + values, + had_value_before, + .. + } = q; + + let ex_obj = self.id_to_exid(obj.0); + let parents = self.parents(*obj); + + let key = match op.key { + Key::Map(index) => self.m.props[index].clone().into(), + Key::Seq(_) => seen.into(), + }; + + if op.insert { + if obj_type == Some(ObjType::Text) { + observer.splice_text(parents, ex_obj, seen, op.to_str()); + } else { + let value = (op.value(), self.id_to_exid(op.id)); + observer.insert(parents, ex_obj, seen, value); + } + } else if op.is_delete() { + if let Some(winner) = &values.last() { + let value = (winner.value(), self.id_to_exid(winner.id)); + let conflict = values.len() > 1; + observer.expose(parents, ex_obj, key, value, conflict); + } else if had_value_before { + observer.delete(parents, ex_obj, key); + } + } else if let Some(value) = op.get_increment_value() { + // only observe this increment if the counter is visible, i.e. the counter's + // create op is in the values + //if values.iter().any(|value| op.pred.contains(&value.id)) { + if values + .last() + .map(|value| op.pred.contains(&value.id)) + .unwrap_or_default() + { + // we have observed the value + observer.increment(parents, ex_obj, key, (value, self.id_to_exid(op.id))); + } + } else { + let just_conflict = values + .last() + .map(|value| self.m.lamport_cmp(op.id, value.id) != Ordering::Greater) + .unwrap_or(false); + let value = (op.value(), self.id_to_exid(op.id)); + if op.is_list_op() && !had_value_before { + observer.insert(parents, ex_obj, seen, value); + } else if just_conflict { + observer.flag_conflict(parents, ex_obj, key); + } else { + let conflict = !values.is_empty(); + observer.put(parents, ex_obj, key, value, conflict); + } + } + + self.add_succ(obj, succ.iter().copied(), &op); + + if !op.is_delete() { + self.insert(pos, obj, op.clone()); + } + + op + } + */ + pub(crate) fn object_type(&self, id: &ObjId) -> Option { self.trees.get(id).map(|tree| tree.objtype) } @@ -291,7 +361,7 @@ impl Default for OpSetInternal { } impl<'a> IntoIterator for &'a OpSetInternal { - type Item = (&'a ObjId, ObjType, &'a Op); + type Item = (&'a ObjId, &'a Op); type IntoIter = Iter<'a>; @@ -300,41 +370,27 @@ impl<'a> IntoIterator for &'a OpSetInternal { } } -pub(crate) struct IterObjs<'a> { - trees: std::vec::IntoIter<(&'a ObjId, ObjType, &'a op_tree::OpTree)>, -} - -impl<'a> Iterator for IterObjs<'a> { - type Item = (&'a ObjId, ObjType, op_tree::OpTreeIter<'a>); - - fn next(&mut self) -> Option { - self.trees - .next() - .map(|(id, typ, tree)| (id, typ, tree.iter())) - } -} - #[derive(Clone)] pub(crate) struct Iter<'a> { opset: &'a OpSet, - trees: std::vec::IntoIter<(&'a ObjId, ObjType, &'a op_tree::OpTree)>, - current: Option<(&'a ObjId, ObjType, op_tree::OpTreeIter<'a>)>, + trees: std::vec::IntoIter<(&'a ObjId, &'a op_tree::OpTree)>, + current: Option<(&'a ObjId, op_tree::OpTreeIter<'a>)>, } impl<'a> Iterator for Iter<'a> { - type Item = (&'a ObjId, ObjType, &'a Op); + type Item = (&'a ObjId, &'a Op); fn next(&mut self) -> Option { - if let Some((id, typ, tree)) = &mut self.current { + if let Some((id, tree)) = &mut self.current { if let Some(next) = tree.next() { - return Some((id, *typ, next)); + return Some((id, next)); } } loop { - self.current = self.trees.next().map(|o| (o.0, o.1, o.2.iter())); - if let Some((obj, typ, tree)) = &mut self.current { + self.current = self.trees.next().map(|o| (o.0, o.1.iter())); + if let Some((obj, tree)) = &mut self.current { if let Some(next) = tree.next() { - return Some((obj, *typ, next)); + return Some((obj, next)); } } else { return None; @@ -380,7 +436,13 @@ impl OpSetMetadata { } pub(crate) fn lamport_cmp(&self, left: OpId, right: OpId) -> Ordering { - left.lamport_cmp(&right, &self.actors.cache) + match (left, right) { + (OpId(0, _), OpId(0, _)) => Ordering::Equal, + (OpId(0, _), OpId(_, _)) => Ordering::Less, + (OpId(_, _), OpId(0, _)) => Ordering::Greater, + (OpId(a, x), OpId(b, y)) if a == b => self.actors[x].cmp(&self.actors[y]), + (OpId(a, _), OpId(b, _)) => a.cmp(&b), + } } pub(crate) fn sorted_opids>(&self, opids: I) -> OpIds { @@ -397,9 +459,3 @@ impl OpSetMetadata { self.props.cache(key.borrow().to_string()) } } - -pub(crate) struct Parent { - pub(crate) obj: ObjId, - pub(crate) key: Key, - pub(crate) visible: bool, -} diff --git a/rust/automerge/src/op_set/load.rs b/rust/automerge/src/op_set/load.rs index e14f46b7..524b31be 100644 --- a/rust/automerge/src/op_set/load.rs +++ b/rust/automerge/src/op_set/load.rs @@ -6,7 +6,8 @@ use super::{OpSet, OpTree}; use crate::{ op_tree::OpTreeInternal, storage::load::{DocObserver, LoadedObject}, - types::ObjId, + types::{ObjId, Op}, + Automerge, OpObserver, }; /// An opset builder which creates an optree for each object as it finishes loading, inserting the @@ -36,7 +37,6 @@ impl DocObserver for OpSetBuilder { internal, objtype: loaded.obj_type, parent: loaded.parent, - last_insert: None, }; self.completed_objects.insert(loaded.id, tree); } @@ -50,3 +50,38 @@ impl DocObserver for OpSetBuilder { } } } + +/// A DocObserver which just accumulates ops until the document has finished reconstructing and +/// then inserts all of the ops using `OpSet::insert_op_with_observer` +pub(crate) struct ObservedOpSetBuilder<'a, O: OpObserver> { + observer: &'a mut O, + ops: Vec<(ObjId, Op)>, +} + +impl<'a, O: OpObserver> ObservedOpSetBuilder<'a, O> { + pub(crate) fn new(observer: &'a mut O) -> Self { + Self { + observer, + ops: Vec::new(), + } + } +} + +impl<'a, O: OpObserver> DocObserver for ObservedOpSetBuilder<'a, O> { + type Output = OpSet; + + fn object_loaded(&mut self, object: LoadedObject) { + self.ops.reserve(object.ops.len()); + for op in object.ops { + self.ops.push((object.id, op)); + } + } + + fn finish(self, _metadata: super::OpSetMetadata) -> Self::Output { + let mut opset = Automerge::new(); + for (obj, op) in self.ops { + opset.insert_op_with_observer(&obj, op, self.observer); + } + opset.ops + } +} diff --git a/rust/automerge/src/op_tree.rs b/rust/automerge/src/op_tree.rs index 7de00dc3..2bc92a4d 100644 --- a/rust/automerge/src/op_tree.rs +++ b/rust/automerge/src/op_tree.rs @@ -1,9 +1,14 @@ -use std::{fmt::Debug, mem, ops::RangeBounds}; +use std::{ + cmp::{min, Ordering}, + fmt::Debug, + mem, + ops::RangeBounds, +}; pub(crate) use crate::op_set::OpSetMetadata; use crate::{ clock::Clock, - query::{self, ChangeVisibility, QueryResult, TreeQuery}, + query::{self, ChangeVisibility, Index, QueryResult, TreeQuery}, }; use crate::{ types::{ObjId, Op, OpId}, @@ -11,12 +16,10 @@ use crate::{ }; use std::collections::HashSet; -mod iter; -mod node; +pub(crate) const B: usize = 16; +mod iter; pub(crate) use iter::OpTreeIter; -#[allow(unused)] -pub(crate) use node::{OpTreeNode, B}; #[derive(Debug, Clone, PartialEq)] pub(crate) struct OpTree { @@ -24,11 +27,6 @@ pub(crate) struct OpTree { pub(crate) objtype: ObjType, /// The id of the parent object, root has no parent. pub(crate) parent: Option, - /// record the last list index and tree position - /// inserted into the op_set - this allows us to - /// short circuit the query if the follow op is another - /// insert or delete at the same spot - pub(crate) last_insert: Option<(usize, usize)>, } impl OpTree { @@ -37,7 +35,6 @@ impl OpTree { internal: Default::default(), objtype: ObjType::Map, parent: None, - last_insert: None, } } @@ -53,16 +50,20 @@ impl OpTree { #[derive(Clone, Debug)] pub(crate) struct OpTreeInternal { pub(crate) root_node: Option, - pub(crate) ops: Vec, +} + +#[derive(Clone, Debug)] +pub(crate) struct OpTreeNode { + pub(crate) children: Vec, + pub(crate) elements: Vec, + pub(crate) index: Index, + length: usize, } impl OpTreeInternal { /// Construct a new, empty, sequence. pub(crate) fn new() -> Self { - Self { - root_node: None, - ops: vec![], - } + Self { root_node: None } } /// Get the length of the sequence. @@ -71,19 +72,13 @@ impl OpTreeInternal { } pub(crate) fn keys(&self) -> Option> { - if self.root_node.is_some() { - Some(query::Keys::new(self)) - } else { - None - } + self.root_node.as_ref().map(query::Keys::new) } pub(crate) fn keys_at(&self, clock: Clock) -> Option> { - if self.root_node.is_some() { - Some(query::KeysAt::new(self, clock)) - } else { - None - } + self.root_node + .as_ref() + .map(|root| query::KeysAt::new(root, clock)) } pub(crate) fn map_range<'a, R: RangeBounds>( @@ -91,11 +86,9 @@ impl OpTreeInternal { range: R, meta: &'a OpSetMetadata, ) -> Option> { - if self.root_node.is_some() { - Some(query::MapRange::new(range, self, meta)) - } else { - None - } + self.root_node + .as_ref() + .map(|node| query::MapRange::new(range, node, meta)) } pub(crate) fn map_range_at<'a, R: RangeBounds>( @@ -104,22 +97,18 @@ impl OpTreeInternal { meta: &'a OpSetMetadata, clock: Clock, ) -> Option> { - if self.root_node.is_some() { - Some(query::MapRangeAt::new(range, self, meta, clock)) - } else { - None - } + self.root_node + .as_ref() + .map(|node| query::MapRangeAt::new(range, node, meta, clock)) } pub(crate) fn list_range>( &self, range: R, ) -> Option> { - if self.root_node.is_some() { - Some(query::ListRange::new(range, self)) - } else { - None - } + self.root_node + .as_ref() + .map(|node| query::ListRange::new(range, node)) } pub(crate) fn list_range_at>( @@ -127,24 +116,22 @@ impl OpTreeInternal { range: R, clock: Clock, ) -> Option> { - if self.root_node.is_some() { - Some(query::ListRangeAt::new(range, clock, self)) - } else { - None - } + self.root_node + .as_ref() + .map(|node| query::ListRangeAt::new(range, clock, node)) } pub(crate) fn search<'a, 'b: 'a, Q>(&'b self, mut query: Q, m: &OpSetMetadata) -> Q where Q: TreeQuery<'a>, { - self.root_node.as_ref().map(|root| { - match query.query_node_with_metadata(root, m, &self.ops) { - QueryResult::Descend => root.search(&mut query, m, &self.ops, None), - QueryResult::Skip(skip) => root.search(&mut query, m, &self.ops, Some(skip)), + self.root_node + .as_ref() + .map(|root| match query.query_node_with_metadata(root, m) { + QueryResult::Descend => root.search(&mut query, m, None), + QueryResult::Skip(skip) => root.search(&mut query, m, Some(skip)), _ => true, - } - }); + }); query } @@ -158,7 +145,7 @@ impl OpTreeInternal { /// # Panics /// /// Panics if `index > len`. - pub(crate) fn insert(&mut self, index: usize, op: Op) { + pub(crate) fn insert(&mut self, index: usize, element: Op) { assert!( index <= self.len(), "tried to insert at {} but len is {}", @@ -166,9 +153,6 @@ impl OpTreeInternal { self.len() ); - let element = self.ops.len(); - self.ops.push(op); - let old_len = self.len(); if let Some(root) = self.root_node.as_mut() { #[cfg(debug_assertions)] @@ -184,7 +168,7 @@ impl OpTreeInternal { root.length += old_root.len(); root.index = old_root.index.clone(); root.children.push(old_root); - root.split_child(0, &self.ops); + root.split_child(0); assert_eq!(original_len, root.len()); @@ -197,14 +181,14 @@ impl OpTreeInternal { (&mut root.children[0], index) }; root.length += 1; - root.index.insert(&self.ops[element]); - child.insert_into_non_full_node(insertion_index, element, &self.ops) + root.index.insert(&element); + child.insert_into_non_full_node(insertion_index, element) } else { - root.insert_into_non_full_node(index, element, &self.ops) + root.insert_into_non_full_node(index, element) } } else { let mut root = OpTreeNode::new(); - root.insert_into_non_full_node(index, element, &self.ops); + root.insert_into_non_full_node(index, element); self.root_node = Some(root) } assert_eq!(self.len(), old_len + 1, "{:#?}", self); @@ -212,28 +196,16 @@ impl OpTreeInternal { /// Get the `element` at `index` in the sequence. pub(crate) fn get(&self, index: usize) -> Option<&Op> { - self.root_node - .as_ref() - .and_then(|n| n.get(index)) - .map(|n| &self.ops[n]) + self.root_node.as_ref().and_then(|n| n.get(index)) } // this replaces get_mut() because it allows the indexes to update correctly pub(crate) fn update(&mut self, index: usize, f: F) where - F: FnOnce(&mut Op), + F: FnMut(&mut Op), { if self.len() > index { - let n = self.root_node.as_ref().unwrap().get(index).unwrap(); - let new_element = self.ops.get_mut(n).unwrap(); - let old_vis = new_element.visible(); - f(new_element); - let vis = ChangeVisibility { - old_vis, - new_vis: new_element.visible(), - op: new_element, - }; - self.root_node.as_mut().unwrap().update(index, vis); + self.root_node.as_mut().unwrap().update(index, f); } } @@ -246,7 +218,7 @@ impl OpTreeInternal { if let Some(root) = self.root_node.as_mut() { #[cfg(debug_assertions)] let len = root.check(); - let old = root.remove(index, &self.ops); + let old = root.remove(index); if root.elements.is_empty() { if root.is_leaf() { @@ -258,13 +230,468 @@ impl OpTreeInternal { #[cfg(debug_assertions)] debug_assert_eq!(len, self.root_node.as_ref().map_or(0, |r| r.check()) + 1); - self.ops[old].clone() + old } else { panic!("remove from empty tree") } } } +impl OpTreeNode { + fn new() -> Self { + Self { + elements: Vec::new(), + children: Vec::new(), + index: Default::default(), + length: 0, + } + } + + pub(crate) fn search<'a, 'b: 'a, Q>( + &'b self, + query: &mut Q, + m: &OpSetMetadata, + skip: Option, + ) -> bool + where + Q: TreeQuery<'a>, + { + if self.is_leaf() { + let skip = skip.unwrap_or(0); + for e in self.elements.iter().skip(skip) { + if query.query_element_with_metadata(e, m) == QueryResult::Finish { + return true; + } + } + false + } else { + let mut skip = skip.unwrap_or(0); + for (child_index, child) in self.children.iter().enumerate() { + match skip.cmp(&child.len()) { + Ordering::Greater => { + // not in this child at all + // take off the number of elements in the child as well as the next element + skip -= child.len() + 1; + } + Ordering::Equal => { + // just try the element + skip -= child.len(); + if let Some(e) = self.elements.get(child_index) { + if query.query_element_with_metadata(e, m) == QueryResult::Finish { + return true; + } + } + } + Ordering::Less => { + // descend and try find it + match query.query_node_with_metadata(child, m) { + QueryResult::Descend => { + // search in the child node, passing in the number of items left to + // skip + if child.search(query, m, Some(skip)) { + return true; + } + } + QueryResult::Finish => return true, + QueryResult::Next => (), + QueryResult::Skip(_) => panic!("had skip from non-root node"), + } + if let Some(e) = self.elements.get(child_index) { + if query.query_element_with_metadata(e, m) == QueryResult::Finish { + return true; + } + } + // reset the skip to zero so we continue iterating normally + skip = 0; + } + } + } + false + } + } + + pub(crate) fn len(&self) -> usize { + self.length + } + + fn reindex(&mut self) { + let mut index = Index::new(); + for c in &self.children { + index.merge(&c.index); + } + for e in &self.elements { + index.insert(e); + } + self.index = index + } + + fn is_leaf(&self) -> bool { + self.children.is_empty() + } + + fn is_full(&self) -> bool { + self.elements.len() >= 2 * B - 1 + } + + /// Returns the child index and the given index adjusted for the cumulative index before that + /// child. + fn find_child_index(&self, index: usize) -> (usize, usize) { + let mut cumulative_len = 0; + for (child_index, child) in self.children.iter().enumerate() { + if cumulative_len + child.len() >= index { + return (child_index, index - cumulative_len); + } else { + cumulative_len += child.len() + 1; + } + } + panic!("index {} not found in node with len {}", index, self.len()) + } + + fn insert_into_non_full_node(&mut self, index: usize, element: Op) { + assert!(!self.is_full()); + + self.index.insert(&element); + + if self.is_leaf() { + self.length += 1; + self.elements.insert(index, element); + } else { + let (child_index, sub_index) = self.find_child_index(index); + let child = &mut self.children[child_index]; + + if child.is_full() { + self.split_child(child_index); + + // child structure has changed so we need to find the index again + let (child_index, sub_index) = self.find_child_index(index); + let child = &mut self.children[child_index]; + child.insert_into_non_full_node(sub_index, element); + } else { + child.insert_into_non_full_node(sub_index, element); + } + self.length += 1; + } + } + + // A utility function to split the child `full_child_index` of this node + // Note that `full_child_index` must be full when this function is called. + fn split_child(&mut self, full_child_index: usize) { + let original_len_self = self.len(); + + let full_child = &mut self.children[full_child_index]; + + // Create a new node which is going to store (B-1) keys + // of the full child. + let mut successor_sibling = OpTreeNode::new(); + + let original_len = full_child.len(); + assert!(full_child.is_full()); + + successor_sibling.elements = full_child.elements.split_off(B); + + if !full_child.is_leaf() { + successor_sibling.children = full_child.children.split_off(B); + } + + let middle = full_child.elements.pop().unwrap(); + + full_child.length = + full_child.elements.len() + full_child.children.iter().map(|c| c.len()).sum::(); + + successor_sibling.length = successor_sibling.elements.len() + + successor_sibling + .children + .iter() + .map(|c| c.len()) + .sum::(); + + let z_len = successor_sibling.len(); + + let full_child_len = full_child.len(); + + full_child.reindex(); + successor_sibling.reindex(); + + self.children + .insert(full_child_index + 1, successor_sibling); + + self.elements.insert(full_child_index, middle); + + assert_eq!(full_child_len + z_len + 1, original_len, "{:#?}", self); + + assert_eq!(original_len_self, self.len()); + } + + fn remove_from_leaf(&mut self, index: usize) -> Op { + self.length -= 1; + self.elements.remove(index) + } + + fn remove_element_from_non_leaf(&mut self, index: usize, element_index: usize) -> Op { + self.length -= 1; + if self.children[element_index].elements.len() >= B { + let total_index = self.cumulative_index(element_index); + // recursively delete index - 1 in predecessor_node + let predecessor = self.children[element_index].remove(index - 1 - total_index); + // replace element with that one + mem::replace(&mut self.elements[element_index], predecessor) + } else if self.children[element_index + 1].elements.len() >= B { + // recursively delete index + 1 in successor_node + let total_index = self.cumulative_index(element_index + 1); + let successor = self.children[element_index + 1].remove(index + 1 - total_index); + // replace element with that one + mem::replace(&mut self.elements[element_index], successor) + } else { + let middle_element = self.elements.remove(element_index); + let successor_child = self.children.remove(element_index + 1); + self.children[element_index].merge(middle_element, successor_child); + + let total_index = self.cumulative_index(element_index); + self.children[element_index].remove(index - total_index) + } + } + + fn cumulative_index(&self, child_index: usize) -> usize { + self.children[0..child_index] + .iter() + .map(|c| c.len() + 1) + .sum() + } + + fn remove_from_internal_child(&mut self, index: usize, mut child_index: usize) -> Op { + if self.children[child_index].elements.len() < B + && if child_index > 0 { + self.children[child_index - 1].elements.len() < B + } else { + true + } + && if child_index + 1 < self.children.len() { + self.children[child_index + 1].elements.len() < B + } else { + true + } + { + // if the child and its immediate siblings have B-1 elements merge the child + // with one sibling, moving an element from this node into the new merged node + // to be the median + + if child_index > 0 { + let middle = self.elements.remove(child_index - 1); + + // use the predessor sibling + let successor = self.children.remove(child_index); + child_index -= 1; + + self.children[child_index].merge(middle, successor); + } else { + let middle = self.elements.remove(child_index); + + // use the sucessor sibling + let successor = self.children.remove(child_index + 1); + + self.children[child_index].merge(middle, successor); + } + } else if self.children[child_index].elements.len() < B { + if child_index > 0 + && self + .children + .get(child_index - 1) + .map_or(false, |c| c.elements.len() >= B) + { + let last_element = self.children[child_index - 1].elements.pop().unwrap(); + assert!(!self.children[child_index - 1].elements.is_empty()); + self.children[child_index - 1].length -= 1; + self.children[child_index - 1].index.remove(&last_element); + + let parent_element = + mem::replace(&mut self.elements[child_index - 1], last_element); + + self.children[child_index].index.insert(&parent_element); + self.children[child_index] + .elements + .insert(0, parent_element); + self.children[child_index].length += 1; + + if let Some(last_child) = self.children[child_index - 1].children.pop() { + self.children[child_index - 1].length -= last_child.len(); + self.children[child_index - 1].reindex(); + self.children[child_index].length += last_child.len(); + self.children[child_index].children.insert(0, last_child); + self.children[child_index].reindex(); + } + } else if self + .children + .get(child_index + 1) + .map_or(false, |c| c.elements.len() >= B) + { + let first_element = self.children[child_index + 1].elements.remove(0); + self.children[child_index + 1].index.remove(&first_element); + self.children[child_index + 1].length -= 1; + + assert!(!self.children[child_index + 1].elements.is_empty()); + + let parent_element = mem::replace(&mut self.elements[child_index], first_element); + + self.children[child_index].length += 1; + self.children[child_index].index.insert(&parent_element); + self.children[child_index].elements.push(parent_element); + + if !self.children[child_index + 1].is_leaf() { + let first_child = self.children[child_index + 1].children.remove(0); + self.children[child_index + 1].length -= first_child.len(); + self.children[child_index + 1].reindex(); + self.children[child_index].length += first_child.len(); + + self.children[child_index].children.push(first_child); + self.children[child_index].reindex(); + } + } + } + self.length -= 1; + let total_index = self.cumulative_index(child_index); + self.children[child_index].remove(index - total_index) + } + + fn check(&self) -> usize { + let l = self.elements.len() + self.children.iter().map(|c| c.check()).sum::(); + assert_eq!(self.len(), l, "{:#?}", self); + + l + } + + pub(crate) fn remove(&mut self, index: usize) -> Op { + let original_len = self.len(); + if self.is_leaf() { + let v = self.remove_from_leaf(index); + self.index.remove(&v); + assert_eq!(original_len, self.len() + 1); + debug_assert_eq!(self.check(), self.len()); + v + } else { + let mut total_index = 0; + for (child_index, child) in self.children.iter().enumerate() { + match (total_index + child.len()).cmp(&index) { + Ordering::Less => { + // should be later on in the loop + total_index += child.len() + 1; + continue; + } + Ordering::Equal => { + let v = self.remove_element_from_non_leaf( + index, + min(child_index, self.elements.len() - 1), + ); + self.index.remove(&v); + assert_eq!(original_len, self.len() + 1); + debug_assert_eq!(self.check(), self.len()); + return v; + } + Ordering::Greater => { + let v = self.remove_from_internal_child(index, child_index); + self.index.remove(&v); + assert_eq!(original_len, self.len() + 1); + debug_assert_eq!(self.check(), self.len()); + return v; + } + } + } + panic!( + "index not found to remove {} {} {} {}", + index, + total_index, + self.len(), + self.check() + ); + } + } + + fn merge(&mut self, middle: Op, successor_sibling: OpTreeNode) { + self.index.insert(&middle); + self.index.merge(&successor_sibling.index); + self.elements.push(middle); + self.elements.extend(successor_sibling.elements); + self.children.extend(successor_sibling.children); + self.length += successor_sibling.length + 1; + assert!(self.is_full()); + } + + /// Update the operation at the given index using the provided function. + /// + /// This handles updating the indices after the update. + pub(crate) fn update(&mut self, index: usize, f: F) -> ChangeVisibility + where + F: FnOnce(&mut Op), + { + if self.is_leaf() { + let new_element = self.elements.get_mut(index).unwrap(); + let old_vis = new_element.visible(); + f(new_element); + self.index.change_vis(ChangeVisibility { + old_vis, + new_vis: new_element.visible(), + key: new_element.elemid_or_key(), + utf16_len: new_element.utf16_len(), + }) + } else { + let mut cumulative_len = 0; + let len = self.len(); + for (child_index, child) in self.children.iter_mut().enumerate() { + match (cumulative_len + child.len()).cmp(&index) { + Ordering::Less => { + cumulative_len += child.len() + 1; + } + Ordering::Equal => { + let new_element = self.elements.get_mut(child_index).unwrap(); + let old_vis = new_element.visible(); + f(new_element); + return self.index.change_vis(ChangeVisibility { + old_vis, + new_vis: new_element.visible(), + key: new_element.elemid_or_key(), + utf16_len: new_element.utf16_len(), + }); + } + Ordering::Greater => { + let vis_args = child.update(index - cumulative_len, f); + return self.index.change_vis(vis_args); + } + } + } + panic!("Invalid index to set: {} but len was {}", index, len) + } + } + + pub(crate) fn last(&self) -> &Op { + if self.is_leaf() { + // node is never empty so this is safe + self.elements.last().unwrap() + } else { + // if not a leaf then there is always at least one child + self.children.last().unwrap().last() + } + } + + pub(crate) fn get(&self, index: usize) -> Option<&Op> { + if self.is_leaf() { + return self.elements.get(index); + } else { + let mut cumulative_len = 0; + for (child_index, child) in self.children.iter().enumerate() { + match (cumulative_len + child.len()).cmp(&index) { + Ordering::Less => { + cumulative_len += child.len() + 1; + } + Ordering::Equal => return self.elements.get(child_index), + Ordering::Greater => { + return child.get(index - cumulative_len); + } + } + } + } + None + } +} + impl Default for OpTreeInternal { fn default() -> Self { Self::new() @@ -325,7 +752,7 @@ mod tests { use super::*; fn op() -> Op { - let zero = OpId::new(0, 0); + let zero = OpId(0, 0); Op { id: zero, action: amp::OpType::Put(0.into()), diff --git a/rust/automerge/src/op_tree/iter.rs b/rust/automerge/src/op_tree/iter.rs index 0b19f359..8d070f11 100644 --- a/rust/automerge/src/op_tree/iter.rs +++ b/rust/automerge/src/op_tree/iter.rs @@ -21,7 +21,6 @@ impl<'a> OpTreeIter<'a> { }, cumulative_index: 0, root_node: root, - ops: &tree.ops, }) .unwrap_or(Inner::Empty), ) @@ -51,7 +50,6 @@ enum Inner<'a> { // How far through the whole optree we are cumulative_index: usize, root_node: &'a OpTreeNode, - ops: &'a [Op], }, } @@ -77,7 +75,6 @@ impl<'a> Iterator for Inner<'a> { Inner::Empty => None, Inner::NonEmpty { ancestors, - ops, current, cumulative_index, .. @@ -86,10 +83,10 @@ impl<'a> Iterator for Inner<'a> { // If we're in a leaf node and we haven't exhausted it yet we just return the elements // of the leaf node if current.index < current.node.len() { - let result = current.node.elements[current.index]; + let result = ¤t.node.elements[current.index]; current.index += 1; *cumulative_index += 1; - Some(&ops[result]) + Some(result) } else { // We've exhausted the leaf node, we must find the nearest non-exhausted parent (lol) let node_iter = loop { @@ -116,10 +113,10 @@ impl<'a> Iterator for Inner<'a> { // return the element from the parent node which is one after the index at which we // descended into the child *current = node_iter; - let result = current.node.elements[current.index]; + let result = ¤t.node.elements[current.index]; current.index += 1; *cumulative_index += 1; - Some(&ops[result]) + Some(result) } } else { // If we're in a non-leaf node then the last iteration returned an element from the @@ -150,7 +147,6 @@ impl<'a> Iterator for Inner<'a> { Self::Empty => None, Self::NonEmpty { root_node, - ops, cumulative_index, current, ancestors, @@ -181,7 +177,7 @@ impl<'a> Iterator for Inner<'a> { Ordering::Equal => { *cumulative_index += child.len() + 1; current.index = child_index + 1; - return Some(&ops[current.node.elements[child_index]]); + return Some(¤t.node.elements[child_index]); } Ordering::Greater => { current.index = child_index; @@ -201,7 +197,7 @@ impl<'a> Iterator for Inner<'a> { // we're in a leaf node and we kept track of the cumulative index as we went, let index_in_this_node = n.saturating_sub(*cumulative_index); current.index = index_in_this_node + 1; - Some(&ops[current.node.elements[index_in_this_node]]) + Some(¤t.node.elements[index_in_this_node]) } } } @@ -262,7 +258,7 @@ mod tests { fn op(counter: u64) -> Op { Op { action: OpType::Put(ScalarValue::Uint(counter)), - id: OpId::new(counter, 0), + id: OpId(counter, 0), key: Key::Map(0), succ: Default::default(), pred: Default::default(), diff --git a/rust/automerge/src/op_tree/node.rs b/rust/automerge/src/op_tree/node.rs deleted file mode 100644 index ed1b7646..00000000 --- a/rust/automerge/src/op_tree/node.rs +++ /dev/null @@ -1,492 +0,0 @@ -use std::{ - cmp::{min, Ordering}, - fmt::Debug, - mem, -}; - -pub(crate) use crate::op_set::OpSetMetadata; -use crate::query::{ChangeVisibility, Index, QueryResult, TreeQuery}; -use crate::types::Op; -pub(crate) const B: usize = 16; - -#[derive(Clone, Debug)] -pub(crate) struct OpTreeNode { - pub(crate) children: Vec, - pub(crate) elements: Vec, - pub(crate) index: Index, - pub(crate) length: usize, -} - -impl OpTreeNode { - pub(crate) fn new() -> Self { - Self { - elements: Vec::new(), - children: Vec::new(), - index: Default::default(), - length: 0, - } - } - - fn search_element<'a, 'b: 'a, Q>( - &'b self, - query: &mut Q, - m: &OpSetMetadata, - ops: &'a [Op], - index: usize, - ) -> bool - where - Q: TreeQuery<'a>, - { - if let Some(e) = self.elements.get(index) { - if query.query_element_with_metadata(&ops[*e], m) == QueryResult::Finish { - return true; - } - } - false - } - - pub(crate) fn search<'a, 'b: 'a, Q>( - &'b self, - query: &mut Q, - m: &OpSetMetadata, - ops: &'a [Op], - mut skip: Option, - ) -> bool - where - Q: TreeQuery<'a>, - { - if self.is_leaf() { - for e in self.elements.iter().skip(skip.unwrap_or(0)) { - if query.query_element_with_metadata(&ops[*e], m) == QueryResult::Finish { - return true; - } - } - false - } else { - for (child_index, child) in self.children.iter().enumerate() { - match skip { - Some(n) if n > child.len() => { - skip = Some(n - child.len() - 1); - } - Some(n) if n == child.len() => { - skip = Some(0); // important to not be None so we never call query_node again - if self.search_element(query, m, ops, child_index) { - return true; - } - } - Some(n) => { - if child.search(query, m, ops, Some(n)) { - return true; - } - skip = Some(0); // important to not be None so we never call query_node again - if self.search_element(query, m, ops, child_index) { - return true; - } - } - None => { - // descend and try find it - match query.query_node_with_metadata(child, m, ops) { - QueryResult::Descend => { - if child.search(query, m, ops, None) { - return true; - } - } - QueryResult::Finish => return true, - QueryResult::Next => (), - QueryResult::Skip(_) => panic!("had skip from non-root node"), - } - if self.search_element(query, m, ops, child_index) { - return true; - } - } - } - } - false - } - } - - pub(crate) fn len(&self) -> usize { - self.length - } - - fn reindex(&mut self, ops: &[Op]) { - let mut index = Index::new(); - for c in &self.children { - index.merge(&c.index); - } - for i in &self.elements { - index.insert(&ops[*i]); - } - self.index = index - } - - pub(crate) fn is_leaf(&self) -> bool { - self.children.is_empty() - } - - pub(crate) fn is_full(&self) -> bool { - self.elements.len() >= 2 * B - 1 - } - - /// Returns the child index and the given index adjusted for the cumulative index before that - /// child. - fn find_child_index(&self, index: usize) -> (usize, usize) { - let mut cumulative_len = 0; - for (child_index, child) in self.children.iter().enumerate() { - if cumulative_len + child.len() >= index { - return (child_index, index - cumulative_len); - } else { - cumulative_len += child.len() + 1; - } - } - panic!("index {} not found in node with len {}", index, self.len()) - } - - pub(crate) fn insert_into_non_full_node(&mut self, index: usize, element: usize, ops: &[Op]) { - assert!(!self.is_full()); - - self.index.insert(&ops[element]); - - if self.is_leaf() { - self.length += 1; - self.elements.insert(index, element); - } else { - let (child_index, sub_index) = self.find_child_index(index); - let child = &mut self.children[child_index]; - - if child.is_full() { - self.split_child(child_index, ops); - - // child structure has changed so we need to find the index again - let (child_index, sub_index) = self.find_child_index(index); - let child = &mut self.children[child_index]; - child.insert_into_non_full_node(sub_index, element, ops); - } else { - child.insert_into_non_full_node(sub_index, element, ops); - } - self.length += 1; - } - } - - // A utility function to split the child `full_child_index` of this node - // Note that `full_child_index` must be full when this function is called. - pub(crate) fn split_child(&mut self, full_child_index: usize, ops: &[Op]) { - let original_len_self = self.len(); - - let full_child = &mut self.children[full_child_index]; - - // Create a new node which is going to store (B-1) keys - // of the full child. - let mut successor_sibling = OpTreeNode::new(); - - let original_len = full_child.len(); - assert!(full_child.is_full()); - - successor_sibling.elements = full_child.elements.split_off(B); - - if !full_child.is_leaf() { - successor_sibling.children = full_child.children.split_off(B); - } - - let middle = full_child.elements.pop().unwrap(); - - full_child.length = - full_child.elements.len() + full_child.children.iter().map(|c| c.len()).sum::(); - - successor_sibling.length = successor_sibling.elements.len() - + successor_sibling - .children - .iter() - .map(|c| c.len()) - .sum::(); - - let z_len = successor_sibling.len(); - - let full_child_len = full_child.len(); - - full_child.reindex(ops); - successor_sibling.reindex(ops); - - self.children - .insert(full_child_index + 1, successor_sibling); - - self.elements.insert(full_child_index, middle); - - assert_eq!(full_child_len + z_len + 1, original_len, "{:#?}", self); - - assert_eq!(original_len_self, self.len()); - } - - fn remove_from_leaf(&mut self, index: usize) -> usize { - self.length -= 1; - self.elements.remove(index) - } - - fn remove_element_from_non_leaf( - &mut self, - index: usize, - element_index: usize, - ops: &[Op], - ) -> usize { - self.length -= 1; - if self.children[element_index].elements.len() >= B { - let total_index = self.cumulative_index(element_index); - // recursively delete index - 1 in predecessor_node - let predecessor = self.children[element_index].remove(index - 1 - total_index, ops); - // replace element with that one - mem::replace(&mut self.elements[element_index], predecessor) - } else if self.children[element_index + 1].elements.len() >= B { - // recursively delete index + 1 in successor_node - let total_index = self.cumulative_index(element_index + 1); - let successor = self.children[element_index + 1].remove(index + 1 - total_index, ops); - // replace element with that one - mem::replace(&mut self.elements[element_index], successor) - } else { - let middle_element = self.elements.remove(element_index); - let successor_child = self.children.remove(element_index + 1); - self.children[element_index].merge(middle_element, successor_child, ops); - - let total_index = self.cumulative_index(element_index); - self.children[element_index].remove(index - total_index, ops) - } - } - - fn cumulative_index(&self, child_index: usize) -> usize { - self.children[0..child_index] - .iter() - .map(|c| c.len() + 1) - .sum() - } - - fn remove_from_internal_child( - &mut self, - index: usize, - mut child_index: usize, - ops: &[Op], - ) -> usize { - if self.children[child_index].elements.len() < B - && if child_index > 0 { - self.children[child_index - 1].elements.len() < B - } else { - true - } - && if child_index + 1 < self.children.len() { - self.children[child_index + 1].elements.len() < B - } else { - true - } - { - // if the child and its immediate siblings have B-1 elements merge the child - // with one sibling, moving an element from this node into the new merged node - // to be the median - - if child_index > 0 { - let middle = self.elements.remove(child_index - 1); - - // use the predessor sibling - let successor = self.children.remove(child_index); - child_index -= 1; - - self.children[child_index].merge(middle, successor, ops); - } else { - let middle = self.elements.remove(child_index); - - // use the sucessor sibling - let successor = self.children.remove(child_index + 1); - - self.children[child_index].merge(middle, successor, ops); - } - } else if self.children[child_index].elements.len() < B { - if child_index > 0 - && self - .children - .get(child_index - 1) - .map_or(false, |c| c.elements.len() >= B) - { - let last_element = self.children[child_index - 1].elements.pop().unwrap(); - assert!(!self.children[child_index - 1].elements.is_empty()); - self.children[child_index - 1].length -= 1; - self.children[child_index - 1] - .index - .remove(&ops[last_element]); - - let parent_element = - mem::replace(&mut self.elements[child_index - 1], last_element); - - self.children[child_index] - .index - .insert(&ops[parent_element]); - self.children[child_index] - .elements - .insert(0, parent_element); - self.children[child_index].length += 1; - - if let Some(last_child) = self.children[child_index - 1].children.pop() { - self.children[child_index - 1].length -= last_child.len(); - self.children[child_index - 1].reindex(ops); - self.children[child_index].length += last_child.len(); - self.children[child_index].children.insert(0, last_child); - self.children[child_index].reindex(ops); - } - } else if self - .children - .get(child_index + 1) - .map_or(false, |c| c.elements.len() >= B) - { - let first_element = self.children[child_index + 1].elements.remove(0); - self.children[child_index + 1] - .index - .remove(&ops[first_element]); - self.children[child_index + 1].length -= 1; - - assert!(!self.children[child_index + 1].elements.is_empty()); - - let parent_element = mem::replace(&mut self.elements[child_index], first_element); - - self.children[child_index].length += 1; - self.children[child_index] - .index - .insert(&ops[parent_element]); - self.children[child_index].elements.push(parent_element); - - if !self.children[child_index + 1].is_leaf() { - let first_child = self.children[child_index + 1].children.remove(0); - self.children[child_index + 1].length -= first_child.len(); - self.children[child_index + 1].reindex(ops); - self.children[child_index].length += first_child.len(); - - self.children[child_index].children.push(first_child); - self.children[child_index].reindex(ops); - } - } - } - self.length -= 1; - let total_index = self.cumulative_index(child_index); - self.children[child_index].remove(index - total_index, ops) - } - - pub(crate) fn check(&self) -> usize { - let l = self.elements.len() + self.children.iter().map(|c| c.check()).sum::(); - assert_eq!(self.len(), l, "{:#?}", self); - - l - } - - pub(crate) fn remove(&mut self, index: usize, ops: &[Op]) -> usize { - let original_len = self.len(); - if self.is_leaf() { - let v = self.remove_from_leaf(index); - self.index.remove(&ops[v]); - assert_eq!(original_len, self.len() + 1); - debug_assert_eq!(self.check(), self.len()); - v - } else { - let mut total_index = 0; - for (child_index, child) in self.children.iter().enumerate() { - match (total_index + child.len()).cmp(&index) { - Ordering::Less => { - // should be later on in the loop - total_index += child.len() + 1; - continue; - } - Ordering::Equal => { - let v = self.remove_element_from_non_leaf( - index, - min(child_index, self.elements.len() - 1), - ops, - ); - self.index.remove(&ops[v]); - assert_eq!(original_len, self.len() + 1); - debug_assert_eq!(self.check(), self.len()); - return v; - } - Ordering::Greater => { - let v = self.remove_from_internal_child(index, child_index, ops); - self.index.remove(&ops[v]); - assert_eq!(original_len, self.len() + 1); - debug_assert_eq!(self.check(), self.len()); - return v; - } - } - } - panic!( - "index not found to remove {} {} {} {}", - index, - total_index, - self.len(), - self.check() - ); - } - } - - fn merge(&mut self, middle: usize, successor_sibling: OpTreeNode, ops: &[Op]) { - self.index.insert(&ops[middle]); - self.index.merge(&successor_sibling.index); - self.elements.push(middle); - self.elements.extend(successor_sibling.elements); - self.children.extend(successor_sibling.children); - self.length += successor_sibling.length + 1; - assert!(self.is_full()); - } - - /// Update the operation at the given index using the provided function. - /// - /// This handles updating the indices after the update. - pub(crate) fn update<'a>( - &mut self, - index: usize, - vis: ChangeVisibility<'a>, - ) -> ChangeVisibility<'a> { - if self.is_leaf() { - self.index.change_vis(vis) - } else { - let mut cumulative_len = 0; - let len = self.len(); - for (_child_index, child) in self.children.iter_mut().enumerate() { - match (cumulative_len + child.len()).cmp(&index) { - Ordering::Less => { - cumulative_len += child.len() + 1; - } - Ordering::Equal => { - return self.index.change_vis(vis); - } - Ordering::Greater => { - let vis = child.update(index - cumulative_len, vis); - return self.index.change_vis(vis); - } - } - } - panic!("Invalid index to set: {} but len was {}", index, len) - } - } - - pub(crate) fn last(&self) -> usize { - if self.is_leaf() { - // node is never empty so this is safe - *self.elements.last().unwrap() - } else { - // if not a leaf then there is always at least one child - self.children.last().unwrap().last() - } - } - - pub(crate) fn get(&self, index: usize) -> Option { - if self.is_leaf() { - return self.elements.get(index).copied(); - } else { - let mut cumulative_len = 0; - for (child_index, child) in self.children.iter().enumerate() { - match (cumulative_len + child.len()).cmp(&index) { - Ordering::Less => { - cumulative_len += child.len() + 1; - } - Ordering::Equal => return self.elements.get(child_index).copied(), - Ordering::Greater => { - return child.get(index - cumulative_len); - } - } - } - } - None - } -} diff --git a/rust/automerge/src/parents.rs b/rust/automerge/src/parents.rs index e1c5cc66..a4b35e89 100644 --- a/rust/automerge/src/parents.rs +++ b/rust/automerge/src/parents.rs @@ -1,16 +1,7 @@ -use crate::op_set; use crate::op_set::OpSet; -use crate::types::{ListEncoding, ObjId}; +use crate::types::ObjId; use crate::{exid::ExId, Prop}; -/// An iterator over the "parents" of an object -/// -/// The "parent" of an object in this context is the ([`ExId`], [`Prop`]) pair which specifies the -/// location of this object in the composite object which contains it. Each element in the iterator -/// is a [`Parent`], yielded in reverse order. This means that once the iterator returns `None` you -/// have reached the root of the document. -/// -/// This is returned by [`crate::ReadDoc::parents`] #[derive(Debug)] pub struct Parents<'a> { pub(crate) obj: ObjId, @@ -18,25 +9,19 @@ pub struct Parents<'a> { } impl<'a> Parents<'a> { - /// Return the path this `Parents` represents - /// - /// This is _not_ in reverse order. - pub fn path(self) -> Vec<(ExId, Prop)> { - let mut path = self - .map(|Parent { obj, prop, .. }| (obj, prop)) - .collect::>(); + pub fn path(&mut self) -> Vec<(ExId, Prop)> { + let mut path = self.map(|(id, prop, _)| (id, prop)).collect::>(); path.reverse(); path } - /// Like `path` but returns `None` if the target is not visible - pub fn visible_path(self) -> Option> { + pub fn visible_path(&mut self) -> Option> { let mut path = Vec::new(); - for Parent { obj, prop, visible } in self { - if !visible { + for (id, prop, vis) in self { + if !vis { return None; } - path.push((obj, prop)) + path.push((id, prop)) } path.reverse(); Some(path) @@ -44,78 +29,20 @@ impl<'a> Parents<'a> { } impl<'a> Iterator for Parents<'a> { - type Item = Parent; + type Item = (ExId, Prop, bool); fn next(&mut self) -> Option { if self.obj.is_root() { None - } else if let Some(op_set::Parent { obj, key, visible }) = self.ops.parent_object(&self.obj) - { + } else if let Some((obj, key, visible)) = self.ops.parent_object(&self.obj) { self.obj = obj; - Some(Parent { - obj: self.ops.id_to_exid(self.obj.0), - prop: self - .ops - .export_key(self.obj, key, ListEncoding::List) - .unwrap(), + Some(( + self.ops.id_to_exid(self.obj.0), + self.ops.export_key(self.obj, key), visible, - }) + )) } else { None } } } - -/// A component of a path to an object -#[derive(Debug, PartialEq, Eq)] -pub struct Parent { - /// The object ID this component refers to - pub obj: ExId, - /// The property within `obj` this component refers to - pub prop: Prop, - /// Whether this component is "visible" - /// - /// An "invisible" component is one where the property is hidden, either because it has been - /// deleted or because there is a conflict on this (object, property) pair and this value does - /// not win the conflict. - pub visible: bool, -} - -#[cfg(test)] -mod tests { - use super::Parent; - use crate::{transaction::Transactable, Prop, ReadDoc}; - - #[test] - fn test_invisible_parents() { - // Create a document with a list of objects, then delete one of the objects, then generate - // a path to the deleted object. - - let mut doc = crate::AutoCommit::new(); - let list = doc - .put_object(crate::ROOT, "list", crate::ObjType::List) - .unwrap(); - let obj1 = doc.insert_object(&list, 0, crate::ObjType::Map).unwrap(); - let _obj2 = doc.insert_object(&list, 1, crate::ObjType::Map).unwrap(); - doc.put(&obj1, "key", "value").unwrap(); - doc.delete(&list, 0).unwrap(); - - let mut parents = doc.parents(&obj1).unwrap().collect::>(); - parents.reverse(); - assert_eq!( - parents, - vec![ - Parent { - obj: crate::ROOT, - prop: Prop::Map("list".to_string()), - visible: true, - }, - Parent { - obj: list, - prop: Prop::Seq(0), - visible: false, - }, - ] - ); - } -} diff --git a/rust/automerge/src/query.rs b/rust/automerge/src/query.rs index 640ecf8d..6a2f3e0c 100644 --- a/rust/automerge/src/query.rs +++ b/rust/automerge/src/query.rs @@ -1,7 +1,5 @@ -use crate::op_tree::{OpSetMetadata, OpTree, OpTreeNode}; -use crate::types::{ - Clock, Counter, Key, ListEncoding, Op, OpId, OpType, ScalarValue, TextEncoding, -}; +use crate::op_tree::{OpSetMetadata, OpTreeNode}; +use crate::types::{Clock, Counter, Key, Op, OpId, OpType, ScalarValue}; use fxhash::FxBuildHasher; use std::cmp::Ordering; use std::collections::{HashMap, HashSet}; @@ -51,10 +49,11 @@ pub(crate) use seek_op_with_patch::SeekOpWithPatch; // use a struct for the args for clarity as they are passed up the update chain in the optree #[derive(Debug, Clone)] -pub(crate) struct ChangeVisibility<'a> { +pub(crate) struct ChangeVisibility { pub(crate) old_vis: bool, pub(crate) new_vis: bool, - pub(crate) op: &'a Op, + pub(crate) key: Key, + pub(crate) utf16_len: usize, } #[derive(Debug, Clone, PartialEq)] @@ -65,26 +64,17 @@ pub(crate) struct CounterData { op: Op, } -pub(crate) trait TreeQuery<'a>: Clone + Debug { - fn equiv(&mut self, _other: &Self) -> bool { - false - } - - fn can_shortcut_search(&mut self, _tree: &'a OpTree) -> bool { - false - } - +pub(crate) trait TreeQuery<'a> { #[inline(always)] fn query_node_with_metadata( &mut self, child: &'a OpTreeNode, _m: &OpSetMetadata, - ops: &[Op], ) -> QueryResult { - self.query_node(child, ops) + self.query_node(child) } - fn query_node(&mut self, _child: &'a OpTreeNode, _ops: &[Op]) -> QueryResult { + fn query_node(&mut self, _child: &'a OpTreeNode) -> QueryResult { QueryResult::Descend } @@ -107,123 +97,57 @@ pub(crate) enum QueryResult { Finish, } -#[derive(Clone, Debug, PartialEq)] -struct TextWidth { - utf8: usize, - utf16: usize, -} - -impl TextWidth { - fn add_op(&mut self, op: &Op) { - self.utf8 += op.width(ListEncoding::Text(TextEncoding::Utf8)); - self.utf16 += op.width(ListEncoding::Text(TextEncoding::Utf16)); - } - - fn remove_op(&mut self, op: &Op) { - // Why are we using saturating_sub here? Shouldn't this always be greater than 0? - // - // In the case of objects which are _not_ `Text` we may end up subtracting more than the - // current width. This can happen if the elements in a list are `ScalarValue::str` and - // there are conflicting elements for the same index in the list. Like so: - // - // ```notrust - // [ - // "element", - // ["conflict1", "conflict2_longer"], - // "element" - // ] - // ``` - // - // Where there are two conflicted elements at index 1 - // - // in `Index::insert` and `Index::change_visibility` we add the width of the inserted op in - // utf8 and utf16 to the current width, but only if there was not a previous element for - // that index. Imagine that we encounter the "conflict1" op first, then we will add the - // length of 'conflict1' to the text widths. When 'conflict2_longer' is added we don't do - // anything because we've already seen an op for this index. Imagine that later we remove - // the `conflict2_longer` op, then we will end up subtracting the length of - // 'conflict2_longer' from the text widths, hence, `saturating_sub`. This isn't a problem - // because for non text objects we don't need the text widths to be accurate anyway. - // - // Really this is a sign that we should be tracking the type of the Index (List or Text) at - // the type level, but for now we just look the other way. - self.utf8 = self - .utf8 - .saturating_sub(op.width(ListEncoding::Text(TextEncoding::Utf8))); - self.utf16 = self - .utf16 - .saturating_sub(op.width(ListEncoding::Text(TextEncoding::Utf16))); - } - - fn merge(&mut self, other: &TextWidth) { - self.utf8 += other.utf8; - self.utf16 += other.utf16; - } -} - #[derive(Clone, Debug, PartialEq)] pub(crate) struct Index { /// The map of visible keys to the number of visible operations for that key. - visible: HashMap, - visible_text: TextWidth, + pub(crate) visible: HashMap, + pub(crate) visible16: usize, /// Set of opids found in this node and below. - ops: HashSet, + pub(crate) ops: HashSet, } impl Index { pub(crate) fn new() -> Self { Index { visible: Default::default(), - visible_text: TextWidth { utf8: 0, utf16: 0 }, + visible16: 0, ops: Default::default(), } } /// Get the number of visible elements in this index. - pub(crate) fn visible_len(&self, encoding: ListEncoding) -> usize { - match encoding { - ListEncoding::List => self.visible.len(), - ListEncoding::Text(TextEncoding::Utf8) => self.visible_text.utf8, - ListEncoding::Text(TextEncoding::Utf16) => self.visible_text.utf16, - } + pub(crate) fn visible_len(&self) -> usize { + self.visible.len() } pub(crate) fn has_visible(&self, seen: &Key) -> bool { self.visible.contains_key(seen) } - /// Whether `opid` is in this node or any below it - pub(crate) fn has_op(&self, opid: &OpId) -> bool { - self.ops.contains(opid) - } - - pub(crate) fn change_vis<'a>( - &mut self, - change_vis: ChangeVisibility<'a>, - ) -> ChangeVisibility<'a> { + pub(crate) fn change_vis(&mut self, change_vis: ChangeVisibility) -> ChangeVisibility { let ChangeVisibility { old_vis, new_vis, - op, + key, + utf16_len, } = &change_vis; - let key = op.elemid_or_key(); match (old_vis, new_vis) { - (true, false) => match self.visible.get(&key).copied() { + (true, false) => match self.visible.get(key).copied() { Some(n) if n == 1 => { - self.visible.remove(&key); - self.visible_text.remove_op(op); + self.visible.remove(key); + self.visible16 -= *utf16_len; } Some(n) => { - self.visible.insert(key, n - 1); + self.visible.insert(*key, n - 1); } None => panic!("remove overun in index"), }, (false, true) => { - if let Some(n) = self.visible.get(&key) { - self.visible.insert(key, n + 1); + if let Some(n) = self.visible.get(key) { + self.visible.insert(*key, n + 1); } else { - self.visible.insert(key, 1); - self.visible_text.add_op(op); + self.visible.insert(*key, 1); + self.visible16 += *utf16_len; } } _ => {} @@ -236,10 +160,10 @@ impl Index { if op.visible() { let key = op.elemid_or_key(); if let Some(n) = self.visible.get(&key) { - self.visible.insert(key, n + 1); + self.visible.insert(key, n + 1); } else { - self.visible.insert(key, 1); - self.visible_text.add_op(op); + self.visible.insert(key, 1); + self.visible16 += op.utf16_len(); } } } @@ -251,7 +175,7 @@ impl Index { match self.visible.get(&key).copied() { Some(n) if n == 1 => { self.visible.remove(&key); - self.visible_text.remove_op(op); + self.visible16 -= op.utf16_len(); } Some(n) => { self.visible.insert(key, n - 1); @@ -266,12 +190,11 @@ impl Index { self.ops.insert(*id); } for (elem, other_len) in other.visible.iter() { - self.visible - .entry(*elem) + self.visible.entry(*elem) .and_modify(|len| *len += *other_len) .or_insert(*other_len); } - self.visible_text.merge(&other.visible_text); + self.visible16 += other.visible16; } } @@ -344,7 +267,7 @@ impl VisWindow { } } -pub(crate) fn binary_search_by(node: &OpTreeNode, ops: &[Op], f: F) -> usize +pub(crate) fn binary_search_by(node: &OpTreeNode, f: F) -> usize where F: Fn(&Op) -> Ordering, { @@ -352,7 +275,7 @@ where let mut left = 0; while left < right { let seq = (left + right) / 2; - if f(&ops[node.get(seq).unwrap()]) == Ordering::Less { + if f(node.get(seq).unwrap()) == Ordering::Less { left = seq + 1; } else { right = seq; diff --git a/rust/automerge/src/query/elem_id_pos.rs b/rust/automerge/src/query/elem_id_pos.rs index cb559216..809b6061 100644 --- a/rust/automerge/src/query/elem_id_pos.rs +++ b/rust/automerge/src/query/elem_id_pos.rs @@ -1,35 +1,23 @@ use crate::{ op_tree::OpTreeNode, - types::{ElemId, ListEncoding, Op, OpId}, + types::{ElemId, Key}, }; use super::{QueryResult, TreeQuery}; -/// Lookup the index in the list that this elemid occupies, includes hidden elements. -#[derive(Clone, Debug)] +/// Lookup the index in the list that this elemid occupies. pub(crate) struct ElemIdPos { - elem_opid: OpId, + elemid: ElemId, pos: usize, found: bool, - encoding: ListEncoding, } impl ElemIdPos { - pub(crate) fn new(elemid: ElemId, encoding: ListEncoding) -> Self { - if elemid.is_head() { - Self { - elem_opid: elemid.0, - pos: 0, - found: true, - encoding, - } - } else { - Self { - elem_opid: elemid.0, - pos: 0, - found: false, - encoding, - } + pub(crate) fn new(elemid: ElemId) -> Self { + Self { + elemid, + pos: 0, + found: false, } } @@ -43,31 +31,25 @@ impl ElemIdPos { } impl<'a> TreeQuery<'a> for ElemIdPos { - fn query_node(&mut self, child: &OpTreeNode, _ops: &[Op]) -> QueryResult { - if self.found { - return QueryResult::Finish; - } + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { // if index has our element then we can continue - if child.index.has_op(&self.elem_opid) { + if child.index.has_visible(&Key::Seq(self.elemid)) { // element is in this node somewhere QueryResult::Descend } else { // not in this node, try the next one - self.pos += child.index.visible_len(self.encoding); + self.pos += child.index.visible_len(); QueryResult::Next } } fn query_element(&mut self, element: &crate::types::Op) -> QueryResult { - if self.found { - return QueryResult::Finish; - } - if element.elemid() == Some(ElemId(self.elem_opid)) { + if element.elemid() == Some(self.elemid) { // this is it self.found = true; return QueryResult::Finish; } else if element.visible() { - self.pos += element.width(self.encoding); + self.pos += 1; } QueryResult::Next } diff --git a/rust/automerge/src/query/insert.rs b/rust/automerge/src/query/insert.rs index 0dc0e98d..9e495c49 100644 --- a/rust/automerge/src/query/insert.rs +++ b/rust/automerge/src/query/insert.rs @@ -1,7 +1,7 @@ use crate::error::AutomergeError; use crate::op_tree::OpTreeNode; -use crate::query::{OpTree, QueryResult, TreeQuery}; -use crate::types::{ElemId, Key, ListEncoding, Op, HEAD}; +use crate::query::{QueryResult, TreeQuery}; +use crate::types::{ElemId, Key, Op, HEAD}; use std::fmt::Debug; #[derive(Debug, Clone, PartialEq)] @@ -10,8 +10,6 @@ pub(crate) struct InsertNth { target: usize, /// the number of visible operations seen seen: usize, - last_width: usize, - encoding: ListEncoding, //pub pos: usize, /// the number of operations (including non-visible) that we have seen n: usize, @@ -24,7 +22,7 @@ pub(crate) struct InsertNth { } impl InsertNth { - pub(crate) fn new(target: usize, encoding: ListEncoding) -> Self { + pub(crate) fn new(target: usize) -> Self { let (valid, last_valid_insert) = if target == 0 { (Some(0), Some(Key::Seq(HEAD))) } else { @@ -33,8 +31,6 @@ impl InsertNth { InsertNth { target, seen: 0, - last_width: 0, - encoding, n: 0, valid, last_seen: None, @@ -50,30 +46,23 @@ impl InsertNth { pub(crate) fn key(&self) -> Result { self.last_valid_insert .ok_or(AutomergeError::InvalidIndex(self.target)) + //if self.target == 0 { + /* + if self.last_insert.is_none() { + Ok(HEAD.into()) + } else if self.seen == self.target && self.last_insert.is_some() { + Ok(Key::Seq(self.last_insert.unwrap())) + } else { + Err(AutomergeError::InvalidIndex(self.target)) + } + */ } } impl<'a> TreeQuery<'a> for InsertNth { - fn equiv(&mut self, other: &Self) -> bool { - self.pos() == other.pos() && self.key() == other.key() - } - - fn can_shortcut_search(&mut self, tree: &'a OpTree) -> bool { - if let Some((index, pos)) = &tree.last_insert { - if let Some(op) = tree.internal.get(*pos) { - if *index + op.width(self.encoding) == self.target { - self.valid = Some(*pos + 1); - self.last_valid_insert = Some(op.elemid_or_key()); - return true; - } - } - } - false - } - - fn query_node(&mut self, child: &OpTreeNode, ops: &[Op]) -> QueryResult { + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { // if this node has some visible elements then we may find our target within - let mut num_vis = child.index.visible_len(self.encoding); + let mut num_vis = child.index.visible_len(); if let Some(last_seen) = self.last_seen { if child.index.has_visible(&last_seen) { num_vis -= 1; @@ -94,7 +83,7 @@ impl<'a> TreeQuery<'a> for InsertNth { // - the insert was at a previous node and this is a long run of overwrites so last_seen should already be set correctly // - the visible op is in this node and the elemid references it so it can be set here // - the visible op is in a future node and so it will be counted as seen there - let last_elemid = ops[child.last()].elemid_or_key(); + let last_elemid = child.last().elemid_or_key(); if child.index.has_visible(&last_elemid) { self.last_seen = Some(last_elemid); } @@ -114,8 +103,7 @@ impl<'a> TreeQuery<'a> for InsertNth { if self.seen >= self.target { return QueryResult::Finish; } - self.last_width = element.width(self.encoding); - self.seen += self.last_width; + self.seen += 1; self.last_seen = Some(element.elemid_or_key()); self.last_valid_insert = self.last_seen } diff --git a/rust/automerge/src/query/keys.rs b/rust/automerge/src/query/keys.rs index edda4fe9..30436f31 100644 --- a/rust/automerge/src/query/keys.rs +++ b/rust/automerge/src/query/keys.rs @@ -1,4 +1,4 @@ -use crate::op_tree::OpTreeInternal; +use crate::op_tree::OpTreeNode; use crate::types::Key; use std::fmt::Debug; @@ -8,17 +8,17 @@ pub(crate) struct Keys<'a> { last_key: Option, index_back: usize, last_key_back: Option, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, } impl<'a> Keys<'a> { - pub(crate) fn new(op_tree: &'a OpTreeInternal) -> Self { + pub(crate) fn new(root_child: &'a OpTreeNode) -> Self { Self { index: 0, last_key: None, - index_back: op_tree.len(), + index_back: root_child.len(), last_key_back: None, - op_tree, + root_child, } } } @@ -28,7 +28,7 @@ impl<'a> Iterator for Keys<'a> { fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; self.index += 1; if Some(op.elemid_or_key()) != self.last_key && op.visible() { self.last_key = Some(op.elemid_or_key()); @@ -42,7 +42,7 @@ impl<'a> Iterator for Keys<'a> { impl<'a> DoubleEndedIterator for Keys<'a> { fn next_back(&mut self) -> Option { for i in (self.index..self.index_back).rev() { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; self.index_back -= 1; if Some(op.elemid_or_key()) != self.last_key_back && op.visible() { self.last_key_back = Some(op.elemid_or_key()); diff --git a/rust/automerge/src/query/keys_at.rs b/rust/automerge/src/query/keys_at.rs index bf5b5e0e..71da2927 100644 --- a/rust/automerge/src/query/keys_at.rs +++ b/rust/automerge/src/query/keys_at.rs @@ -1,4 +1,4 @@ -use crate::op_tree::OpTreeInternal; +use crate::op_tree::OpTreeNode; use crate::query::VisWindow; use crate::types::{Clock, Key}; use std::fmt::Debug; @@ -11,19 +11,19 @@ pub(crate) struct KeysAt<'a> { last_key: Option, index_back: usize, last_key_back: Option, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, } impl<'a> KeysAt<'a> { - pub(crate) fn new(op_tree: &'a OpTreeInternal, clock: Clock) -> Self { + pub(crate) fn new(root_child: &'a OpTreeNode, clock: Clock) -> Self { Self { clock, window: VisWindow::default(), index: 0, last_key: None, - index_back: op_tree.len(), + index_back: root_child.len(), last_key_back: None, - op_tree, + root_child, } } } @@ -33,7 +33,7 @@ impl<'a> Iterator for KeysAt<'a> { fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; let visible = self.window.visible_at(op, i, &self.clock); self.index += 1; if Some(op.elemid_or_key()) != self.last_key && visible { @@ -48,7 +48,7 @@ impl<'a> Iterator for KeysAt<'a> { impl<'a> DoubleEndedIterator for KeysAt<'a> { fn next_back(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; let visible = self.window.visible_at(op, i, &self.clock); self.index_back -= 1; if Some(op.elemid_or_key()) != self.last_key_back && visible { diff --git a/rust/automerge/src/query/len.rs b/rust/automerge/src/query/len.rs index 9134b11f..697d0430 100644 --- a/rust/automerge/src/query/len.rs +++ b/rust/automerge/src/query/len.rs @@ -1,23 +1,21 @@ use crate::op_tree::OpTreeNode; use crate::query::{QueryResult, TreeQuery}; -use crate::types::{ListEncoding, Op}; use std::fmt::Debug; #[derive(Debug, Clone, PartialEq)] pub(crate) struct Len { pub(crate) len: usize, - encoding: ListEncoding, } impl Len { - pub(crate) fn new(encoding: ListEncoding) -> Self { - Len { len: 0, encoding } + pub(crate) fn new() -> Self { + Len { len: 0 } } } impl<'a> TreeQuery<'a> for Len { - fn query_node(&mut self, child: &OpTreeNode, _ops: &[Op]) -> QueryResult { - self.len = child.index.visible_len(self.encoding); + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { + self.len = child.index.visible_len(); QueryResult::Finish } } diff --git a/rust/automerge/src/query/len_at.rs b/rust/automerge/src/query/len_at.rs index 9380501e..46744c84 100644 --- a/rust/automerge/src/query/len_at.rs +++ b/rust/automerge/src/query/len_at.rs @@ -1,5 +1,5 @@ use crate::query::{QueryResult, TreeQuery, VisWindow}; -use crate::types::{Clock, ElemId, ListEncoding, Op}; +use crate::types::{Clock, ElemId, Op}; use std::fmt::Debug; #[derive(Debug, Clone, PartialEq)] @@ -7,18 +7,16 @@ pub(crate) struct LenAt { pub(crate) len: usize, clock: Clock, pos: usize, - encoding: ListEncoding, last: Option, window: VisWindow, } impl LenAt { - pub(crate) fn new(clock: Clock, encoding: ListEncoding) -> Self { + pub(crate) fn new(clock: Clock) -> Self { LenAt { clock, pos: 0, len: 0, - encoding, last: None, window: Default::default(), } @@ -33,7 +31,7 @@ impl<'a> TreeQuery<'a> for LenAt { let elem = op.elemid(); let visible = self.window.visible_at(op, self.pos, &self.clock); if elem != self.last && visible { - self.len += op.width(self.encoding); + self.len += 1; self.last = elem; } self.pos += 1; diff --git a/rust/automerge/src/query/list_range.rs b/rust/automerge/src/query/list_range.rs index d01082ab..d3206af3 100644 --- a/rust/automerge/src/query/list_range.rs +++ b/rust/automerge/src/query/list_range.rs @@ -1,5 +1,5 @@ use crate::exid::ExId; -use crate::op_tree::OpTreeInternal; +use crate::op_tree::OpTreeNode; use crate::types::{ElemId, OpId}; use crate::values::ValueIter; use crate::{Automerge, Value}; @@ -14,19 +14,19 @@ pub(crate) struct ListRange<'a, R: RangeBounds> { last_elemid: Option, next_result: Option<(usize, Value<'a>, OpId)>, index_back: usize, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, } impl<'a, R: RangeBounds> ListRange<'a, R> { - pub(crate) fn new(range: R, op_tree: &'a OpTreeInternal) -> Self { + pub(crate) fn new(range: R, root_child: &'a OpTreeNode) -> Self { Self { range, index: 0, // FIXME root_child.seek_to_pos(range.start) pos: 0, // FIXME range.start last_elemid: None, next_result: None, - index_back: op_tree.len(), - op_tree, + index_back: root_child.len(), + root_child, } } } @@ -45,7 +45,7 @@ impl<'a, R: RangeBounds> Iterator for ListRange<'a, R> { // point and stop at the end point and not needless scan all the ops before and after the range fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; self.index += 1; if op.visible() { if op.elemid() != self.last_elemid { diff --git a/rust/automerge/src/query/list_range_at.rs b/rust/automerge/src/query/list_range_at.rs index 33cdf548..5c7257af 100644 --- a/rust/automerge/src/query/list_range_at.rs +++ b/rust/automerge/src/query/list_range_at.rs @@ -1,6 +1,6 @@ use super::VisWindow; use crate::exid::ExId; -use crate::op_tree::OpTreeInternal; +use crate::op_tree::OpTreeNode; use crate::types::{Clock, ElemId, OpId}; use crate::values::ValueIter; use crate::{Automerge, Value}; @@ -15,7 +15,7 @@ pub(crate) struct ListRangeAt<'a, R: RangeBounds> { last_elemid: Option, next_result: Option<(usize, Value<'a>, OpId)>, index_back: usize, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, clock: Clock, window: VisWindow, } @@ -27,15 +27,15 @@ impl<'a, R: RangeBounds> ValueIter<'a> for ListRangeAt<'a, R> { } impl<'a, R: RangeBounds> ListRangeAt<'a, R> { - pub(crate) fn new(range: R, clock: Clock, op_tree: &'a OpTreeInternal) -> Self { + pub(crate) fn new(range: R, clock: Clock, root_child: &'a OpTreeNode) -> Self { Self { range, index: 0, // FIXME root_child.seek_to_pos(range.start) pos: 0, // FIXME range.start last_elemid: None, next_result: None, - index_back: op_tree.len(), - op_tree, + index_back: root_child.len(), + root_child, clock, window: VisWindow::default(), } @@ -47,7 +47,7 @@ impl<'a, R: RangeBounds> Iterator for ListRangeAt<'a, R> { fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; let visible = self.window.visible_at(op, i, &self.clock); self.index += 1; if visible { diff --git a/rust/automerge/src/query/list_vals.rs b/rust/automerge/src/query/list_vals.rs index 6c056621..4ad2f47b 100644 --- a/rust/automerge/src/query/list_vals.rs +++ b/rust/automerge/src/query/list_vals.rs @@ -19,10 +19,10 @@ impl ListVals { } impl<'a> TreeQuery<'a> for ListVals { - fn query_node(&mut self, child: &OpTreeNode, ops: &[Op]) -> QueryResult { + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { let start = 0; for pos in start..child.len() { - let op = &ops[child.get(pos).unwrap()]; + let op = child.get(pos).unwrap(); if op.insert { self.last_elem = None; } diff --git a/rust/automerge/src/query/map_range.rs b/rust/automerge/src/query/map_range.rs index 909312db..81334ca4 100644 --- a/rust/automerge/src/query/map_range.rs +++ b/rust/automerge/src/query/map_range.rs @@ -1,5 +1,5 @@ use crate::exid::ExId; -use crate::op_tree::{OpSetMetadata, OpTreeInternal}; +use crate::op_tree::{OpSetMetadata, OpTreeNode}; use crate::types::{Key, OpId}; use crate::values::ValueIter; use crate::{Automerge, Value}; @@ -14,7 +14,7 @@ pub(crate) struct MapRange<'a, R: RangeBounds> { next_result: Option<(&'a str, Value<'a>, OpId)>, index_back: usize, last_key_back: Option, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, meta: &'a OpSetMetadata, } @@ -25,15 +25,15 @@ impl<'a, R: RangeBounds> ValueIter<'a> for MapRange<'a, R> { } impl<'a, R: RangeBounds> MapRange<'a, R> { - pub(crate) fn new(range: R, op_tree: &'a OpTreeInternal, meta: &'a OpSetMetadata) -> Self { + pub(crate) fn new(range: R, root_child: &'a OpTreeNode, meta: &'a OpSetMetadata) -> Self { Self { range, index: 0, last_key: None, next_result: None, - index_back: op_tree.len(), + index_back: root_child.len(), last_key_back: None, - op_tree, + root_child, meta, } } @@ -47,7 +47,7 @@ impl<'a, R: RangeBounds> Iterator for MapRange<'a, R> { // point and stop at the end point and not needless scan all the ops before and after the range fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; self.index += 1; if op.visible() { let prop = match op.key { @@ -72,7 +72,7 @@ impl<'a, R: RangeBounds> Iterator for MapRange<'a, R> { impl<'a, R: RangeBounds> DoubleEndedIterator for MapRange<'a, R> { fn next_back(&mut self) -> Option { for i in (self.index..self.index_back).rev() { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; self.index_back -= 1; if Some(op.key) != self.last_key_back && op.visible() { diff --git a/rust/automerge/src/query/map_range_at.rs b/rust/automerge/src/query/map_range_at.rs index c5c5af06..84453955 100644 --- a/rust/automerge/src/query/map_range_at.rs +++ b/rust/automerge/src/query/map_range_at.rs @@ -1,6 +1,6 @@ use crate::clock::Clock; use crate::exid::ExId; -use crate::op_tree::{OpSetMetadata, OpTreeInternal}; +use crate::op_tree::{OpSetMetadata, OpTreeNode}; use crate::types::{Key, OpId}; use crate::values::ValueIter; use crate::{Automerge, Value}; @@ -22,7 +22,7 @@ pub(crate) struct MapRangeAt<'a, R: RangeBounds> { index_back: usize, last_key_back: Option, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, meta: &'a OpSetMetadata, } @@ -35,7 +35,7 @@ impl<'a, R: RangeBounds> ValueIter<'a> for MapRangeAt<'a, R> { impl<'a, R: RangeBounds> MapRangeAt<'a, R> { pub(crate) fn new( range: R, - op_tree: &'a OpTreeInternal, + root_child: &'a OpTreeNode, meta: &'a OpSetMetadata, clock: Clock, ) -> Self { @@ -46,9 +46,9 @@ impl<'a, R: RangeBounds> MapRangeAt<'a, R> { index: 0, last_key: None, next_result: None, - index_back: op_tree.len(), + index_back: root_child.len(), last_key_back: None, - op_tree, + root_child, meta, } } @@ -59,7 +59,7 @@ impl<'a, R: RangeBounds> Iterator for MapRangeAt<'a, R> { fn next(&mut self) -> Option { for i in self.index..self.index_back { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; let visible = self.window.visible_at(op, i, &self.clock); self.index += 1; if visible { @@ -85,7 +85,7 @@ impl<'a, R: RangeBounds> Iterator for MapRangeAt<'a, R> { impl<'a, R: RangeBounds> DoubleEndedIterator for MapRangeAt<'a, R> { fn next_back(&mut self) -> Option { for i in (self.index..self.index_back).rev() { - let op = self.op_tree.get(i)?; + let op = self.root_child.get(i)?; let visible = self.window.visible_at(op, i, &self.clock); self.index_back -= 1; if Some(op.key) != self.last_key_back && visible { diff --git a/rust/automerge/src/query/nth.rs b/rust/automerge/src/query/nth.rs index ed374b9b..f73f2a10 100644 --- a/rust/automerge/src/query/nth.rs +++ b/rust/automerge/src/query/nth.rs @@ -1,16 +1,13 @@ use crate::error::AutomergeError; -use crate::op_set::OpSet; -use crate::op_tree::{OpTree, OpTreeNode}; +use crate::op_tree::OpTreeNode; use crate::query::{QueryResult, TreeQuery}; -use crate::types::{Key, ListEncoding, Op, OpIds}; +use crate::types::{Key, Op}; use std::fmt::Debug; #[derive(Debug, Clone, PartialEq)] pub(crate) struct Nth<'a> { target: usize, seen: usize, - encoding: ListEncoding, - last_width: usize, /// last_seen is the target elemid of the last `seen` operation. /// It is used to avoid double counting visible elements (which arise through conflicts) that are split across nodes. last_seen: Option, @@ -20,12 +17,10 @@ pub(crate) struct Nth<'a> { } impl<'a> Nth<'a> { - pub(crate) fn new(target: usize, encoding: ListEncoding) -> Self { + pub(crate) fn new(target: usize) -> Self { Nth { target, seen: 0, - last_width: 1, - encoding, last_seen: None, ops: vec![], ops_pos: vec![], @@ -33,10 +28,6 @@ impl<'a> Nth<'a> { } } - pub(crate) fn pred(&self, ops: &OpSet) -> OpIds { - ops.m.sorted_opids(self.ops.iter().map(|o| o.id)) - } - /// Get the key pub(crate) fn key(&self) -> Result { // the query collects the ops so we can use that to get the key they all use @@ -46,35 +37,11 @@ impl<'a> Nth<'a> { Err(AutomergeError::InvalidIndex(self.target)) } } - - pub(crate) fn index(&self) -> usize { - self.seen - self.last_width - } } impl<'a> TreeQuery<'a> for Nth<'a> { - fn equiv(&mut self, other: &Self) -> bool { - self.index() == other.index() && self.key() == other.key() - } - - fn can_shortcut_search(&mut self, tree: &'a OpTree) -> bool { - if let Some((index, pos)) = &tree.last_insert { - if *index == self.target { - if let Some(op) = tree.internal.get(*pos) { - self.last_width = op.width(self.encoding); - self.seen = *index + self.last_width; - self.ops.push(op); - self.ops_pos.push(*pos); - self.pos = *pos + 1; - return true; - } - } - } - false - } - - fn query_node(&mut self, child: &OpTreeNode, ops: &[Op]) -> QueryResult { - let mut num_vis = child.index.visible_len(self.encoding); + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { + let mut num_vis = child.index.visible_len(); if let Some(last_seen) = self.last_seen { if child.index.has_visible(&last_seen) { num_vis -= 1; @@ -94,7 +61,7 @@ impl<'a> TreeQuery<'a> for Nth<'a> { // - the insert was at a previous node and this is a long run of overwrites so last_seen should already be set correctly // - the visible op is in this node and the elemid references it so it can be set here // - the visible op is in a future node and so it will be counted as seen there - let last_elemid = ops[child.last()].elemid_or_key(); + let last_elemid = child.last().elemid_or_key(); if child.index.has_visible(&last_elemid) { self.last_seen = Some(last_elemid); } @@ -112,12 +79,11 @@ impl<'a> TreeQuery<'a> for Nth<'a> { } let visible = element.visible(); if visible && self.last_seen.is_none() { - self.last_width = element.width(self.encoding); - self.seen += self.last_width; + self.seen += 1; // we have a new visible element self.last_seen = Some(element.elemid_or_key()) } - if self.seen > self.target && visible { + if self.seen == self.target + 1 && visible { self.ops.push(element); self.ops_pos.push(self.pos); } diff --git a/rust/automerge/src/query/nth_at.rs b/rust/automerge/src/query/nth_at.rs index e193ca03..10851e7c 100644 --- a/rust/automerge/src/query/nth_at.rs +++ b/rust/automerge/src/query/nth_at.rs @@ -1,5 +1,5 @@ use crate::query::{QueryResult, TreeQuery, VisWindow}; -use crate::types::{Clock, ElemId, ListEncoding, Op}; +use crate::types::{Clock, ElemId, Op}; use std::fmt::Debug; #[derive(Debug, Clone, PartialEq)] @@ -7,7 +7,6 @@ pub(crate) struct NthAt { clock: Clock, target: usize, seen: usize, - encoding: ListEncoding, last_seen: Option, window: VisWindow, pub(crate) ops: Vec, @@ -16,12 +15,11 @@ pub(crate) struct NthAt { } impl NthAt { - pub(crate) fn new(target: usize, clock: Clock, encoding: ListEncoding) -> Self { + pub(crate) fn new(target: usize, clock: Clock) -> Self { NthAt { clock, target, seen: 0, - encoding, last_seen: None, ops: vec![], ops_pos: vec![], @@ -41,10 +39,10 @@ impl<'a> TreeQuery<'a> for NthAt { } let visible = self.window.visible_at(element, self.pos, &self.clock); if visible && self.last_seen.is_none() { - self.seen += element.width(self.encoding); + self.seen += 1; self.last_seen = element.elemid() } - if self.seen > self.target && visible { + if self.seen == self.target + 1 && visible { for (vpos, vop) in self.window.seen_op(element, self.pos) { if vop.is_counter() { // this could be out of order because of inc's - we can find the right place diff --git a/rust/automerge/src/query/opid.rs b/rust/automerge/src/query/opid.rs index 3d4c8b24..aa3a45e6 100644 --- a/rust/automerge/src/query/opid.rs +++ b/rust/automerge/src/query/opid.rs @@ -33,7 +33,7 @@ impl OpIdSearch { } impl<'a> TreeQuery<'a> for OpIdSearch { - fn query_node(&mut self, child: &OpTreeNode, _ops: &[Op]) -> QueryResult { + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { if child.index.ops.contains(&self.target) { QueryResult::Descend } else { diff --git a/rust/automerge/src/query/opid_vis.rs b/rust/automerge/src/query/opid_vis.rs index c0d2cc89..8a4b6a10 100644 --- a/rust/automerge/src/query/opid_vis.rs +++ b/rust/automerge/src/query/opid_vis.rs @@ -28,7 +28,7 @@ impl OpIdVisSearch { } impl<'a> TreeQuery<'a> for OpIdVisSearch { - fn query_node(&mut self, child: &OpTreeNode, _ops: &[Op]) -> QueryResult { + fn query_node(&mut self, child: &OpTreeNode) -> QueryResult { if child.index.ops.contains(&self.target) { QueryResult::Descend } else { diff --git a/rust/automerge/src/query/prop.rs b/rust/automerge/src/query/prop.rs index d2a11361..8b59d698 100644 --- a/rust/automerge/src/query/prop.rs +++ b/rust/automerge/src/query/prop.rs @@ -9,6 +9,15 @@ pub(crate) struct Prop<'a> { pub(crate) ops: Vec<&'a Op>, pub(crate) ops_pos: Vec, pub(crate) pos: usize, + start: Option, +} + +#[derive(Debug, Clone, PartialEq)] +struct Start { + /// The index to start searching for in the optree + idx: usize, + /// The total length of the optree + optree_len: usize, } impl<'a> Prop<'a> { @@ -18,6 +27,7 @@ impl<'a> Prop<'a> { ops: vec![], ops_pos: vec![], pos: 0, + start: None, } } } @@ -27,11 +37,39 @@ impl<'a> TreeQuery<'a> for Prop<'a> { &mut self, child: &'a OpTreeNode, m: &OpSetMetadata, - ops: &[Op], ) -> QueryResult { - let start = binary_search_by(child, ops, |op| m.key_cmp(&op.key, &self.key)); - self.pos = start; - QueryResult::Skip(start) + if let Some(Start { + idx: start, + optree_len, + }) = self.start + { + if self.pos + child.len() >= start { + // skip empty nodes + if child.index.visible_len() == 0 { + if self.pos + child.len() >= optree_len { + self.pos = optree_len; + QueryResult::Finish + } else { + self.pos += child.len(); + QueryResult::Next + } + } else { + QueryResult::Descend + } + } else { + self.pos += child.len(); + QueryResult::Next + } + } else { + // in the root node find the first op position for the key + let start = binary_search_by(child, |op| m.key_cmp(&op.key, &self.key)); + self.start = Some(Start { + idx: start, + optree_len: child.len(), + }); + self.pos = start; + QueryResult::Skip(start) + } } fn query_element(&mut self, op: &'a Op) -> QueryResult { diff --git a/rust/automerge/src/query/prop_at.rs b/rust/automerge/src/query/prop_at.rs index f0c2eedc..08b1cb59 100644 --- a/rust/automerge/src/query/prop_at.rs +++ b/rust/automerge/src/query/prop_at.rs @@ -29,13 +29,12 @@ impl<'a> TreeQuery<'a> for PropAt { &mut self, child: &'a OpTreeNode, m: &OpSetMetadata, - ops: &[Op], ) -> QueryResult { - let start = binary_search_by(child, ops, |op| m.key_cmp(&op.key, &self.key)); + let start = binary_search_by(child, |op| m.key_cmp(&op.key, &self.key)); let mut window: VisWindow = Default::default(); self.pos = start; for pos in start..child.len() { - let op = &ops[child.get(pos).unwrap()]; + let op = child.get(pos).unwrap(); if op.key != self.key { break; } diff --git a/rust/automerge/src/query/seek_op.rs b/rust/automerge/src/query/seek_op.rs index 2ed875d2..023c431a 100644 --- a/rust/automerge/src/query/seek_op.rs +++ b/rust/automerge/src/query/seek_op.rs @@ -14,6 +14,8 @@ pub(crate) struct SeekOp<'a> { pub(crate) succ: Vec, /// whether a position has been found found: bool, + /// The found start position of the key if there is one yet (for map objects). + start: Option, } impl<'a> SeekOp<'a> { @@ -23,6 +25,7 @@ impl<'a> SeekOp<'a> { succ: vec![], pos: 0, found: false, + start: None, } } @@ -40,19 +43,14 @@ impl<'a> SeekOp<'a> { } impl<'a> TreeQuery<'a> for SeekOp<'a> { - fn query_node_with_metadata( - &mut self, - child: &OpTreeNode, - m: &OpSetMetadata, - ops: &[Op], - ) -> QueryResult { + fn query_node_with_metadata(&mut self, child: &OpTreeNode, m: &OpSetMetadata) -> QueryResult { if self.found { return QueryResult::Descend; } match self.op.key { Key::Seq(HEAD) => { while self.pos < child.len() { - let op = &ops[child.get(self.pos).unwrap()]; + let op = child.get(self.pos).unwrap(); if op.insert && m.lamport_cmp(op.id, self.op.id) == Ordering::Less { break; } @@ -69,9 +67,26 @@ impl<'a> TreeQuery<'a> for SeekOp<'a> { } } Key::Map(_) => { - let start = binary_search_by(child, ops, |op| m.key_cmp(&op.key, &self.op.key)); - self.pos = start; - QueryResult::Skip(start) + if let Some(start) = self.start { + if self.pos + child.len() >= start { + // skip empty nodes + if child.index.visible_len() == 0 { + self.pos += child.len(); + QueryResult::Next + } else { + QueryResult::Descend + } + } else { + self.pos += child.len(); + QueryResult::Next + } + } else { + // in the root node find the first op position for the key + let start = binary_search_by(child, |op| m.key_cmp(&op.key, &self.op.key)); + self.start = Some(start); + self.pos = start; + QueryResult::Skip(start) + } } } } @@ -128,120 +143,3 @@ impl<'a> TreeQuery<'a> for SeekOp<'a> { } } } - -#[cfg(test)] -pub(crate) mod tests { - use crate::{ - op_set::OpSet, - op_tree::B, - query::SeekOp, - types::{Key, ObjId, Op, OpId}, - ActorId, ScalarValue, - }; - - /// Create an optree in which the only visible ops are on the boundaries of the nodes, - /// i.e. the visible elements are in the internal nodes. Like so - /// - /// ```notrust - /// - /// .----------------------. - /// | id | key | succ | - /// | B | "a" | | - /// | 2B | "b" | | - /// '----------------------' - /// / | \ - /// ;------------------------. | `------------------------------------. - /// | id | op | succ | | | id | op | succ | - /// | 0 |set "a" | 1 | | | 2B + 1 |set "c" | 2B + 2 | - /// | 1 |set "a" | 2 | | | 2B + 2 |set "c" | 2B + 3 | - /// | 2 |set "a" | 3 | | ... - /// ... | | 3B |set "c" | | - /// | B - 1 |set "a" | B | | '------------------------------------' - /// '--------'--------'------' | - /// | - /// .-----------------------------. - /// | id | key | succ | - /// | B + 1 | "b" | B + 2 | - /// | B + 2 | "b" | B + 3 | - /// .... - /// | B + (B - 1 | "b" | 2B | - /// '-----------------------------' - /// ``` - /// - /// The important point here is that the leaf nodes contain no visible ops for keys "a" and - /// "b". - /// - /// # Returns - /// - /// The opset in question and an op which should be inserted at the next position after the - /// internally visible ops. - pub(crate) fn optree_with_only_internally_visible_ops() -> (OpSet, Op) { - let mut set = OpSet::new(); - let actor = set.m.actors.cache(ActorId::random()); - let a = set.m.props.cache("a".to_string()); - let b = set.m.props.cache("b".to_string()); - let c = set.m.props.cache("c".to_string()); - - let mut counter = 0; - // For each key insert `B` operations with the `pred` and `succ` setup such that the final - // operation for each key is the only visible op. - for key in [a, b, c] { - for iteration in 0..B { - // Generate a value to insert - let keystr = set.m.props.get(key); - let val = keystr.repeat(iteration + 1); - - // Only the last op is visible - let pred = if iteration == 0 { - Default::default() - } else { - set.m - .sorted_opids(vec![OpId::new(counter - 1, actor)].into_iter()) - }; - - // only the last op is visible - let succ = if iteration == B - 1 { - Default::default() - } else { - set.m - .sorted_opids(vec![OpId::new(counter, actor)].into_iter()) - }; - - let op = Op { - id: OpId::new(counter, actor), - action: crate::OpType::Put(ScalarValue::Str(val.into())), - key: Key::Map(key), - succ, - pred, - insert: false, - }; - set.insert(counter as usize, &ObjId::root(), op); - counter += 1; - } - } - - // Now try and create an op which inserts at the next index of 'a' - let new_op = Op { - id: OpId::new(counter, actor), - action: crate::OpType::Put(ScalarValue::Str("test".into())), - key: Key::Map(a), - succ: Default::default(), - pred: set - .m - .sorted_opids(std::iter::once(OpId::new(B as u64 - 1, actor))), - insert: false, - }; - (set, new_op) - } - - #[test] - fn seek_on_page_boundary() { - let (set, new_op) = optree_with_only_internally_visible_ops(); - - let q = SeekOp::new(&new_op); - let q = set.search(&ObjId::root(), q); - - // we've inserted `B - 1` elements for "a", so the index should be `B` - assert_eq!(q.pos, B); - } -} diff --git a/rust/automerge/src/query/seek_op_with_patch.rs b/rust/automerge/src/query/seek_op_with_patch.rs index cd30f5bb..8262eda1 100644 --- a/rust/automerge/src/query/seek_op_with_patch.rs +++ b/rust/automerge/src/query/seek_op_with_patch.rs @@ -1,6 +1,6 @@ use crate::op_tree::{OpSetMetadata, OpTreeNode}; use crate::query::{binary_search_by, QueryResult, TreeQuery}; -use crate::types::{Key, ListEncoding, Op, HEAD}; +use crate::types::{Key, Op, HEAD}; use std::cmp::Ordering; use std::fmt::Debug; @@ -10,27 +10,28 @@ pub(crate) struct SeekOpWithPatch<'a> { pub(crate) pos: usize, pub(crate) succ: Vec, found: bool, - encoding: ListEncoding, pub(crate) seen: usize, - pub(crate) last_width: usize, + pub(crate) seen16: usize, last_seen: Option, pub(crate) values: Vec<&'a Op>, pub(crate) had_value_before: bool, + /// The found start position of the key if there is one yet (for map objects). + start: Option, } impl<'a> SeekOpWithPatch<'a> { - pub(crate) fn new(op: &Op, encoding: ListEncoding) -> Self { + pub(crate) fn new(op: &Op) -> Self { SeekOpWithPatch { op: op.clone(), succ: vec![], pos: 0, found: false, - encoding, seen: 0, - last_width: 0, + seen16: 0, last_seen: None, values: vec![], had_value_before: false, + start: None, } } @@ -58,7 +59,8 @@ impl<'a> SeekOpWithPatch<'a> { self.last_seen = None } if e.visible() && self.last_seen.is_none() { - self.seen += e.width(self.encoding); + self.seen += 1; + self.seen16 += e.utf16_len(); self.last_seen = Some(e.elemid_or_key()) } } @@ -69,7 +71,6 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { &mut self, child: &'a OpTreeNode, m: &OpSetMetadata, - ops: &[Op], ) -> QueryResult { if self.found { return QueryResult::Descend; @@ -80,7 +81,7 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { // the opId of the operation being inserted. Key::Seq(e) if e == HEAD => { while self.pos < child.len() { - let op = &ops[child.get(self.pos).unwrap()]; + let op = child.get(self.pos).unwrap(); if op.insert && m.lamport_cmp(op.id, self.op.id) == Ordering::Less { break; } @@ -103,7 +104,7 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { // elements it contains. However, it could happen that a visible element is // split across two tree nodes. To avoid double-counting in this situation, we // subtract one if the last visible element also appears in this tree node. - let mut num_vis = child.index.visible_len(self.encoding); + let mut num_vis = child.index.visible_len(); if num_vis > 0 { // FIXME: I think this is wrong: we should subtract one only if this // subtree contains a *visible* (i.e. empty succs) operation for the list @@ -115,13 +116,14 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { } } self.seen += num_vis; + self.seen += child.index.visible16; // FIXME: this is also wrong: `last_seen` needs to be the elemId of the // last *visible* list element in this subtree, but I think this returns // the last operation's elemId regardless of whether it's visible or not. // This will lead to incorrect counting if `last_seen` is not visible: it's // not counted towards `num_vis`, so we shouldn't be subtracting 1. - self.last_seen = Some(ops[child.last()].elemid_or_key()); + self.last_seen = Some(child.last().elemid_or_key()); } QueryResult::Next } @@ -129,9 +131,28 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { // Updating a map: operations appear in sorted order by key Key::Map(_) => { - let start = binary_search_by(child, ops, |op| m.key_cmp(&op.key, &self.op.key)); - self.pos = start; - QueryResult::Skip(start) + if let Some(start) = self.start { + if self.pos + child.len() >= start { + // skip empty nodes + if child.index.visible_len() == 0 { + self.pos += child.len(); + QueryResult::Next + } else { + QueryResult::Descend + } + } else { + self.pos += child.len(); + QueryResult::Next + } + } else { + // in the root node find the first op position for the key + // Search for the place where we need to insert the new operation. First find the + // first op with a key >= the key we're updating + let start = binary_search_by(child, |op| m.key_cmp(&op.key, &self.op.key)); + self.start = Some(start); + self.pos = start; + QueryResult::Skip(start) + } } } } @@ -156,7 +177,6 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { self.values.push(e); } self.succ.push(self.pos); - self.last_width = e.width(self.encoding); if e.visible() { self.had_value_before = true; @@ -202,7 +222,6 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { self.values.push(e); } self.succ.push(self.pos); - self.last_width = e.width(self.encoding); } if e.visible() { self.had_value_before = true; @@ -220,7 +239,6 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { self.values.push(e); } self.succ.push(self.pos); - self.last_width = e.width(self.encoding); } // If the new op is an insertion, skip over any existing list elements whose elemId is @@ -269,23 +287,3 @@ impl<'a> TreeQuery<'a> for SeekOpWithPatch<'a> { } } } - -#[cfg(test)] -mod tests { - use super::{super::seek_op::tests::optree_with_only_internally_visible_ops, SeekOpWithPatch}; - use crate::{ - op_tree::B, - types::{ListEncoding, ObjId}, - }; - - #[test] - fn test_insert_on_internal_only_nodes() { - let (set, new_op) = optree_with_only_internally_visible_ops(); - - let q = SeekOpWithPatch::new(&new_op, ListEncoding::List); - let q = set.search(&ObjId::root(), q); - - // we've inserted `B - 1` elements for "a", so the index should be `B` - assert_eq!(q.pos, B); - } -} diff --git a/rust/automerge/src/read.rs b/rust/automerge/src/read.rs deleted file mode 100644 index 6d479718..00000000 --- a/rust/automerge/src/read.rs +++ /dev/null @@ -1,199 +0,0 @@ -use crate::{ - error::AutomergeError, exid::ExId, keys::Keys, keys_at::KeysAt, list_range::ListRange, - list_range_at::ListRangeAt, map_range::MapRange, map_range_at::MapRangeAt, parents::Parents, - values::Values, Change, ChangeHash, ObjType, Prop, Value, -}; - -use std::ops::RangeBounds; - -/// Methods for reading values from an automerge document -/// -/// Many of the methods on this trait have an alternate `*_at` version which -/// takes an additional argument of `&[ChangeHash]`. This allows you to retrieve -/// the value at a particular point in the document history identified by the -/// given change hashes. -pub trait ReadDoc { - /// Get the parents of an object in the document tree. - /// - /// See the documentation for [`Parents`] for more details. - /// - /// ### Errors - /// - /// Returns an error when the id given is not the id of an object in this document. - /// This function does not get the parents of scalar values contained within objects. - /// - /// ### Experimental - /// - /// This function may in future be changed to allow getting the parents from the id of a scalar - /// value. - fn parents>(&self, obj: O) -> Result, AutomergeError>; - - /// Get the path to an object - /// - /// "path" here means the sequence of `(object Id, key)` pairs which leads - /// to the object in question. - /// - /// ### Errors - /// - /// * If the object ID `obj` is not in the document - fn path_to_object>(&self, obj: O) -> Result, AutomergeError>; - - /// Get the keys of the object `obj`. - /// - /// For a map this returns the keys of the map. - /// For a list this returns the element ids (opids) encoded as strings. - fn keys>(&self, obj: O) -> Keys<'_, '_>; - - /// Get the keys of the object `obj` as at `heads` - /// - /// See [`Self::keys`] - fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_>; - - /// Iterate over the keys and values of the map `obj` in the given range. - /// - /// If the object correspoding to `obj` is a list then this will return an empty iterator - /// - /// The returned iterator yields `(key, value, exid)` tuples, where the - /// third element is the ID of the operation which created the value. - fn map_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> MapRange<'_, R>; - - /// Iterate over the keys and values of the map `obj` in the given range as - /// at `heads` - /// - /// If the object correspoding to `obj` is a list then this will return an empty iterator - /// - /// The returned iterator yields `(key, value, exid)` tuples, where the - /// third element is the ID of the operation which created the value. - /// - /// See [`Self::map_range`] - fn map_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> MapRangeAt<'_, R>; - - /// Iterate over the indexes and values of the list or text `obj` in the given range. - /// - /// The reuturned iterator yields `(index, value, exid)` tuples, where the third - /// element is the ID of the operation which created the value. - fn list_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> ListRange<'_, R>; - - /// Iterate over the indexes and values of the list or text `obj` in the given range as at `heads` - /// - /// The returned iterator yields `(index, value, exid)` tuples, where the third - /// element is the ID of the operation which created the value. - /// - /// See [`Self::list_range`] - fn list_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> ListRangeAt<'_, R>; - - /// Iterate over the values in a map, list, or text object - /// - /// The returned iterator yields `(value, exid)` tuples, where the second element - /// is the ID of the operation which created the value. - fn values>(&self, obj: O) -> Values<'_>; - - /// Iterate over the values in a map, list, or text object as at `heads` - /// - /// The returned iterator yields `(value, exid)` tuples, where the second element - /// is the ID of the operation which created the value. - /// - /// See [`Self::values`] - fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_>; - - /// Get the length of the given object. - /// - /// If the given object is not in this document this method will return `0` - fn length>(&self, obj: O) -> usize; - - /// Get the length of the given object as at `heads` - /// - /// If the given object is not in this document this method will return `0` - /// - /// See [`Self::length`] - fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize; - - /// Get the type of this object, if it is an object. - fn object_type>(&self, obj: O) -> Result; - - /// Get the string represented by the given text object. - fn text>(&self, obj: O) -> Result; - - /// Get the string represented by the given text object as at `heads`, see - /// [`Self::text`] - fn text_at>( - &self, - obj: O, - heads: &[ChangeHash], - ) -> Result; - - /// Get a value out of the document. - /// - /// This returns a tuple of `(value, object ID)`. This is for two reasons: - /// - /// 1. If `value` is an object (represented by `Value::Object`) then the ID - /// is the ID of that object. This can then be used to retrieve nested - /// values from the document. - /// 2. Even if `value` is a scalar, the ID represents the operation which - /// created the value. This is useful if there are conflicting values for - /// this key as each value is tagged with the ID. - /// - /// In the case of a key which has conflicting values, this method will - /// return a single arbitrarily chosen value. This value will be chosen - /// deterministically on all nodes. If you want to get all the values for a - /// key use [`Self::get_all`]. - fn get, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError>; - - /// Get the value of the given key as at `heads`, see `[Self::get]` - fn get_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError>; - - /// Get all conflicting values out of the document at this prop that conflict. - /// - /// If there are multiple conflicting values for a given key this method - /// will return all of them, with each value tagged by the ID of the - /// operation which created it. - fn get_all, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError>; - - /// Get all possibly conflicting values for a key as at `heads` - /// - /// See `[Self::get_all]` - fn get_all_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError>; - - /// Get the hashes of the changes in this document that aren't transitive dependencies of the - /// given `heads`. - fn get_missing_deps(&self, heads: &[ChangeHash]) -> Vec; - - /// Get a change by its hash. - fn get_change_by_hash(&self, hash: &ChangeHash) -> Option<&Change>; -} diff --git a/rust/automerge-wasm/src/sequence_tree.rs b/rust/automerge/src/sequence_tree.rs similarity index 87% rename from rust/automerge-wasm/src/sequence_tree.rs rename to rust/automerge/src/sequence_tree.rs index 91b183a2..f95ceab3 100644 --- a/rust/automerge-wasm/src/sequence_tree.rs +++ b/rust/automerge/src/sequence_tree.rs @@ -5,10 +5,10 @@ use std::{ }; pub(crate) const B: usize = 16; -pub(crate) type SequenceTree = SequenceTreeInternal; +pub type SequenceTree = SequenceTreeInternal; #[derive(Clone, Debug)] -pub(crate) struct SequenceTreeInternal { +pub struct SequenceTreeInternal { root_node: Option>, } @@ -24,17 +24,22 @@ where T: Clone + Debug, { /// Construct a new, empty, sequence. - pub(crate) fn new() -> Self { + pub fn new() -> Self { Self { root_node: None } } /// Get the length of the sequence. - pub(crate) fn len(&self) -> usize { + pub fn len(&self) -> usize { self.root_node.as_ref().map_or(0, |n| n.len()) } + /// Check if the sequence is empty. + pub fn is_empty(&self) -> bool { + self.len() == 0 + } + /// Create an iterator through the sequence. - pub(crate) fn iter(&self) -> Iter<'_, T> { + pub fn iter(&self) -> Iter<'_, T> { Iter { inner: self, index: 0, @@ -46,7 +51,7 @@ where /// # Panics /// /// Panics if `index > len`. - pub(crate) fn insert(&mut self, index: usize, element: T) { + pub fn insert(&mut self, index: usize, element: T) { let old_len = self.len(); if let Some(root) = self.root_node.as_mut() { #[cfg(debug_assertions)] @@ -89,22 +94,27 @@ where } /// Push the `element` onto the back of the sequence. - pub(crate) fn push(&mut self, element: T) { + pub fn push(&mut self, element: T) { let l = self.len(); self.insert(l, element) } /// Get the `element` at `index` in the sequence. - pub(crate) fn get(&self, index: usize) -> Option<&T> { + pub fn get(&self, index: usize) -> Option<&T> { self.root_node.as_ref().and_then(|n| n.get(index)) } + /// Get the `element` at `index` in the sequence. + pub fn get_mut(&mut self, index: usize) -> Option<&mut T> { + self.root_node.as_mut().and_then(|n| n.get_mut(index)) + } + /// Removes the element at `index` from the sequence. /// /// # Panics /// /// Panics if `index` is out of bounds. - pub(crate) fn remove(&mut self, index: usize) -> T { + pub fn remove(&mut self, index: usize) -> T { if let Some(root) = self.root_node.as_mut() { #[cfg(debug_assertions)] let len = root.check(); @@ -125,6 +135,15 @@ where panic!("remove from empty tree") } } + + /// Update the `element` at `index` in the sequence, returning the old value. + /// + /// # Panics + /// + /// Panics if `index > len` + pub fn set(&mut self, index: usize, element: T) -> T { + self.root_node.as_mut().unwrap().set(index, element) + } } impl SequenceTreeNode @@ -413,6 +432,30 @@ where assert!(self.is_full()); } + pub(crate) fn set(&mut self, index: usize, element: T) -> T { + if self.is_leaf() { + let old_element = self.elements.get_mut(index).unwrap(); + mem::replace(old_element, element) + } else { + let mut cumulative_len = 0; + for (child_index, child) in self.children.iter_mut().enumerate() { + match (cumulative_len + child.len()).cmp(&index) { + Ordering::Less => { + cumulative_len += child.len() + 1; + } + Ordering::Equal => { + let old_element = self.elements.get_mut(child_index).unwrap(); + return mem::replace(old_element, element); + } + Ordering::Greater => { + return child.set(index - cumulative_len, element); + } + } + } + panic!("Invalid index to set: {} but len was {}", index, self.len()) + } + } + pub(crate) fn get(&self, index: usize) -> Option<&T> { if self.is_leaf() { return self.elements.get(index); @@ -432,6 +475,26 @@ where } None } + + pub(crate) fn get_mut(&mut self, index: usize) -> Option<&mut T> { + if self.is_leaf() { + return self.elements.get_mut(index); + } else { + let mut cumulative_len = 0; + for (child_index, child) in self.children.iter_mut().enumerate() { + match (cumulative_len + child.len()).cmp(&index) { + Ordering::Less => { + cumulative_len += child.len() + 1; + } + Ordering::Equal => return self.elements.get_mut(child_index), + Ordering::Greater => { + return child.get_mut(index - cumulative_len); + } + } + } + } + None + } } impl Default for SequenceTreeInternal diff --git a/rust/automerge/src/storage.rs b/rust/automerge/src/storage.rs index 5b3d03a7..c8a2183d 100644 --- a/rust/automerge/src/storage.rs +++ b/rust/automerge/src/storage.rs @@ -14,7 +14,6 @@ pub(crate) use { chunk::{CheckSum, Chunk, ChunkType, Header}, columns::{Columns, MismatchingColumn, RawColumn, RawColumns}, document::{AsChangeMeta, AsDocOp, ChangeMetadata, CompressConfig, DocOp, Document}, - load::VerificationMode, }; fn shift_range(range: Range, by: usize) -> Range { diff --git a/rust/automerge/src/storage/change.rs b/rust/automerge/src/storage/change.rs index 61db0b00..ff3cc9ab 100644 --- a/rust/automerge/src/storage/change.rs +++ b/rust/automerge/src/storage/change.rs @@ -177,9 +177,6 @@ impl<'a> Change<'a, Unverified> { for op in self.iter_ops() { f(op?); } - if u32::try_from(u64::from(self.start_op)).is_err() { - return Err(ReadChangeOpError::CounterTooLarge); - } Ok(Change { bytes: self.bytes, header: self.header, diff --git a/rust/automerge/src/storage/change/change_op_columns.rs b/rust/automerge/src/storage/change/change_op_columns.rs index 86ec59c2..c50c67ae 100644 --- a/rust/automerge/src/storage/change/change_op_columns.rs +++ b/rust/automerge/src/storage/change/change_op_columns.rs @@ -14,7 +14,6 @@ use crate::{ }, }, convert, - error::InvalidOpType, storage::{ change::AsChangeOp, columns::{ @@ -23,7 +22,6 @@ use crate::{ RawColumns, }, types::{ElemId, ObjId, OpId, ScalarValue}, - OpType, }; const OBJ_COL_ID: ColumnId = ColumnId::new(0); @@ -179,7 +177,7 @@ impl ChangeOpsColumns { obj.append(op.obj()); key.append(op.key()); insert.append(op.insert()); - action.append_value(op.action()); + action.append_value(op.action() as u64); val.append(&op.val()); pred.append(op.pred()); } @@ -278,14 +276,7 @@ impl ChangeOpsColumns { #[derive(thiserror::Error, Debug)] #[error(transparent)] -pub enum ReadChangeOpError { - #[error(transparent)] - DecodeError(#[from] DecodeColumnError), - #[error(transparent)] - InvalidOpType(#[from] InvalidOpType), - #[error("counter too large")] - CounterTooLarge, -} +pub struct ReadChangeOpError(#[from] DecodeColumnError); #[derive(Clone)] pub(crate) struct ChangeOpsIter<'a> { @@ -317,11 +308,6 @@ impl<'a> ChangeOpsIter<'a> { let action = self.action.next_in_col("action")?; let val = self.val.next_in_col("value")?; let pred = self.pred.next_in_col("pred")?; - - // This check is necessary to ensure that OpType::from_action_and_value - // cannot panic later in the process. - OpType::validate_action_and_value(action, &val)?; - Ok(Some(ChangeOp { obj, key, @@ -472,14 +458,10 @@ mod tests { action in 0_u64..6, obj in opid(), insert in any::()) -> ChangeOp { - - let val = if action == 5 && !(value.is_int() || value.is_uint()) { - ScalarValue::Uint(0) - } else { value }; ChangeOp { obj: obj.into(), key, - val, + val: value, pred, action, insert, diff --git a/rust/automerge/src/storage/chunk.rs b/rust/automerge/src/storage/chunk.rs index d0048528..821c2c55 100644 --- a/rust/automerge/src/storage/chunk.rs +++ b/rust/automerge/src/storage/chunk.rs @@ -258,7 +258,7 @@ impl Header { Header { checksum: checksum_bytes.into(), chunk_type, - data_len: data.len(), + data_len: data.len() as usize, header_size: header.len(), hash, }, @@ -286,7 +286,7 @@ impl Header { fn hash(typ: ChunkType, data: &[u8]) -> ChangeHash { let mut out = vec![u8::from(typ)]; leb128::write::unsigned(&mut out, data.len() as u64).unwrap(); - out.extend(data); + out.extend(data.as_ref()); let hash_result = Sha256::digest(out); let array: [u8; 32] = hash_result.into(); ChangeHash(array) diff --git a/rust/automerge/src/storage/columns/raw_column.rs b/rust/automerge/src/storage/columns/raw_column.rs index ac9a5759..053c3c75 100644 --- a/rust/automerge/src/storage/columns/raw_column.rs +++ b/rust/automerge/src/storage/columns/raw_column.rs @@ -73,19 +73,15 @@ impl RawColumn { } } - fn decompress( - &self, - input: &[u8], - out: &mut Vec, - ) -> Result<(ColumnSpec, usize), ParseError> { + fn decompress(&self, input: &[u8], out: &mut Vec) -> (ColumnSpec, usize) { let len = if self.spec.deflate() { let mut inflater = flate2::bufread::DeflateDecoder::new(&input[self.data.clone()]); - inflater.read_to_end(out).map_err(ParseError::Deflate)? + inflater.read_to_end(out).unwrap() } else { out.extend(&input[self.data.clone()]); self.data.len() }; - Ok((self.spec.inflated(), len)) + (self.spec.inflated(), len) } } @@ -144,7 +140,7 @@ impl RawColumns { &self, input: &[u8], out: &mut Vec, - ) -> Result, ParseError> { + ) -> RawColumns { let mut result = Vec::with_capacity(self.0.len()); let mut start = 0; for col in &self.0 { @@ -152,7 +148,7 @@ impl RawColumns { out.extend(&input[decomp.data.clone()]); (decomp.spec, decomp.data.len()) } else { - col.decompress(input, out)? + col.decompress(input, out) }; result.push(RawColumn { spec, @@ -161,7 +157,7 @@ impl RawColumns { }); start += len; } - Ok(RawColumns(result)) + RawColumns(result) } } @@ -197,8 +193,6 @@ pub(crate) enum ParseError { NotInNormalOrder, #[error(transparent)] Leb128(#[from] parse::leb128::Error), - #[error(transparent)] - Deflate(#[from] std::io::Error), } impl RawColumns { @@ -219,10 +213,7 @@ impl RawColumns { let columns: Vec> = specs_and_lens .into_iter() .scan(0_usize, |offset, (spec, len)| { - // Note: we use a saturating add here as len was passed over the network - // and so could be anything. If the addition does every saturate we would - // expect parsing to fail later (but at least it won't panic!). - let end = offset.saturating_add(len as usize); + let end = *offset + len as usize; let data = *offset..end; *offset = end; Some(RawColumn { diff --git a/rust/automerge/src/storage/document.rs b/rust/automerge/src/storage/document.rs index ecef0bfd..500fbe85 100644 --- a/rust/automerge/src/storage/document.rs +++ b/rust/automerge/src/storage/document.rs @@ -173,8 +173,7 @@ impl<'a> Document<'a> { raw_columns: ops_meta, }, extra_args: (), - }) - .map_err(|e| parse::ParseError::Error(ParseError::RawColumns(e)))?; + }); let ops_layout = Columns::parse(op_bytes.len(), ops.iter()).map_err(|e| { parse::ParseError::Error(ParseError::BadColumnLayout { diff --git a/rust/automerge/src/storage/document/compression.rs b/rust/automerge/src/storage/document/compression.rs index 2f0e96ce..f7daa127 100644 --- a/rust/automerge/src/storage/document/compression.rs +++ b/rust/automerge/src/storage/document/compression.rs @@ -1,9 +1,6 @@ -use std::{borrow::Cow, convert::Infallible, ops::Range}; +use std::{borrow::Cow, ops::Range}; -use crate::storage::{ - columns::{compression, raw_column}, - shift_range, ChunkType, Header, RawColumns, -}; +use crate::storage::{columns::compression, shift_range, ChunkType, Header, RawColumns}; pub(super) struct Args<'a, T: compression::ColumnCompression, DirArgs> { /// The original data of the entire document chunk (compressed or uncompressed) @@ -26,50 +23,40 @@ pub(super) struct CompressArgs { } /// Compress a document chunk returning the compressed bytes -pub(super) fn compress(args: Args<'_, compression::Uncompressed, CompressArgs>) -> Vec { +pub(super) fn compress<'a>(args: Args<'a, compression::Uncompressed, CompressArgs>) -> Vec { let header_len = args.extra_args.original_header_len; let threshold = args.extra_args.threshold; - // Wrap in a closure so we can use `?` in the construction but still force the compiler - // to check that the error type is `Infallible` - let result: Result<_, Infallible> = (|| { - Ok(Compression::::new( - args, - Compressing { - threshold, - header_len, - }, - ) - .changes()? - .ops()? - .write_data() - .finish()) - })(); - // We just checked the error is `Infallible` so unwrap is fine - result.unwrap() + Compression::<'a, Compressing, _>::new( + args, + Compressing { + threshold, + header_len, + }, + ) + .changes() + .ops() + .write_data() + .finish() } -pub(super) fn decompress<'a>( - args: Args<'a, compression::Unknown, ()>, -) -> Result, raw_column::ParseError> { +pub(super) fn decompress<'a>(args: Args<'a, compression::Unknown, ()>) -> Decompressed<'a> { match ( args.changes.raw_columns.uncompressed(), args.ops.raw_columns.uncompressed(), ) { - (Some(changes), Some(ops)) => Ok(Decompressed { + (Some(changes), Some(ops)) => Decompressed { changes, ops, compressed: None, uncompressed: args.original, change_bytes: args.changes.data, op_bytes: args.ops.data, - }), - _ => Ok( - Compression::<'a, Decompressing, _>::new(args, Decompressing) - .changes()? - .ops()? - .write_data() - .finish(), - ), + }, + _ => Compression::<'a, Decompressing, _>::new(args, Decompressing) + .changes() + .ops() + .write_data() + .finish(), } } @@ -107,7 +94,6 @@ pub(super) struct Cols { trait Direction: std::fmt::Debug { type Out: compression::ColumnCompression; type In: compression::ColumnCompression; - type Error; type Args; /// This method represents the (de)compression process for a direction. The arguments are: @@ -122,7 +108,7 @@ trait Direction: std::fmt::Debug { input: &[u8], out: &mut Vec, meta_out: &mut Vec, - ) -> Result, Self::Error>; + ) -> Cols; } #[derive(Debug)] struct Compressing { @@ -131,7 +117,6 @@ struct Compressing { } impl Direction for Compressing { - type Error = Infallible; type Out = compression::Unknown; type In = compression::Uncompressed; type Args = CompressArgs; @@ -142,16 +127,16 @@ impl Direction for Compressing { input: &[u8], out: &mut Vec, meta_out: &mut Vec, - ) -> Result, Self::Error> { + ) -> Cols { let start = out.len(); let raw_columns = cols .raw_columns .compress(&input[cols.data.clone()], out, self.threshold); raw_columns.write(meta_out); - Ok(Cols { + Cols { data: start..out.len(), raw_columns, - }) + } } } @@ -159,7 +144,6 @@ impl Direction for Compressing { struct Decompressing; impl Direction for Decompressing { - type Error = raw_column::ParseError; type Out = compression::Uncompressed; type In = compression::Unknown; type Args = (); @@ -170,16 +154,14 @@ impl Direction for Decompressing { input: &[u8], out: &mut Vec, meta_out: &mut Vec, - ) -> Result, raw_column::ParseError> { + ) -> Cols { let start = out.len(); - let raw_columns = cols - .raw_columns - .uncompress(&input[cols.data.clone()], out)?; + let raw_columns = cols.raw_columns.uncompress(&input[cols.data.clone()], out); raw_columns.write(meta_out); - Ok(Cols { + Cols { data: start..out.len(), raw_columns, - }) + } } } @@ -251,7 +233,7 @@ impl<'a, D: Direction> Compression<'a, D, Starting> { } impl<'a, D: Direction> Compression<'a, D, Starting> { - fn changes(self) -> Result>, D::Error> { + fn changes(self) -> Compression<'a, D, Changes> { let Starting { mut data_out, mut meta_out, @@ -261,8 +243,8 @@ impl<'a, D: Direction> Compression<'a, D, Starting> { &self.args.original, &mut data_out, &mut meta_out, - )?; - Ok(Compression { + ); + Compression { args: self.args, direction: self.direction, state: Changes { @@ -270,12 +252,12 @@ impl<'a, D: Direction> Compression<'a, D, Starting> { meta_out, data_out, }, - }) + } } } impl<'a, D: Direction> Compression<'a, D, Changes> { - fn ops(self) -> Result>, D::Error> { + fn ops(self) -> Compression<'a, D, ChangesAndOps> { let Changes { change_cols, mut meta_out, @@ -286,8 +268,8 @@ impl<'a, D: Direction> Compression<'a, D, Changes> { &self.args.original, &mut data_out, &mut meta_out, - )?; - Ok(Compression { + ); + Compression { args: self.args, direction: self.direction, state: ChangesAndOps { @@ -296,7 +278,7 @@ impl<'a, D: Direction> Compression<'a, D, Changes> { meta_out, data_out, }, - }) + } } } diff --git a/rust/automerge/src/storage/document/doc_op_columns.rs b/rust/automerge/src/storage/document/doc_op_columns.rs index 82de17eb..5f61dff8 100644 --- a/rust/automerge/src/storage/document/doc_op_columns.rs +++ b/rust/automerge/src/storage/document/doc_op_columns.rs @@ -116,7 +116,7 @@ impl DocOpColumns { let key = KeyRange::encode(ops.clone().map(|o| o.key()), out); let id = OpIdRange::encode(ops.clone().map(|o| o.id()), out); let insert = BooleanRange::encode(ops.clone().map(|o| o.insert()), out); - let action = RleRange::encode(ops.clone().map(|o| Some(o.action())), out); + let action = RleRange::encode(ops.clone().map(|o| Some(o.action() as u64)), out); let val = ValueRange::encode(ops.clone().map(|o| o.val()), out); let succ = OpIdListRange::encode(ops.map(|o| o.succ()), out); Self { diff --git a/rust/automerge/src/storage/load.rs b/rust/automerge/src/storage/load.rs index 80ab3d82..fe2e8429 100644 --- a/rust/automerge/src/storage/load.rs +++ b/rust/automerge/src/storage/load.rs @@ -8,7 +8,7 @@ use crate::{ mod change_collector; mod reconstruct_document; pub(crate) use reconstruct_document::{ - reconstruct_document, DocObserver, LoadedObject, Reconstructed, VerificationMode, + reconstruct_document, DocObserver, LoadedObject, Reconstructed, }; #[derive(Debug, thiserror::Error)] @@ -84,7 +84,7 @@ fn load_next_change<'a>( let Reconstructed { changes: new_changes, .. - } = reconstruct_document(&d, VerificationMode::DontCheck, NullObserver) + } = reconstruct_document(&d, NullObserver) .map_err(|e| Error::InflateDocument(Box::new(e)))?; changes.extend(new_changes); } diff --git a/rust/automerge/src/storage/load/change_collector.rs b/rust/automerge/src/storage/load/change_collector.rs index d05367a9..75ef98f1 100644 --- a/rust/automerge/src/storage/load/change_collector.rs +++ b/rust/automerge/src/storage/load/change_collector.rs @@ -26,8 +26,6 @@ pub(crate) enum Error { MissingChange, #[error("unable to read change metadata: {0}")] ReadChange(Box), - #[error("incorrect max op")] - IncorrectMaxOp, #[error("missing ops")] MissingOps, } @@ -182,18 +180,7 @@ impl<'a> PartialChange<'a> { .ops .iter() .map(|(obj, op)| op_as_actor_id(obj, op, metadata)); - let actor = metadata - .actors - .safe_get(self.actor) - .ok_or_else(|| { - tracing::error!(actor_index = self.actor, "actor out of bounds"); - Error::MissingActor - })? - .clone(); - - if num_ops > self.max_op { - return Err(Error::IncorrectMaxOp); - } + let actor = metadata.actors.get(self.actor).clone(); let change = match StoredChange::builder() .with_dependencies(deps) diff --git a/rust/automerge/src/storage/load/reconstruct_document.rs b/rust/automerge/src/storage/load/reconstruct_document.rs index 44ace72a..e8221e5c 100644 --- a/rust/automerge/src/storage/load/reconstruct_document.rs +++ b/rust/automerge/src/storage/load/reconstruct_document.rs @@ -6,7 +6,7 @@ use crate::{ change::Change, columnar::Key as DocOpKey, op_tree::OpSetMetadata, - storage::{change::Verified, Change as StoredChange, DocOp, Document}, + storage::{DocOp, Document}, types::{ChangeHash, ElemId, Key, ObjId, ObjType, Op, OpId, OpIds, OpType}, ScalarValue, }; @@ -24,29 +24,13 @@ pub(crate) enum Error { #[error("invalid changes: {0}")] InvalidChanges(#[from] super::change_collector::Error), #[error("mismatching heads")] - MismatchingHeads(MismatchedHeads), + MismatchingHeads, #[error("missing operations")] MissingOps, #[error("succ out of order")] SuccOutOfOrder, } -pub(crate) struct MismatchedHeads { - changes: Vec>, - expected_heads: BTreeSet, - derived_heads: BTreeSet, -} - -impl std::fmt::Debug for MismatchedHeads { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - f.debug_struct("MismatchedHeads") - .field("changes", &self.changes.len()) - .field("expected_heads", &self.expected_heads) - .field("derived_heads", &self.derived_heads) - .finish() - } -} - /// All the operations loaded from an object in the document format pub(crate) struct LoadedObject { /// The id of the object @@ -83,16 +67,9 @@ pub(crate) struct Reconstructed { pub(crate) heads: BTreeSet, } -#[derive(Debug)] -pub enum VerificationMode { - Check, - DontCheck, -} - #[instrument(skip(doc, observer))] pub(crate) fn reconstruct_document<'a, O: DocObserver>( doc: &'a Document<'a>, - mode: VerificationMode, mut observer: O, ) -> Result, Error> { // The document format does not contain the bytes of the changes which are encoded in it @@ -208,16 +185,10 @@ pub(crate) fn reconstruct_document<'a, O: DocObserver>( let super::change_collector::CollectedChanges { history, heads } = collector.finish(&metadata)?; - if matches!(mode, VerificationMode::Check) { - let expected_heads: BTreeSet<_> = doc.heads().iter().cloned().collect(); - if expected_heads != heads { - tracing::error!(?expected_heads, ?heads, "mismatching heads"); - return Err(Error::MismatchingHeads(MismatchedHeads { - changes: history, - expected_heads, - derived_heads: heads, - })); - } + let expected_heads: BTreeSet<_> = doc.heads().iter().cloned().collect(); + if expected_heads != heads { + tracing::error!(?expected_heads, ?heads, "mismatching heads"); + return Err(Error::MismatchingHeads); } let result = observer.finish(metadata); diff --git a/rust/automerge/src/storage/parse.rs b/rust/automerge/src/storage/parse.rs index 6751afb4..64419fda 100644 --- a/rust/automerge/src/storage/parse.rs +++ b/rust/automerge/src/storage/parse.rs @@ -110,7 +110,7 @@ use crate::{ActorId, ChangeHash}; const HASH_SIZE: usize = 32; // 256 bits = 32 bytes #[allow(unused_imports)] -pub(crate) use self::leb128::{leb128_i64, leb128_u32, leb128_u64, nonzero_leb128_u64}; +pub(crate) use self::leb128::{leb128_i32, leb128_i64, leb128_u32, leb128_u64, nonzero_leb128_u64}; pub(crate) type ParseResult<'a, O, E> = Result<(Input<'a>, O), ParseError>; @@ -308,7 +308,6 @@ impl<'a> Input<'a> { } /// The bytes behind this input - including bytes which have been consumed - #[allow(clippy::misnamed_getters)] pub(crate) fn bytes(&self) -> &'a [u8] { self.original } diff --git a/rust/automerge/src/storage/parse/leb128.rs b/rust/automerge/src/storage/parse/leb128.rs index 9f5e72a2..800253c9 100644 --- a/rust/automerge/src/storage/parse/leb128.rs +++ b/rust/automerge/src/storage/parse/leb128.rs @@ -1,3 +1,4 @@ +use core::mem::size_of; use std::num::NonZeroU64; use super::{take1, Input, ParseError, ParseResult}; @@ -6,83 +7,44 @@ use super::{take1, Input, ParseError, ParseResult}; pub(crate) enum Error { #[error("leb128 was too large for the destination type")] Leb128TooLarge, - #[error("leb128 was improperly encoded")] - Leb128Overlong, #[error("leb128 was zero when it was expected to be nonzero")] UnexpectedZero, } -pub(crate) fn leb128_u64(input: Input<'_>) -> ParseResult<'_, u64, E> -where - E: From, -{ - let mut res = 0; - let mut shift = 0; - let mut input = input; +macro_rules! impl_leb { + ($parser_name: ident, $ty: ty) => { + #[allow(dead_code)] + pub(crate) fn $parser_name<'a, E>(input: Input<'a>) -> ParseResult<'a, $ty, E> + where + E: From, + { + let mut res = 0; + let mut shift = 0; - loop { - let (i, byte) = take1(input)?; - input = i; - res |= ((byte & 0x7F) as u64) << shift; - shift += 7; - - if (byte & 0x80) == 0 { - if shift > 64 && byte > 1 { - return Err(ParseError::Error(Error::Leb128TooLarge.into())); - } else if shift > 7 && byte == 0 { - return Err(ParseError::Error(Error::Leb128Overlong.into())); + let mut input = input; + let mut pos = 0; + loop { + let (i, byte) = take1(input)?; + input = i; + if (byte & 0x80) == 0 { + res |= (byte as $ty) << shift; + return Ok((input, res)); + } else if pos == leb128_size::<$ty>() - 1 { + return Err(ParseError::Error(Error::Leb128TooLarge.into())); + } else { + res |= ((byte & 0x7F) as $ty) << shift; + } + pos += 1; + shift += 7; } - return Ok((input, res)); - } else if shift > 64 { - return Err(ParseError::Error(Error::Leb128TooLarge.into())); } - } + }; } -pub(crate) fn leb128_i64(input: Input<'_>) -> ParseResult<'_, i64, E> -where - E: From, -{ - let mut res = 0; - let mut shift = 0; - - let mut input = input; - let mut prev = 0; - loop { - let (i, byte) = take1(input)?; - input = i; - res |= ((byte & 0x7F) as i64) << shift; - shift += 7; - - if (byte & 0x80) == 0 { - if shift > 64 && byte != 0 && byte != 0x7f { - // the 10th byte (if present) must contain only the sign-extended sign bit - return Err(ParseError::Error(Error::Leb128TooLarge.into())); - } else if shift > 7 - && ((byte == 0 && prev & 0x40 == 0) || (byte == 0x7f && prev & 0x40 > 0)) - { - // overlong if the sign bit of penultimate byte has been extended - return Err(ParseError::Error(Error::Leb128Overlong.into())); - } else if shift < 64 && byte & 0x40 > 0 { - // sign extend negative numbers - res |= -1 << shift; - } - return Ok((input, res)); - } else if shift > 64 { - return Err(ParseError::Error(Error::Leb128TooLarge.into())); - } - prev = byte; - } -} - -pub(crate) fn leb128_u32(input: Input<'_>) -> ParseResult<'_, u32, E> -where - E: From, -{ - let (i, num) = leb128_u64(input)?; - let result = u32::try_from(num).map_err(|_| ParseError::Error(Error::Leb128TooLarge.into()))?; - Ok((i, result)) -} +impl_leb!(leb128_u64, u64); +impl_leb!(leb128_u32, u32); +impl_leb!(leb128_i64, i64); +impl_leb!(leb128_i32, i32); /// Parse a LEB128 encoded u64 from the input, throwing an error if it is `0` pub(crate) fn nonzero_leb128_u64(input: Input<'_>) -> ParseResult<'_, NonZeroU64, E> @@ -95,27 +57,38 @@ where Ok((input, result)) } +/// Maximum LEB128-encoded size of an integer type +const fn leb128_size() -> usize { + let bits = size_of::() * 8; + (bits + 6) / 7 // equivalent to ceil(bits/7) w/o floats +} + #[cfg(test)] mod tests { use super::super::Needed; use super::*; - use std::num::NonZeroUsize; + use std::{convert::TryFrom, num::NonZeroUsize}; const NEED_ONE: Needed = Needed::Size(unsafe { NonZeroUsize::new_unchecked(1) }); #[test] - fn leb_128_u64() { + fn leb_128_unsigned() { let one = &[0b00000001_u8]; let one_two_nine = &[0b10000001, 0b00000001]; let one_and_more = &[0b00000001, 0b00000011]; let scenarios: Vec<(&'static [u8], ParseResult<'_, u64, Error>)> = vec![ (one, Ok((Input::with_position(one, 1), 1))), + (&[0b10000001_u8], Err(ParseError::Incomplete(NEED_ONE))), ( one_two_nine, Ok((Input::with_position(one_two_nine, 2), 129)), ), (one_and_more, Ok((Input::with_position(one_and_more, 1), 1))), + ( + &[129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129], + Err(ParseError::Error(Error::Leb128TooLarge)), + ), ]; for (index, (input, expected)) in scenarios.clone().into_iter().enumerate() { let result = leb128_u64(Input::new(input)); @@ -129,174 +102,17 @@ mod tests { } } - let error_cases: Vec<(&'static str, &'static [u8], ParseError<_>)> = vec![ - ( - "too many bytes", - &[129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "too many bits", - &[129, 129, 129, 129, 129, 129, 129, 129, 129, 2], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "overlong encoding", - &[129, 0], - ParseError::Error(Error::Leb128Overlong), - ), - ("missing data", &[255], ParseError::Incomplete(NEED_ONE)), - ]; - error_cases.into_iter().for_each(|(desc, input, expected)| { - match leb128_u64::(Input::new(input)) { - Ok((_, x)) => panic!("leb128_u64 should fail with {}, got {}", desc, x), - Err(error) => { - if error != expected { - panic!("leb128_u64 should fail with {}, got {}", expected, error) - } - } + for (index, (input, expected)) in scenarios.into_iter().enumerate() { + let u32_expected = expected.map(|(i, e)| (i, u32::try_from(e).unwrap())); + let result = leb128_u32(Input::new(input)); + if result != u32_expected { + panic!( + "Scenario {} failed for u32: expected {:?} got {:?}", + index + 1, + u32_expected, + result + ); } - }); - - let success_cases: Vec<(&'static [u8], u64)> = vec![ - (&[0], 0), - (&[0x7f], 127), - (&[0x80, 0x01], 128), - (&[0xff, 0x7f], 16383), - ( - &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1], - u64::MAX, - ), - ]; - success_cases.into_iter().for_each(|(input, expected)| { - match leb128_u64::(Input::new(input)) { - Ok((_, x)) => { - if x != expected { - panic!("leb128_u64 should succeed with {}, got {}", expected, x) - } - } - Err(error) => panic!("leb128_u64 should succeed with {}, got {}", expected, error), - } - }); - } - - #[test] - fn leb_128_u32() { - let error_cases: Vec<(&'static str, &'static [u8], ParseError<_>)> = vec![ - ( - "too many bytes", - &[129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "too many bits", - &[0xff, 0xff, 0xff, 0xff, 0x1f], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "overlong encoding", - &[129, 0], - ParseError::Error(Error::Leb128Overlong), - ), - ("missing data", &[0xaa], ParseError::Incomplete(NEED_ONE)), - ]; - error_cases.into_iter().for_each(|(desc, input, expected)| { - match leb128_u32::(Input::new(input)) { - Ok((_, x)) => panic!("leb128_u32 should fail with {}, got {}", desc, x), - Err(error) => { - if error != expected { - panic!("leb128_u32 should fail with {}, got {}", expected, error) - } - } - } - }); - - let success_cases: Vec<(&'static [u8], u32)> = vec![ - (&[0], 0), - (&[0x7f], 127), - (&[0x80, 0x01], 128), - (&[0xff, 0x7f], 16383), - (&[0xff, 0xff, 0xff, 0xff, 0x0f], u32::MAX), - ]; - success_cases.into_iter().for_each(|(input, expected)| { - match leb128_u32::(Input::new(input)) { - Ok((_, x)) => { - if x != expected { - panic!("leb128_u32 should succeed with {}, got {}", expected, x) - } - } - Err(error) => panic!("leb128_u64 should succeed with {}, got {}", expected, error), - } - }); - } - - #[test] - fn leb_128_i64() { - let error_cases: Vec<(&'static str, &'static [u8], ParseError<_>)> = vec![ - ( - "too many bytes", - &[129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, 129], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "too many positive bits", - &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "too many negative bits", - &[0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7e], - ParseError::Error(Error::Leb128TooLarge), - ), - ( - "overlong positive encoding", - &[0xbf, 0], - ParseError::Error(Error::Leb128Overlong), - ), - ( - "overlong negative encoding", - &[0x81, 0xff, 0x7f], - ParseError::Error(Error::Leb128Overlong), - ), - ("missing data", &[0x90], ParseError::Incomplete(NEED_ONE)), - ]; - error_cases.into_iter().for_each(|(desc, input, expected)| { - match leb128_i64::(Input::new(input)) { - Ok((_, x)) => panic!("leb128_i64 should fail with {}, got {}", desc, x), - Err(error) => { - if error != expected { - panic!("leb128_i64 should fail with {}, got {}", expected, error) - } - } - } - }); - - let success_cases: Vec<(&'static [u8], i64)> = vec![ - (&[0], 0), - (&[0x7f], -1), - (&[0x3f], 63), - (&[0x40], -64), - (&[0x80, 0x01], 128), - (&[0xff, 0x3f], 8191), - (&[0x80, 0x40], -8192), - ( - &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0], - i64::MAX, - ), - ( - &[0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x7f], - i64::MIN, - ), - ]; - success_cases.into_iter().for_each(|(input, expected)| { - match leb128_i64::(Input::new(input)) { - Ok((_, x)) => { - if x != expected { - panic!("leb128_i64 should succeed with {}, got {}", expected, x) - } - } - Err(error) => panic!("leb128_u64 should succeed with {}, got {}", expected, error), - } - }); + } } } diff --git a/rust/automerge/src/sync.rs b/rust/automerge/src/sync.rs index d6dc2580..6a206fdf 100644 --- a/rust/automerge/src/sync.rs +++ b/rust/automerge/src/sync.rs @@ -1,120 +1,23 @@ -//! # Sync Protocol -//! -//! The sync protocol is based on this paper: -//! , it assumes a reliable in-order stream -//! between two peers who are synchronizing a document. -//! -//! Each peer maintains a [`State`] for each peer they are synchronizing with. -//! This state tracks things like what the heads of the other peer are and -//! whether there are in-flight messages. Anything which implements [`SyncDoc`] -//! can take part in the sync protocol. The flow goes something like this: -//! -//! * The initiating peer creates an empty [`State`] and then calls -//! [`SyncDoc::generate_sync_message`] to generate new sync message and sends -//! it to the receiving peer. -//! * The receiving peer receives a message from the initiator, creates a new -//! [`State`], and calls [`SyncDoc::receive_sync_message`] on it's view of the -//! document -//! * The receiving peer then calls [`SyncDoc::generate_sync_message`] to generate -//! a new sync message and send it back to the initiator -//! * From this point on each peer operates in a loop, receiving a sync message -//! from the other peer and then generating a new message to send back. -//! -//! ## Example -//! -//! ``` -//! use automerge::{transaction::Transactable, sync::{self, SyncDoc}, ReadDoc}; -//! # fn main() -> Result<(), automerge::AutomergeError> { -//! // Create a document on peer1 -//! let mut peer1 = automerge::AutoCommit::new(); -//! peer1.put(automerge::ROOT, "key", "value")?; -//! -//! // Create a state to track our sync with peer2 -//! let mut peer1_state = sync::State::new(); -//! // Generate the initial message to send to peer2, unwrap for brevity -//! let message1to2 = peer1.sync().generate_sync_message(&mut peer1_state).unwrap(); -//! -//! // We receive the message on peer2. We don't have a document at all yet -//! // so we create one -//! let mut peer2 = automerge::AutoCommit::new(); -//! // We don't have a state for peer1 (it's a new connection), so we create one -//! let mut peer2_state = sync::State::new(); -//! // Now receive the message from peer 1 -//! peer2.sync().receive_sync_message(&mut peer2_state, message1to2)?; -//! -//! // Now we loop, sending messages from one to two and two to one until -//! // neither has anything new to send -//! -//! loop { -//! let two_to_one = peer2.sync().generate_sync_message(&mut peer2_state); -//! if let Some(message) = two_to_one.as_ref() { -//! println!("two to one"); -//! peer1.sync().receive_sync_message(&mut peer1_state, message.clone())?; -//! } -//! let one_to_two = peer1.sync().generate_sync_message(&mut peer1_state); -//! if let Some(message) = one_to_two.as_ref() { -//! println!("one to two"); -//! peer2.sync().receive_sync_message(&mut peer2_state, message.clone())?; -//! } -//! if two_to_one.is_none() && one_to_two.is_none() { -//! break; -//! } -//! } -//! -//! assert_eq!(peer2.get(automerge::ROOT, "key")?.unwrap().0.to_str(), Some("value")); -//! -//! # Ok(()) -//! # } -//! ``` - use itertools::Itertools; use serde::ser::SerializeMap; use std::collections::{HashMap, HashSet}; use crate::{ storage::{parse, Change as StoredChange, ReadChangeOpError}, - Automerge, AutomergeError, Change, ChangeHash, OpObserver, ReadDoc, + Automerge, AutomergeError, Change, ChangeHash, OpObserver, }; mod bloom; mod state; -pub use bloom::{BloomFilter, DecodeError as DecodeBloomError}; +pub use bloom::BloomFilter; pub use state::DecodeError as DecodeStateError; pub use state::{Have, State}; -/// A document which can take part in the sync protocol -/// -/// See the [module level documentation](crate::sync) for more details. -pub trait SyncDoc { - /// Generate a sync message for the remote peer represented by `sync_state` - /// - /// If this returns `None` then there are no new messages to send, either because we are - /// waiting for an acknolwedgement of an in-flight message, or because the remote is up to - /// date. - fn generate_sync_message(&self, sync_state: &mut State) -> Option; - - /// Apply a received sync message to this document and `sync_state` - fn receive_sync_message( - &mut self, - sync_state: &mut State, - message: Message, - ) -> Result<(), AutomergeError>; - - /// Apply a received sync message to this document and `sync_state`, observing any changes with - /// `op_observer` - fn receive_sync_message_with( - &mut self, - sync_state: &mut State, - message: Message, - op_observer: &mut Obs, - ) -> Result<(), AutomergeError>; -} - const MESSAGE_TYPE_SYNC: u8 = 0x42; // first byte of a sync message, for identification -impl SyncDoc for Automerge { - fn generate_sync_message(&self, sync_state: &mut State) -> Option { +impl Automerge { + pub fn generate_sync_message(&self, sync_state: &mut State) -> Option { let our_heads = self.get_heads(); let our_need = self.get_missing_deps(sync_state.their_heads.as_ref().unwrap_or(&vec![])); @@ -203,25 +106,80 @@ impl SyncDoc for Automerge { Some(sync_message) } - fn receive_sync_message( + pub fn receive_sync_message( &mut self, sync_state: &mut State, message: Message, ) -> Result<(), AutomergeError> { - self.do_receive_sync_message::<()>(sync_state, message, None) + self.receive_sync_message_with::<()>(sync_state, message, None) } - fn receive_sync_message_with( + pub fn receive_sync_message_with( &mut self, sync_state: &mut State, message: Message, - op_observer: &mut Obs, + op_observer: Option<&mut Obs>, ) -> Result<(), AutomergeError> { - self.do_receive_sync_message(sync_state, message, Some(op_observer)) - } -} + let before_heads = self.get_heads(); + + let Message { + heads: message_heads, + changes: message_changes, + need: message_need, + have: message_have, + } = message; + + let changes_is_empty = message_changes.is_empty(); + if !changes_is_empty { + self.apply_changes_with(message_changes, op_observer)?; + sync_state.shared_heads = advance_heads( + &before_heads.iter().collect(), + &self.get_heads().into_iter().collect(), + &sync_state.shared_heads, + ); + } + + // trim down the sent hashes to those that we know they haven't seen + self.filter_changes(&message_heads, &mut sync_state.sent_hashes)?; + + if changes_is_empty && message_heads == before_heads { + sync_state.last_sent_heads = message_heads.clone(); + } + + if sync_state.sent_hashes.is_empty() { + sync_state.in_flight = false; + } + + let known_heads = message_heads + .iter() + .filter(|head| self.get_change_by_hash(head).is_some()) + .collect::>(); + if known_heads.len() == message_heads.len() { + sync_state.shared_heads = message_heads.clone(); + sync_state.in_flight = false; + // If the remote peer has lost all its data, reset our state to perform a full resync + if message_heads.is_empty() { + sync_state.last_sent_heads = Default::default(); + sync_state.sent_hashes = Default::default(); + } + } else { + sync_state.shared_heads = sync_state + .shared_heads + .iter() + .chain(known_heads) + .copied() + .unique() + .sorted() + .collect::>(); + } + + sync_state.their_have = Some(message_have); + sync_state.their_heads = Some(message_heads); + sync_state.their_need = Some(message_need); + + Ok(()) + } -impl Automerge { fn make_bloom_filter(&self, last_sync: Vec) -> Have { let new_changes = self .get_changes(&last_sync) @@ -303,72 +261,6 @@ impl Automerge { Ok(changes_to_send) } } - - fn do_receive_sync_message( - &mut self, - sync_state: &mut State, - message: Message, - op_observer: Option<&mut Obs>, - ) -> Result<(), AutomergeError> { - let before_heads = self.get_heads(); - - let Message { - heads: message_heads, - changes: message_changes, - need: message_need, - have: message_have, - } = message; - - let changes_is_empty = message_changes.is_empty(); - if !changes_is_empty { - self.apply_changes_with(message_changes, op_observer)?; - sync_state.shared_heads = advance_heads( - &before_heads.iter().collect(), - &self.get_heads().into_iter().collect(), - &sync_state.shared_heads, - ); - } - - // trim down the sent hashes to those that we know they haven't seen - self.filter_changes(&message_heads, &mut sync_state.sent_hashes)?; - - if changes_is_empty && message_heads == before_heads { - sync_state.last_sent_heads = message_heads.clone(); - } - - if sync_state.sent_hashes.is_empty() { - sync_state.in_flight = false; - } - - let known_heads = message_heads - .iter() - .filter(|head| self.get_change_by_hash(head).is_some()) - .collect::>(); - if known_heads.len() == message_heads.len() { - sync_state.shared_heads = message_heads.clone(); - sync_state.in_flight = false; - // If the remote peer has lost all its data, reset our state to perform a full resync - if message_heads.is_empty() { - sync_state.last_sent_heads = Default::default(); - sync_state.sent_hashes = Default::default(); - } - } else { - sync_state.shared_heads = sync_state - .shared_heads - .iter() - .chain(known_heads) - .copied() - .unique() - .sorted() - .collect::>(); - } - - sync_state.their_have = Some(message_have); - sync_state.their_heads = Some(message_heads); - sync_state.their_need = Some(message_need); - - Ok(()) - } } #[derive(Debug, thiserror::Error)] @@ -524,7 +416,7 @@ impl Message { encode_many(&mut buf, self.changes.iter_mut(), |buf, change| { leb128::write::unsigned(buf, change.raw_bytes().len() as u64).unwrap(); - buf.extend::<&[u8]>(change.raw_bytes().as_ref()) + buf.extend(change.raw_bytes().as_ref()) }); buf @@ -653,8 +545,8 @@ mod tests { doc.put(crate::ROOT, "key", "value").unwrap(); let mut sync_state = State::new(); - assert!(doc.sync().generate_sync_message(&mut sync_state).is_some()); - assert!(doc.sync().generate_sync_message(&mut sync_state).is_none()); + assert!(doc.generate_sync_message(&mut sync_state).is_some()); + assert!(doc.generate_sync_message(&mut sync_state).is_none()); } #[test] @@ -664,12 +556,11 @@ mod tests { let mut s1 = State::new(); let mut s2 = State::new(); let m1 = doc1 - .sync() .generate_sync_message(&mut s1) .expect("message was none"); - doc2.sync().receive_sync_message(&mut s2, m1).unwrap(); - let m2 = doc2.sync().generate_sync_message(&mut s2); + doc2.receive_sync_message(&mut s2, m1).unwrap(); + let m2 = doc2.generate_sync_message(&mut s2); assert!(m2.is_none()); } @@ -693,11 +584,9 @@ mod tests { //// both sides report what they have but have no shared peer state let msg1to2 = doc1 - .sync() .generate_sync_message(&mut s1) .expect("initial sync from 1 to 2 was None"); let msg2to1 = doc2 - .sync() .generate_sync_message(&mut s2) .expect("initial sync message from 2 to 1 was None"); assert_eq!(msg1to2.changes.len(), 0); @@ -706,57 +595,52 @@ mod tests { assert_eq!(msg2to1.have[0].last_sync.len(), 0); //// doc1 and doc2 receive that message and update sync state - doc1.sync().receive_sync_message(&mut s1, msg2to1).unwrap(); - doc2.sync().receive_sync_message(&mut s2, msg1to2).unwrap(); + doc1.receive_sync_message(&mut s1, msg2to1).unwrap(); + doc2.receive_sync_message(&mut s2, msg1to2).unwrap(); //// now both reply with their local changes the other lacks //// (standard warning that 1% of the time this will result in a "need" message) let msg1to2 = doc1 - .sync() .generate_sync_message(&mut s1) .expect("first reply from 1 to 2 was None"); assert_eq!(msg1to2.changes.len(), 5); let msg2to1 = doc2 - .sync() .generate_sync_message(&mut s2) .expect("first reply from 2 to 1 was None"); assert_eq!(msg2to1.changes.len(), 5); //// both should now apply the changes - doc1.sync().receive_sync_message(&mut s1, msg2to1).unwrap(); + doc1.receive_sync_message(&mut s1, msg2to1).unwrap(); assert_eq!(doc1.get_missing_deps(&[]), Vec::new()); - doc2.sync().receive_sync_message(&mut s2, msg1to2).unwrap(); + doc2.receive_sync_message(&mut s2, msg1to2).unwrap(); assert_eq!(doc2.get_missing_deps(&[]), Vec::new()); //// The response acknowledges the changes received and sends no further changes let msg1to2 = doc1 - .sync() .generate_sync_message(&mut s1) .expect("second reply from 1 to 2 was None"); assert_eq!(msg1to2.changes.len(), 0); let msg2to1 = doc2 - .sync() .generate_sync_message(&mut s2) .expect("second reply from 2 to 1 was None"); assert_eq!(msg2to1.changes.len(), 0); //// After receiving acknowledgements, their shared heads should be equal - doc1.sync().receive_sync_message(&mut s1, msg2to1).unwrap(); - doc2.sync().receive_sync_message(&mut s2, msg1to2).unwrap(); + doc1.receive_sync_message(&mut s1, msg2to1).unwrap(); + doc2.receive_sync_message(&mut s2, msg1to2).unwrap(); assert_eq!(s1.shared_heads, s2.shared_heads); //// We're in sync, no more messages required - assert!(doc1.sync().generate_sync_message(&mut s1).is_none()); - assert!(doc2.sync().generate_sync_message(&mut s2).is_none()); + assert!(doc1.generate_sync_message(&mut s1).is_none()); + assert!(doc2.generate_sync_message(&mut s2).is_none()); //// If we make one more change and start another sync then its lastSync should be updated doc1.put(crate::ROOT, "x", 5).unwrap(); doc1.commit(); let msg1to2 = doc1 - .sync() .generate_sync_message(&mut s1) .expect("third reply from 1 to 2 was None"); let mut expected_heads = vec![head1, head2]; @@ -887,51 +771,6 @@ mod tests { assert_eq!(doc2.get_heads(), all_heads); } - #[test] - fn should_handle_lots_of_branching_and_merging() { - let mut doc1 = crate::AutoCommit::new().with_actor(ActorId::try_from("01234567").unwrap()); - let mut doc2 = crate::AutoCommit::new().with_actor(ActorId::try_from("89abcdef").unwrap()); - let mut doc3 = crate::AutoCommit::new().with_actor(ActorId::try_from("fedcba98").unwrap()); - let mut s1 = State::new(); - let mut s2 = State::new(); - - doc1.put(crate::ROOT, "x", 0).unwrap(); - let change1 = doc1.get_last_local_change().unwrap().clone(); - - doc2.apply_changes([change1.clone()]).unwrap(); - doc3.apply_changes([change1]).unwrap(); - - doc3.put(crate::ROOT, "x", 1).unwrap(); - - //// - n1c1 <------ n1c2 <------ n1c3 <-- etc. <-- n1c20 <------ n1c21 - //// / \/ \/ \/ - //// / /\ /\ /\ - //// c0 <---- n2c1 <------ n2c2 <------ n2c3 <-- etc. <-- n2c20 <------ n2c21 - //// \ / - //// ---------------------------------------------- n3c1 <----- - for i in 1..20 { - doc1.put(crate::ROOT, "n1", i).unwrap(); - doc2.put(crate::ROOT, "n2", i).unwrap(); - let change1 = doc1.get_last_local_change().unwrap().clone(); - let change2 = doc2.get_last_local_change().unwrap().clone(); - doc1.apply_changes([change2.clone()]).unwrap(); - doc2.apply_changes([change1]).unwrap(); - } - - sync(&mut doc1, &mut doc2, &mut s1, &mut s2); - - //// Having n3's last change concurrent to the last sync heads forces us into the slower code path - let change3 = doc3.get_last_local_change().unwrap().clone(); - doc2.apply_changes([change3]).unwrap(); - - doc1.put(crate::ROOT, "n1", "final").unwrap(); - doc2.put(crate::ROOT, "n1", "final").unwrap(); - - sync(&mut doc1, &mut doc2, &mut s1, &mut s2); - - assert_eq!(doc1.get_heads(), doc2.get_heads()); - } - fn sync( a: &mut crate::AutoCommit, b: &mut crate::AutoCommit, @@ -943,8 +782,8 @@ mod tests { let mut iterations = 0; loop { - let a_to_b = a.sync().generate_sync_message(a_sync_state); - let b_to_a = b.sync().generate_sync_message(b_sync_state); + let a_to_b = a.generate_sync_message(a_sync_state); + let b_to_a = b.generate_sync_message(b_sync_state); if a_to_b.is_none() && b_to_a.is_none() { break; } @@ -952,10 +791,10 @@ mod tests { panic!("failed to sync in {} iterations", MAX_ITER); } if let Some(msg) = a_to_b { - b.sync().receive_sync_message(b_sync_state, msg).unwrap() + b.receive_sync_message(b_sync_state, msg).unwrap() } if let Some(msg) = b_to_a { - a.sync().receive_sync_message(a_sync_state, msg).unwrap() + a.receive_sync_message(a_sync_state, msg).unwrap() } iterations += 1; } diff --git a/rust/automerge/src/sync/bloom.rs b/rust/automerge/src/sync/bloom.rs index 8523061e..c02acbc0 100644 --- a/rust/automerge/src/sync/bloom.rs +++ b/rust/automerge/src/sync/bloom.rs @@ -126,7 +126,7 @@ impl BloomFilter { let num_entries = hashes.len() as u32; let num_bits_per_entry = BITS_PER_ENTRY; let num_probes = NUM_PROBES; - let bits = vec![0; bits_capacity(num_entries, num_bits_per_entry)]; + let bits = vec![0; bits_capacity(num_entries, num_bits_per_entry) as usize]; let mut filter = Self { num_entries, num_bits_per_entry, diff --git a/rust/automerge/src/sync/state.rs b/rust/automerge/src/sync/state.rs index 354c605f..00775196 100644 --- a/rust/automerge/src/sync/state.rs +++ b/rust/automerge/src/sync/state.rs @@ -23,23 +23,13 @@ impl From for DecodeError { } /// The state of synchronisation with a peer. -/// -/// This should be persisted using [`Self::encode`] when you know you will be interacting with the -/// same peer in multiple sessions. [`Self::encode`] only encodes state which should be reused -/// across connections. #[derive(Debug, Clone, Default, PartialEq, Eq, Hash)] pub struct State { - /// The hashes which we know both peers have pub shared_heads: Vec, - /// The heads we last sent pub last_sent_heads: Vec, - /// The heads we last received from them pub their_heads: Option>, - /// Any specific changes they last said they needed pub their_need: Option>, - /// The bloom filters summarising what they said they have pub their_have: Option>, - /// The hashes we have sent in this session pub sent_hashes: BTreeSet, /// `generate_sync_message` should return `None` if there are no new changes to send. In diff --git a/rust/automerge/src/transaction.rs b/rust/automerge/src/transaction.rs index b513bc63..4a91d5b5 100644 --- a/rust/automerge/src/transaction.rs +++ b/rust/automerge/src/transaction.rs @@ -7,7 +7,7 @@ mod transactable; pub use self::commit::CommitOptions; pub use self::transactable::Transactable; -pub(crate) use inner::{TransactionArgs, TransactionInner}; +pub(crate) use inner::TransactionInner; pub use manual_transaction::Transaction; pub use observation::{Observation, Observed, UnObserved}; pub use result::Failure; diff --git a/rust/automerge/src/transaction/inner.rs b/rust/automerge/src/transaction/inner.rs index 0fe735d5..5a1456c6 100644 --- a/rust/automerge/src/transaction/inner.rs +++ b/rust/automerge/src/transaction/inner.rs @@ -1,88 +1,33 @@ use std::num::NonZeroU64; +use crate::automerge::Actor; use crate::exid::ExId; use crate::query::{self, OpIdSearch}; use crate::storage::Change as StoredChange; -use crate::types::{Key, ListEncoding, ObjId, OpId, OpIds, TextEncoding}; +use crate::types::{Key, ObjId, OpId}; use crate::{op_tree::OpSetMetadata, types::Op, Automerge, Change, ChangeHash, OpObserver, Prop}; use crate::{AutomergeError, ObjType, OpType, ScalarValue}; #[derive(Debug, Clone)] pub(crate) struct TransactionInner { - actor: usize, - seq: u64, - start_op: NonZeroU64, - time: i64, - message: Option, - deps: Vec, - operations: Vec<(ObjId, Op)>, -} - -/// Arguments required to create a new transaction -pub(crate) struct TransactionArgs { - /// The index of the actor ID this transaction will create ops for in the - /// [`OpSetMetadata::actors`] - pub(crate) actor_index: usize, - /// The sequence number of the change this transaction will create + pub(crate) actor: usize, pub(crate) seq: u64, - /// The start op of the change this transaction will create pub(crate) start_op: NonZeroU64, - /// The dependencies of the change this transaction will create + pub(crate) time: i64, + pub(crate) message: Option, pub(crate) deps: Vec, + pub(crate) operations: Vec<(ObjId, Prop, Op)>, } impl TransactionInner { - pub(crate) fn new( - TransactionArgs { - actor_index: actor, - seq, - start_op, - deps, - }: TransactionArgs, - ) -> Self { - TransactionInner { - actor, - seq, - start_op, - time: 0, - message: None, - operations: vec![], - deps, - } - } - - /// Create an empty change - pub(crate) fn empty( - doc: &mut Automerge, - args: TransactionArgs, - message: Option, - time: Option, - ) -> ChangeHash { - Self::new(args).commit_impl(doc, message, time) - } - pub(crate) fn pending_ops(&self) -> usize { self.operations.len() } /// Commit the operations performed in this transaction, returning the hashes corresponding to /// the new heads. - /// - /// Returns `None` if there were no operations to commit #[tracing::instrument(skip(self, doc))] pub(crate) fn commit( - self, - doc: &mut Automerge, - message: Option, - time: Option, - ) -> Option { - if self.pending_ops() == 0 { - return None; - } - Some(self.commit_impl(doc, message, time)) - } - - pub(crate) fn commit_impl( mut self, doc: &mut Automerge, message: Option, @@ -97,7 +42,7 @@ impl TransactionInner { } let num_ops = self.pending_ops(); - let change = self.export(&doc.ops().m); + let change = self.export(&doc.ops.m); let hash = change.hash(); #[cfg(not(debug_assertions))] tracing::trace!(commit=?hash, deps=?change.deps(), "committing transaction"); @@ -116,6 +61,8 @@ impl TransactionInner { use crate::storage::{change::PredOutOfOrder, convert::op_as_actor_id}; let actor = metadata.actors.get(self.actor).clone(); + let ops = self.operations.iter().map(|o| (&o.0, &o.2)); + //let (ops, other_actors) = encode_change_ops(ops, actor.clone(), actors, props); let deps = self.deps.clone(); let stored = match StoredChange::builder() .with_actor(actor) @@ -125,8 +72,7 @@ impl TransactionInner { .with_dependencies(deps) .with_timestamp(self.time) .build( - self.operations - .iter() + ops.into_iter() .map(|(obj, op)| op_as_actor_id(obj, op, metadata)), ) { Ok(s) => s, @@ -150,18 +96,22 @@ impl TransactionInner { pub(crate) fn rollback(self, doc: &mut Automerge) -> usize { let num = self.pending_ops(); // remove in reverse order so sets are removed before makes etc... - for (obj, op) in self.operations.into_iter().rev() { + for (obj, _prop, op) in self.operations.into_iter().rev() { for pred_id in &op.pred { - if let Some(p) = doc.ops().search(&obj, OpIdSearch::new(*pred_id)).index() { - doc.ops_mut().change_vis(&obj, p, |o| o.remove_succ(&op)); + if let Some(p) = doc.ops.search(&obj, OpIdSearch::new(*pred_id)).index() { + doc.ops.change_vis(&obj, p, |o| o.remove_succ(&op)); } } - if let Some(pos) = doc.ops().search(&obj, OpIdSearch::new(op.id)).index() { - doc.ops_mut().remove(&obj, pos); + if let Some(pos) = doc.ops.search(&obj, OpIdSearch::new(op.id)).index() { + doc.ops.remove(&obj, pos); } } - doc.rollback_last_actor(); + // remove the actor from the cache so that it doesn't end up in the saved document + if doc.states.get(&self.actor).is_none() && doc.ops.m.actors.len() > 0 { + let actor = doc.ops.m.actors.remove_last(); + doc.actor = Actor::Unused(actor); + } num } @@ -187,13 +137,16 @@ impl TransactionInner { prop: P, value: V, ) -> Result<(), AutomergeError> { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; + let obj = doc.exid_to_obj(ex_obj)?; let value = value.into(); let prop = prop.into(); + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; match (&prop, obj_type) { (Prop::Map(_), ObjType::Map) => Ok(()), (Prop::Seq(_), ObjType::List) => Ok(()), - (Prop::Seq(_), ObjType::Text) => Ok(()), _ => Err(AutomergeError::InvalidOp(obj_type)), }?; self.local_op(doc, op_observer, obj, prop, value.into())?; @@ -221,8 +174,12 @@ impl TransactionInner { prop: P, value: ObjType, ) -> Result { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; + let obj = doc.exid_to_obj(ex_obj)?; let prop = prop.into(); + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; match (&prop, obj_type) { (Prop::Map(_), ObjType::Map) => Ok(()), (Prop::Seq(_), ObjType::List) => Ok(()), @@ -236,29 +193,7 @@ impl TransactionInner { } fn next_id(&mut self) -> OpId { - OpId::new(self.start_op.get() + self.pending_ops() as u64, self.actor) - } - - fn next_insert(&mut self, key: Key, value: ScalarValue) -> Op { - Op { - id: self.next_id(), - action: OpType::Put(value), - key, - succ: Default::default(), - pred: Default::default(), - insert: true, - } - } - - fn next_delete(&mut self, key: Key, pred: OpIds) -> Op { - Op { - id: self.next_id(), - action: OpType::Delete, - key, - succ: Default::default(), - pred, - insert: false, - } + OpId(self.start_op.get() + self.pending_ops() as u64, self.actor) } #[allow(clippy::too_many_arguments)] @@ -272,10 +207,10 @@ impl TransactionInner { obj: ObjId, succ_pos: &[usize], ) { - doc.ops_mut().add_succ(&obj, succ_pos, &op); + doc.ops.add_succ(&obj, succ_pos.iter().copied(), &op); if !op.is_delete() { - doc.ops_mut().insert(pos, &obj, op.clone()); + doc.ops.insert(pos, &obj, op.clone()); } self.finalize_op(doc, op_observer, obj, prop, op); @@ -289,8 +224,12 @@ impl TransactionInner { index: usize, value: V, ) -> Result<(), AutomergeError> { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; - if !matches!(obj_type, ObjType::List | ObjType::Text) { + let obj = doc.exid_to_obj(ex_obj)?; + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; + if obj_type != ObjType::List { return Err(AutomergeError::InvalidOp(obj_type)); } let value = value.into(); @@ -307,8 +246,12 @@ impl TransactionInner { index: usize, value: ObjType, ) -> Result { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; - if !matches!(obj_type, ObjType::List | ObjType::Text) { + let obj = doc.exid_to_obj(ex_obj)?; + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; + if obj_type != ObjType::List { return Err(AutomergeError::InvalidOp(obj_type)); } let id = self.do_insert(doc, op_observer, obj, index, value.into())?; @@ -326,9 +269,7 @@ impl TransactionInner { ) -> Result { let id = self.next_id(); - let query = doc - .ops() - .search(&obj, query::InsertNth::new(index, ListEncoding::List)); + let query = doc.ops.search(&obj, query::InsertNth::new(index)); let key = query.key()?; @@ -341,7 +282,7 @@ impl TransactionInner { insert: true, }; - doc.ops_mut().insert(query.pos(), &obj, op.clone()); + doc.ops.insert(query.pos(), &obj, op.clone()); self.finalize_op(doc, op_observer, obj, Prop::Seq(index), op); @@ -375,8 +316,8 @@ impl TransactionInner { } let id = self.next_id(); - let prop_index = doc.ops_mut().m.props.cache(prop.clone()); - let query = doc.ops().search(&obj, query::Prop::new(prop_index)); + let prop_index = doc.ops.m.props.cache(prop.clone()); + let query = doc.ops.search(&obj, query::Prop::new(prop_index)); // no key present to delete if query.ops.is_empty() && action == OpType::Delete { @@ -393,7 +334,7 @@ impl TransactionInner { return Err(AutomergeError::MissingCounter); } - let pred = doc.ops().m.sorted_opids(query.ops.iter().map(|o| o.id)); + let pred = doc.ops.m.sorted_opids(query.ops.iter().map(|o| o.id)); let op = Op { id, @@ -419,12 +360,10 @@ impl TransactionInner { index: usize, action: OpType, ) -> Result, AutomergeError> { - let query = doc - .ops() - .search(&obj, query::Nth::new(index, ListEncoding::List)); + let query = doc.ops.search(&obj, query::Nth::new(index)); let id = self.next_id(); - let pred = doc.ops().m.sorted_opids(query.ops.iter().map(|o| o.id)); + let pred = doc.ops.m.sorted_opids(query.ops.iter().map(|o| o.id)); let key = query.key()?; if query.ops.len() == 1 && query.ops[0].is_noop(&action) { @@ -461,7 +400,7 @@ impl TransactionInner { prop: P, value: i64, ) -> Result<(), AutomergeError> { - let obj = doc.exid_to_obj(obj)?.0; + let obj = doc.exid_to_obj(obj)?; self.local_op(doc, op_observer, obj, prop.into(), OpType::Increment(value))?; Ok(()) } @@ -473,24 +412,9 @@ impl TransactionInner { ex_obj: &ExId, prop: P, ) -> Result<(), AutomergeError> { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; + let obj = doc.exid_to_obj(ex_obj)?; let prop = prop.into(); - if obj_type == ObjType::Text { - let index = prop.to_index().ok_or(AutomergeError::InvalidOp(obj_type))?; - self.inner_splice( - doc, - op_observer, - SpliceArgs { - obj, - index, - del: 1, - values: vec![], - splice_type: SpliceType::Text("", doc.text_encoding()), - }, - )?; - } else { - self.local_op(doc, op_observer, obj, prop, OpType::Delete)?; - } + self.local_op(doc, op_observer, obj, prop, OpType::Delete)?; Ok(()) } @@ -501,26 +425,19 @@ impl TransactionInner { doc: &mut Automerge, op_observer: Option<&mut Obs>, ex_obj: &ExId, - index: usize, + pos: usize, del: usize, vals: impl IntoIterator, ) -> Result<(), AutomergeError> { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; - if !matches!(obj_type, ObjType::List | ObjType::Text) { + let obj = doc.exid_to_obj(ex_obj)?; + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; + if obj_type != ObjType::List { return Err(AutomergeError::InvalidOp(obj_type)); } - let values = vals.into_iter().collect(); - self.inner_splice( - doc, - op_observer, - SpliceArgs { - obj, - index, - del, - values, - splice_type: SpliceType::List, - }, - ) + self.inner_splice(doc, op_observer, obj, pos, del, vals) } /// Splice string into a text object @@ -529,122 +446,87 @@ impl TransactionInner { doc: &mut Automerge, op_observer: Option<&mut Obs>, ex_obj: &ExId, - index: usize, + pos: usize, del: usize, text: &str, ) -> Result<(), AutomergeError> { - let (obj, obj_type) = doc.exid_to_obj(ex_obj)?; + let obj = doc.exid_to_obj(ex_obj)?; + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; if obj_type != ObjType::Text { return Err(AutomergeError::InvalidOp(obj_type)); } - let values = text.chars().map(ScalarValue::from).collect(); - self.inner_splice( - doc, - op_observer, - SpliceArgs { - obj, - index, - del, - values, - splice_type: SpliceType::Text(text, doc.text_encoding()), - }, - ) + let vals = text.chars().map(ScalarValue::from); + self.inner_splice(doc, op_observer, obj, pos, del, vals) } - fn inner_splice( + /// Splice string into a text object + pub(crate) fn splice_text_utf16( &mut self, doc: &mut Automerge, mut op_observer: Option<&mut Obs>, - SpliceArgs { - obj, - mut index, - mut del, - values, - splice_type, - }: SpliceArgs<'_>, + ex_obj: &ExId, + mut pos: usize, + del: usize, + text: &str, ) -> Result<(), AutomergeError> { - let ex_obj = doc.ops().id_to_exid(obj.0); - let encoding = splice_type.encoding(); - // delete `del` items - performing the query for each one - let mut deleted = 0; - while deleted < del { - // TODO: could do this with a single custom query - let query = doc.ops().search(&obj, query::Nth::new(index, encoding)); - - // if we delete in the middle of a multi-character - // move cursor back to the beginning and expand the del width - let adjusted_index = query.index(); - if adjusted_index < index { - del += index - adjusted_index; - index = adjusted_index; - } - - let step = if let Some(op) = query.ops.last() { - op.width(encoding) + let obj = doc.exid_to_obj(ex_obj)?; + let obj_type = doc + .ops + .object_type(&obj) + .ok_or(AutomergeError::NotAnObject)?; + if obj_type != ObjType::Text { + return Err(AutomergeError::InvalidOp(obj_type)); + } + let vals = text.chars().map(ScalarValue::from); + for _ in 0..del { + // This unwrap and rewrap of the option is necessary to appeas the borrow checker :( + if let Some(obs) = op_observer.as_mut() { + self.local_op(doc, Some(*obs), obj, pos.into(), OpType::Delete)?; } else { - break; - }; - - let op = self.next_delete(query.key()?, query.pred(doc.ops())); - - let ops_pos = query.ops_pos; - doc.ops_mut().add_succ(&obj, &ops_pos, &op); - - self.operations.push((obj, op)); - - deleted += step; + self.local_op::(doc, None, obj, pos.into(), OpType::Delete)?; + } } - - if deleted > 0 { + for v in vals { + // As above this unwrap and rewrap of the option is necessary to appeas the borrow checker :( if let Some(obs) = op_observer.as_mut() { - obs.delete_seq(doc, ex_obj.clone(), index, deleted); + self.do_insert(doc, Some(*obs), obj, pos, v.clone().into())?; + } else { + self.do_insert::(doc, None, obj, pos, v.clone().into())?; } + pos += 1; } + Ok(()) + } - // do the insert query for the first item and then - // insert the remaining ops one after the other - if !values.is_empty() { - let query = doc - .ops() - .search(&obj, query::InsertNth::new(index, encoding)); - let mut pos = query.pos(); - let mut key = query.key()?; - let mut cursor = index; - let mut width = 0; - - for v in &values { - let op = self.next_insert(key, v.clone()); - - doc.ops_mut().insert(pos, &obj, op.clone()); - - width = op.width(encoding); - cursor += width; - pos += 1; - key = op.id.into(); - - self.operations.push((obj, op)); - } - - doc.ops_mut().hint(&obj, cursor - width, pos - 1); - - // handle the observer + pub(crate) fn inner_splice( + &mut self, + doc: &mut Automerge, + mut op_observer: Option<&mut Obs>, + obj: ObjId, + mut pos: usize, + del: usize, + vals: impl IntoIterator, + ) -> Result<(), AutomergeError> { + for _ in 0..del { + // This unwrap and rewrap of the option is necessary to appeas the borrow checker :( if let Some(obs) = op_observer.as_mut() { - match splice_type { - SpliceType::Text(text, _) if !obs.text_as_seq() => { - obs.splice_text(doc, ex_obj, index, text) - } - SpliceType::List | SpliceType::Text(..) => { - let start = self.operations.len() - values.len(); - for (offset, v) in values.iter().enumerate() { - let op = &self.operations[start + offset].1; - let value = (v.clone().into(), doc.ops().id_to_exid(op.id)); - obs.insert(doc, ex_obj.clone(), index + offset, value) - } - } - } + self.local_op(doc, Some(*obs), obj, pos.into(), OpType::Delete)?; + } else { + self.local_op::(doc, None, obj, pos.into(), OpType::Delete)?; } } - + for v in vals { + // As above this unwrap and rewrap of the option is necessary to appeas the borrow checker :( + if let Some(obs) = op_observer.as_mut() { + self.do_insert(doc, Some(*obs), obj, pos, v.clone().into())?; + } else { + self.do_insert::(doc, None, obj, pos, v.clone().into())?; + } + pos += 1; + } Ok(()) } @@ -658,64 +540,42 @@ impl TransactionInner { ) { // TODO - id_to_exid should be a noop if not used - change type to Into? if let Some(op_observer) = op_observer { - let ex_obj = doc.ops().id_to_exid(obj.0); + let ex_obj = doc.ops.id_to_exid(obj.0); if op.insert { - let obj_type = doc.ops().object_type(&obj); - assert!(obj_type.unwrap().is_sequence()); - match (obj_type, prop) { + let obj_type = doc.ops.object_type(&obj); + match (obj_type, prop.clone()) { (Some(ObjType::List), Prop::Seq(index)) => { - let value = (op.value(), doc.ops().id_to_exid(op.id)); + let value = (op.value(), doc.ops.id_to_exid(op.id)); op_observer.insert(doc, ex_obj, index, value) } (Some(ObjType::Text), Prop::Seq(index)) => { // FIXME - if op_observer.text_as_seq() { - let value = (op.value(), doc.ops().id_to_exid(op.id)); - op_observer.insert(doc, ex_obj, index, value) - } else { - op_observer.splice_text(doc, ex_obj, index, op.to_str()) - } + op_observer.splice_text(doc, ex_obj, index, 0, op.to_str()) } - _ => {} + // this should be a warning - not a panic + _ => panic!("insert into a map"), } } else if op.is_delete() { - op_observer.delete(doc, ex_obj, prop); + op_observer.delete(doc, ex_obj, prop.clone()); } else if let Some(value) = op.get_increment_value() { - op_observer.increment(doc, ex_obj, prop, (value, doc.ops().id_to_exid(op.id))); + op_observer.increment( + doc, + ex_obj, + prop.clone(), + (value, doc.ops.id_to_exid(op.id)), + ); } else { - let value = (op.value(), doc.ops().id_to_exid(op.id)); - op_observer.put(doc, ex_obj, prop, value, false); + let value = (op.value(), doc.ops.id_to_exid(op.id)); + op_observer.put(doc, ex_obj, prop.clone(), value, false); } } - self.operations.push((obj, op)); + self.operations.push((obj, prop, op)); } } -enum SpliceType<'a> { - List, - Text(&'a str, TextEncoding), -} - -impl<'a> SpliceType<'a> { - fn encoding(&self) -> ListEncoding { - match self { - SpliceType::List => ListEncoding::List, - SpliceType::Text(_, encoding) => ListEncoding::Text(*encoding), - } - } -} - -struct SpliceArgs<'a> { - obj: ObjId, - index: usize, - del: usize, - values: Vec, - splice_type: SpliceType<'a>, -} - #[cfg(test)] mod tests { - use crate::{transaction::Transactable, ReadDoc, ROOT}; + use crate::{transaction::Transactable, ROOT}; use super::*; diff --git a/rust/automerge/src/transaction/manual_transaction.rs b/rust/automerge/src/transaction/manual_transaction.rs index fa5f6340..b416cc48 100644 --- a/rust/automerge/src/transaction/manual_transaction.rs +++ b/rust/automerge/src/transaction/manual_transaction.rs @@ -1,14 +1,11 @@ use std::ops::RangeBounds; use crate::exid::ExId; -use crate::op_observer::BranchableObserver; -use crate::{ - Automerge, ChangeHash, KeysAt, ObjType, OpObserver, Prop, ReadDoc, ScalarValue, Value, Values, -}; +use crate::{Automerge, ChangeHash, KeysAt, ObjType, OpObserver, Prop, ScalarValue, Value, Values}; use crate::{AutomergeError, Keys}; use crate::{ListRange, ListRangeAt, MapRange, MapRangeAt}; -use super::{observation, CommitOptions, Transactable, TransactionArgs, TransactionInner}; +use super::{observation, CommitOptions, Transactable, TransactionInner}; /// A transaction on a document. /// Transactions group operations into a single change so that no other operations can happen @@ -26,33 +23,13 @@ use super::{observation, CommitOptions, Transactable, TransactionArgs, Transacti pub struct Transaction<'a, Obs: observation::Observation> { // this is an option so that we can take it during commit and rollback to prevent it being // rolled back during drop. - inner: Option, + pub(crate) inner: Option, // As with `inner` this is an `Option` so we can `take` it during `commit` - observation: Option, - doc: &'a mut Automerge, + pub(crate) observation: Option, + pub(crate) doc: &'a mut Automerge, } -impl<'a, Obs: observation::Observation> Transaction<'a, Obs> { - pub(crate) fn new(doc: &'a mut Automerge, args: TransactionArgs, obs: Obs) -> Self { - Self { - inner: Some(TransactionInner::new(args)), - doc, - observation: Some(obs), - } - } -} - -impl<'a> Transaction<'a, observation::UnObserved> { - pub(crate) fn empty( - doc: &'a mut Automerge, - args: TransactionArgs, - opts: CommitOptions, - ) -> ChangeHash { - TransactionInner::empty(doc, args, opts.message, opts.time) - } -} - -impl<'a, Obs: OpObserver + BranchableObserver> Transaction<'a, observation::Observed> { +impl<'a, Obs: OpObserver> Transaction<'a, observation::Observed> { pub fn observer(&mut self) -> &mut Obs { self.observation.as_mut().unwrap().observer() } @@ -115,132 +92,6 @@ impl<'a, Obs: observation::Observation> Transaction<'a, Obs> { } } -impl<'a, Obs: observation::Observation> ReadDoc for Transaction<'a, Obs> { - fn keys>(&self, obj: O) -> Keys<'_, '_> { - self.doc.keys(obj) - } - - fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_> { - self.doc.keys_at(obj, heads) - } - - fn map_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> MapRange<'_, R> { - self.doc.map_range(obj, range) - } - - fn map_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> MapRangeAt<'_, R> { - self.doc.map_range_at(obj, range, heads) - } - - fn list_range, R: RangeBounds>( - &self, - obj: O, - range: R, - ) -> ListRange<'_, R> { - self.doc.list_range(obj, range) - } - - fn list_range_at, R: RangeBounds>( - &self, - obj: O, - range: R, - heads: &[ChangeHash], - ) -> ListRangeAt<'_, R> { - self.doc.list_range_at(obj, range, heads) - } - - fn values>(&self, obj: O) -> Values<'_> { - self.doc.values(obj) - } - - fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_> { - self.doc.values_at(obj, heads) - } - - fn length>(&self, obj: O) -> usize { - self.doc.length(obj) - } - - fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize { - self.doc.length_at(obj, heads) - } - - fn object_type>(&self, obj: O) -> Result { - self.doc.object_type(obj) - } - - fn text>(&self, obj: O) -> Result { - self.doc.text(obj) - } - - fn text_at>( - &self, - obj: O, - heads: &[ChangeHash], - ) -> Result { - self.doc.text_at(obj, heads) - } - - fn get, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - self.doc.get(obj, prop) - } - - fn get_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_at(obj, prop, heads) - } - - fn get_all, P: Into>( - &self, - obj: O, - prop: P, - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_all(obj, prop) - } - - fn get_all_at, P: Into>( - &self, - obj: O, - prop: P, - heads: &[ChangeHash], - ) -> Result, ExId)>, AutomergeError> { - self.doc.get_all_at(obj, prop, heads) - } - - fn parents>(&self, obj: O) -> Result, AutomergeError> { - self.doc.parents(obj) - } - - fn path_to_object>(&self, obj: O) -> Result, AutomergeError> { - self.doc.path_to_object(obj) - } - - fn get_missing_deps(&self, heads: &[ChangeHash]) -> Vec { - self.doc.get_missing_deps(heads) - } - - fn get_change_by_hash(&self, hash: &ChangeHash) -> Option<&crate::Change> { - self.doc.get_change_by_hash(hash) - } -} - impl<'a, Obs: observation::Observation> Transactable for Transaction<'a, Obs> { /// Get the number of pending operations in this transaction. fn pending_ops(&self) -> usize { @@ -330,6 +181,128 @@ impl<'a, Obs: observation::Observation> Transactable for Transaction<'a, Obs> { self.do_tx(|tx, doc, obs| tx.splice_text(doc, obs, obj.as_ref(), pos, del, text)) } + fn splice_text_utf16>( + &mut self, + obj: O, + pos: usize, + del: usize, + text: &str, + ) -> Result<(), AutomergeError> { + self.do_tx(|tx, doc, obs| tx.splice_text_utf16(doc, obs, obj.as_ref(), pos, del, text)) + } + + fn keys>(&self, obj: O) -> Keys<'_, '_> { + self.doc.keys(obj) + } + + fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_> { + self.doc.keys_at(obj, heads) + } + + fn map_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> MapRange<'_, R> { + self.doc.map_range(obj, range) + } + + fn map_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> MapRangeAt<'_, R> { + self.doc.map_range_at(obj, range, heads) + } + + fn list_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> ListRange<'_, R> { + self.doc.list_range(obj, range) + } + + fn list_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> ListRangeAt<'_, R> { + self.doc.list_range_at(obj, range, heads) + } + + fn values>(&self, obj: O) -> Values<'_> { + self.doc.values(obj) + } + + fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_> { + self.doc.values_at(obj, heads) + } + + fn length>(&self, obj: O) -> usize { + self.doc.length(obj) + } + + fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize { + self.doc.length_at(obj, heads) + } + + fn object_type>(&self, obj: O) -> Option { + self.doc.object_type(obj) + } + + fn text>(&self, obj: O) -> Result { + self.doc.text(obj) + } + + fn text_at>( + &self, + obj: O, + heads: &[ChangeHash], + ) -> Result { + self.doc.text_at(obj, heads) + } + + fn get, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + self.doc.get(obj, prop) + } + + fn get_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_at(obj, prop, heads) + } + + fn get_all, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_all(obj, prop) + } + + fn get_all_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError> { + self.doc.get_all_at(obj, prop, heads) + } + + fn parents>(&self, obj: O) -> Result, AutomergeError> { + self.doc.parents(obj) + } + fn base_heads(&self) -> Vec { self.doc.get_heads() } diff --git a/rust/automerge/src/transaction/observation.rs b/rust/automerge/src/transaction/observation.rs index 53723711..fb380cd8 100644 --- a/rust/automerge/src/transaction/observation.rs +++ b/rust/automerge/src/transaction/observation.rs @@ -1,29 +1,27 @@ //! This module is essentially a type level Option. It is used in sitations where we know at //! compile time whether an `OpObserver` is available to track changes in a transaction. -use crate::{op_observer::BranchableObserver, ChangeHash, OpObserver}; +use crate::{ChangeHash, OpObserver}; mod private { - use crate::op_observer::BranchableObserver; - pub trait Sealed {} - impl Sealed for super::Observed {} + impl Sealed for super::Observed {} impl Sealed for super::UnObserved {} } pub trait Observation: private::Sealed { - type Obs: OpObserver + BranchableObserver; + type Obs: OpObserver; type CommitResult; fn observer(&mut self) -> Option<&mut Self::Obs>; - fn make_result(self, hash: Option) -> Self::CommitResult; + fn make_result(self, hash: ChangeHash) -> Self::CommitResult; fn branch(&self) -> Self; fn merge(&mut self, other: &Self); } #[derive(Clone, Debug)] -pub struct Observed(Obs); +pub struct Observed(Obs); -impl Observed { +impl Observed { pub(crate) fn new(o: O) -> Self { Self(o) } @@ -33,14 +31,14 @@ impl Observed { } } -impl Observation for Observed { +impl Observation for Observed { type Obs = Obs; - type CommitResult = (Obs, Option); + type CommitResult = (Obs, ChangeHash); fn observer(&mut self) -> Option<&mut Self::Obs> { Some(&mut self.0) } - fn make_result(self, hash: Option) -> Self::CommitResult { + fn make_result(self, hash: ChangeHash) -> Self::CommitResult { (self.0, hash) } @@ -63,12 +61,12 @@ impl UnObserved { impl Observation for UnObserved { type Obs = (); - type CommitResult = Option; + type CommitResult = ChangeHash; fn observer(&mut self) -> Option<&mut Self::Obs> { None } - fn make_result(self, hash: Option) -> Self::CommitResult { + fn make_result(self, hash: ChangeHash) -> Self::CommitResult { hash } diff --git a/rust/automerge/src/transaction/result.rs b/rust/automerge/src/transaction/result.rs index 5327ff44..8943b7a2 100644 --- a/rust/automerge/src/transaction/result.rs +++ b/rust/automerge/src/transaction/result.rs @@ -5,8 +5,8 @@ use crate::ChangeHash; pub struct Success { /// The result of the transaction. pub result: O, - /// The hash of the change, will be `None` if the transaction did not create any operations - pub hash: Option, + /// The hash of the change, also the head of the document. + pub hash: ChangeHash, pub op_observer: Obs, } diff --git a/rust/automerge/src/transaction/transactable.rs b/rust/automerge/src/transaction/transactable.rs index 05c48c79..8d5c119e 100644 --- a/rust/automerge/src/transaction/transactable.rs +++ b/rust/automerge/src/transaction/transactable.rs @@ -1,8 +1,13 @@ +use std::ops::RangeBounds; + use crate::exid::ExId; -use crate::{AutomergeError, ChangeHash, ObjType, Prop, ReadDoc, ScalarValue}; +use crate::{ + AutomergeError, ChangeHash, Keys, KeysAt, ListRange, ListRangeAt, MapRange, MapRangeAt, + ObjType, Parents, Prop, ScalarValue, Value, Values, +}; /// A way of mutating a document within a single change. -pub trait Transactable: ReadDoc { +pub trait Transactable { /// Get the number of pending operations in this transaction. fn pending_ops(&self) -> usize; @@ -88,6 +93,115 @@ pub trait Transactable: ReadDoc { text: &str, ) -> Result<(), AutomergeError>; + /// Like [`Self::splice`] but for text. + fn splice_text_utf16>( + &mut self, + obj: O, + pos: usize, + del: usize, + text: &str, + ) -> Result<(), AutomergeError>; + + /// Get the keys of the given object, it should be a map. + fn keys>(&self, obj: O) -> Keys<'_, '_>; + + /// Get the keys of the given object at a point in history. + fn keys_at>(&self, obj: O, heads: &[ChangeHash]) -> KeysAt<'_, '_>; + + fn map_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> MapRange<'_, R>; + + fn map_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> MapRangeAt<'_, R>; + + fn list_range, R: RangeBounds>( + &self, + obj: O, + range: R, + ) -> ListRange<'_, R>; + + fn list_range_at, R: RangeBounds>( + &self, + obj: O, + range: R, + heads: &[ChangeHash], + ) -> ListRangeAt<'_, R>; + + fn values>(&self, obj: O) -> Values<'_>; + + fn values_at>(&self, obj: O, heads: &[ChangeHash]) -> Values<'_>; + + /// Get the length of the given object. + fn length>(&self, obj: O) -> usize; + + /// Get the length of the given object at a point in history. + fn length_at>(&self, obj: O, heads: &[ChangeHash]) -> usize; + + /// Get type for object + fn object_type>(&self, obj: O) -> Option; + + /// Get the string that this text object represents. + fn text>(&self, obj: O) -> Result; + + /// Get the string that this text object represents at a point in history. + fn text_at>( + &self, + obj: O, + heads: &[ChangeHash], + ) -> Result; + + /// Get the value at this prop in the object. + fn get, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError>; + + /// Get the value at this prop in the object at a point in history. + fn get_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError>; + + fn get_all, P: Into>( + &self, + obj: O, + prop: P, + ) -> Result, ExId)>, AutomergeError>; + + fn get_all_at, P: Into>( + &self, + obj: O, + prop: P, + heads: &[ChangeHash], + ) -> Result, ExId)>, AutomergeError>; + + /// Get the parents of an object in the document tree. + /// + /// ### Errors + /// + /// Returns an error when the id given is not the id of an object in this document. + /// This function does not get the parents of scalar values contained within objects. + /// + /// ### Experimental + /// + /// This function may in future be changed to allow getting the parents from the id of a scalar + /// value. + fn parents>(&self, obj: O) -> Result, AutomergeError>; + + fn path_to_object>(&self, obj: O) -> Result, AutomergeError> { + Ok(self.parents(obj.as_ref().clone())?.path()) + } + /// The heads this transaction will be based on fn base_heads(&self) -> Vec; } diff --git a/rust/automerge/src/types.rs b/rust/automerge/src/types.rs index 468986ec..c4f4c808 100644 --- a/rust/automerge/src/types.rs +++ b/rust/automerge/src/types.rs @@ -3,12 +3,10 @@ use crate::legacy as amp; use serde::{Deserialize, Serialize}; use std::borrow::Cow; use std::cmp::Eq; -use std::cmp::Ordering; use std::fmt; use std::fmt::Display; use std::str::FromStr; use tinyvec::{ArrayVec, TinyVec}; -//use crate::indexed_cache::IndexedCache; mod opids; pub(crate) use opids::OpIds; @@ -143,17 +141,12 @@ impl fmt::Display for ActorId { } } -/// The type of an object #[derive(Deserialize, Serialize, Debug, Clone, PartialEq, Eq, Copy, Hash)] #[serde(rename_all = "camelCase", untagged)] pub enum ObjType { - /// A map Map, - /// Retained for backwards compatibility, tables are identical to maps Table, - /// A sequence of arbitrary values List, - /// A sequence of characters Text, } @@ -216,35 +209,23 @@ impl OpType { } } - pub(crate) fn validate_action_and_value( - action: u64, - value: &ScalarValue, - ) -> Result<(), error::InvalidOpType> { - match action { - 0..=4 => Ok(()), + pub(crate) fn from_index_and_value( + index: u64, + value: ScalarValue, + ) -> Result { + match index { + 0 => Ok(Self::Make(ObjType::Map)), + 1 => Ok(Self::Put(value)), + 2 => Ok(Self::Make(ObjType::List)), + 3 => Ok(Self::Delete), + 4 => Ok(Self::Make(ObjType::Text)), 5 => match value { - ScalarValue::Int(_) | ScalarValue::Uint(_) => Ok(()), + ScalarValue::Int(i) => Ok(Self::Increment(i)), + ScalarValue::Uint(i) => Ok(Self::Increment(i as i64)), _ => Err(error::InvalidOpType::NonNumericInc), }, - 6 => Ok(()), - _ => Err(error::InvalidOpType::UnknownAction(action)), - } - } - - pub(crate) fn from_action_and_value(action: u64, value: ScalarValue) -> OpType { - match action { - 0 => Self::Make(ObjType::Map), - 1 => Self::Put(value), - 2 => Self::Make(ObjType::List), - 3 => Self::Delete, - 4 => Self::Make(ObjType::Text), - 5 => match value { - ScalarValue::Int(i) => Self::Increment(i), - ScalarValue::Uint(i) => Self::Increment(i as i64), - _ => unreachable!("validate_action_and_value returned NonNumericInc"), - }, - 6 => Self::Make(ObjType::Table), - _ => unreachable!("validate_action_and_value returned UnknownAction"), + 6 => Ok(Self::Make(ObjType::Table)), + other => Err(error::InvalidOpType::UnknownAction(other)), } } } @@ -272,6 +253,17 @@ pub(crate) trait Exportable { fn export(&self) -> Export; } +impl OpId { + #[inline] + pub(crate) fn counter(&self) -> u64 { + self.0 + } + #[inline] + pub(crate) fn actor(&self) -> usize { + self.1 + } +} + impl Exportable for ObjId { fn export(&self) -> Export { if self.0 == ROOT { @@ -395,27 +387,12 @@ pub(crate) enum Key { Seq(ElemId), } -/// A property of an object -/// -/// This is either a string representing a property in a map, or an integer -/// which is the index into a sequence #[derive(Debug, PartialEq, PartialOrd, Eq, Ord, Clone)] pub enum Prop { - /// A property in a map Map(String), - /// An index into a sequence Seq(usize), } -impl Prop { - pub(crate) fn to_index(&self) -> Option { - match self { - Prop::Map(_) => None, - Prop::Seq(n) => Some(*n), - } - } -} - impl Display for Prop { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { @@ -435,28 +412,11 @@ impl Key { } #[derive(Debug, Clone, PartialOrd, Ord, Eq, PartialEq, Copy, Hash, Default)] -pub(crate) struct OpId(u32, u32); +pub(crate) struct OpId(pub(crate) u64, pub(crate) usize); impl OpId { - pub(crate) fn new(counter: u64, actor: usize) -> Self { - Self(counter.try_into().unwrap(), actor.try_into().unwrap()) - } - - #[inline] - pub(crate) fn counter(&self) -> u64 { - self.0.into() - } - - #[inline] - pub(crate) fn actor(&self) -> usize { - self.1.try_into().unwrap() - } - - #[inline] - pub(crate) fn lamport_cmp(&self, other: &OpId, actors: &[ActorId]) -> Ordering { - self.0 - .cmp(&other.0) - .then_with(|| actors[self.1 as usize].cmp(&actors[other.1 as usize])) + pub(crate) fn new(actor: usize, counter: u64) -> Self { + Self(counter, actor) } } @@ -477,48 +437,6 @@ impl ObjId { } } -/// How indexes into text sequeces are calculated -/// -/// Automerge text objects are internally sequences of utf8 characters. This -/// means that in environments (such as javascript) which use a different -/// encoding the indexes into the text sequence will be different. This enum -/// represents the different ways indexes can be calculated. -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub enum TextEncoding { - /// The indexes are calculated using the utf8 encoding - Utf8, - /// The indexes are calculated using the utf16 encoding - Utf16, -} - -#[derive(Debug, Copy, Clone, PartialEq, Eq)] -pub(crate) enum ListEncoding { - List, - Text(TextEncoding), -} - -impl Default for ListEncoding { - fn default() -> Self { - ListEncoding::List - } -} - -impl Default for TextEncoding { - fn default() -> Self { - TextEncoding::Utf8 - } -} - -impl ListEncoding { - pub(crate) fn new(obj: ObjType, text_encoding: TextEncoding) -> Self { - if obj == ObjType::Text { - ListEncoding::Text(text_encoding) - } else { - ListEncoding::List - } - } -} - #[derive(Debug, Clone, Copy, PartialOrd, Eq, PartialEq, Ord, Hash, Default)] pub(crate) struct ElemId(pub(crate) OpId); @@ -573,11 +491,11 @@ impl Op { } } - pub(crate) fn width(&self, encoding: ListEncoding) -> usize { - match encoding { - ListEncoding::List => 1, - ListEncoding::Text(TextEncoding::Utf8) => self.to_str().chars().count(), - ListEncoding::Text(TextEncoding::Utf16) => self.to_str().encode_utf16().count(), + pub(crate) fn utf16_len(&self) -> usize { + if let OpType::Put(ScalarValue::Str(s)) = &self.action { + s.encode_utf16().count() + } else { + 1 // "\u{fffc}".to_owned().encode_utf16().count() } } diff --git a/rust/automerge/src/types/opids.rs b/rust/automerge/src/types/opids.rs index a81ccb36..3ebac93c 100644 --- a/rust/automerge/src/types/opids.rs +++ b/rust/automerge/src/types/opids.rs @@ -129,8 +129,7 @@ mod tests { fn gen_opid(actors: Vec) -> impl Strategy { (0..actors.len()).prop_flat_map(|actor_idx| { - (Just(actor_idx), 0..(u32::MAX as u64)) - .prop_map(|(actor_idx, counter)| OpId::new(counter, actor_idx)) + (Just(actor_idx), 0..u64::MAX).prop_map(|(actor_idx, counter)| OpId(counter, actor_idx)) }) } @@ -191,7 +190,7 @@ mod tests { (OpId(0, _), OpId(0, _)) => Ordering::Equal, (OpId(0, _), OpId(_, _)) => Ordering::Less, (OpId(_, _), OpId(0, _)) => Ordering::Greater, - (OpId(a, x), OpId(b, y)) if a == b => actors[*x as usize].cmp(&actors[*y as usize]), + (OpId(a, x), OpId(b, y)) if a == b => actors[*x].cmp(&actors[*y]), (OpId(a, _), OpId(b, _)) => a.cmp(b), } } diff --git a/rust/automerge/src/value.rs b/rust/automerge/src/value.rs index be128787..b3142bdf 100644 --- a/rust/automerge/src/value.rs +++ b/rust/automerge/src/value.rs @@ -5,12 +5,9 @@ use smol_str::SmolStr; use std::borrow::Cow; use std::fmt; -/// The type of values in an automerge document #[derive(Debug, Clone, PartialEq)] pub enum Value<'a> { - /// An composite object of type `ObjType` Object(ObjType), - /// A non composite value // TODO: if we don't have to store this in patches any more then it might be able to be just a // &'a ScalarValue rather than a Cow Scalar(Cow<'a, ScalarValue>), @@ -269,12 +266,6 @@ impl<'a> From for Value<'a> { } } -impl<'a> From for Value<'a> { - fn from(s: SmolStr) -> Self { - Value::Scalar(Cow::Owned(ScalarValue::Str(s))) - } -} - impl<'a> From for Value<'a> { fn from(c: char) -> Self { Value::Scalar(Cow::Owned(ScalarValue::Str(SmolStr::new(c.to_string())))) @@ -434,7 +425,6 @@ impl From<&Counter> for f64 { } } -/// A value which is not a composite value #[derive(Serialize, PartialEq, Debug, Clone)] #[serde(untagged)] pub enum ScalarValue { @@ -446,11 +436,7 @@ pub enum ScalarValue { Counter(Counter), Timestamp(i64), Boolean(bool), - /// A value from a future version of automerge - Unknown { - type_code: u8, - bytes: Vec, - }, + Unknown { type_code: u8, bytes: Vec }, Null, } diff --git a/rust/automerge/src/values.rs b/rust/automerge/src/values.rs index 15ccb4cb..90f596f3 100644 --- a/rust/automerge/src/values.rs +++ b/rust/automerge/src/values.rs @@ -2,9 +2,6 @@ use crate::exid::ExId; use crate::{Automerge, Value}; use std::fmt; -/// An iterator over the values in an object -/// -/// This is returned by the [`crate::ReadDoc::values`] and [`crate::ReadDoc::values_at`] methods pub struct Values<'a> { range: Box>, doc: &'a Automerge, @@ -55,3 +52,9 @@ impl<'a> Iterator for Values<'a> { self.range.next_value(self.doc) } } + +impl<'a> DoubleEndedIterator for Values<'a> { + fn next_back(&mut self) -> Option { + unimplemented!() + } +} diff --git a/rust/automerge/src/visualisation.rs b/rust/automerge/src/visualisation.rs index 31e9bbdb..6894f46f 100644 --- a/rust/automerge/src/visualisation.rs +++ b/rust/automerge/src/visualisation.rs @@ -1,4 +1,4 @@ -use crate::types::{ObjId, Op}; +use crate::types::ObjId; use fxhash::FxHasher; use std::{borrow::Cow, collections::HashMap, hash::BuildHasherDefault}; @@ -26,7 +26,7 @@ pub(crate) struct Node<'a> { #[derive(Clone)] pub(crate) enum NodeType<'a> { ObjRoot(crate::types::ObjId), - ObjTreeNode(ObjId, &'a crate::op_tree::OpTreeNode, &'a [Op]), + ObjTreeNode(ObjId, &'a crate::op_tree::OpTreeNode), } #[derive(Clone)] @@ -52,13 +52,7 @@ impl<'a> GraphVisualisation<'a> { let mut nodes = HashMap::new(); for (obj_id, tree) in trees { if let Some(root_node) = &tree.internal.root_node { - let tree_id = Self::construct_nodes( - root_node, - &tree.internal.ops, - obj_id, - &mut nodes, - metadata, - ); + let tree_id = Self::construct_nodes(root_node, obj_id, &mut nodes, metadata); let obj_tree_id = NodeId::default(); nodes.insert( obj_tree_id, @@ -83,7 +77,6 @@ impl<'a> GraphVisualisation<'a> { fn construct_nodes( node: &'a crate::op_tree::OpTreeNode, - ops: &'a [Op], objid: &ObjId, nodes: &mut HashMap>, m: &'a crate::op_set::OpSetMetadata, @@ -91,7 +84,7 @@ impl<'a> GraphVisualisation<'a> { let node_id = NodeId::default(); let mut child_ids = Vec::new(); for child in &node.children { - let child_id = Self::construct_nodes(child, ops, objid, nodes, m); + let child_id = Self::construct_nodes(child, objid, nodes, m); child_ids.push(child_id); } nodes.insert( @@ -99,7 +92,7 @@ impl<'a> GraphVisualisation<'a> { Node { id: node_id, children: child_ids, - node_type: NodeType::ObjTreeNode(*objid, node, ops), + node_type: NodeType::ObjTreeNode(*objid, node), metadata: m, }, ); @@ -145,7 +138,7 @@ impl<'a> dot::Labeller<'a, &'a Node<'a>, Edge> for GraphVisualisation<'a> { fn node_shape(&'a self, node: &&'a Node<'a>) -> Option> { let shape = match node.node_type { - NodeType::ObjTreeNode(_, _, _) => dot::LabelText::label("none"), + NodeType::ObjTreeNode(_, _) => dot::LabelText::label("none"), NodeType::ObjRoot(_) => dot::LabelText::label("ellipse"), }; Some(shape) @@ -153,8 +146,8 @@ impl<'a> dot::Labeller<'a, &'a Node<'a>, Edge> for GraphVisualisation<'a> { fn node_label(&'a self, n: &&Node<'a>) -> dot::LabelText<'a> { match n.node_type { - NodeType::ObjTreeNode(objid, tree_node, ops) => dot::LabelText::HtmlStr( - OpTable::create(tree_node, ops, &objid, n.metadata, &self.actor_shorthands) + NodeType::ObjTreeNode(objid, tree_node) => dot::LabelText::HtmlStr( + OpTable::create(tree_node, &objid, n.metadata, &self.actor_shorthands) .to_html() .into(), ), @@ -172,7 +165,6 @@ struct OpTable { impl OpTable { fn create<'a>( node: &'a crate::op_tree::OpTreeNode, - ops: &'a [Op], obj: &ObjId, metadata: &crate::op_set::OpSetMetadata, actor_shorthands: &HashMap, @@ -180,7 +172,7 @@ impl OpTable { let rows = node .elements .iter() - .map(|e| OpTableRow::create(&ops[*e], obj, metadata, actor_shorthands)) + .map(|e| OpTableRow::create(e, obj, metadata, actor_shorthands)) .collect(); OpTable { rows } } diff --git a/rust/automerge/tests/fixtures/64bit_obj_id_change.automerge b/rust/automerge/tests/fixtures/64bit_obj_id_change.automerge deleted file mode 100644 index 700342a2..00000000 Binary files a/rust/automerge/tests/fixtures/64bit_obj_id_change.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/64bit_obj_id_doc.automerge b/rust/automerge/tests/fixtures/64bit_obj_id_doc.automerge deleted file mode 100644 index 6beb57fe..00000000 Binary files a/rust/automerge/tests/fixtures/64bit_obj_id_doc.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/counter_value_has_incorrect_meta.automerge b/rust/automerge/tests/fixtures/counter_value_has_incorrect_meta.automerge deleted file mode 100644 index 2290b446..00000000 Binary files a/rust/automerge/tests/fixtures/counter_value_has_incorrect_meta.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/counter_value_is_ok.automerge b/rust/automerge/tests/fixtures/counter_value_is_ok.automerge deleted file mode 100644 index fdc59896..00000000 Binary files a/rust/automerge/tests/fixtures/counter_value_is_ok.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/counter_value_is_overlong.automerge b/rust/automerge/tests/fixtures/counter_value_is_overlong.automerge deleted file mode 100644 index 831346f7..00000000 Binary files a/rust/automerge/tests/fixtures/counter_value_is_overlong.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/two_change_chunks.automerge b/rust/automerge/tests/fixtures/two_change_chunks.automerge deleted file mode 100644 index 1a84b363..00000000 Binary files a/rust/automerge/tests/fixtures/two_change_chunks.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/two_change_chunks_compressed.automerge b/rust/automerge/tests/fixtures/two_change_chunks_compressed.automerge deleted file mode 100644 index 9e3f305f..00000000 Binary files a/rust/automerge/tests/fixtures/two_change_chunks_compressed.automerge and /dev/null differ diff --git a/rust/automerge/tests/fixtures/two_change_chunks_out_of_order.automerge b/rust/automerge/tests/fixtures/two_change_chunks_out_of_order.automerge deleted file mode 100644 index 9ba0355f..00000000 Binary files a/rust/automerge/tests/fixtures/two_change_chunks_out_of_order.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/action-is-48.automerge b/rust/automerge/tests/fuzz-crashers/action-is-48.automerge deleted file mode 100644 index 16e6f719..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/action-is-48.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/crash-da39a3ee5e6b4b0d3255bfef95601890afd80709 b/rust/automerge/tests/fuzz-crashers/crash-da39a3ee5e6b4b0d3255bfef95601890afd80709 deleted file mode 100644 index bcb12cdd..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/crash-da39a3ee5e6b4b0d3255bfef95601890afd80709 and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/incorrect_max_op.automerge b/rust/automerge/tests/fuzz-crashers/incorrect_max_op.automerge deleted file mode 100644 index 05cc2c82..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/incorrect_max_op.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/invalid_deflate_stream.automerge b/rust/automerge/tests/fuzz-crashers/invalid_deflate_stream.automerge deleted file mode 100644 index 21e869eb..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/invalid_deflate_stream.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/missing_actor.automerge b/rust/automerge/tests/fuzz-crashers/missing_actor.automerge deleted file mode 100644 index cc8c61b1..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/missing_actor.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/missing_deps.automerge b/rust/automerge/tests/fuzz-crashers/missing_deps.automerge deleted file mode 100644 index 8a57a0f4..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/missing_deps.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/missing_deps_compressed.automerge b/rust/automerge/tests/fuzz-crashers/missing_deps_compressed.automerge deleted file mode 100644 index 2c7b123b..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/missing_deps_compressed.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/missing_deps_subsequent.automerge b/rust/automerge/tests/fuzz-crashers/missing_deps_subsequent.automerge deleted file mode 100644 index 2fe439af..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/missing_deps_subsequent.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/overflow_in_length.automerge b/rust/automerge/tests/fuzz-crashers/overflow_in_length.automerge deleted file mode 100644 index 45771f34..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/overflow_in_length.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/too_many_deps.automerge b/rust/automerge/tests/fuzz-crashers/too_many_deps.automerge deleted file mode 100644 index 657ce993..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/too_many_deps.automerge and /dev/null differ diff --git a/rust/automerge/tests/fuzz-crashers/too_many_ops.automerge b/rust/automerge/tests/fuzz-crashers/too_many_ops.automerge deleted file mode 100644 index 661258b0..00000000 Binary files a/rust/automerge/tests/fuzz-crashers/too_many_ops.automerge and /dev/null differ diff --git a/rust/automerge/tests/test.rs b/rust/automerge/tests/test.rs index 3be6725e..876acb74 100644 --- a/rust/automerge/tests/test.rs +++ b/rust/automerge/tests/test.rs @@ -1,12 +1,11 @@ use automerge::transaction::Transactable; use automerge::{ - ActorId, AutoCommit, Automerge, AutomergeError, Change, ExpandedChange, ObjType, ReadDoc, - ScalarValue, VecOpObserver, ROOT, + ActorId, AutoCommit, Automerge, AutomergeError, Change, ExpandedChange, ObjType, ScalarValue, + VecOpObserver, ROOT, }; -use std::fs; // set up logging for all the tests -//use test_log::test; +use test_log::test; #[allow(unused_imports)] use automerge_test::{ @@ -21,7 +20,7 @@ fn no_conflict_on_repeated_assignment() { doc.put(&automerge::ROOT, "foo", 1).unwrap(); doc.put(&automerge::ROOT, "foo", 2).unwrap(); assert_doc!( - &doc, + doc.document(), map! { "foo" => { 2 }, } @@ -41,7 +40,7 @@ fn repeated_map_assignment_which_resolves_conflict_not_ignored() { doc1.put(&automerge::ROOT, "field", 123).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "field" => { 123 } } @@ -62,7 +61,7 @@ fn repeated_list_assignment_which_resolves_conflict_not_ignored() { doc1.put(&list_id, 0, 789).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "list" => { list![ @@ -84,7 +83,7 @@ fn list_deletion() { doc.insert(&list_id, 2, 789).unwrap(); doc.delete(&list_id, 1).unwrap(); assert_doc!( - &doc, + doc.document(), map! { "list" => { list![ { 123 }, @@ -106,7 +105,7 @@ fn merge_concurrent_map_prop_updates() { "bar".into() ); assert_doc!( - &doc1, + doc1.document(), map! { "foo" => { "bar" }, "hello" => { "world" }, @@ -114,7 +113,7 @@ fn merge_concurrent_map_prop_updates() { ); doc2.merge(&mut doc1).unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "foo" => { "bar" }, "hello" => { "world" }, @@ -134,7 +133,7 @@ fn add_concurrent_increments_of_same_property() { doc2.increment(&automerge::ROOT, "counter", 2).unwrap(); doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "counter" => { mk_counter(3) @@ -161,7 +160,7 @@ fn add_increments_only_to_preceeded_values() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "counter" => { mk_counter(1), @@ -181,7 +180,7 @@ fn concurrent_updates_of_same_field() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "field" => { "one", @@ -206,7 +205,7 @@ fn concurrent_updates_of_same_list_element() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => { list![{ @@ -232,7 +231,7 @@ fn assignment_conflicts_of_different_types() { doc1.merge(&mut doc3).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "field" => { "string", @@ -255,7 +254,7 @@ fn changes_within_conflicting_map_field() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "field" => { "string", @@ -292,7 +291,7 @@ fn changes_within_conflicting_list_element() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "list" => { list![ @@ -330,7 +329,7 @@ fn concurrently_assigned_nested_maps_should_not_merge() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "config" => { map!{ @@ -364,7 +363,7 @@ fn concurrent_insertions_at_different_list_positions() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "list" => { list![ @@ -396,7 +395,7 @@ fn concurrent_insertions_at_same_list_position() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => { list![ @@ -427,7 +426,7 @@ fn concurrent_assignment_and_deletion_of_a_map_entry() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "bestBird" => { "magpie", @@ -451,7 +450,7 @@ fn concurrent_assignment_and_deletion_of_list_entry() { doc2.delete(&list_id, 1).unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "birds" => {list![ {"blackbird"}, @@ -461,7 +460,7 @@ fn concurrent_assignment_and_deletion_of_list_entry() { ); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => {list![ { "blackbird" }, @@ -474,7 +473,7 @@ fn concurrent_assignment_and_deletion_of_list_entry() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => {list![ { "blackbird" }, @@ -507,7 +506,7 @@ fn insertion_after_a_deleted_list_element() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => {list![ { "blackbird" }, @@ -518,7 +517,7 @@ fn insertion_after_a_deleted_list_element() { doc2.merge(&mut doc1).unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "birds" => {list![ { "blackbird" }, @@ -549,7 +548,7 @@ fn concurrent_deletion_of_same_list_element() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => {list![ { "albatross" }, @@ -560,7 +559,7 @@ fn concurrent_deletion_of_same_list_element() { doc2.merge(&mut doc1).unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "birds" => {list![ { "albatross" }, @@ -593,7 +592,7 @@ fn concurrent_updates_at_different_levels() { doc1.merge(&mut doc2).unwrap(); assert_obj!( - &doc1, + doc1.document(), &automerge::ROOT, "animals", map! { @@ -635,7 +634,7 @@ fn concurrent_updates_of_concurrently_deleted_objects() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "birds" => { map!{}, @@ -686,7 +685,7 @@ fn does_not_interleave_sequence_insertions_at_same_position() { doc1.merge(&mut doc2).unwrap(); assert_doc!( - &doc1, + doc1.document(), map! { "wisdom" => {list![ {"to"}, @@ -719,7 +718,7 @@ fn mutliple_insertions_at_same_list_position_with_insertion_by_greater_actor_id( doc2.insert(&list, 0, "one").unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "list" => { list![ { "one" }, @@ -744,7 +743,7 @@ fn mutliple_insertions_at_same_list_position_with_insertion_by_lesser_actor_id() doc2.insert(&list, 0, "one").unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "list" => { list![ { "one" }, @@ -771,7 +770,7 @@ fn insertion_consistent_with_causality() { doc2.insert(&list, 0, "one").unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "list" => { list![ {"one"}, @@ -1129,7 +1128,7 @@ fn test_merging_test_conflicts_then_saving_and_loading() { let mut doc2 = AutoCommit::load(&doc1.save()).unwrap(); doc2.set_actor(actor2); - assert_doc! {&doc2, map!{ + assert_doc! {doc2.document(), map!{ "text" => { list![{"h"}, {"e"}, {"l"}, {"l"}, {"o"}]}, }}; @@ -1139,16 +1138,16 @@ fn test_merging_test_conflicts_then_saving_and_loading() { doc2.splice_text(&text, 6, 0, "world").unwrap(); assert_doc!( - &doc2, + doc2.document(), map! { "text" => { list![{"h"}, {"e"}, {"l"}, {"l"}, {"!"}, {" "}, {"w"} , {"o"}, {"r"}, {"l"}, {"d"}]} } ); - let doc3 = AutoCommit::load(&doc2.save()).unwrap(); + let mut doc3 = AutoCommit::load(&doc2.save()).unwrap(); assert_doc!( - &doc3, + doc3.document(), map! { "text" => { list![{"h"}, {"e"}, {"l"}, {"l"}, {"!"}, {" "}, {"w"} , {"o"}, {"r"}, {"l"}, {"d"}]} } @@ -1394,106 +1393,7 @@ fn ops_on_wrong_objets() -> Result<(), AutomergeError> { doc.splice_text(&text, 0, 0, "hello world")?; let e5 = doc.put(&text, "a", "AAA"); assert_eq!(e5, Err(AutomergeError::InvalidOp(ObjType::Text))); - //let e6 = doc.insert(&text, 0, "b"); - //assert_eq!(e6, Err(AutomergeError::InvalidOp(ObjType::Text))); + let e6 = doc.insert(&text, 0, "b"); + assert_eq!(e6, Err(AutomergeError::InvalidOp(ObjType::Text))); Ok(()) } - -#[test] -fn fuzz_crashers() { - let paths = fs::read_dir("./tests/fuzz-crashers").unwrap(); - - for path in paths { - // uncomment this line to figure out which fixture is crashing: - // println!("{:?}", path.as_ref().unwrap().path().display()); - let bytes = fs::read(path.as_ref().unwrap().path()); - let res = Automerge::load(&bytes.unwrap()); - assert!(res.is_err()); - } -} - -fn fixture(name: &str) -> Vec { - fs::read("./tests/fixtures/".to_owned() + name).unwrap() -} - -#[test] -fn overlong_leb() { - // the value metadata says "2", but the LEB is only 1-byte long and there's an extra 0 - assert!(Automerge::load(&fixture("counter_value_has_incorrect_meta.automerge")).is_err()); - // the LEB is overlong (using 2 bytes where one would have sufficed) - assert!(Automerge::load(&fixture("counter_value_is_overlong.automerge")).is_err()); - // the LEB is correct - assert!(Automerge::load(&fixture("counter_value_is_ok.automerge")).is_ok()); -} - -#[test] -fn load() { - fn check_fixture(name: &str) { - let doc = Automerge::load(&fixture(name)).unwrap(); - let map_id = doc.get(ROOT, "a").unwrap().unwrap().1; - assert_eq!(doc.get(map_id, "a").unwrap().unwrap().0, "b".into()); - } - - check_fixture("two_change_chunks.automerge"); - check_fixture("two_change_chunks_compressed.automerge"); - check_fixture("two_change_chunks_out_of_order.automerge"); -} - -#[test] -fn negative_64() { - let mut doc = Automerge::new(); - assert!(doc.transact(|d| { d.put(ROOT, "a", -64_i64) }).is_ok()) -} - -#[test] -fn obj_id_64bits() { - // this change has an opId of 2**42, which when cast to a 32-bit int gives 0. - // The file should either fail to load (a limit of ~4 billion ops per doc seems reasonable), or be handled correctly. - if let Ok(doc) = Automerge::load(&fixture("64bit_obj_id_change.automerge")) { - let map_id = doc.get(ROOT, "a").unwrap().unwrap().1; - assert!(map_id != ROOT) - } - - // this fixture is the same as the above, but as a document chunk. - if let Ok(doc) = Automerge::load(&fixture("64bit_obj_id_doc.automerge")) { - let map_id = doc.get(ROOT, "a").unwrap().unwrap().1; - assert!(map_id != ROOT) - } -} - -#[test] -fn bad_change_on_optree_node_boundary() { - let mut doc = Automerge::new(); - doc.transact::<_, _, AutomergeError>(|d| { - d.put(ROOT, "a", "z")?; - d.put(ROOT, "b", 0)?; - d.put(ROOT, "c", 0)?; - Ok(()) - }) - .unwrap(); - let iterations = 15_u64; - for i in 0_u64..iterations { - doc.transact::<_, _, AutomergeError>(|d| { - let s = "a".repeat(i as usize); - d.put(ROOT, "a", s)?; - d.put(ROOT, "b", i + 1)?; - d.put(ROOT, "c", i + 1)?; - Ok(()) - }) - .unwrap(); - } - let mut doc2 = Automerge::load(doc.save().as_slice()).unwrap(); - doc.transact::<_, _, AutomergeError>(|d| { - let i = iterations + 2; - let s = "a".repeat(i as usize); - d.put(ROOT, "a", s)?; - d.put(ROOT, "b", i)?; - d.put(ROOT, "c", i)?; - Ok(()) - }) - .unwrap(); - let change = doc.get_changes(&doc2.get_heads()).unwrap(); - doc2.apply_changes(change.into_iter().cloned().collect::>()) - .unwrap(); - Automerge::load(doc2.save().as_slice()).unwrap(); -} diff --git a/rust/deny.toml b/rust/deny.toml index 473cdae8..f6985357 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -46,6 +46,7 @@ notice = "warn" # output a note when they are encountered. ignore = [ #"RUSTSEC-0000-0000", + "RUSTSEC-2021-0127", # serde_cbor is unmaintained, but we only use it in criterion for benchmarks ] # Threshold for security vulnerabilities, any vulnerability with a CVSS score # lower than the range specified will be ignored. Note that ignored advisories @@ -99,6 +100,10 @@ confidence-threshold = 0.8 # Allow 1 or more licenses on a per-crate basis, so that particular licenses # aren't accepted for every possible crate as with the normal allow list exceptions = [ + # this is a LGPL like license in the CLI + # since this is an application not a library people would link to it should be fine + { allow = ["EPL-2.0"], name = "colored_json" }, + # The Unicode-DFS--2016 license is necessary for unicode-ident because they # use data from the unicode tables to generate the tables which are # included in the application. We do not distribute those data files so @@ -110,9 +115,6 @@ exceptions = [ # should be revied more fully before release { allow = ["MPL-2.0"], name = "cbindgen" }, { allow = ["BSD-3-Clause"], name = "instant" }, - - # we only use prettytable in tests - { allow = ["BSD-3-Clause"], name = "prettytable" }, ] # Some crates don't have (easily) machine readable licensing information, @@ -175,20 +177,21 @@ deny = [ ] # Certain crates/versions that will be skipped when doing duplicate detection. skip = [ - # duct, which we only depend on for integration tests in automerge-cli, - # pulls in a version of os_pipe which in turn pulls in a version of - # windows-sys which is different to the version in pulled in by is-terminal. - # This is fine to ignore for now because it doesn't end up in downstream - # dependencies. - { name = "windows-sys", version = "0.42.0" } + # These are transitive depdendencies of criterion, which is only included for benchmarking anyway + { name = "itoa", version = "0.4.8" }, + { name = "textwrap", version = "0.11.0" }, + { name = "clap", version = "2.34.0" }, + + # These are transitive depdendencies of cbindgen + { name = "strsim", version = "0.8.0" }, + { name = "heck", version = "0.3.3" }, ] # Similarly to `skip` allows you to skip certain crates during duplicate # detection. Unlike skip, it also includes the entire tree of transitive # dependencies starting at the specified crate, up to a certain depth, which is # by default infinite skip-tree = [ - # // We only ever use criterion in benchmarks - { name = "criterion", version = "0.4.0", depth=10}, + #{ name = "ansi_term", version = "=0.11.0", depth = 20 }, ] # This section is considered when running `cargo deny check sources`. diff --git a/rust/edit-trace/.gitignore b/rust/edit-trace/.gitignore index 55778aca..bf54725a 100644 --- a/rust/edit-trace/.gitignore +++ b/rust/edit-trace/.gitignore @@ -3,4 +3,3 @@ Cargo.lock node_modules yarn.lock flamegraph.svg -/prof diff --git a/rust/edit-trace/Cargo.toml b/rust/edit-trace/Cargo.toml index eaebde46..0107502b 100644 --- a/rust/edit-trace/Cargo.toml +++ b/rust/edit-trace/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [dependencies] automerge = { path = "../automerge" } -criterion = "0.4.0" +criterion = "0.3.5" json = "0.12.4" rand = "^0.8" diff --git a/rust/edit-trace/automerge-js.js b/rust/edit-trace/automerge-js.js index 2956d5d5..6a6d3389 100644 --- a/rust/edit-trace/automerge-js.js +++ b/rust/edit-trace/automerge-js.js @@ -2,7 +2,7 @@ const { edits, finalText } = require('./editing-trace') const Automerge = require('../../javascript') -let start = new Date() +const start = new Date() let state = Automerge.from({text: ""}) state = Automerge.change(state, doc => { @@ -14,16 +14,10 @@ state = Automerge.change(state, doc => { Automerge.splice(doc, 'text', ... edit) } }) + +let _ = Automerge.save(state) console.log(`Done in ${new Date() - start} ms`) -start = new Date() -let bytes = Automerge.save(state) -console.log(`Save in ${new Date() - start} ms`) - -start = new Date() -let _load = Automerge.load(bytes) -console.log(`Load in ${new Date() - start} ms`) - if (state.text !== finalText) { throw new RangeError('ERROR: final text did not match expectation') } diff --git a/rust/edit-trace/automerge-rs.js b/rust/edit-trace/automerge-rs.js new file mode 100644 index 00000000..342f5268 --- /dev/null +++ b/rust/edit-trace/automerge-rs.js @@ -0,0 +1,31 @@ + +// this assumes that the automerge-rs folder is checked out along side this repo +// and someone has run + +// # cd automerge-rs/automerge-backend-wasm +// # yarn release + +const { edits, finalText } = require('./editing-trace') +const Automerge = require('../../automerge') +const path = require('path') +const wasmBackend = require(path.resolve("../../automerge-rs/automerge-backend-wasm")) +Automerge.setDefaultBackend(wasmBackend) + +const start = new Date() +let state = Automerge.from({text: new Automerge.Text()}) + +state = Automerge.change(state, doc => { + for (let i = 0; i < edits.length; i++) { + if (i % 10000 === 0) { + console.log(`Processed ${i} edits in ${new Date() - start} ms`) + } + if (edits[i][1] > 0) doc.text.deleteAt(edits[i][0], edits[i][1]) + if (edits[i].length > 2) doc.text.insertAt(edits[i][0], ...edits[i].slice(2)) + } +}) + +console.log(`Done in ${new Date() - start} ms`) + +if (state.text.join('') !== finalText) { + throw new RangeError('ERROR: final text did not match expectation') +} diff --git a/rust/edit-trace/automerge-wasm.js b/rust/edit-trace/automerge-wasm.js index 8f6f51af..e0f1454d 100644 --- a/rust/edit-trace/automerge-wasm.js +++ b/rust/edit-trace/automerge-wasm.js @@ -4,8 +4,6 @@ const Automerge = require('../automerge-wasm') const start = new Date() let doc = Automerge.create(); -doc.enablePatches(true) -let mat = doc.materialize("/") let text = doc.putObject("_root", "text", "", "text") for (let i = 0; i < edits.length; i++) { @@ -16,25 +14,14 @@ for (let i = 0; i < edits.length; i++) { doc.splice(text, ...edit) } +let _ = doc.save() + console.log(`Done in ${new Date() - start} ms`) let t_time = new Date() -let saved = doc.save() -console.log(`doc.save in ${new Date() - t_time} ms`) - -t_time = new Date() -Automerge.load(saved) -console.log(`doc.load in ${new Date() - t_time} ms`) - -t_time = new Date() let t = doc.text(text); console.log(`doc.text in ${new Date() - t_time} ms`) -t_time = new Date() -t = doc.text(text); -mat = doc.applyPatches(mat) -console.log(`doc.applyPatches() in ${new Date() - t_time} ms`) - if (doc.text(text) !== finalText) { throw new RangeError('ERROR: final text did not match expectation') } diff --git a/rust/edit-trace/package.json b/rust/edit-trace/package.json index acd37ac0..a9d1e0e0 100644 --- a/rust/edit-trace/package.json +++ b/rust/edit-trace/package.json @@ -4,9 +4,9 @@ "main": "wasm-text.js", "license": "MIT", "scripts": { - "wasm": "0x -D prof automerge-wasm.js" + "wasm": "0x -D prof wasm-text.js" }, "devDependencies": { - "0x": "^5.4.1" + "0x": "^4.11.0" } } diff --git a/rust/edit-trace/src/main.rs b/rust/edit-trace/src/main.rs index 9724a109..f6924c7d 100644 --- a/rust/edit-trace/src/main.rs +++ b/rust/edit-trace/src/main.rs @@ -1,5 +1,4 @@ use automerge::ObjType; -use automerge::ReadDoc; use automerge::{transaction::Transactable, Automerge, AutomergeError, ROOT}; use std::time::Instant; @@ -29,18 +28,16 @@ fn main() -> Result<(), AutomergeError> { tx.splice_text(&text, pos, del, &vals)?; } tx.commit(); - println!("Done in {} ms", now.elapsed().as_millis()); let save = Instant::now(); - let bytes = doc.save(); + let _bytes = doc.save(); println!("Saved in {} ms", save.elapsed().as_millis()); - let load = Instant::now(); - let _ = Automerge::load(&bytes).unwrap(); - println!("Loaded in {} ms", load.elapsed().as_millis()); - - let get_txt = Instant::now(); - doc.text(&text)?; - println!("Text in {} ms", get_txt.elapsed().as_millis()); + /* + let load = Instant::now(); + let _ = Automerge::load(&bytes).unwrap(); + println!("Loaded in {} ms", load.elapsed().as_millis()); + */ + println!("Done in {} ms", now.elapsed().as_millis()); Ok(()) } diff --git a/scripts/ci/cmake-build b/scripts/ci/cmake-build index 25a69756..e36513a2 100755 --- a/scripts/ci/cmake-build +++ b/scripts/ci/cmake-build @@ -1,13 +1,12 @@ #!/usr/bin/env bash set -eoux pipefail -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +THIS_SCRIPT=$(dirname "$0"); # \note CMake's default build types are "Debug", "MinSizeRel", "Release" and # "RelWithDebInfo" but custom ones can also be defined so we pass it verbatim. BUILD_TYPE=$1; LIB_TYPE=$2; -if [ "$(echo "${LIB_TYPE}" | tr '[:upper:]' '[:lower:]')" == "shared" ]; then +if [ "${LIB_TYPE,,}" == "shared" ]; then SHARED_TOGGLE="ON" else SHARED_TOGGLE="OFF" @@ -16,4 +15,4 @@ C_PROJECT=$THIS_SCRIPT/../../rust/automerge-c; mkdir -p $C_PROJECT/build; cd $C_PROJECT/build; cmake --log-level=ERROR -B . -S .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_SHARED_LIBS=$SHARED_TOGGLE; -cmake --build . --target automerge_test; +cmake --build . --target test_automerge; diff --git a/scripts/ci/deno_tests b/scripts/ci/deno_tests deleted file mode 100755 index 9f297557..00000000 --- a/scripts/ci/deno_tests +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash -set -eou pipefail -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -WASM_PROJECT=$THIS_SCRIPT/../../rust/automerge-wasm; -JS_PROJECT=$THIS_SCRIPT/../../javascript; -E2E_PROJECT=$THIS_SCRIPT/../../javascript/e2e; - -echo "building wasm and js" -yarn --cwd $E2E_PROJECT install; -yarn --cwd $E2E_PROJECT e2e buildjs; -cp $WASM_PROJECT/index.d.ts $WASM_PROJECT/deno/; -sed -i '1i /// ' $WASM_PROJECT/deno/automerge_wasm.js; - -echo "Running Wasm Deno tests"; -deno test $WASM_PROJECT/deno-tests/deno.ts --allow-read; - -echo "Running JS Deno tests"; -ROOT_MODULE=$WASM_PROJECT/deno yarn --cwd $JS_PROJECT deno:build; -yarn --cwd $JS_PROJECT deno:test; - diff --git a/scripts/ci/fmt_js b/scripts/ci/fmt_js deleted file mode 100755 index 8f387b6a..00000000 --- a/scripts/ci/fmt_js +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -set -eoux pipefail - -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -yarn --cwd $THIS_SCRIPT/../../javascript prettier -c . - diff --git a/scripts/ci/js_tests b/scripts/ci/js_tests index 68205a33..b05edd1c 100755 --- a/scripts/ci/js_tests +++ b/scripts/ci/js_tests @@ -1,8 +1,6 @@ -#!/usr/bin/env bash -set -eoux pipefail +set -e -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +THIS_SCRIPT=$(dirname "$0"); WASM_PROJECT=$THIS_SCRIPT/../../rust/automerge-wasm; JS_PROJECT=$THIS_SCRIPT/../../javascript; E2E_PROJECT=$THIS_SCRIPT/../../javascript/e2e; diff --git a/scripts/ci/lint b/scripts/ci/lint index 87a16765..15a0228d 100755 --- a/scripts/ci/lint +++ b/scripts/ci/lint @@ -1,10 +1,7 @@ #!/usr/bin/env bash set -eoux pipefail -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" - -cd $THIS_SCRIPT/../../rust +cd rust # Force clippy to consider all local sources # https://github.com/rust-lang/rust-clippy/issues/4612 find . -name "*.rs" -not -path "./target/*" -exec touch "{}" + diff --git a/scripts/ci/run b/scripts/ci/run index aebfe4c4..926e60d7 100755 --- a/scripts/ci/run +++ b/scripts/ci/run @@ -2,12 +2,10 @@ set -eou pipefail ./scripts/ci/fmt -./scripts/ci/fmt_js ./scripts/ci/lint ./scripts/ci/build-test ./scripts/ci/rust-docs ./scripts/ci/advisory ./scripts/ci/wasm_tests -./scripts/ci/deno_tests ./scripts/ci/js_tests ./scripts/ci/cmake-build Release static diff --git a/scripts/ci/rust-docs b/scripts/ci/rust-docs index 4be0ed9a..bbbc4fe1 100755 --- a/scripts/ci/rust-docs +++ b/scripts/ci/rust-docs @@ -1,8 +1,6 @@ #!/usr/bin/env bash set -eoux pipefail -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" -cd $THIS_SCRIPT/../../rust +cd rust RUSTDOCFLAGS="-D rustdoc::broken-intra-doc-links -D warnings" \ cargo doc --no-deps --workspace --document-private-items diff --git a/scripts/ci/wasm_tests b/scripts/ci/wasm_tests index fac344d8..2f273d99 100755 --- a/scripts/ci/wasm_tests +++ b/scripts/ci/wasm_tests @@ -1,5 +1,4 @@ -# see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself -THIS_SCRIPT="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" +THIS_SCRIPT=$(dirname "$0"); WASM_PROJECT=$THIS_SCRIPT/../../rust/automerge-wasm; yarn --cwd $WASM_PROJECT install;