diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..a5f5b035 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,21 @@ +--- +name: Bug report +about: Create a bug report +title: '' +labels: '' +assignees: '' + +--- + +## Environment + +* project (cli, server, browser-extension): +* version: +* operating system: + + +## Description + + +## Steps to reproduce + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..75c8a7b4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,14 @@ +--- +name: Feature request +about: Suggest an idea for a feature + +--- + +* **Please describe the feature you would like to have.** + + +* **What alternatives have you considered?** + + +* **Any additional context** + diff --git a/.github/ISSUE_TEMPLATE/pull_request_template.md b/.github/ISSUE_TEMPLATE/pull_request_template.md new file mode 100644 index 00000000..a0e96a8d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/pull_request_template.md @@ -0,0 +1 @@ +## Short description diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..ac44b4f3 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,34 @@ +name: CI +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-22.04 + + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-go@v6 + with: + go-version: '>=1.25.0' + + - name: Install dependencies + run: | + make install + + - name: Test cli + run: | + make test-cli + + - name: Test app + run: | + make test-api + + - name: Test e2e + run: | + make test-e2e diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml new file mode 100644 index 00000000..81a2ea5e --- /dev/null +++ b/.github/workflows/release-cli.yml @@ -0,0 +1,77 @@ +name: Release CLI + +on: + push: + tags: + - 'cli-v*' + +jobs: + release: + runs-on: ubuntu-22.04 + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - uses: actions/setup-go@v6 + with: + go-version: '>=1.25.0' + + - name: Extract version from tag + id: version + run: | + TAG=${GITHUB_REF#refs/tags/cli-v} + echo "version=$TAG" >> $GITHUB_OUTPUT + echo "Releasing version: $TAG" + + - name: Install dependencies + run: make install + + - name: Run CLI tests + run: make test-cli + + - name: Run E2E tests + run: make test-e2e + + - name: Build CLI + run: make version=${{ steps.version.outputs.version }} build-cli + + - name: Generate changelog + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="cli-v${VERSION}" + + # Find previous CLI tag + PREV_TAG=$(git tag --sort=-version:refname | grep "^cli-" | grep -v "^${TAG}$" | head -n 1) + + if [ -z "$PREV_TAG" ]; then + echo "Error: No previous CLI tag found" + echo "This appears to be the first release." + exit 1 + fi + + ./scripts/generate-changelog.sh cli "$TAG" "$PREV_TAG" > /tmp/changelog.txt + cat /tmp/changelog.txt + + - name: Create GitHub release + env: + GH_TOKEN: ${{ github.token }} + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="cli-v${VERSION}" + + # Determine if prerelease (version not matching major.minor.patch) + FLAGS="" + if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + FLAGS="--prerelease" + fi + + gh release create "$TAG" \ + build/cli/*.tar.gz \ + build/cli/*_checksums.txt \ + $FLAGS \ + --title="$TAG" \ + --notes-file=/tmp/changelog.txt \ + --draft diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml new file mode 100644 index 00000000..a5f52933 --- /dev/null +++ b/.github/workflows/release-server.yml @@ -0,0 +1,109 @@ +name: Release Server + +on: + push: + tags: + - 'server-v*' + +jobs: + release: + runs-on: ubuntu-22.04 + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + with: + fetch-depth: 0 + - uses: actions/setup-go@v6 + with: + go-version: '>=1.25.0' + - uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Extract version from tag + id: version + run: | + TAG=${GITHUB_REF#refs/tags/server-v} + echo "version=$TAG" >> $GITHUB_OUTPUT + echo "Releasing version: $TAG" + + - name: Install dependencies + run: make install + + - name: Run tests + run: make test + + - name: Build server + run: make version=${{ steps.version.outputs.version }} build-server + + - name: Generate changelog + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="server-v${VERSION}" + + # Find previous server tag + PREV_TAG=$(git tag --sort=-version:refname | grep "^server-" | grep -v "^${TAG}$" | head -n 1) + + if [ -z "$PREV_TAG" ]; then + echo "Error: No previous server tag found" + echo "This appears to be the first release." + exit 1 + fi + + ./scripts/generate-changelog.sh server "$TAG" "$PREV_TAG" > /tmp/changelog.txt + cat /tmp/changelog.txt + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Prepare Docker build context + run: | + VERSION="${{ steps.version.outputs.version }}" + cp build/server/dnote_server_${VERSION}_linux_amd64.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_arm64.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_arm.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_386.tar.gz host/docker/ + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_TOKEN }} + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: ./host/docker + push: true + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 + tags: | + dnote/dnote:${{ steps.version.outputs.version }} + dnote/dnote:latest + build-args: | + version=${{ steps.version.outputs.version }} + + - name: Create GitHub release + env: + GH_TOKEN: ${{ github.token }} + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="server-v${VERSION}" + + # Determine if prerelease (version not matching major.minor.patch) + FLAGS="" + if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + FLAGS="--prerelease" + fi + + gh release create "$TAG" \ + build/server/*.tar.gz \ + build/server/*_checksums.txt \ + $FLAGS \ + --title="$TAG" \ + --notes-file=/tmp/changelog.txt \ + --draft diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..2847e75d --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +/vendor +/build +.vagrant +*.log +node_modules +/test +tmp +*.db +/server diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..b0fa33eb --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,68 @@ +# Contributing to Dnote + +Dnote is an open source project. + +* [Setting up](#setting-up) +* [Server](#server) +* [Command Line Interface](#command-line-interface) + +## Setting up + +The CLI and server are single single binary files with SQLite embedded - no databases to install, no containers to run, no VMs required. + +**Prerequisites** + +* Go 1.25+ ([Download](https://go.dev/dl/)) +* Node.js 18+ ([Download](https://nodejs.org/) - only needed for building frontend assets) + +**Quick Start** + +1. Clone the repository +2. Install dependencies: + ```bash + make install + ``` +3. Start developing! Run tests: + ```bash + make test + ``` + Or start the dev server: + ```bash + make dev-server + ``` + +That's it. You're ready to contribute. + +## Server + +```bash +# Start dev server (runs on localhost:3001) +make dev-server + +# Run tests +make test-api + +# Run tests in watch mode +WATCH=true make test-api +``` + +## Command Line Interface + +```bash +# Run tests +make test-cli + +# Build dev version (places in your PATH) +make debug=true build-cli + +# Build production version for all platforms +make version=v0.1.0 build-cli + +# Build for a specific platform +# Note: You cannot cross-compile using this method because Dnote uses CGO +# and requires the OS specific headers. +GOOS=[insert OS] GOARCH=[insert arch] make version=v0.1.0 build-cli + +# Debug mode +DNOTE_DEBUG=1 dnote sync +``` diff --git a/LICENSE b/LICENSE index 283b7c68..6b0b1270 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,203 @@ -Source code in this repository is variously licensed under the GNU Affero General Public -License v3.0 (GNU AGPLv3), and GNU General Public License v3.0 (GNU GPLv3). A copy of each -license can be found in the licenses directory. The Source code for the cli is licensed under -GNU GPLv3. The source code for the server and the web is licensed under GNU AGPLv3. In all -other cases, source code in a given file is licensed under the GNU AGPLv3. -Unless otherwise noted at the beginning of the file, the copyright belongs to -Monomax Software Pty Ltd. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..c38819c0 --- /dev/null +++ b/Makefile @@ -0,0 +1,104 @@ +NPM := $(shell command -v npm 2> /dev/null) +GH := $(shell command -v gh 2> /dev/null) + +currentDir = $(shell pwd) +serverOutputDir = ${currentDir}/build/server +cliOutputDir = ${currentDir}/build/cli +cliHomebrewDir = ${currentDir}/../homebrew-dnote + +## installation +install: install-go install-js +.PHONY: install + +install-go: + @echo "==> installing go dependencies" + @go mod download +.PHONY: install-go + +install-js: +ifndef NPM + $(error npm is not installed) +endif + + @echo "==> installing js dependencies" + +ifeq ($(CI), true) + @(cd ${currentDir}/pkg/server/assets && npm ci --cache $(NPM_CACHE_DIR) --prefer-offline --unsafe-perm=true) +else + @(cd ${currentDir}/pkg/server/assets && npm install) +endif +.PHONY: install-js + +## test +test: test-cli test-api test-e2e +.PHONY: test + +test-cli: generate-cli-schema + @echo "==> running CLI test" + @(${currentDir}/scripts/cli/test.sh) +.PHONY: test-cli + +test-api: + @echo "==> running API test" + @(${currentDir}/scripts/server/test-local.sh) +.PHONY: test-api + +test-e2e: + @echo "==> running E2E test" + @(${currentDir}/scripts/e2e/test.sh) +.PHONY: test-e2e + +# development +dev-server: + @echo "==> running dev environment" + @VERSION=master ${currentDir}/scripts/server/dev.sh +.PHONY: dev-server + +build-server: +ifndef version + $(error version is required. Usage: make version=0.1.0 build-server) +endif + + @echo "==> building server assets" + @(cd "${currentDir}/pkg/server/assets/" && ./styles/build.sh) + @(cd "${currentDir}/pkg/server/assets/" && ./js/build.sh) + + @echo "==> building server" + @${currentDir}/scripts/server/build.sh $(version) +.PHONY: build-server + +build-server-docker: build-server +ifndef version + $(error version is required. Usage: make version=0.1.0 [platform=linux/amd64] build-server-docker) +endif + + @echo "==> building Docker image" + @(cd ${currentDir}/host/docker && ./build.sh $(version) $(platform)) +.PHONY: build-server-docker + +generate-cli-schema: + @echo "==> generating CLI database schema" + @mkdir -p pkg/cli/database + @touch pkg/cli/database/schema.sql + @go run -tags fts5 ./pkg/cli/database/schema +.PHONY: generate-cli-schema + +build-cli: generate-cli-schema +ifeq ($(debug), true) + @echo "==> building cli in dev mode" + @${currentDir}/scripts/cli/dev.sh +else + +ifndef version + $(error version is required. Usage: make version=0.1.0 build-cli) +endif + + @echo "==> building cli" + @${currentDir}/scripts/cli/build.sh $(version) +endif +.PHONY: build-cli + +clean: + @git clean -f + @rm -rf build +.PHONY: clean diff --git a/README.md b/README.md index 956936fa..7ab0063f 100644 --- a/README.md +++ b/README.md @@ -1,42 +1,64 @@ -# Dnote +![Dnote](assets/logo.png) +========================= -A simple, encrypted personal knowledge base. +![Build Status](https://github.com/dnote/dnote/actions/workflows/ci.yml/badge.svg) -## What It Does +Dnote is a simple command line notebook. Single binary, no dependencies. Since 2017. -Instantly capture your microlessons and get automatic reminders for spaced repetition. Because: +Your notes are stored in **one SQLite file** - portable, searchable, and completely under your control. Optional sync between devices via a self-hosted server with REST API access. -* we forget exponentially unless we write down what we learn and come back. -* ideas cannot be grokked unless we can put them down in clear words. +```sh +# Add a note (or omit -c to launch your editor) +dnote add linux -c "Check disk usage with df -h" -## How to Use +# View notes in a book +dnote view linux -Use the following to keep Dnote handy. +# Full-text search +dnote find "disk usage" -- [CLI](https://github.com/dnote/dnote/blob/fix-loading/cli/README.md) -- [Web](https://dnote.io) -- [Browser extension](https://github.com/dnote/browser-extension) -- [Atom](https://github.com/dnote/dnote-atom) +# Sync notes +dnote sync +``` +## Installation -### User Stories +```bash +# Linux, macOS, FreeBSD, Windows +curl -s https://www.getdnote.com/install | sh -- [How I Built a Personal Knowledge Base for Myself](https://dnote.io/blog/how-i-built-personal-knowledge-base-for-myself/) -- [I Wrote Down Everything I Learned While Programming for a Month](https://dnote.io/blog/writing-everything-i-learn-coding-for-a-month/) +# macOS with Homebrew +brew install dnote +``` -## Security +Or [download binary](https://github.com/dnote/dnote/releases). -Dnote is end-to-end encrypted and respects your privacy. It does not track you. +## Server (Optional) -When syncing, your data is encrypted with AES-256. Dnote server has zero knowledge about note contents. +Server is a binary with SQLite embedded. No database setup is required. -## Self-host +If using docker, create a compose.yml: -Instructions are coming soon. +```yaml +services: + dnote: + image: dnote/dnote:latest + container_name: dnote + ports: + - 3001:3001 + volumes: + - ./dnote_data:/data + restart: unless-stopped +``` -## Links +Then run: -- [Dnote](https://dnote.io) -- [Dnote Pro](https://dnote.io/pricing) +```bash +docker-compose up -d +``` -[![Build Status](https://semaphoreci.com/api/v1/dnote/dnote-2/branches/master/badge.svg)](https://semaphoreci.com/dnote/dnote-2) +Or see the [guide](https://www.getdnote.com/docs/server/manual) for binary installation. + +## Documentation + +See the [Dnote doc](https://www.getdnote.com/docs). diff --git a/SELF_HOSTING.md b/SELF_HOSTING.md new file mode 100644 index 00000000..e67df891 --- /dev/null +++ b/SELF_HOSTING.md @@ -0,0 +1,43 @@ +# Self-Hosting Dnote Server + +Please see the [doc](https://www.getdnote.com/docs/server) for more. + +## Docker Installation + +1. Install [Docker](https://docs.docker.com/install/). +2. Install Docker [Compose plugin](https://docs.docker.com/compose/install/linux/). +3. Create a `compose.yml` file with the following content: + +```yaml +services: + dnote: + image: dnote/dnote:latest + container_name: dnote + ports: + - 3001:3001 + volumes: + - ./dnote_data:/data + restart: unless-stopped +``` + +4. Run the following to download the image and start the container + +``` +docker compose up -d +``` + +Visit http://localhost:3001 in your browser to see Dnote running. + +## Manual Installation + +Download from [releases](https://github.com/dnote/dnote/releases), extract, and run: + +```bash +tar -xzf dnote-server-$version-$os.tar.gz +mv ./dnote-server /usr/local/bin +dnote-server start --baseUrl=https://your.server +``` + +You're up and running. Database: `~/.local/share/dnote/server.db` (customize with `--dbPath`). Run `dnote-server start --help` for options. + +Set `apiEndpoint: https://your.server/api` in `~/.config/dnote/dnoterc` to connect your CLI to the server. diff --git a/assets/logo.png b/assets/logo.png new file mode 100644 index 00000000..e446301e Binary files /dev/null and b/assets/logo.png differ diff --git a/cli/CONBTRIBUTING.md b/cli/CONBTRIBUTING.md deleted file mode 100644 index ec5f3e4c..00000000 --- a/cli/CONBTRIBUTING.md +++ /dev/null @@ -1,50 +0,0 @@ -# Contributing - -This is a guide for contributors. - -## Set up - -First, download the project - -```sh -go get github.com/dnote/dnote/cli -``` - -Go to the project root and download dependencies using [dep](https://github.com/golang/dep). - -```sh -dep ensure -``` - -## Test - -Run - -```sh -./scripts/test.sh -``` - -## Debug - -Run Dnote with `DNOTE_DEBUG=1` to print debugging statements. - -## Release - -* Build for all target platforms, tag, push tags -* Release on GitHub and [Dnote Homebrew tap](https://github.com/dnote/homebrew-dnote). - -```sh -VERSION=0.4.8 make release -``` - -* Build, without releasing, for all target platforms - -```sh -VERSION=0.4.8 make -``` - -**Note** - -- If a release is not stable, - - disable the homebrew release by commenting out `homebrew` block in `.goreleaser.yml` - - mark release as pre-release on GitHub release diff --git a/cli/Gopkg.lock b/cli/Gopkg.lock deleted file mode 100644 index 4649541f..00000000 --- a/cli/Gopkg.lock +++ /dev/null @@ -1,148 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:cd0089a5b5d872ac1b772087c7ee0ff2e71de50aa3a51826be64a63963a85287" - name = "github.com/dnote/actions" - packages = ["."] - pruneopts = "" - revision = "60e81aff027d39f4494c5ee5c1db9c3efc015ccf" - version = "v0.2.0" - -[[projects]] - digest = "1:e988ed0ca0d81f4d28772760c02ee95084961311291bdfefc1b04617c178b722" - name = "github.com/dnote/color" - packages = ["."] - pruneopts = "" - revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - version = "v1.7.0" - -[[projects]] - branch = "master" - digest = "1:fe99ddb68e996f2f9f7995e9765bc283ceef12dbe30de17922900c1cfa9dfc09" - name = "github.com/google/go-github" - packages = ["github"] - pruneopts = "" - revision = "b7b480f79db7ae436e87bef80ff47596139af8f2" - -[[projects]] - digest = "1:cea4aa2038169ee558bf507d5ea02c94ca85bcca28a4c7bb99fd59b31e43a686" - name = "github.com/google/go-querystring" - packages = ["query"] - pruneopts = "" - revision = "44c6ddd0a2342c386950e880b658017258da92fc" - version = "v1.0.0" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:9ea83adf8e96d6304f394d40436f2eb44c1dc3250d223b74088cc253a6cd0a1c" - name = "github.com/mattn/go-colorable" - packages = ["."] - pruneopts = "" - revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" - version = "v0.0.9" - -[[projects]] - digest = "1:3140e04675a6a91d2a20ea9d10bdadf6072085502e6def6768361260aee4b967" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "" - revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c" - version = "v0.0.4" - -[[projects]] - digest = "1:8bbdb2b3dce59271877770d6fe7dcbb8362438fa7d2e1e1f688e4bf2aac72706" - name = "github.com/mattn/go-sqlite3" - packages = ["."] - pruneopts = "" - revision = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75" - version = "v1.10.0" - -[[projects]] - digest = "1:1d7e1867c49a6dd9856598ef7c3123604ea3daabf5b83f303ff457bcbc410b1d" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[[projects]] - digest = "1:7f569d906bdd20d906b606415b7d794f798f91a62fcfb6a4daa6d50690fb7a3f" - name = "github.com/satori/go.uuid" - packages = ["."] - pruneopts = "" - revision = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - version = "v1.2.0" - -[[projects]] - digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6" - name = "github.com/spf13/cobra" - packages = ["."] - pruneopts = "" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" - -[[projects]] - digest = "1:cbaf13cdbfef0e4734ed8a7504f57fe893d471d62a35b982bf6fb3f036449a66" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - branch = "master" - digest = "1:d0f4eb7abce3fbd3f0dcbbc03ffe18464846afd34c815928d2ae11c1e5aded04" - name = "golang.org/x/crypto" - packages = [ - "hkdf", - "pbkdf2", - "ssh/terminal", - ] - pruneopts = "" - revision = "ffb98f73852f696ea2bb21a617a5c4b3e067a439" - -[[projects]] - branch = "master" - digest = "1:7e3b61f51ebcb58b3894928ed7c63aae68820dec1dd57166e5d6e65ef2868f40" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "" - revision = "b90733256f2e882e81d52f9126de08df5615afd9" - -[[projects]] - branch = "v2" - digest = "1:cedccf16b71e86db87a24f8d4c70b0a855872eb967cb906a66b95de56aefbd0d" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/dnote/actions", - "github.com/dnote/color", - "github.com/google/go-github/github", - "github.com/mattn/go-sqlite3", - "github.com/pkg/errors", - "github.com/satori/go.uuid", - "github.com/spf13/cobra", - "golang.org/x/crypto/hkdf", - "golang.org/x/crypto/pbkdf2", - "golang.org/x/crypto/ssh/terminal", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/cli/Gopkg.toml b/cli/Gopkg.toml deleted file mode 100644 index e5e6ef80..00000000 --- a/cli/Gopkg.toml +++ /dev/null @@ -1,53 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" - - -[[constraint]] - branch = "master" - name = "github.com/google/go-github" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.0" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "0.0.3" - -[[constraint]] - branch = "v2" - name = "gopkg.in/yaml.v2" - -[[constraint]] - name = "github.com/satori/go.uuid" - version = "1.1.0" - -[[constraint]] - name = "github.com/dnote/actions" - version = "0.2.0" - -[[constraint]] - name = "github.com/mattn/go-sqlite3" - version = "1.10.0" - -[[constraint]] - name = "github.com/dnote/color" - version = "1.7.0" diff --git a/cli/Makefile b/cli/Makefile deleted file mode 100644 index 1cfaed29..00000000 --- a/cli/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -all: - ./scripts/build.sh $(VERSION) -.PHONY: all - -release: - ./scripts/build.sh $(VERSION) - ./scripts/release.sh $(VERSION) -.PHONY: release - -clean: - @git clean -f -.PHONY: clean diff --git a/cli/README.md b/cli/README.md deleted file mode 100644 index 9a4c9cff..00000000 --- a/cli/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# Dnote CLI - -A simple command line interface for Dnote. - -![Dnote](assets/dnote.gif) - -It is Designed to minimize context switching for taking notes. - -## Install - -On macOS, you can install using Homebrew: - -```sh -brew tap dnote/dnote -brew install dnote - -# to upgrade to the latest version -brew upgrade dnote -``` - -On Linux or macOS, you can use the installation script: - - curl -s https://raw.githubusercontent.com/dnote/dnote/master/cli/install.sh | sh - -In some cases, you might need an elevated permission: - - curl -s https://raw.githubusercontent.com/dnote/dnote/master/cli/install.sh | sudo sh - -Otherwise, you can download the binary for your platform manually from the [releases page](https://github.com/dnote/dnote/releases). - -## Commands - -Please refer to [commands](/COMMANDS.md). diff --git a/cli/assets/dnote.gif b/cli/assets/dnote.gif deleted file mode 100644 index 23867eef..00000000 Binary files a/cli/assets/dnote.gif and /dev/null differ diff --git a/cli/assets/main.png b/cli/assets/main.png deleted file mode 100644 index d5542855..00000000 Binary files a/cli/assets/main.png and /dev/null differ diff --git a/cli/cmd/add/add.go b/cli/cmd/add/add.go deleted file mode 100644 index b9e1f1c2..00000000 --- a/cli/cmd/add/add.go +++ /dev/null @@ -1,149 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package add - -import ( - "database/sql" - "time" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var reservedBookNames = []string{"trash", "conflicts"} - -var content string - -var example = ` - * Open an editor to write content - dnote add git - - * Skip the editor by providing content directly - dnote add git -c "time is a part of the commit hash"` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) != 1 { - return errors.New("Incorrect number of argument") - } - - return nil -} - -// NewCmd returns a new add command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "add ", - Short: "Add a new note", - Aliases: []string{"a", "n", "new"}, - Example: example, - PreRunE: preRun, - RunE: newRun(ctx), - } - - f := cmd.Flags() - f.StringVarP(&content, "content", "c", "", "The new content for the note") - - return cmd -} - -func isReservedName(name string) bool { - for _, n := range reservedBookNames { - if name == n { - return true - } - } - - return false -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - bookName := args[0] - - if isReservedName(bookName) { - return errors.Errorf("book name '%s' is reserved", bookName) - } - - if content == "" { - fpath := core.GetDnoteTmpContentPath(ctx) - err := core.GetEditorInput(ctx, fpath, &content) - if err != nil { - return errors.Wrap(err, "Failed to get editor input") - } - } - - if content == "" { - return errors.New("Empty content") - } - - ts := time.Now().UnixNano() - err := writeNote(ctx, bookName, content, ts) - if err != nil { - return errors.Wrap(err, "Failed to write note") - } - - log.Successf("added to %s\n", bookName) - log.PrintContent(content) - - if err := core.CheckUpdate(ctx); err != nil { - log.Error(errors.Wrap(err, "automatically checking updates").Error()) - } - - return nil - } -} - -func writeNote(ctx infra.DnoteCtx, bookLabel string, content string, ts int64) error { - tx, err := ctx.DB.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - var bookUUID string - err = tx.QueryRow("SELECT uuid FROM books WHERE label = ?", bookLabel).Scan(&bookUUID) - if err == sql.ErrNoRows { - bookUUID = utils.GenerateUUID() - - b := core.NewBook(bookUUID, bookLabel, 0, false, true) - err = b.Insert(tx) - if err != nil { - tx.Rollback() - return errors.Wrap(err, "creating the book") - } - } else if err != nil { - return errors.Wrap(err, "finding the book") - } - - noteUUID := utils.GenerateUUID() - n := core.NewNote(noteUUID, bookUUID, content, ts, 0, 0, false, false, true) - - err = n.Insert(tx) - if err != nil { - tx.Rollback() - return errors.Wrap(err, "creating the note") - } - - tx.Commit() - - return nil -} diff --git a/cli/cmd/cat/cat.go b/cli/cmd/cat/cat.go deleted file mode 100644 index 60ccbd6e..00000000 --- a/cli/cmd/cat/cat.go +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package cat - -import ( - "database/sql" - "fmt" - "time" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var example = ` - * See the notes with index 2 from a book 'javascript' - dnote cat javascript 2 - ` - -var deprecationWarning = `and "view" will replace it in v0.5.0. - - Run "dnote view --help" for more information. -` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) != 2 { - return errors.New("Incorrect number of arguments") - } - - return nil -} - -// NewCmd returns a new cat command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "cat ", - Aliases: []string{"c"}, - Short: "See a note", - Example: example, - RunE: NewRun(ctx), - PreRunE: preRun, - Deprecated: deprecationWarning, - } - - return cmd -} - -type noteInfo struct { - BookLabel string - UUID string - Content string - AddedOn int64 - EditedOn int64 -} - -// NewRun returns a new run function -func NewRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - db := ctx.DB - bookLabel := args[0] - noteRowID := args[1] - - var bookUUID string - err := db.QueryRow("SELECT uuid FROM books WHERE label = ?", bookLabel).Scan(&bookUUID) - if err == sql.ErrNoRows { - return errors.Errorf("book '%s' not found", bookLabel) - } else if err != nil { - return errors.Wrap(err, "querying the book") - } - - var info noteInfo - err = db.QueryRow(`SELECT books.label, notes.uuid, notes.body, notes.added_on, notes.edited_on - FROM notes - INNER JOIN books ON books.uuid = notes.book_uuid - WHERE notes.rowid = ? AND books.uuid = ?`, noteRowID, bookUUID). - Scan(&info.BookLabel, &info.UUID, &info.Content, &info.AddedOn, &info.EditedOn) - if err == sql.ErrNoRows { - return errors.Errorf("note %s not found in the book '%s'", noteRowID, bookLabel) - } else if err != nil { - return errors.Wrap(err, "querying the note") - } - - log.Infof("book name: %s\n", info.BookLabel) - log.Infof("note uuid: %s\n", info.UUID) - log.Infof("created at: %s\n", time.Unix(0, info.AddedOn).Format("Jan 2, 2006 3:04pm (MST)")) - if info.EditedOn != 0 { - log.Infof("updated at: %s\n", time.Unix(0, info.EditedOn).Format("Jan 2, 2006 3:04pm (MST)")) - } - fmt.Printf("\n------------------------content------------------------\n") - fmt.Printf("%s", info.Content) - fmt.Printf("\n-------------------------------------------------------\n") - - return nil - } -} diff --git a/cli/cmd/edit/edit.go b/cli/cmd/edit/edit.go deleted file mode 100644 index 23665005..00000000 --- a/cli/cmd/edit/edit.go +++ /dev/null @@ -1,130 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package edit - -import ( - "database/sql" - "fmt" - "io/ioutil" - "time" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var newContent string - -var example = ` - * Edit the note by index in a book - dnote edit js 3 - - * Skip the prompt by providing new content directly - dnote edit js 3 -c "new content"` - -// NewCmd returns a new edit command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "edit", - Short: "Edit a note or a book", - Aliases: []string{"e"}, - Example: example, - PreRunE: preRun, - RunE: newRun(ctx), - } - - f := cmd.Flags() - f.StringVarP(&newContent, "content", "c", "", "The new content for the note") - - return cmd -} - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) != 2 { - return errors.New("Incorrect number of argument") - } - - return nil -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - db := ctx.DB - bookLabel := args[0] - noteRowID := args[1] - - bookUUID, err := core.GetBookUUID(ctx, bookLabel) - if err != nil { - return errors.Wrap(err, "finding book uuid") - } - - var noteUUID, oldContent string - err = db.QueryRow("SELECT uuid, body FROM notes WHERE rowid = ? AND book_uuid = ?", noteRowID, bookUUID).Scan(¬eUUID, &oldContent) - if err == sql.ErrNoRows { - return errors.Errorf("note %s not found in the book '%s'", noteRowID, bookLabel) - } else if err != nil { - return errors.Wrap(err, "querying the book") - } - - if newContent == "" { - fpath := core.GetDnoteTmpContentPath(ctx) - - e := ioutil.WriteFile(fpath, []byte(oldContent), 0644) - if e != nil { - return errors.Wrap(e, "preparing tmp content file") - } - - e = core.GetEditorInput(ctx, fpath, &newContent) - if e != nil { - return errors.Wrap(err, "getting editor input") - } - } - - if oldContent == newContent { - return errors.New("Nothing changed") - } - - ts := time.Now().UnixNano() - newContent = core.SanitizeContent(newContent) - - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - _, err = tx.Exec(`UPDATE notes - SET body = ?, edited_on = ?, dirty = ? - WHERE rowid = ? AND book_uuid = ?`, newContent, ts, true, noteRowID, bookUUID) - if err != nil { - tx.Rollback() - return errors.Wrap(err, "updating the note") - } - - tx.Commit() - - log.Success("edited the note\n") - fmt.Printf("\n------------------------content------------------------\n") - fmt.Printf("%s", newContent) - fmt.Printf("\n-------------------------------------------------------\n") - - return nil - } -} diff --git a/cli/cmd/login/login.go b/cli/cmd/login/login.go deleted file mode 100644 index e2ffdf95..00000000 --- a/cli/cmd/login/login.go +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package login - -import ( - "encoding/base64" - "strconv" - - "github.com/dnote/dnote/cli/client" - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/crypt" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var example = ` - dnote login` - -// NewCmd returns a new login command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "login", - Short: "Login to dnote server", - Example: example, - RunE: newRun(ctx), - } - - return cmd -} - -// Do dervies credentials on the client side and requests a session token from the server -func Do(ctx infra.DnoteCtx, email, password string) error { - presigninResp, err := client.GetPresignin(ctx, email) - if err != nil { - return errors.Wrap(err, "getting presiginin") - } - - masterKey, authKey, err := crypt.MakeKeys([]byte(password), []byte(email), presigninResp.Iteration) - if err != nil { - return errors.Wrap(err, "making keys") - } - - authKeyB64 := base64.StdEncoding.EncodeToString(authKey) - signinResp, err := client.Signin(ctx, email, authKeyB64) - if err != nil { - return errors.Wrap(err, "requesting session") - } - - cipherKeyDec, err := crypt.AesGcmDecrypt(masterKey, signinResp.CipherKeyEnc) - if err != nil { - return errors.Wrap(err, "decrypting cipher key") - } - - cipherKeyDecB64 := base64.StdEncoding.EncodeToString(cipherKeyDec) - - db := ctx.DB - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - if err := core.UpsertSystem(tx, infra.SystemCipherKey, cipherKeyDecB64); err != nil { - return errors.Wrap(err, "saving enc key") - } - if err := core.UpsertSystem(tx, infra.SystemSessionKey, signinResp.Key); err != nil { - return errors.Wrap(err, "saving session key") - } - if err := core.UpsertSystem(tx, infra.SystemSessionKeyExpiry, strconv.FormatInt(signinResp.ExpiresAt, 10)); err != nil { - return errors.Wrap(err, "saving session key") - } - - tx.Commit() - - return nil -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - var email, password string - if err := utils.PromptInput("email", &email); err != nil { - return errors.Wrap(err, "getting email input") - } - if email == "" { - return errors.New("Email is empty") - } - - if err := utils.PromptPassword("password", &password); err != nil { - return errors.Wrap(err, "getting password input") - } - if password == "" { - return errors.New("Password is empty") - } - - err := Do(ctx, email, password) - if errors.Cause(err) == client.ErrInvalidLogin { - log.Error("wrong login\n") - return nil - } else if err != nil { - return errors.Wrap(err, "logging in") - } - - log.Success("logged in\n") - - return nil - } - -} diff --git a/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go deleted file mode 100644 index 4f8536dc..00000000 --- a/cli/cmd/logout/logout.go +++ /dev/null @@ -1,100 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package logout - -import ( - "database/sql" - - "github.com/dnote/dnote/cli/client" - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -// ErrNotLoggedIn is an error for logging out when not logged in -var ErrNotLoggedIn = errors.New("not logged in") - -var example = ` - dnote logout` - -// NewCmd returns a new logout command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "logout", - Short: "Logout from the server", - Example: example, - RunE: newRun(ctx), - } - - return cmd -} - -// Do performs logout -func Do(ctx infra.DnoteCtx) error { - db := ctx.DB - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - var key string - err = core.GetSystem(tx, infra.SystemSessionKey, &key) - if errors.Cause(err) == sql.ErrNoRows { - return ErrNotLoggedIn - } else if err != nil { - return errors.Wrap(err, "getting session key") - } - - err = client.Signout(ctx, key) - if err != nil { - return errors.Wrap(err, "requesting logout") - } - - if err := core.DeleteSystem(tx, infra.SystemCipherKey); err != nil { - return errors.Wrap(err, "deleting enc key") - } - if err := core.DeleteSystem(tx, infra.SystemSessionKey); err != nil { - return errors.Wrap(err, "deleting session key") - } - if err := core.DeleteSystem(tx, infra.SystemSessionKeyExpiry); err != nil { - return errors.Wrap(err, "deleting session key expiry") - } - - tx.Commit() - - return nil -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - err := Do(ctx) - if err == ErrNotLoggedIn { - log.Error("not logged in\n") - return nil - } else if err != nil { - return errors.Wrap(err, "logging out") - } - - log.Success("logged out\n") - - return nil - } -} diff --git a/cli/cmd/ls/ls.go b/cli/cmd/ls/ls.go deleted file mode 100644 index c232e247..00000000 --- a/cli/cmd/ls/ls.go +++ /dev/null @@ -1,202 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package ls - -import ( - "database/sql" - "fmt" - "strings" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var example = ` - * List all books - dnote ls - - * List notes in a book - dnote ls javascript - ` - -var deprecationWarning = `and "view" will replace it in v1.0.0. - -Run "dnote view --help" for more information. -` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) > 1 { - return errors.New("Incorrect number of argument") - } - - return nil -} - -// NewCmd returns a new ls command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "ls ", - Aliases: []string{"l", "notes"}, - Short: "List all notes", - Example: example, - RunE: NewRun(ctx), - PreRunE: preRun, - Deprecated: deprecationWarning, - } - - return cmd -} - -// NewRun returns a new run function for ls -func NewRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - if len(args) == 0 { - if err := printBooks(ctx); err != nil { - return errors.Wrap(err, "viewing books") - } - - return nil - } - - bookName := args[0] - if err := printNotes(ctx, bookName); err != nil { - return errors.Wrapf(err, "viewing book '%s'", bookName) - } - - return nil - } -} - -// bookInfo is an information about the book to be printed on screen -type bookInfo struct { - BookLabel string - NoteCount int -} - -// noteInfo is an information about the note to be printed on screen -type noteInfo struct { - RowID int - Body string -} - -// getNewlineIdx returns the index of newline character in a string -func getNewlineIdx(str string) int { - var ret int - - ret = strings.Index(str, "\n") - - if ret == -1 { - ret = strings.Index(str, "\r\n") - } - - return ret -} - -// formatBody returns an excerpt of the given raw note content and a boolean -// indicating if the returned string has been excertped -func formatBody(noteBody string) (string, bool) { - newlineIdx := getNewlineIdx(noteBody) - - if newlineIdx > -1 { - ret := strings.Trim(noteBody[0:newlineIdx], " ") - - return ret, true - } - - return strings.Trim(noteBody, " "), false -} - -func printBooks(ctx infra.DnoteCtx) error { - db := ctx.DB - - rows, err := db.Query(`SELECT books.label, count(notes.uuid) note_count - FROM books - LEFT JOIN notes ON notes.book_uuid = books.uuid AND notes.deleted = false - WHERE books.deleted = false - GROUP BY books.uuid - ORDER BY books.label ASC;`) - if err != nil { - return errors.Wrap(err, "querying books") - } - defer rows.Close() - - infos := []bookInfo{} - for rows.Next() { - var info bookInfo - err = rows.Scan(&info.BookLabel, &info.NoteCount) - if err != nil { - return errors.Wrap(err, "scanning a row") - } - - infos = append(infos, info) - } - - for _, info := range infos { - log.Printf("%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) - } - - return nil -} - -func printNotes(ctx infra.DnoteCtx, bookName string) error { - db := ctx.DB - - var bookUUID string - err := db.QueryRow("SELECT uuid FROM books WHERE label = ?", bookName).Scan(&bookUUID) - if err == sql.ErrNoRows { - return errors.New("book not found") - } else if err != nil { - return errors.Wrap(err, "querying the book") - } - - rows, err := db.Query(`SELECT rowid, body FROM notes WHERE book_uuid = ? AND deleted = ? ORDER BY added_on ASC;`, bookUUID, false) - if err != nil { - return errors.Wrap(err, "querying notes") - } - defer rows.Close() - - infos := []noteInfo{} - for rows.Next() { - var info noteInfo - err = rows.Scan(&info.RowID, &info.Body) - if err != nil { - return errors.Wrap(err, "scanning a row") - } - - infos = append(infos, info) - } - - log.Infof("on book %s\n", bookName) - - for _, info := range infos { - body, isExcerpt := formatBody(info.Body) - - rowid := log.ColorYellow.Sprintf("(%d)", info.RowID) - if isExcerpt { - body = fmt.Sprintf("%s %s", body, log.ColorYellow.Sprintf("[---More---]")) - } - - log.Plainf("%s %s\n", rowid, body) - } - - return nil -} diff --git a/cli/cmd/remove/remove.go b/cli/cmd/remove/remove.go deleted file mode 100644 index 781279a4..00000000 --- a/cli/cmd/remove/remove.go +++ /dev/null @@ -1,163 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package remove - -import ( - "database/sql" - "fmt" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var targetBookName string - -var example = ` - * Delete a note by its index from a book - dnote delete js 2 - - * Delete a book - dnote delete -b js` - -// NewCmd returns a new remove command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "remove", - Short: "Remove a note or a book", - Aliases: []string{"rm", "d", "delete"}, - Example: example, - RunE: newRun(ctx), - } - - f := cmd.Flags() - f.StringVarP(&targetBookName, "book", "b", "", "The book name to delete") - - return cmd -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - if targetBookName != "" { - if err := removeBook(ctx, targetBookName); err != nil { - return errors.Wrap(err, "removing the book") - } - - return nil - } - - if len(args) < 2 { - return errors.New("Missing argument") - } - - targetBook := args[0] - noteRowID := args[1] - - if err := removeNote(ctx, noteRowID, targetBook); err != nil { - return errors.Wrap(err, "removing the note") - } - - return nil - } -} - -func removeNote(ctx infra.DnoteCtx, noteRowID, bookLabel string) error { - db := ctx.DB - - bookUUID, err := core.GetBookUUID(ctx, bookLabel) - if err != nil { - return errors.Wrap(err, "finding book uuid") - } - - var noteUUID, noteContent string - err = db.QueryRow("SELECT uuid, body FROM notes WHERE rowid = ? AND book_uuid = ?", noteRowID, bookUUID).Scan(¬eUUID, ¬eContent) - if err == sql.ErrNoRows { - return errors.Errorf("note %s not found in the book '%s'", noteRowID, bookLabel) - } else if err != nil { - return errors.Wrap(err, "querying the book") - } - - // todo: multiline - log.Printf("body: \"%s\"\n", noteContent) - - ok, err := utils.AskConfirmation("remove this note?", false) - if err != nil { - return errors.Wrap(err, "getting confirmation") - } - if !ok { - log.Warnf("aborted by user\n") - return nil - } - - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - if _, err = tx.Exec("UPDATE notes SET deleted = ?, dirty = ?, body = ? WHERE uuid = ? AND book_uuid = ?", true, true, "", noteUUID, bookUUID); err != nil { - return errors.Wrap(err, "removing the note") - } - tx.Commit() - - log.Successf("removed from %s\n", bookLabel) - - return nil -} - -func removeBook(ctx infra.DnoteCtx, bookLabel string) error { - db := ctx.DB - - bookUUID, err := core.GetBookUUID(ctx, bookLabel) - if err != nil { - return errors.Wrap(err, "finding book uuid") - } - - ok, err := utils.AskConfirmation(fmt.Sprintf("delete book '%s' and all its notes?", bookLabel), false) - if err != nil { - return errors.Wrap(err, "getting confirmation") - } - if !ok { - log.Warnf("aborted by user\n") - return nil - } - - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - if _, err = tx.Exec("UPDATE notes SET deleted = ?, dirty = ?, body = ? WHERE book_uuid = ?", true, true, "", bookUUID); err != nil { - return errors.Wrap(err, "removing notes in the book") - } - - // override the label with a random string - uniqLabel := utils.GenerateUUID() - if _, err = tx.Exec("UPDATE books SET deleted = ?, dirty = ?, label = ? WHERE uuid = ?", true, true, uniqLabel, bookUUID); err != nil { - return errors.Wrap(err, "removing the book") - } - - tx.Commit() - - log.Success("removed book\n") - - return nil -} diff --git a/cli/cmd/root/root.go b/cli/cmd/root/root.go deleted file mode 100644 index 3da8e7e0..00000000 --- a/cli/cmd/root/root.go +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package root - -import ( - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/migrate" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var root = &cobra.Command{ - Use: "dnote", - Short: "Dnote - Instantly capture what you learn while coding", - SilenceErrors: true, - SilenceUsage: true, -} - -// Register adds a new command -func Register(cmd *cobra.Command) { - root.AddCommand(cmd) -} - -// Execute runs the main command -func Execute() error { - return root.Execute() -} - -// Prepare initializes necessary files -func Prepare(ctx infra.DnoteCtx) error { - if err := core.InitFiles(ctx); err != nil { - return errors.Wrap(err, "initializing files") - } - - if err := infra.InitDB(ctx); err != nil { - return errors.Wrap(err, "initializing database") - } - if err := core.InitSystem(ctx); err != nil { - return errors.Wrap(err, "initializing system data") - } - - if err := migrate.Legacy(ctx); err != nil { - return errors.Wrap(err, "running legacy migration") - } - if err := migrate.Run(ctx, migrate.LocalSequence, migrate.LocalMode); err != nil { - return errors.Wrap(err, "running migration") - } - - return nil -} diff --git a/cli/cmd/sync/sync_test.go b/cli/cmd/sync/sync_test.go deleted file mode 100644 index b87ca333..00000000 --- a/cli/cmd/sync/sync_test.go +++ /dev/null @@ -1,3183 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package sync - -import ( - "encoding/json" - "fmt" - "net/http" - "net/http/httptest" - "sort" - "strings" - "testing" - - "github.com/dnote/dnote/cli/client" - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/crypt" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/testutils" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" -) - -var cipherKey = []byte("AES256Key-32Characters1234567890") - -func TestProcessFragments(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - fragments := []client.SyncFragment{ - client.SyncFragment{ - FragMaxUSN: 10, - UserMaxUSN: 10, - CurrentTime: 1550436136, - Notes: []client.SyncFragNote{ - client.SyncFragNote{ - UUID: "45546de0-40ed-45cf-9bfc-62ce729a7d3d", - Body: "7GgIppDdxDn+4DUoVoLXbncZDRqXGwbDVNF/eCssu+1BXMdq+HAziJHGgK7drdcIBtYDDXj0OwHz9dQDDOyWeNqkLWEIQ2Roygs229dRxdO3Z6ST+qSOr/9TTjDlFxydF5Ps7nAXdN9KVxH8FKIZDsxJ45qeLKpQK/6poAM39BCOiysqAXJQz9ngOJiqImAuftS6d/XhwX77QvnM91VCKK0tFmsMdDDw0J9QMwnlYU1CViHy1Hdhhcf9Ea38Mj4SCrWMPscXyP2fpAu5ukbIK3vS2pvbnH5vC8ZuvihrQif1BsiwfYmN981mLYs069Dn4B72qcXPwU7qrN3V0k57JGcAlTiEoOD5QowyraensQlR1doorLb43SjTiJLItougn5K5QPRiHuNxfv39pa7A0gKA1n/3UhG/SBuCpDuPYjwmBkvkzCKJNgpbLQ8p29JXMQcWrm4e9GfnVjMhAEtxttIta3MN6EcYG7cB1dJ04OLYVcJuRA==", - }, - client.SyncFragNote{ - UUID: "a25a5336-afe9-46c4-b881-acab911c0bc3", - Body: "WGzcYA6kLuUFEU7HLTDJt7UWF7fEmbCPHfC16VBrAyfT2wDejXbIuFpU5L7g0aU=", - }, - }, - Books: []client.SyncFragBook{ - client.SyncFragBook{ - UUID: "e8ac6f25-d95b-435a-9fae-094f7506a5ac", - Label: "qBrSrAcnTUHu51bIrv6jSA/dNffr/kRlIg+MklxeQQ==", - }, - client.SyncFragBook{ - UUID: "05fd8b95-ddcd-4071-9380-4358ffb8a436", - Label: "uHWoBFdKT78gTkFR7qhyzZkrn59c8ktEa8idrLkksKzIQ3VVAXxq0QZp7Uc=", - }, - }, - ExpungedNotes: []string{}, - ExpungedBooks: []string{}, - }, - } - - // exec - sl, err := processFragments(fragments, cipherKey) - if err != nil { - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - expected := syncList{ - Notes: map[string]client.SyncFragNote{ - "45546de0-40ed-45cf-9bfc-62ce729a7d3d": client.SyncFragNote{ - UUID: "45546de0-40ed-45cf-9bfc-62ce729a7d3d", - Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n Donec ac libero efficitur, posuere dui non, egestas lectus.\n Aliquam urna ligula, sagittis eu volutpat vel, consequat et augue.\n\n Ut mi urna, dignissim a ex eget, venenatis accumsan sem. Praesent facilisis, ligula hendrerit auctor varius, mauris metus hendrerit dolor, sit amet pulvinar.", - }, - "a25a5336-afe9-46c4-b881-acab911c0bc3": client.SyncFragNote{ - UUID: "a25a5336-afe9-46c4-b881-acab911c0bc3", - Body: "foo bar baz quz\nqux", - }, - }, - Books: map[string]client.SyncFragBook{ - "e8ac6f25-d95b-435a-9fae-094f7506a5ac": client.SyncFragBook{ - UUID: "e8ac6f25-d95b-435a-9fae-094f7506a5ac", - Label: "foo", - }, - "05fd8b95-ddcd-4071-9380-4358ffb8a436": client.SyncFragBook{ - UUID: "05fd8b95-ddcd-4071-9380-4358ffb8a436", - Label: "foo-bar-baz-1000", - }, - }, - ExpungedNotes: map[string]bool{}, - ExpungedBooks: map[string]bool{}, - MaxUSN: 10, - MaxCurrentTime: 1550436136, - } - - // test - testutils.AssertDeepEqual(t, sl, expected, "syncList mismatch") -} - -func TestGetLastSyncAt(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "setting up last_sync_at", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastSyncAt, 1541108743) - - // exec - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - got, err := getLastSyncAt(tx) - if err != nil { - t.Fatalf(errors.Wrap(err, "getting last_sync_at").Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, got, 1541108743, "last_sync_at mismatch") -} - -func TestGetLastMaxUSN(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "setting up last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, 20001) - - // exec - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - got, err := getLastMaxUSN(tx) - if err != nil { - t.Fatalf(errors.Wrap(err, "getting last_max_usn").Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, got, 20001, "last_max_usn mismatch") -} - -func TestResolveLabel(t *testing.T) { - testCases := []struct { - input string - expected string - }{ - { - input: "js", - expected: "js (2)", - }, - { - input: "css", - expected: "css (3)", - }, - { - input: "linux", - expected: "linux (4)", - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "js") - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b2-uuid", "css (2)") - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b3-uuid", "linux (1)") - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b4-uuid", "linux (2)") - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b5-uuid", "linux (3)") - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - got, err := resolveLabel(tx, tc.input) - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - tx.Rollback() - - testutils.AssertEqual(t, got, tc.expected, fmt.Sprintf("output mismatch for test case %d", idx)) - }() - } -} - -func TestSyncDeleteNote(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := syncDeleteNote(tx, "nonexistent-note-uuid"); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 0, "book count mismatch") - }) - - t.Run("local copy is dirty", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) - testutils.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 11, "n2 body", 1541108743, false, true) - - var n1 core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - var n2 core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), - &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Public, &n2.Deleted, &n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction for test case").Error()) - } - - if err := syncDeleteNote(tx, "n1-uuid"); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - // do not delete note if local copy is dirty - testutils.AssertEqualf(t, noteCount, 2, "note count mismatch for test case") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch for test case") - - var n1Record core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n1.UUID), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Public, &n1Record.Deleted, &n1Record.Dirty) - var n2Record core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, n1Record.UUID, n1.UUID, "n1 UUID mismatch for test case") - testutils.AssertEqual(t, n1Record.BookUUID, n1.BookUUID, "n1 BookUUID mismatch for test case") - testutils.AssertEqual(t, n1Record.USN, n1.USN, "n1 USN mismatch for test case") - testutils.AssertEqual(t, n1Record.AddedOn, n1.AddedOn, "n1 AddedOn mismatch for test case") - testutils.AssertEqual(t, n1Record.EditedOn, n1.EditedOn, "n1 EditedOn mismatch for test case") - testutils.AssertEqual(t, n1Record.Body, n1.Body, "n1 Body mismatch for test case") - testutils.AssertEqual(t, n1Record.Public, n1.Public, "n1 Public mismatch for test case") - testutils.AssertEqual(t, n1Record.Deleted, n1.Deleted, "n1 Deleted mismatch for test case") - testutils.AssertEqual(t, n1Record.Dirty, n1.Dirty, "n1 Dirty mismatch for test case") - - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") - testutils.AssertEqual(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") - testutils.AssertEqual(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") - testutils.AssertEqual(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") - testutils.AssertEqual(t, n2Record.Public, n2.Public, "n2 Public mismatch for test case") - testutils.AssertEqual(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") - testutils.AssertEqual(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") - }) - - t.Run("local copy is not dirty", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 11, "n2 body", 1541108743, false, false) - - var n1 core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - var n2 core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), - &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Public, &n2.Deleted, &n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction for test case").Error()) - } - - if err := syncDeleteNote(tx, "n1-uuid"); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch for test case") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch for test case") - - var n2Record core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") - testutils.AssertEqual(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") - testutils.AssertEqual(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") - testutils.AssertEqual(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") - testutils.AssertEqual(t, n2Record.Public, n2.Public, "n2 Public mismatch for test case") - testutils.AssertEqual(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") - testutils.AssertEqual(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") - }) -} - -func TestSyncDeleteBook(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "b1-label") - - var b1 core.Book - testutils.MustScan(t, "getting b1 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1.UUID, &b1.Label, &b1.USN, &b1.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := syncDeleteBook(tx, "nonexistent-book-uuid"); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var b1Record core.Book - testutils.MustScan(t, "getting b1 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch for test case") - testutils.AssertEqual(t, b1Record.Label, b1.Label, "b1 Label mismatch for test case") - testutils.AssertEqual(t, b1Record.USN, b1.USN, "b1 USN mismatch for test case") - testutils.AssertEqual(t, b1Record.Dirty, b1.Dirty, "b1 Dirty mismatch for test case") - }) - - t.Run("local copy is dirty", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 12, true) - testutils.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) - - var b1 core.Book - testutils.MustScan(t, "getting b1 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), - &b1.UUID, &b1.Label, &b1.USN, &b1.Dirty) - var n1 core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction for test case").Error()) - } - - if err := syncDeleteBook(tx, b1UUID); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - // do not delete note if local copy is dirty - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch for test case") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch for test case") - - var b1Record core.Book - testutils.MustScan(t, "getting b1Record for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - var n1Record core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n1.UUID), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Public, &n1Record.Deleted, &n1Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch for test case") - testutils.AssertEqual(t, b1Record.Label, b1.Label, "b1 Label mismatch for test case") - testutils.AssertEqual(t, b1Record.USN, b1.USN, "b1 USN mismatch for test case") - testutils.AssertEqual(t, b1Record.Dirty, b1.Dirty, "b1 Dirty mismatch for test case") - - testutils.AssertEqual(t, n1Record.UUID, n1.UUID, "n1 UUID mismatch for test case") - testutils.AssertEqual(t, n1Record.BookUUID, n1.BookUUID, "n1 BookUUID mismatch for test case") - testutils.AssertEqual(t, n1Record.USN, n1.USN, "n1 USN mismatch for test case") - testutils.AssertEqual(t, n1Record.AddedOn, n1.AddedOn, "n1 AddedOn mismatch for test case") - testutils.AssertEqual(t, n1Record.EditedOn, n1.EditedOn, "n1 EditedOn mismatch for test case") - testutils.AssertEqual(t, n1Record.Body, n1.Body, "n1 Body mismatch for test case") - testutils.AssertEqual(t, n1Record.Public, n1.Public, "n1 Public mismatch for test case") - testutils.AssertEqual(t, n1Record.Deleted, n1.Deleted, "n1 Deleted mismatch for test case") - testutils.AssertEqual(t, n1Record.Dirty, n1.Dirty, "n1 Dirty mismatch for test case") - }) - - t.Run("local copy is not dirty", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - b2UUID := utils.GenerateUUID() - - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) - testutils.MustExec(t, "inserting b2 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") - testutils.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b2UUID, 11, "n2 body", 1541108743, false, false) - - var b2 core.Book - testutils.MustScan(t, "getting b2 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), - &b2.UUID, &b2.Label, &b2.USN, &b2.Dirty) - var n2 core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), - &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Public, &n2.Deleted, &n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction for test case").Error()) - } - - if err := syncDeleteBook(tx, b1UUID); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch for test case") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch for test case") - - var b2Record core.Book - testutils.MustScan(t, "getting b2 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - var n2Record core.Note - testutils.MustScan(t, "getting n2 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, b2Record.UUID, b2.UUID, "b2 UUID mismatch for test case") - testutils.AssertEqual(t, b2Record.Label, b2.Label, "b2 Label mismatch for test case") - testutils.AssertEqual(t, b2Record.USN, b2.USN, "b2 USN mismatch for test case") - testutils.AssertEqual(t, b2Record.Dirty, b2.Dirty, "b2 Dirty mismatch for test case") - - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") - testutils.AssertEqual(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") - testutils.AssertEqual(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") - testutils.AssertEqual(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") - testutils.AssertEqual(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") - testutils.AssertEqual(t, n2Record.Public, n2.Public, "n2 Public mismatch for test case") - testutils.AssertEqual(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") - testutils.AssertEqual(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") - }) - - t.Run("local copy has at least one note that is dirty", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction for test case").Error()) - } - - if err := syncDeleteBook(tx, b1UUID); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch for test case") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch for test case") - - var b1Record core.Book - testutils.MustScan(t, "getting b1 for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - var n1Record core.Note - testutils.MustScan(t, "getting n1 for test case", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, body,deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.Body, &n1Record.Deleted, &n1Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1UUID, "b1 UUID mismatch for test case") - testutils.AssertEqual(t, b1Record.Label, "b1-label", "b1 Label mismatch for test case") - testutils.AssertEqual(t, b1Record.Dirty, true, "b1 Dirty mismatch for test case") - - testutils.AssertEqual(t, n1Record.UUID, "n1-uuid", "n1 UUID mismatch for test case") - testutils.AssertEqual(t, n1Record.BookUUID, b1UUID, "n1 BookUUID mismatch for test case") - testutils.AssertEqual(t, n1Record.USN, 10, "n1 USN mismatch for test case") - testutils.AssertEqual(t, n1Record.AddedOn, int64(1541108743), "n1 AddedOn mismatch for test case") - testutils.AssertEqual(t, n1Record.Body, "n1 body", "n1 Body mismatch for test case") - testutils.AssertEqual(t, n1Record.Deleted, false, "n1 Deleted mismatch for test case") - testutils.AssertEqual(t, n1Record.Dirty, true, "n1 Dirty mismatch for test case") - }) -} - -func TestFullSyncNote(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - n := client.SyncFragNote{ - UUID: "n1-uuid", - BookUUID: b1UUID, - USN: 128, - AddedOn: 1541232118, - EditedOn: 1541219321, - Body: "n1-body", - Public: true, - Deleted: false, - } - - if err := fullSyncNote(tx, n); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var n1 core.Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - - testutils.AssertEqual(t, n1.UUID, n.UUID, "n1 UUID mismatch") - testutils.AssertEqual(t, n1.BookUUID, n.BookUUID, "n1 BookUUID mismatch") - testutils.AssertEqual(t, n1.USN, n.USN, "n1 USN mismatch") - testutils.AssertEqual(t, n1.AddedOn, n.AddedOn, "n1 AddedOn mismatch") - testutils.AssertEqual(t, n1.EditedOn, n.EditedOn, "n1 EditedOn mismatch") - testutils.AssertEqual(t, n1.Body, n.Body, "n1 Body mismatch") - testutils.AssertEqual(t, n1.Public, n.Public, "n1 Public mismatch") - testutils.AssertEqual(t, n1.Deleted, n.Deleted, "n1 Deleted mismatch") - testutils.AssertEqual(t, n1.Dirty, false, "n1 Dirty mismatch") - }) - - t.Run("exists on server and client", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - b2UUID := utils.GenerateUUID() - - testCases := []struct { - addedOn int64 - clientUSN int - clientEditedOn int64 - clientBody string - clientPublic bool - clientDeleted bool - clientBookUUID string - clientDirty bool - serverUSN int - serverEditedOn int64 - serverBody string - serverPublic bool - serverDeleted bool - serverBookUUID string - expectedUSN int - expectedAddedOn int64 - expectedEditedOn int64 - expectedBody string - expectedPublic bool - expectedDeleted bool - expectedBookUUID string - expectedDirty bool - }{ - // server has higher usn and client is dirty - { - clientDirty: true, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: true, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: true, - }, - // server has higher usn and client deleted locally - { - clientDirty: true, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "", - clientPublic: false, - clientDeleted: true, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body server", - serverPublic: false, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body server", - expectedPublic: false, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - // server has higher usn and client is not dirty - { - clientDirty: false, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: true, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - // they're in sync - { - clientDirty: true, - clientUSN: 21, - clientEditedOn: 1541219321, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b2UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body", - serverPublic: false, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body", - expectedPublic: false, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: true, - }, - // they have the same usn but client is dirty - // not sure if this is a possible scenario but if it happens, the local copy will - // be uploaded to the server anyway. - { - clientDirty: true, - clientUSN: 21, - clientEditedOn: 1541219320, - clientBody: "n1 body client", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b2UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body server", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219320, - expectedBody: "n1 body client", - expectedPublic: false, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, tc.clientBookUUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientPublic, tc.clientDeleted, tc.clientDirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - // update all fields but uuid and bump usn - n := client.SyncFragNote{ - UUID: n1UUID, - BookUUID: tc.serverBookUUID, - USN: tc.serverUSN, - AddedOn: tc.addedOn, - EditedOn: tc.serverEditedOn, - Body: tc.serverBody, - Public: tc.serverPublic, - Deleted: tc.serverDeleted, - } - - if err := fullSyncNote(tx, n); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) - testutils.AssertEqualf(t, bookCount, 2, fmt.Sprintf("book count mismatch for test case %d", idx)) - - var n1 core.Note - testutils.MustScan(t, fmt.Sprintf("getting n1 for test case %d", idx), - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - - testutils.AssertEqual(t, n1.UUID, n.UUID, fmt.Sprintf("n1 UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1 BookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.USN, tc.expectedUSN, fmt.Sprintf("n1 USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1 AddedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1 EditedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Body, tc.expectedBody, fmt.Sprintf("n1 Body mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Public, tc.expectedPublic, fmt.Sprintf("n1 Public mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Deleted, tc.expectedDeleted, fmt.Sprintf("n1 Deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Dirty, tc.expectedDirty, fmt.Sprintf("n1 Dirty mismatch for test case %d", idx)) - }() - } - }) -} - -func TestFullSyncBook(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b2UUID := utils.GenerateUUID() - b := client.SyncFragBook{ - UUID: b2UUID, - USN: 1, - AddedOn: 1541108743, - Label: "b2-label", - Deleted: false, - } - - if err := fullSyncBook(tx, b); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - - var b1, b2 core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), - &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), - &b2.UUID, &b2.USN, &b2.Label, &b2.Dirty, &b2.Deleted) - - testutils.AssertEqual(t, b1.UUID, b1UUID, "b1 UUID mismatch") - testutils.AssertEqual(t, b1.USN, 555, "b1 USN mismatch") - testutils.AssertEqual(t, b1.Label, "b1-label", "b1 Label mismatch") - testutils.AssertEqual(t, b1.Dirty, true, "b1 Dirty mismatch") - testutils.AssertEqual(t, b1.Deleted, false, "b1 Deleted mismatch") - - testutils.AssertEqual(t, b2.UUID, b2UUID, "b2 UUID mismatch") - testutils.AssertEqual(t, b2.USN, b.USN, "b2 USN mismatch") - testutils.AssertEqual(t, b2.Label, b.Label, "b2 Label mismatch") - testutils.AssertEqual(t, b2.Dirty, false, "b2 Dirty mismatch") - testutils.AssertEqual(t, b2.Deleted, b.Deleted, "b2 Deleted mismatch") - }) - - t.Run("exists on server and client", func(t *testing.T) { - testCases := []struct { - clientDirty bool - clientUSN int - clientLabel string - clientDeleted bool - serverUSN int - serverLabel string - serverDeleted bool - expectedUSN int - expectedLabel string - expectedDeleted bool - }{ - // server has higher usn and client is dirty - { - clientDirty: true, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label-updated", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label-updated", - expectedDeleted: false, - }, - { - clientDirty: true, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "", - serverDeleted: true, - expectedUSN: 3, - expectedLabel: "", - expectedDeleted: true, - }, - // server has higher usn and client is not dirty - { - clientDirty: false, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label-updated", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label-updated", - expectedDeleted: false, - }, - // they are in sync - { - clientDirty: false, - clientUSN: 3, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label", - expectedDeleted: false, - }, - // they have the same usn but client is dirty - { - clientDirty: true, - clientUSN: 3, - clientLabel: "b2-label-client", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label-client", - expectedDeleted: false, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - // update all fields but uuid and bump usn - b := client.SyncFragBook{ - UUID: b1UUID, - USN: tc.serverUSN, - Label: tc.serverLabel, - Deleted: tc.serverDeleted, - } - - if err := fullSyncBook(tx, b); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, fmt.Sprintf("note count mismatch for test case %d", idx)) - testutils.AssertEqualf(t, bookCount, 1, fmt.Sprintf("book count mismatch for test case %d", idx)) - - var b1 core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), - &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) - - testutils.AssertEqual(t, b1.UUID, b1UUID, fmt.Sprintf("b1 UUID mismatch for idx %d", idx)) - testutils.AssertEqual(t, b1.USN, tc.expectedUSN, fmt.Sprintf("b1 USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1.Label, tc.expectedLabel, fmt.Sprintf("b1 Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1.Dirty, tc.clientDirty, fmt.Sprintf("b1 Dirty mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1.Deleted, tc.expectedDeleted, fmt.Sprintf("b1 Deleted mismatch for test case %d", idx)) - }() - } - }) -} - -func TestStepSyncNote(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - n := client.SyncFragNote{ - UUID: "n1-uuid", - BookUUID: b1UUID, - USN: 128, - AddedOn: 1541232118, - EditedOn: 1541219321, - Body: "n1-body", - Public: true, - Deleted: false, - } - - if err := stepSyncNote(tx, n); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var n1 core.Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - - testutils.AssertEqual(t, n1.UUID, n.UUID, "n1 UUID mismatch") - testutils.AssertEqual(t, n1.BookUUID, n.BookUUID, "n1 BookUUID mismatch") - testutils.AssertEqual(t, n1.USN, n.USN, "n1 USN mismatch") - testutils.AssertEqual(t, n1.AddedOn, n.AddedOn, "n1 AddedOn mismatch") - testutils.AssertEqual(t, n1.EditedOn, n.EditedOn, "n1 EditedOn mismatch") - testutils.AssertEqual(t, n1.Body, n.Body, "n1 Body mismatch") - testutils.AssertEqual(t, n1.Public, n.Public, "n1 Public mismatch") - testutils.AssertEqual(t, n1.Deleted, n.Deleted, "n1 Deleted mismatch") - testutils.AssertEqual(t, n1.Dirty, false, "n1 Dirty mismatch") - }) - - t.Run("exists on server and client", func(t *testing.T) { - b1UUID := utils.GenerateUUID() - b2UUID := utils.GenerateUUID() - - testCases := []struct { - addedOn int64 - clientUSN int - clientEditedOn int64 - clientBody string - clientPublic bool - clientDeleted bool - clientBookUUID string - clientDirty bool - serverUSN int - serverEditedOn int64 - serverBody string - serverPublic bool - serverDeleted bool - serverBookUUID string - expectedUSN int - expectedAddedOn int64 - expectedEditedOn int64 - expectedBody string - expectedPublic bool - expectedDeleted bool - expectedBookUUID string - expectedDirty bool - }{ - { - clientDirty: true, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: true, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: true, - }, - // if deleted locally, resurrect it - { - clientDirty: true, - clientUSN: 1, - clientEditedOn: 1541219321, - clientBody: "", - clientPublic: false, - clientDeleted: true, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: false, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: false, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - { - clientDirty: false, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: true, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") - testutils.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, tc.clientBookUUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientPublic, tc.clientDeleted, tc.clientDirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - // update all fields but uuid and bump usn - n := client.SyncFragNote{ - UUID: n1UUID, - BookUUID: tc.serverBookUUID, - USN: tc.serverUSN, - AddedOn: tc.addedOn, - EditedOn: tc.serverEditedOn, - Body: tc.serverBody, - Public: tc.serverPublic, - Deleted: tc.serverDeleted, - } - - if err := stepSyncNote(tx, n); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) - testutils.AssertEqualf(t, bookCount, 2, fmt.Sprintf("book count mismatch for test case %d", idx)) - - var n1 core.Note - testutils.MustScan(t, fmt.Sprintf("getting n1 for test case %d", idx), - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), - &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Public, &n1.Deleted, &n1.Dirty) - - testutils.AssertEqual(t, n1.UUID, n.UUID, fmt.Sprintf("n1 UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1 BookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.USN, tc.expectedUSN, fmt.Sprintf("n1 USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1 AddedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1 EditedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Body, tc.expectedBody, fmt.Sprintf("n1 Body mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Public, tc.expectedPublic, fmt.Sprintf("n1 Public mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Deleted, tc.expectedDeleted, fmt.Sprintf("n1 Deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1.Dirty, tc.expectedDirty, fmt.Sprintf("n1 Dirty mismatch for test case %d", idx)) - }() - } - }) -} - -func TestStepSyncBook(t *testing.T) { - t.Run("exists on server only", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b2UUID := utils.GenerateUUID() - b := client.SyncFragBook{ - UUID: b2UUID, - USN: 1, - AddedOn: 1541108743, - Label: "b2-label", - Deleted: false, - } - - if err := stepSyncBook(tx, b); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - - var b1, b2 core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), - &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), - &b2.UUID, &b2.USN, &b2.Label, &b2.Dirty, &b2.Deleted) - - testutils.AssertEqual(t, b1.UUID, b1UUID, "b1 UUID mismatch") - testutils.AssertEqual(t, b1.USN, 555, "b1 USN mismatch") - testutils.AssertEqual(t, b1.Label, "b1-label", "b1 Label mismatch") - testutils.AssertEqual(t, b1.Dirty, true, "b1 Dirty mismatch") - testutils.AssertEqual(t, b1.Deleted, false, "b1 Deleted mismatch") - - testutils.AssertEqual(t, b2.UUID, b2UUID, "b2 UUID mismatch") - testutils.AssertEqual(t, b2.USN, b.USN, "b2 USN mismatch") - testutils.AssertEqual(t, b2.Label, b.Label, "b2 Label mismatch") - testutils.AssertEqual(t, b2.Dirty, false, "b2 Dirty mismatch") - testutils.AssertEqual(t, b2.Deleted, b.Deleted, "b2 Deleted mismatch") - }) - - t.Run("exists on server and client", func(t *testing.T) { - testCases := []struct { - clientDirty bool - clientUSN int - clientLabel string - clientDeleted bool - serverUSN int - serverLabel string - serverDeleted bool - expectedUSN int - expectedLabel string - expectedDeleted bool - anotherBookLabel string - expectedAnotherBookLabel string - expectedAnotherBookDirty bool - }{ - { - clientDirty: true, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label-updated", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label-updated", - expectedDeleted: false, - anotherBookLabel: "foo", - expectedAnotherBookLabel: "foo", - expectedAnotherBookDirty: false, - }, - { - clientDirty: false, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "b2-label-updated", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "b2-label-updated", - expectedDeleted: false, - anotherBookLabel: "foo", - expectedAnotherBookLabel: "foo", - expectedAnotherBookDirty: false, - }, - { - clientDirty: false, - clientUSN: 1, - clientLabel: "b2-label", - clientDeleted: false, - serverUSN: 3, - serverLabel: "foo", - serverDeleted: false, - expectedUSN: 3, - expectedLabel: "foo", - expectedDeleted: false, - anotherBookLabel: "foo", - expectedAnotherBookLabel: "foo (2)", - expectedAnotherBookDirty: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) - b2UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b2UUID, 2, tc.anotherBookLabel, false, false) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - // update all fields but uuid and bump usn - b := client.SyncFragBook{ - UUID: b1UUID, - USN: tc.serverUSN, - Label: tc.serverLabel, - Deleted: tc.serverDeleted, - } - - if err := fullSyncBook(tx, b); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, fmt.Sprintf("note count mismatch for test case %d", idx)) - testutils.AssertEqualf(t, bookCount, 2, fmt.Sprintf("book count mismatch for test case %d", idx)) - - var b1Record, b2Record core.Book - testutils.MustScan(t, "getting b1Record", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), - &b1Record.UUID, &b1Record.USN, &b1Record.Label, &b1Record.Dirty, &b1Record.Deleted) - testutils.MustScan(t, "getting b2Record", - db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), - &b2Record.UUID, &b2Record.USN, &b2Record.Label, &b2Record.Dirty, &b2Record.Deleted) - - testutils.AssertEqual(t, b1Record.UUID, b1UUID, fmt.Sprintf("b1Record UUID mismatch for idx %d", idx)) - testutils.AssertEqual(t, b1Record.USN, tc.expectedUSN, fmt.Sprintf("b1Record USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Label, tc.expectedLabel, fmt.Sprintf("b1Record Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Dirty, tc.clientDirty, fmt.Sprintf("b1Record Dirty mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Deleted, tc.expectedDeleted, fmt.Sprintf("b1Record Deleted mismatch for test case %d", idx)) - - testutils.AssertEqual(t, b2Record.UUID, b2UUID, fmt.Sprintf("b2Record UUID mismatch for idx %d", idx)) - testutils.AssertEqual(t, b2Record.USN, 2, fmt.Sprintf("b2Record USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Label, tc.expectedAnotherBookLabel, fmt.Sprintf("b2Record Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Dirty, tc.expectedAnotherBookDirty, fmt.Sprintf("b2Record Dirty mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Deleted, false, fmt.Sprintf("b2Record Deleted mismatch for test case %d", idx)) - }() - } - }) -} - -func TestMergeBook(t *testing.T) { - t.Run("insert, no duplicates", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b1 := client.SyncFragBook{ - UUID: "b1-uuid", - USN: 12, - AddedOn: 1541108743, - Label: "b1-label", - Deleted: false, - } - - if err := mergeBook(tx, b1, modeInsert); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var b1Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch") - testutils.AssertEqual(t, b1Record.Label, b1.Label, "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, b1.USN, "b1 USN mismatch") - }) - - t.Run("insert, 1 duplicate", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b := client.SyncFragBook{ - UUID: "b2-uuid", - USN: 12, - AddedOn: 1541108743, - Label: "foo", - Deleted: false, - } - - if err := mergeBook(tx, b, modeInsert); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - - var b1Record, b2Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - - testutils.AssertEqual(t, b1Record.Label, "foo (2)", "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, 1, "b1 USN mismatch") - testutils.AssertEqual(t, b1Record.Dirty, true, "b1 should have been marked dirty") - - testutils.AssertEqual(t, b2Record.Label, "foo", "b2 Label mismatch") - testutils.AssertEqual(t, b2Record.USN, 12, "b2 USN mismatch") - testutils.AssertEqual(t, b2Record.Dirty, false, "b2 Dirty mismatch") - }) - - t.Run("insert, 3 duplicates", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "foo (2)", true, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b3-uuid", 3, "foo (3)", false, false) - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b := client.SyncFragBook{ - UUID: "b4-uuid", - USN: 12, - AddedOn: 1541108743, - Label: "foo", - Deleted: false, - } - - if err := mergeBook(tx, b, modeInsert); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 4, "book count mismatch") - - var b1Record, b2Record, b3Record, b4Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - testutils.MustScan(t, "getting b3", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b3-uuid"), - &b3Record.UUID, &b3Record.Label, &b3Record.USN, &b3Record.Dirty) - testutils.MustScan(t, "getting b4", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b4-uuid"), - &b4Record.UUID, &b4Record.Label, &b4Record.USN, &b4Record.Dirty) - - testutils.AssertEqual(t, b1Record.Label, "foo (4)", "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, 1, "b1 USN mismatch") - testutils.AssertEqual(t, b1Record.Dirty, true, "b1 Dirty mismatch") - - testutils.AssertEqual(t, b2Record.Label, "foo (2)", "b2 Label mismatch") - testutils.AssertEqual(t, b2Record.USN, 2, "b2 USN mismatch") - testutils.AssertEqual(t, b2Record.Dirty, true, "b2 Dirty mismatch") - - testutils.AssertEqual(t, b3Record.Label, "foo (3)", "b3 Label mismatch") - testutils.AssertEqual(t, b3Record.USN, 3, "b3 USN mismatch") - testutils.AssertEqual(t, b3Record.Dirty, false, "b3 Dirty mismatch") - - testutils.AssertEqual(t, b4Record.Label, "foo", "b4 Label mismatch") - testutils.AssertEqual(t, b4Record.USN, 12, "b4 USN mismatch") - testutils.AssertEqual(t, b4Record.Dirty, false, "b4 Dirty mismatch") - }) - - t.Run("update, no duplicates", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 1, "b1-label", false, false) - - b1 := client.SyncFragBook{ - UUID: b1UUID, - USN: 12, - AddedOn: 1541108743, - Label: "b1-label-edited", - Deleted: false, - } - - if err := mergeBook(tx, b1, modeUpdate); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var b1Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1UUID, "b1 UUID mismatch") - testutils.AssertEqual(t, b1Record.Label, "b1-label-edited", "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, 12, "b1 USN mismatch") - }) - - t.Run("update, 1 duplicate", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b := client.SyncFragBook{ - UUID: "b1-uuid", - USN: 12, - AddedOn: 1541108743, - Label: "bar", - Deleted: false, - } - - if err := mergeBook(tx, b, modeUpdate); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - - var b1Record, b2Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - - testutils.AssertEqual(t, b1Record.Label, "bar", "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, 12, "b1 USN mismatch") - testutils.AssertEqual(t, b1Record.Dirty, false, "b1 Dirty mismatch") - - testutils.AssertEqual(t, b2Record.Label, "bar (2)", "b2 Label mismatch") - testutils.AssertEqual(t, b2Record.USN, 2, "b2 USN mismatch") - testutils.AssertEqual(t, b2Record.Dirty, true, "b2 Dirty mismatch") - }) - - t.Run("update, 3 duplicate", func(t *testing.T) { - // set uj - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b3-uuid", 3, "bar (2)", true, false) - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b4-uuid", 4, "bar (3)", false, false) - - // test - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - b := client.SyncFragBook{ - UUID: "b1-uuid", - USN: 12, - AddedOn: 1541108743, - Label: "bar", - Deleted: false, - } - - if err := mergeBook(tx, b, modeUpdate); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // execute - var noteCount, bookCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 0, "note count mismatch") - testutils.AssertEqualf(t, bookCount, 4, "book count mismatch") - - var b1Record, b2Record, b3Record, b4Record core.Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - testutils.MustScan(t, "getting b3", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b3-uuid"), - &b3Record.UUID, &b3Record.Label, &b3Record.USN, &b3Record.Dirty) - testutils.MustScan(t, "getting b4", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b4-uuid"), - &b4Record.UUID, &b4Record.Label, &b4Record.USN, &b4Record.Dirty) - - testutils.AssertEqual(t, b1Record.Label, "bar", "b1 Label mismatch") - testutils.AssertEqual(t, b1Record.USN, 12, "b1 USN mismatch") - testutils.AssertEqual(t, b1Record.Dirty, false, "b1 Dirty mismatch") - - testutils.AssertEqual(t, b2Record.Label, "bar (4)", "b2 Label mismatch") - testutils.AssertEqual(t, b2Record.USN, 2, "b2 USN mismatch") - testutils.AssertEqual(t, b2Record.Dirty, true, "b2 Dirty mismatch") - - testutils.AssertEqual(t, b3Record.Label, "bar (2)", "b3 Label mismatch") - testutils.AssertEqual(t, b3Record.USN, 3, "b3 USN mismatch") - testutils.AssertEqual(t, b3Record.Dirty, true, "b3 Dirty mismatch") - - testutils.AssertEqual(t, b4Record.Label, "bar (3)", "b4 Label mismatch") - testutils.AssertEqual(t, b4Record.USN, 4, "b4 USN mismatch") - testutils.AssertEqual(t, b4Record.Dirty, false, "b4 Dirty mismatch") - }) -} - -func TestSaveServerState(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastSyncAt, int64(1231108742)) - testutils.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, 8) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - serverTime := int64(1541108743) - serverMaxUSN := 100 - - err = saveSyncState(tx, serverTime, serverMaxUSN) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var lastSyncedAt int64 - var lastMaxUSN int - - testutils.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastSyncAt), &lastSyncedAt) - testutils.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastMaxUSN), &lastMaxUSN) - - testutils.AssertEqual(t, lastSyncedAt, serverTime, "last synced at mismatch") - testutils.AssertEqual(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") -} - -// TestSendBooks tests that books are put to correct 'buckets' by running a test server and recording the -// uuid from the incoming data. It also tests that the uuid of the created books and book_uuids of their notes -// are updated accordingly based on the server response. -func TestSendBooks(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, 0) - - // should be ignored - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) - testutils.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b2-uuid", "b2-label", 2, false, false) - // should be created - testutils.MustExec(t, "inserting b3", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 0, false, true) - testutils.MustExec(t, "inserting b4", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b4-uuid", "b4-label", 0, false, true) - // should be only expunged locally without syncing to server - testutils.MustExec(t, "inserting b5", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b5-uuid", "b5-label", 0, true, true) - // should be deleted - testutils.MustExec(t, "inserting b6", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b6-uuid", "b6-label", 10, true, true) - // should be updated - testutils.MustExec(t, "inserting b7", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b7-uuid", "b7-label", 11, false, true) - testutils.MustExec(t, "inserting b8", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b8-uuid", "b8-label", 18, false, true) - - // some random notes - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 10, "n1 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", "b5-uuid", 10, "n2 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", "b6-uuid", 10, "n3 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n4-uuid", "b7-uuid", 10, "n4 body", 1541108743, false, false) - // notes that belong to the created book. Their book_uuid should be updated. - testutils.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", "b3-uuid", 10, "n5 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", "b3-uuid", 10, "n6 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n7", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n7-uuid", "b4-uuid", 10, "n7 body", 1541108743, false, false) - - var createdLabels []string - var updatesUUIDs []string - var deletedUUIDs []string - - // fire up a test server. It decrypts the payload for test purposes. - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v2/books" && r.Method == "POST" { - var payload client.CreateBookPayload - - err := json.NewDecoder(r.Body).Decode(&payload) - if err != nil { - t.Fatalf(errors.Wrap(err, "decoding payload in the test server").Error()) - return - } - - labelDec, err := crypt.AesGcmDecrypt(cipherKey, payload.Name) - if err != nil { - t.Fatalf(errors.Wrap(err, "decrypting label").Error()) - } - - labelDecStr := string(labelDec) - - createdLabels = append(createdLabels, labelDecStr) - - resp := client.CreateBookResp{ - Book: client.RespBook{ - UUID: fmt.Sprintf("server-%s-uuid", labelDecStr), - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - - p := strings.Split(r.URL.Path, "/") - if len(p) == 4 && p[0] == "" && p[1] == "v1" && p[2] == "books" { - if r.Method == "PATCH" { - uuid := p[3] - updatesUUIDs = append(updatesUUIDs, uuid) - - w.Header().Set("Content-Type", "application/json") - w.Write([]byte("{}")) - return - } else if r.Method == "DELETE" { - uuid := p[3] - deletedUUIDs = append(deletedUUIDs, uuid) - - w.Header().Set("Content-Type", "application/json") - w.Write([]byte("{}")) - return - } - } - - t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) - })) - defer ts.Close() - - ctx.APIEndpoint = ts.URL - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if _, err := sendBooks(ctx, tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - - // First, decrypt data so that they can be asserted - sort.SliceStable(createdLabels, func(i, j int) bool { - return strings.Compare(createdLabels[i], createdLabels[j]) < 0 - }) - - testutils.AssertDeepEqual(t, createdLabels, []string{"b3-label", "b4-label"}, "createdLabels mismatch") - testutils.AssertDeepEqual(t, updatesUUIDs, []string{"b7-uuid", "b8-uuid"}, "updatesUUIDs mismatch") - testutils.AssertDeepEqual(t, deletedUUIDs, []string{"b6-uuid"}, "deletedUUIDs mismatch") - - var b1, b2, b3, b4, b7, b8 core.Book - testutils.MustScan(t, "getting b1", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b1-label"), &b1.UUID, &b1.Dirty) - testutils.MustScan(t, "getting b2", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b2-label"), &b2.UUID, &b2.Dirty) - testutils.MustScan(t, "getting b3", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b3-label"), &b3.UUID, &b3.Dirty) - testutils.MustScan(t, "getting b4", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b4-label"), &b4.UUID, &b4.Dirty) - testutils.MustScan(t, "getting b7", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b7-label"), &b7.UUID, &b7.Dirty) - testutils.MustScan(t, "getting b8", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b8-label"), &b8.UUID, &b8.Dirty) - - var bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.AssertEqualf(t, bookCount, 6, "book count mismatch") - - testutils.AssertEqual(t, b1.Dirty, false, "b1 Dirty mismatch") - testutils.AssertEqual(t, b2.Dirty, false, "b2 Dirty mismatch") - testutils.AssertEqual(t, b3.Dirty, false, "b3 Dirty mismatch") - testutils.AssertEqual(t, b4.Dirty, false, "b4 Dirty mismatch") - testutils.AssertEqual(t, b7.Dirty, false, "b7 Dirty mismatch") - testutils.AssertEqual(t, b8.Dirty, false, "b8 Dirty mismatch") - testutils.AssertEqual(t, b1.UUID, "b1-uuid", "b1 UUID mismatch") - testutils.AssertEqual(t, b2.UUID, "b2-uuid", "b2 UUID mismatch") - // uuids of created books should have been updated - testutils.AssertEqual(t, b3.UUID, "server-b3-label-uuid", "b3 UUID mismatch") - testutils.AssertEqual(t, b4.UUID, "server-b4-label-uuid", "b4 UUID mismatch") - testutils.AssertEqual(t, b7.UUID, "b7-uuid", "b7 UUID mismatch") - testutils.AssertEqual(t, b8.UUID, "b8-uuid", "b8 UUID mismatch") - - var n1, n2, n3, n4, n5, n6, n7 core.Note - testutils.MustScan(t, "getting n1", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n1 body"), &n1.BookUUID) - testutils.MustScan(t, "getting n2", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n2 body"), &n2.BookUUID) - testutils.MustScan(t, "getting n3", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n3 body"), &n3.BookUUID) - testutils.MustScan(t, "getting n4", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n4 body"), &n4.BookUUID) - testutils.MustScan(t, "getting n5", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n5 body"), &n5.BookUUID) - testutils.MustScan(t, "getting n6", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n6 body"), &n6.BookUUID) - testutils.MustScan(t, "getting n7", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n7 body"), &n7.BookUUID) - testutils.AssertEqual(t, n1.BookUUID, "b1-uuid", "n1 bookUUID mismatch") - testutils.AssertEqual(t, n2.BookUUID, "b5-uuid", "n2 bookUUID mismatch") - testutils.AssertEqual(t, n3.BookUUID, "b6-uuid", "n3 bookUUID mismatch") - testutils.AssertEqual(t, n4.BookUUID, "b7-uuid", "n4 bookUUID mismatch") - testutils.AssertEqual(t, n5.BookUUID, "server-b3-label-uuid", "n5 bookUUID mismatch") - testutils.AssertEqual(t, n6.BookUUID, "server-b3-label-uuid", "n6 bookUUID mismatch") - testutils.AssertEqual(t, n7.BookUUID, "server-b4-label-uuid", "n7 bookUUID mismatch") -} - -func TestSendBooks_isBehind(t *testing.T) { - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v2/books" && r.Method == "POST" { - var payload client.CreateBookPayload - - err := json.NewDecoder(r.Body).Decode(&payload) - if err != nil { - t.Fatalf(errors.Wrap(err, "decoding payload in the test server").Error()) - return - } - - resp := client.CreateBookResp{ - Book: client.RespBook{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - - p := strings.Split(r.URL.Path, "/") - if len(p) == 4 && p[0] == "" && p[1] == "v1" && p[2] == "books" { - if r.Method == "PATCH" { - resp := client.UpdateBookResp{ - Book: client.RespBook{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } else if r.Method == "DELETE" { - resp := client.DeleteBookResp{ - Book: client.RespBook{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - } - - t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) - })) - defer ts.Close() - - t.Run("create book", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 0, false, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendBooks(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) - - t.Run("delete book", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, true, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendBooks(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) - - t.Run("update book", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 11, false, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendBooks(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) -} - -// TestSendNotes tests that notes are put to correct 'buckets' by running a test server and recording the -// uuid from the incoming data. -func TestSendNotes(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, 0) - - b1UUID := "b1-uuid" - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 1, false, false) - - // should be ignored - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1-body", 1541108743, false, false) - // should be created - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 0, "n2-body", 1541108743, false, true) - // should be updated - testutils.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", b1UUID, 11, "n3-body", 1541108743, false, true) - // should be only expunged locally without syncing to server - testutils.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n4-uuid", b1UUID, 0, "n4-body", 1541108743, true, true) - // should be deleted - testutils.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", b1UUID, 17, "n5-body", 1541108743, true, true) - // should be created - testutils.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", b1UUID, 0, "n6-body", 1541108743, false, true) - // should be ignored - testutils.MustExec(t, "inserting n7", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n7-uuid", b1UUID, 12, "n7-body", 1541108743, false, false) - // should be updated - testutils.MustExec(t, "inserting n8", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n8-uuid", b1UUID, 17, "n8-body", 1541108743, false, true) - // should be deleted - testutils.MustExec(t, "inserting n9", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n9-uuid", b1UUID, 17, "n9-body", 1541108743, true, true) - // should be created - testutils.MustExec(t, "inserting n10", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n10-uuid", b1UUID, 0, "n10-body", 1541108743, false, true) - - var createdBodys []string - var updatedUUIDs []string - var deletedUUIDs []string - - // fire up a test server. It decrypts the payload for test purposes. - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v2/notes" && r.Method == "POST" { - var payload client.CreateNotePayload - - err := json.NewDecoder(r.Body).Decode(&payload) - if err != nil { - t.Fatalf(errors.Wrap(err, "decoding payload in the test server").Error()) - return - } - - bodyDec, err := crypt.AesGcmDecrypt(cipherKey, payload.Body) - if err != nil { - t.Fatalf(errors.Wrap(err, "decrypting body").Error()) - } - bodyDecStr := string(bodyDec) - - createdBodys = append(createdBodys, bodyDecStr) - - resp := client.CreateNoteResp{ - Result: client.RespNote{ - UUID: fmt.Sprintf("server-%s-uuid", bodyDecStr), - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - - p := strings.Split(r.URL.Path, "/") - if len(p) == 4 && p[0] == "" && p[1] == "v1" && p[2] == "notes" { - if r.Method == "PATCH" { - uuid := p[3] - updatedUUIDs = append(updatedUUIDs, uuid) - - w.Header().Set("Content-Type", "application/json") - w.Write([]byte("{}")) - return - } else if r.Method == "DELETE" { - uuid := p[3] - deletedUUIDs = append(deletedUUIDs, uuid) - - w.Header().Set("Content-Type", "application/json") - w.Write([]byte("{}")) - return - } - } - - t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) - })) - defer ts.Close() - - ctx.APIEndpoint = ts.URL - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if _, err := sendNotes(ctx, tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - sort.SliceStable(createdBodys, func(i, j int) bool { - return strings.Compare(createdBodys[i], createdBodys[j]) < 0 - }) - - testutils.AssertDeepEqual(t, createdBodys, []string{"n10-body", "n2-body", "n6-body"}, "createdBodys mismatch") - testutils.AssertDeepEqual(t, updatedUUIDs, []string{"n3-uuid", "n8-uuid"}, "updatedUUIDs mismatch") - testutils.AssertDeepEqual(t, deletedUUIDs, []string{"n5-uuid", "n9-uuid"}, "deletedUUIDs mismatch") - - var noteCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.AssertEqualf(t, noteCount, 7, "note count mismatch") - - var n1, n2, n3, n6, n7, n8, n10 core.Note - testutils.MustScan(t, "getting n1", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n1-body"), &n1.UUID, &n1.AddedOn, &n1.Dirty) - testutils.MustScan(t, "getting n2", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n2-body"), &n2.UUID, &n2.AddedOn, &n2.Dirty) - testutils.MustScan(t, "getting n3", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n3-body"), &n3.UUID, &n3.AddedOn, &n3.Dirty) - testutils.MustScan(t, "getting n6", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n6-body"), &n6.UUID, &n6.AddedOn, &n6.Dirty) - testutils.MustScan(t, "getting n7", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n7-body"), &n7.UUID, &n7.AddedOn, &n7.Dirty) - testutils.MustScan(t, "getting n8", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n8-body"), &n8.UUID, &n8.AddedOn, &n8.Dirty) - testutils.MustScan(t, "getting n10", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n10-body"), &n10.UUID, &n10.AddedOn, &n10.Dirty) - - testutils.AssertEqualf(t, noteCount, 7, "note count mismatch") - - testutils.AssertEqual(t, n1.Dirty, false, "n1 Dirty mismatch") - testutils.AssertEqual(t, n2.Dirty, false, "n2 Dirty mismatch") - testutils.AssertEqual(t, n3.Dirty, false, "n3 Dirty mismatch") - testutils.AssertEqual(t, n6.Dirty, false, "n6 Dirty mismatch") - testutils.AssertEqual(t, n7.Dirty, false, "n7 Dirty mismatch") - testutils.AssertEqual(t, n8.Dirty, false, "n8 Dirty mismatch") - testutils.AssertEqual(t, n10.Dirty, false, "n10 Dirty mismatch") - - testutils.AssertEqual(t, n1.AddedOn, int64(1541108743), "n1 AddedOn mismatch") - testutils.AssertEqual(t, n2.AddedOn, int64(1541108743), "n2 AddedOn mismatch") - testutils.AssertEqual(t, n3.AddedOn, int64(1541108743), "n3 AddedOn mismatch") - testutils.AssertEqual(t, n6.AddedOn, int64(1541108743), "n6 AddedOn mismatch") - testutils.AssertEqual(t, n7.AddedOn, int64(1541108743), "n7 AddedOn mismatch") - testutils.AssertEqual(t, n8.AddedOn, int64(1541108743), "n8 AddedOn mismatch") - testutils.AssertEqual(t, n10.AddedOn, int64(1541108743), "n10 AddedOn mismatch") - - // UUIDs of created notes should have been updated with those from the server response - testutils.AssertEqual(t, n1.UUID, "n1-uuid", "n1 UUID mismatch") - testutils.AssertEqual(t, n2.UUID, "server-n2-body-uuid", "n2 UUID mismatch") - testutils.AssertEqual(t, n3.UUID, "n3-uuid", "n3 UUID mismatch") - testutils.AssertEqual(t, n6.UUID, "server-n6-body-uuid", "n6 UUID mismatch") - testutils.AssertEqual(t, n7.UUID, "n7-uuid", "n7 UUID mismatch") - testutils.AssertEqual(t, n8.UUID, "n8-uuid", "n8 UUID mismatch") - testutils.AssertEqual(t, n10.UUID, "server-n10-body-uuid", "n10 UUID mismatch") -} - -func TestSendNotes_addedOn(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, 0) - - // should be created - b1UUID := "b1-uuid" - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 0, "n1-body", 1541108743, false, true) - - // fire up a test server. It decrypts the payload for test purposes. - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v2/notes" && r.Method == "POST" { - resp := client.CreateNoteResp{ - Result: client.RespNote{ - UUID: utils.GenerateUUID(), - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - - t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) - })) - defer ts.Close() - - ctx.APIEndpoint = ts.URL - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if _, err := sendNotes(ctx, tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var n1 core.Note - testutils.MustScan(t, "getting n1", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n1-body"), &n1.UUID, &n1.AddedOn, &n1.Dirty) - testutils.AssertEqual(t, n1.AddedOn, int64(1541108743), "n1 AddedOn mismatch") -} - -func TestSendNotes_isBehind(t *testing.T) { - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v1/notes" && r.Method == "POST" { - var payload client.CreateBookPayload - - err := json.NewDecoder(r.Body).Decode(&payload) - if err != nil { - t.Fatalf(errors.Wrap(err, "decoding payload in the test server").Error()) - return - } - - resp := client.CreateNoteResp{ - Result: client.RespNote{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - - p := strings.Split(r.URL.Path, "/") - if len(p) == 4 && p[0] == "" && p[1] == "v1" && p[2] == "notes" { - if r.Method == "PATCH" { - resp := client.UpdateNoteResp{ - Result: client.RespNote{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } else if r.Method == "DELETE" { - resp := client.DeleteNoteResp{ - Result: client.RespNote{ - USN: 11, - }, - } - - w.Header().Set("Content-Type", "application/json") - if err := json.NewEncoder(w).Encode(resp); err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - return - } - return - } - } - - t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) - })) - defer ts.Close() - - t.Run("create note", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 1, "n1 body", 1541108743, false, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendNotes(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) - - t.Run("delete note", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 2, "n1 body", 1541108743, true, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendNotes(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) - - t.Run("update note", func(t *testing.T) { - testCases := []struct { - systemLastMaxUSN int - expectedIsBehind bool - }{ - { - systemLastMaxUSN: 10, - expectedIsBehind: false, - }, - { - systemLastMaxUSN: 9, - expectedIsBehind: true, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - testutils.Login(t, &ctx) - ctx.APIEndpoint = ts.URL - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemLastMaxUSN, tc.systemLastMaxUSN) - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 8, "n1 body", 1541108743, false, true) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - isBehind, err := sendNotes(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) - }() - } - }) -} - -func TestMergeNote(t *testing.T) { - b1UUID := "b1-uuid" - b2UUID := "b2-uuid" - - testCases := []struct { - addedOn int64 - clientUSN int - clientEditedOn int64 - clientBody string - clientPublic bool - clientDeleted bool - clientBookUUID string - clientDirty bool - serverUSN int - serverEditedOn int64 - serverBody string - serverPublic bool - serverDeleted bool - serverBookUUID string - expectedUSN int - expectedAddedOn int64 - expectedEditedOn int64 - expectedBody string - expectedPublic bool - expectedDeleted bool - expectedBookUUID string - expectedDirty bool - }{ - { - clientDirty: false, - clientUSN: 1, - clientEditedOn: 0, - clientBody: "n1 body", - clientPublic: false, - clientDeleted: false, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: true, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: true, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - // deleted locally and edited on server - { - clientDirty: true, - clientUSN: 1, - clientEditedOn: 1541219321, - clientBody: "", - clientPublic: false, - clientDeleted: true, - clientBookUUID: b1UUID, - addedOn: 1541232118, - serverUSN: 21, - serverEditedOn: 1541219321, - serverBody: "n1 body edited", - serverPublic: false, - serverDeleted: false, - serverBookUUID: b2UUID, - expectedUSN: 21, - expectedAddedOn: 1541232118, - expectedEditedOn: 1541219321, - expectedBody: "n1 body edited", - expectedPublic: false, - expectedDeleted: false, - expectedBookUUID: b2UUID, - expectedDirty: false, - }, - } - - for idx, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 5, false) - testutils.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b2UUID, "b2-label", 6, false) - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, b1UUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientPublic, tc.clientDeleted, tc.clientDirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - // update all fields but uuid and bump usn - fragNote := client.SyncFragNote{ - UUID: n1UUID, - BookUUID: tc.serverBookUUID, - USN: tc.serverUSN, - AddedOn: tc.addedOn, - EditedOn: tc.serverEditedOn, - Body: tc.serverBody, - Public: tc.serverPublic, - Deleted: tc.serverDeleted, - } - var localNote core.Note - testutils.MustScan(t, fmt.Sprintf("getting localNote for test case %d", idx), - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n1UUID), - &localNote.UUID, &localNote.BookUUID, &localNote.USN, &localNote.AddedOn, &localNote.EditedOn, &localNote.Body, &localNote.Public, &localNote.Deleted, &localNote.Dirty) - - if err := mergeNote(tx, fragNote, localNote); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var noteCount, bookCount int - testutils.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) - testutils.AssertEqualf(t, bookCount, 2, fmt.Sprintf("book count mismatch for test case %d", idx)) - - var n1Record core.Note - testutils.MustScan(t, fmt.Sprintf("getting n1Record for test case %d", idx), - db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty FROM notes WHERE uuid = ?", n1UUID), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Public, &n1Record.Deleted, &n1Record.Dirty) - var b1Record core.Book - testutils.MustScan(t, "getting b1Record for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) - var b2Record core.Book - testutils.MustScan(t, "getting b2Record for test case", - db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1UUID, fmt.Sprintf("b1Record UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Label, "b1-label", fmt.Sprintf("b1Record Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.USN, 5, fmt.Sprintf("b1Record USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Dirty, false, fmt.Sprintf("b1Record Dirty mismatch for test case %d", idx)) - - testutils.AssertEqual(t, b2Record.UUID, b2UUID, fmt.Sprintf("b2Record UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Label, "b2-label", fmt.Sprintf("b2Record Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.USN, 6, fmt.Sprintf("b2Record USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Dirty, false, fmt.Sprintf("b2Record Dirty mismatch for test case %d", idx)) - - testutils.AssertEqual(t, n1Record.UUID, n1UUID, fmt.Sprintf("n1Record UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1Record BookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.USN, tc.expectedUSN, fmt.Sprintf("n1Record USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1Record AddedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1Record EditedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Body, tc.expectedBody, fmt.Sprintf("n1Record Body mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Public, tc.expectedPublic, fmt.Sprintf("n1Record Public mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Deleted, tc.expectedDeleted, fmt.Sprintf("n1Record Deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Dirty, tc.expectedDirty, fmt.Sprintf("n1Record Dirty mismatch for test case %d", idx)) - }() - } -} - -func TestCheckBookPristine(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false) - testutils.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b2-uuid", "b2-label", 6, false) - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 1541108743, "n1 body", false) - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n2-uuid", "b1-uuid", 1541108743, "n2 body", false) - testutils.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n3-uuid", "b1-uuid", 1541108743, "n3 body", true) - testutils.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n4-uuid", "b2-uuid", 1541108743, "n4 body", false) - testutils.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n5-uuid", "b2-uuid", 1541108743, "n5 body", false) - - t.Run("b1", func(t *testing.T) { - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - got, err := checkNotesPristine(tx, "b1-uuid") - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, got, false, "b1 should not be pristine") - }) - - t.Run("b2", func(t *testing.T) { - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - got, err := checkNotesPristine(tx, "b2-uuid") - if err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - testutils.AssertEqual(t, got, true, "b2 should be pristine") - }) -} - -func TestCheckNoteInList(t *testing.T) { - list := syncList{ - Notes: map[string]client.SyncFragNote{ - "n1-uuid": client.SyncFragNote{ - UUID: "n1-uuid", - }, - "n2-uuid": client.SyncFragNote{ - UUID: "n2-uuid", - }, - }, - Books: map[string]client.SyncFragBook{ - "b1-uuid": client.SyncFragBook{ - UUID: "b1-uuid", - }, - "b2-uuid": client.SyncFragBook{ - UUID: "b2-uuid", - }, - }, - ExpungedNotes: map[string]bool{ - "n3-uuid": true, - "n4-uuid": true, - }, - ExpungedBooks: map[string]bool{ - "b3-uuid": true, - "b4-uuid": true, - }, - MaxUSN: 1, - MaxCurrentTime: 2, - } - - testCases := []struct { - uuid string - expected bool - }{ - { - uuid: "n1-uuid", - expected: true, - }, - { - uuid: "n2-uuid", - expected: true, - }, - { - uuid: "n3-uuid", - expected: true, - }, - { - uuid: "n4-uuid", - expected: true, - }, - { - uuid: "nonexistent-note-uuid", - expected: false, - }, - } - - for idx, tc := range testCases { - got := checkNoteInList(tc.uuid, &list) - testutils.AssertEqual(t, got, tc.expected, fmt.Sprintf("result mismatch for test case %d", idx)) - } -} - -func TestCheckBookInList(t *testing.T) { - list := syncList{ - Notes: map[string]client.SyncFragNote{ - "n1-uuid": client.SyncFragNote{ - UUID: "n1-uuid", - }, - "n2-uuid": client.SyncFragNote{ - UUID: "n2-uuid", - }, - }, - Books: map[string]client.SyncFragBook{ - "b1-uuid": client.SyncFragBook{ - UUID: "b1-uuid", - }, - "b2-uuid": client.SyncFragBook{ - UUID: "b2-uuid", - }, - }, - ExpungedNotes: map[string]bool{ - "n3-uuid": true, - "n4-uuid": true, - }, - ExpungedBooks: map[string]bool{ - "b3-uuid": true, - "b4-uuid": true, - }, - MaxUSN: 1, - MaxCurrentTime: 2, - } - - testCases := []struct { - uuid string - expected bool - }{ - { - uuid: "b1-uuid", - expected: true, - }, - { - uuid: "b2-uuid", - expected: true, - }, - { - uuid: "b3-uuid", - expected: true, - }, - { - uuid: "b4-uuid", - expected: true, - }, - { - uuid: "nonexistent-book-uuid", - expected: false, - }, - } - - for idx, tc := range testCases { - got := checkBookInList(tc.uuid, &list) - testutils.AssertEqual(t, got, tc.expected, fmt.Sprintf("result mismatch for test case %d", idx)) - } -} - -func TestCleanLocalNotes(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - list := syncList{ - Notes: map[string]client.SyncFragNote{ - "n1-uuid": client.SyncFragNote{ - UUID: "n1-uuid", - }, - "n2-uuid": client.SyncFragNote{ - UUID: "n2-uuid", - }, - }, - Books: map[string]client.SyncFragBook{ - "b1-uuid": client.SyncFragBook{ - UUID: "b1-uuid", - }, - "b2-uuid": client.SyncFragBook{ - UUID: "b2-uuid", - }, - }, - ExpungedNotes: map[string]bool{ - "n3-uuid": true, - "n4-uuid": true, - }, - ExpungedBooks: map[string]bool{ - "b3-uuid": true, - "b4-uuid": true, - }, - MaxUSN: 1, - MaxCurrentTime: 2, - } - - b1UUID := "b1-uuid" - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 1, false, false) - - // exists in the list - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 0, "n2 body", 1541108743, false, true) - // non-existent in the list but in valid state - // (created in the cli and hasn't been uploaded) - testutils.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", b1UUID, 0, "n6 body", 1541108743, false, true) - // non-existent in the list and in an invalid state - testutils.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", b1UUID, 7, "n5 body", 1541108743, true, true) - testutils.MustExec(t, "inserting n9", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n9-uuid", b1UUID, 17, "n9 body", 1541108743, true, false) - testutils.MustExec(t, "inserting n10", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n10-uuid", b1UUID, 0, "n10 body", 1541108743, false, false) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := cleanLocalNotes(tx, &list); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.AssertEqual(t, noteCount, 3, "note count mismatch") - - var n1, n2, n6 core.Note - testutils.MustScan(t, "getting n1", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n1-uuid"), &n1.Dirty) - testutils.MustScan(t, "getting n2", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n2-uuid"), &n2.Dirty) - testutils.MustScan(t, "getting n6", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n6-uuid"), &n6.Dirty) -} - -func TestCleanLocalBooks(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../../tmp", "../../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - list := syncList{ - Notes: map[string]client.SyncFragNote{ - "n1-uuid": client.SyncFragNote{ - UUID: "n1-uuid", - }, - "n2-uuid": client.SyncFragNote{ - UUID: "n2-uuid", - }, - }, - Books: map[string]client.SyncFragBook{ - "b1-uuid": client.SyncFragBook{ - UUID: "b1-uuid", - }, - "b2-uuid": client.SyncFragBook{ - UUID: "b2-uuid", - }, - }, - ExpungedNotes: map[string]bool{ - "n3-uuid": true, - "n4-uuid": true, - }, - ExpungedBooks: map[string]bool{ - "b3-uuid": true, - "b4-uuid": true, - }, - MaxUSN: 1, - MaxCurrentTime: 2, - } - - // existent in the server - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) - testutils.MustExec(t, "inserting b3", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 0, false, true) - // non-existent in the server but in valid state - testutils.MustExec(t, "inserting b5", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b5-uuid", "b5-label", 0, true, true) - // non-existent in the server and in an invalid state - testutils.MustExec(t, "inserting b6", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b6-uuid", "b6-label", 10, true, true) - testutils.MustExec(t, "inserting b7", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b7-uuid", "b7-label", 11, false, false) - testutils.MustExec(t, "inserting b8", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b8-uuid", "b8-label", 0, false, false) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := cleanLocalBooks(tx, &list); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.AssertEqual(t, bookCount, 3, "note count mismatch") - - var b1, b3, b5 core.Book - testutils.MustScan(t, "getting b1", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b1-uuid"), &b1.Label) - testutils.MustScan(t, "getting b3", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b3-uuid"), &b3.Label) - testutils.MustScan(t, "getting b5", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b5-uuid"), &b5.Label) -} diff --git a/cli/cmd/version/version.go b/cli/cmd/version/version.go deleted file mode 100644 index 27b530e8..00000000 --- a/cli/cmd/version/version.go +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package version - -import ( - "fmt" - - "github.com/dnote/dnote/cli/infra" - "github.com/spf13/cobra" -) - -// NewCmd returns a new version command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "version", - Short: "Print the version number of Dnote", - Long: "Print the version number of Dnote", - Run: func(cmd *cobra.Command, args []string) { - fmt.Printf("dnote %s\n", ctx.Version) - }, - } - - return cmd -} diff --git a/cli/cmd/view/view.go b/cli/cmd/view/view.go deleted file mode 100644 index b8a55caa..00000000 --- a/cli/cmd/view/view.go +++ /dev/null @@ -1,78 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package view - -import ( - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/pkg/errors" - "github.com/spf13/cobra" - - "github.com/dnote/dnote/cli/cmd/cat" - "github.com/dnote/dnote/cli/cmd/ls" -) - -var example = ` - * View all books - dnote view - - * List notes in a book - dnote view javascript - - * View a particular note in a book - dnote view javascript 0 - ` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) > 2 { - return errors.New("Incorrect number of argument") - } - - return nil -} - -// NewCmd returns a new view command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "view ", - Aliases: []string{"v"}, - Short: "List books, notes or view a content", - Example: example, - RunE: newRun(ctx), - PreRunE: preRun, - } - - return cmd -} - -func newRun(ctx infra.DnoteCtx) core.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - var run core.RunEFunc - - if len(args) <= 1 { - run = ls.NewRun(ctx) - } else if len(args) == 2 { - run = cat.NewRun(ctx) - } else { - return errors.New("Incorrect number of arguments") - } - - return run(cmd, args) - } -} diff --git a/cli/core/core.go b/cli/core/core.go deleted file mode 100644 index db33ddf6..00000000 --- a/cli/core/core.go +++ /dev/null @@ -1,358 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "database/sql" - "fmt" - "io/ioutil" - "os" - "os/exec" - "strconv" - "strings" - "time" - - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" - "github.com/satori/go.uuid" - "github.com/spf13/cobra" - "gopkg.in/yaml.v2" -) - -var ( - // ConfigFilename is the name of the config file - ConfigFilename = "dnoterc" - // TmpContentFilename is the name of the temporary file that holds editor input - TmpContentFilename = "DNOTE_TMPCONTENT.md" -) - -// RunEFunc is a function type of dnote commands -type RunEFunc func(*cobra.Command, []string) error - -// GetConfigPath returns the path to the dnote config file -func GetConfigPath(ctx infra.DnoteCtx) string { - return fmt.Sprintf("%s/%s", ctx.DnoteDir, ConfigFilename) -} - -// GetDnoteTmpContentPath returns the path to the temporary file containing -// content being added or edited -func GetDnoteTmpContentPath(ctx infra.DnoteCtx) string { - return fmt.Sprintf("%s/%s", ctx.DnoteDir, TmpContentFilename) -} - -// GetBookUUID returns a uuid of a book given a label -func GetBookUUID(ctx infra.DnoteCtx, label string) (string, error) { - db := ctx.DB - - var ret string - err := db.QueryRow("SELECT uuid FROM books WHERE label = ?", label).Scan(&ret) - if err == sql.ErrNoRows { - return ret, errors.Errorf("book '%s' not found", label) - } else if err != nil { - return ret, errors.Wrap(err, "querying the book") - } - - return ret, nil -} - -// getEditorCommand returns the system's editor command with appropriate flags, -// if necessary, to make the command wait until editor is close to exit. -func getEditorCommand() string { - editor := os.Getenv("EDITOR") - - var ret string - - switch editor { - case "atom": - ret = "atom -w" - case "subl": - ret = "subl -n -w" - case "mate": - ret = "mate -w" - case "vim": - ret = "vim" - case "nano": - ret = "nano" - case "emacs": - ret = "emacs" - case "nvim": - ret = "nvim" - default: - ret = "vi" - } - - return ret -} - -// InitFiles creates, if necessary, the dnote directory and files inside -func InitFiles(ctx infra.DnoteCtx) error { - if err := initDnoteDir(ctx); err != nil { - return errors.Wrap(err, "creating the dnote dir") - } - if err := initConfigFile(ctx); err != nil { - return errors.Wrap(err, "generating the config file") - } - - return nil -} - -// initConfigFile populates a new config file if it does not exist yet -func initConfigFile(ctx infra.DnoteCtx) error { - path := GetConfigPath(ctx) - - if utils.FileExists(path) { - return nil - } - - editor := getEditorCommand() - - config := infra.Config{ - Editor: editor, - } - - b, err := yaml.Marshal(config) - if err != nil { - return errors.Wrap(err, "marshalling config into YAML") - } - - err = ioutil.WriteFile(path, b, 0644) - if err != nil { - return errors.Wrap(err, "writing the config file") - } - - return nil -} - -// initDnoteDir initializes dnote directory if it does not exist yet -func initDnoteDir(ctx infra.DnoteCtx) error { - path := ctx.DnoteDir - - if utils.FileExists(path) { - return nil - } - - if err := os.MkdirAll(path, 0755); err != nil { - return errors.Wrap(err, "Failed to create dnote directory") - } - - return nil -} - -// WriteConfig writes the config to the config file -func WriteConfig(ctx infra.DnoteCtx, config infra.Config) error { - d, err := yaml.Marshal(config) - if err != nil { - return errors.Wrap(err, "marhsalling config") - } - - configPath := GetConfigPath(ctx) - - err = ioutil.WriteFile(configPath, d, 0644) - if err != nil { - errors.Wrap(err, "writing the config file") - } - - return nil -} - -// LogAction logs action and updates the last_action -func LogAction(tx *sql.Tx, schema int, actionType, data string, timestamp int64) error { - uuid := uuid.NewV4().String() - - _, err := tx.Exec(`INSERT INTO actions (uuid, schema, type, data, timestamp) - VALUES (?, ?, ?, ?, ?)`, uuid, schema, actionType, data, timestamp) - if err != nil { - return errors.Wrap(err, "inserting an action") - } - - _, err = tx.Exec("UPDATE system SET value = ? WHERE key = ?", timestamp, "last_action") - if err != nil { - return errors.Wrap(err, "updating last_action") - } - - return nil -} - -// ReadConfig reads the config file -func ReadConfig(ctx infra.DnoteCtx) (infra.Config, error) { - var ret infra.Config - - configPath := GetConfigPath(ctx) - b, err := ioutil.ReadFile(configPath) - if err != nil { - return ret, errors.Wrap(err, "reading config file") - } - - err = yaml.Unmarshal(b, &ret) - if err != nil { - return ret, errors.Wrap(err, "unmarshalling config") - } - - return ret, nil -} - -// SanitizeContent sanitizes note content -func SanitizeContent(s string) string { - var ret string - - ret = strings.Trim(s, " ") - - // Remove newline at the end of the file because POSIX defines a line as - // characters followed by a newline - ret = strings.TrimSuffix(ret, "\n") - ret = strings.TrimSuffix(ret, "\r\n") - - return ret -} - -func newEditorCmd(ctx infra.DnoteCtx, fpath string) (*exec.Cmd, error) { - config, err := ReadConfig(ctx) - if err != nil { - return nil, errors.Wrap(err, "reading config") - } - - args := strings.Fields(config.Editor) - args = append(args, fpath) - - return exec.Command(args[0], args[1:]...), nil -} - -// GetEditorInput gets the user input by launching a text editor and waiting for -// it to exit -func GetEditorInput(ctx infra.DnoteCtx, fpath string, content *string) error { - if !utils.FileExists(fpath) { - f, err := os.Create(fpath) - if err != nil { - return errors.Wrap(err, "creating a temporary content file") - } - err = f.Close() - if err != nil { - return errors.Wrap(err, "closing the temporary content file") - } - } - - cmd, err := newEditorCmd(ctx, fpath) - if err != nil { - return errors.Wrap(err, "creating an editor command") - } - - cmd.Stdin = os.Stdin - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - - err = cmd.Start() - if err != nil { - return errors.Wrapf(err, "launching an editor") - } - - err = cmd.Wait() - if err != nil { - return errors.Wrap(err, "waiting for the editor") - } - - b, err := ioutil.ReadFile(fpath) - if err != nil { - return errors.Wrap(err, "reading the temporary content file") - } - - err = os.Remove(fpath) - if err != nil { - return errors.Wrap(err, "removing the temporary content file") - } - - raw := string(b) - c := SanitizeContent(raw) - - *content = c - - return nil -} - -func initSystemKV(db *infra.DB, key string, val string) error { - var count int - if err := db.QueryRow("SELECT count(*) FROM system WHERE key = ?", key).Scan(&count); err != nil { - return errors.Wrapf(err, "counting %s", key) - } - - if count > 0 { - return nil - } - - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (?, ?)", key, val); err != nil { - db.Rollback() - return errors.Wrapf(err, "inserting %s %s", key, val) - - } - - return nil -} - -// InitSystem inserts system data if missing -func InitSystem(ctx infra.DnoteCtx) error { - db := ctx.DB - - tx, err := db.Begin() - if err != nil { - return errors.Wrap(err, "beginning a transaction") - } - - nowStr := strconv.FormatInt(time.Now().Unix(), 10) - if err := initSystemKV(tx, infra.SystemLastUpgrade, nowStr); err != nil { - return errors.Wrapf(err, "initializing system config for %s", infra.SystemLastUpgrade) - } - if err := initSystemKV(tx, infra.SystemLastMaxUSN, "0"); err != nil { - return errors.Wrapf(err, "initializing system config for %s", infra.SystemLastMaxUSN) - } - if err := initSystemKV(tx, infra.SystemLastSyncAt, "0"); err != nil { - return errors.Wrapf(err, "initializing system config for %s", infra.SystemLastSyncAt) - } - - tx.Commit() - - return nil -} - -// GetValidSession returns a session key from the local storage if one exists and is not expired -// If one does not exist or is expired, it prints out an instruction and returns false -func GetValidSession(ctx infra.DnoteCtx) (string, bool, error) { - db := ctx.DB - - var sessionKey string - var sessionKeyExpires int64 - - if err := GetSystem(db, infra.SystemSessionKey, &sessionKey); err != nil { - return "", false, errors.Wrap(err, "getting session key") - } - if err := GetSystem(db, infra.SystemSessionKeyExpiry, &sessionKeyExpires); err != nil { - return "", false, errors.Wrap(err, "getting session key expiry") - } - - if sessionKey == "" { - log.Error("login required. please run `dnote login`\n") - return "", false, nil - } - if sessionKeyExpires < time.Now().Unix() { - log.Error("sesison expired. please run `dnote login`\n") - return "", false, nil - } - - return sessionKey, true, nil -} diff --git a/cli/core/core_test.go b/cli/core/core_test.go deleted file mode 100644 index 2d084e86..00000000 --- a/cli/core/core_test.go +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "testing" - - "github.com/dnote/dnote/cli/testutils" - "github.com/pkg/errors" -) - -func TestInitSystemKV(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - var originalCount int - testutils.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - if err := initSystemKV(tx, "testKey", "testVal"); err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "executing")) - } - - tx.Commit() - - // Test - var count int - testutils.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &count) - testutils.AssertEqual(t, count, originalCount+1, "system count mismatch") - - var val string - testutils.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", "testKey"), &val) - testutils.AssertEqual(t, val, "testVal", "system value mismatch") -} - -func TestInitSystemKV_existing(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting a system config", db, "INSERT INTO system (key, value) VALUES (?, ?)", "testKey", "testVal") - - var originalCount int - testutils.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - if err := initSystemKV(tx, "testKey", "newTestVal"); err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "executing")) - } - - tx.Commit() - - // Test - var count int - testutils.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &count) - testutils.AssertEqual(t, count, originalCount, "system count mismatch") - - var val string - testutils.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", "testKey"), &val) - testutils.AssertEqual(t, val, "testVal", "system value should not have been updated") -} diff --git a/cli/core/models_test.go b/cli/core/models_test.go deleted file mode 100644 index bb3c8369..00000000 --- a/cli/core/models_test.go +++ /dev/null @@ -1,901 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "fmt" - "testing" - - "github.com/dnote/dnote/cli/testutils" - "github.com/pkg/errors" -) - -func TestNewNote(t *testing.T) { - testCases := []struct { - uuid string - bookUUID string - body string - addedOn int64 - editedOn int64 - usn int - public bool - deleted bool - dirty bool - }{ - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 0, - public: false, - deleted: false, - dirty: false, - }, - { - uuid: "n2-uuid", - bookUUID: "b2-uuid", - body: "n2-body", - addedOn: 1542058875, - editedOn: 1542058876, - usn: 1008, - public: true, - deleted: true, - dirty: true, - }, - } - - for idx, tc := range testCases { - got := NewNote(tc.uuid, tc.bookUUID, tc.body, tc.addedOn, tc.editedOn, tc.usn, tc.public, tc.deleted, tc.dirty) - - testutils.AssertEqual(t, got.UUID, tc.uuid, fmt.Sprintf("UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.BookUUID, tc.bookUUID, fmt.Sprintf("BookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Body, tc.body, fmt.Sprintf("Body mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.AddedOn, tc.addedOn, fmt.Sprintf("AddedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.EditedOn, tc.editedOn, fmt.Sprintf("EditedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.USN, tc.usn, fmt.Sprintf("USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Public, tc.public, fmt.Sprintf("Public mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Deleted, tc.deleted, fmt.Sprintf("Deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Dirty, tc.dirty, fmt.Sprintf("Dirty mismatch for test case %d", idx)) - } -} - -func TestNoteInsert(t *testing.T) { - testCases := []struct { - uuid string - bookUUID string - body string - addedOn int64 - editedOn int64 - usn int - public bool - deleted bool - dirty bool - }{ - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 0, - public: false, - deleted: false, - dirty: false, - }, - { - uuid: "n2-uuid", - bookUUID: "b2-uuid", - body: "n2-body", - addedOn: 1542058875, - editedOn: 1542058876, - usn: 1008, - public: true, - deleted: true, - dirty: true, - }, - } - - for idx, tc := range testCases { - func() { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - n := Note{ - UUID: tc.uuid, - BookUUID: tc.bookUUID, - Body: tc.body, - AddedOn: tc.addedOn, - EditedOn: tc.editedOn, - USN: tc.usn, - Public: tc.public, - Deleted: tc.deleted, - Dirty: tc.dirty, - } - - // execute - db := ctx.DB - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - if err := n.Insert(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var uuid, bookUUID, body string - var addedOn, editedOn int64 - var usn int - var public, deleted, dirty bool - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), - &uuid, &bookUUID, &body, &addedOn, &editedOn, &usn, &public, &deleted, &dirty) - - testutils.AssertEqual(t, uuid, tc.uuid, fmt.Sprintf("uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, bookUUID, tc.bookUUID, fmt.Sprintf("bookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, body, tc.body, fmt.Sprintf("body mismatch for test case %d", idx)) - testutils.AssertEqual(t, addedOn, tc.addedOn, fmt.Sprintf("addedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, editedOn, tc.editedOn, fmt.Sprintf("editedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, usn, tc.usn, fmt.Sprintf("usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, public, tc.public, fmt.Sprintf("public mismatch for test case %d", idx)) - testutils.AssertEqual(t, deleted, tc.deleted, fmt.Sprintf("deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, dirty, tc.dirty, fmt.Sprintf("dirty mismatch for test case %d", idx)) - }() - } -} - -func TestNoteUpdate(t *testing.T) { - testCases := []struct { - uuid string - bookUUID string - body string - addedOn int64 - editedOn int64 - usn int - public bool - deleted bool - dirty bool - newBookUUID string - newBody string - newEditedOn int64 - newUSN int - newPublic bool - newDeleted bool - newDirty bool - }{ - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 0, - public: false, - deleted: false, - dirty: false, - newBookUUID: "b1-uuid", - newBody: "n1-body edited", - newEditedOn: 1542058879, - newUSN: 0, - newPublic: false, - newDeleted: false, - newDirty: false, - }, - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 0, - public: false, - deleted: false, - dirty: true, - newBookUUID: "b2-uuid", - newBody: "n1-body", - newEditedOn: 1542058879, - newUSN: 0, - newPublic: true, - newDeleted: false, - newDirty: false, - }, - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 10, - public: false, - deleted: false, - dirty: false, - newBookUUID: "", - newBody: "", - newEditedOn: 1542058879, - newUSN: 151, - newPublic: false, - newDeleted: true, - newDirty: false, - }, - { - uuid: "n1-uuid", - bookUUID: "b1-uuid", - body: "n1-body", - addedOn: 1542058875, - editedOn: 0, - usn: 0, - public: false, - deleted: false, - dirty: false, - newBookUUID: "", - newBody: "", - newEditedOn: 1542058879, - newUSN: 15, - newPublic: false, - newDeleted: true, - newDirty: false, - }, - } - - for idx, tc := range testCases { - func() { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - n1 := Note{ - UUID: tc.uuid, - BookUUID: tc.bookUUID, - Body: tc.body, - AddedOn: tc.addedOn, - EditedOn: tc.editedOn, - USN: tc.usn, - Public: tc.public, - Deleted: tc.deleted, - Dirty: tc.dirty, - } - n2 := Note{ - UUID: "n2-uuid", - BookUUID: "b10-uuid", - Body: "n2 body", - AddedOn: 1542058875, - EditedOn: 0, - USN: 39, - Public: false, - Deleted: false, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Public, n1.Deleted, n1.Dirty) - testutils.MustExec(t, fmt.Sprintf("inserting n2 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Public, n2.Deleted, n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - n1.BookUUID = tc.newBookUUID - n1.Body = tc.newBody - n1.EditedOn = tc.newEditedOn - n1.USN = tc.newUSN - n1.Public = tc.newPublic - n1.Deleted = tc.newDeleted - n1.Dirty = tc.newDirty - - if err := n1.Update(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var n1Record, n2Record Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.Body, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.USN, &n1Record.Public, &n1Record.Deleted, &n1Record.Dirty) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, n1Record.UUID, n1.UUID, fmt.Sprintf("n1 uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.BookUUID, tc.newBookUUID, fmt.Sprintf("n1 bookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Body, tc.newBody, fmt.Sprintf("n1 body mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.AddedOn, n1.AddedOn, fmt.Sprintf("n1 addedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.EditedOn, tc.newEditedOn, fmt.Sprintf("n1 editedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.USN, tc.newUSN, fmt.Sprintf("n1 usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Public, tc.newPublic, fmt.Sprintf("n1 public mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Deleted, tc.newDeleted, fmt.Sprintf("n1 deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, n1Record.Dirty, tc.newDirty, fmt.Sprintf("n1 dirty mismatch for test case %d", idx)) - - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, fmt.Sprintf("n2 uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.BookUUID, n2.BookUUID, fmt.Sprintf("n2 bookUUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.Body, n2.Body, fmt.Sprintf("n2 body mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.AddedOn, n2.AddedOn, fmt.Sprintf("n2 addedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.EditedOn, n2.EditedOn, fmt.Sprintf("n2 editedOn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.USN, n2.USN, fmt.Sprintf("n2 usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.Public, n2.Public, fmt.Sprintf("n2 public mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.Deleted, n2.Deleted, fmt.Sprintf("n2 deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, n2Record.Dirty, n2.Dirty, fmt.Sprintf("n2 dirty mismatch for test case %d", idx)) - }() - } -} - -func TestNoteUpdateUUID(t *testing.T) { - testCases := []struct { - newUUID string - }{ - { - newUUID: "n1-new-uuid", - }, - { - newUUID: "n2-new-uuid", - }, - } - - for idx, tc := range testCases { - t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - n1 := Note{ - UUID: "n1-uuid", - BookUUID: "b1-uuid", - AddedOn: 1542058874, - Body: "n1-body", - USN: 1, - Deleted: true, - Dirty: false, - } - n2 := Note{ - UUID: "n2-uuid", - BookUUID: "b1-uuid", - AddedOn: 1542058874, - Body: "n2-body", - USN: 1, - Deleted: true, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.Body, n1.AddedOn, n1.USN, n1.Deleted, n1.Dirty) - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.Body, n2.AddedOn, n2.USN, n2.Deleted, n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - if err := n1.UpdateUUID(tx, tc.newUUID); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var n1Record, n2Record Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, body, usn, deleted, dirty FROM notes WHERE body = ?", "n1-body"), - &n1Record.UUID, &n1Record.Body, &n1Record.USN, &n1Record.Deleted, &n1Record.Dirty) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, body, usn, deleted, dirty FROM notes WHERE body = ?", "n2-body"), - &n2Record.UUID, &n2Record.Body, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, n1.UUID, tc.newUUID, "n1 original reference uuid mismatch") - testutils.AssertEqual(t, n1Record.UUID, tc.newUUID, "n1 uuid mismatch") - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") - }) - } -} - -func TestNoteExpunge(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - n1 := Note{ - UUID: "n1-uuid", - BookUUID: "b9-uuid", - Body: "n1 body", - AddedOn: 1542058874, - EditedOn: 0, - USN: 22, - Public: false, - Deleted: false, - Dirty: false, - } - n2 := Note{ - UUID: "n2-uuid", - BookUUID: "b10-uuid", - Body: "n2 body", - AddedOn: 1542058875, - EditedOn: 0, - USN: 39, - Public: false, - Deleted: false, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Public, n1.Deleted, n1.Dirty) - testutils.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Public, n2.Deleted, n2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := n1.Expunge(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var noteCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch") - - var n2Record Note - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) - - testutils.AssertEqual(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") - testutils.AssertEqual(t, n2Record.BookUUID, n2.BookUUID, "n2 bookUUID mismatch") - testutils.AssertEqual(t, n2Record.Body, n2.Body, "n2 body mismatch") - testutils.AssertEqual(t, n2Record.AddedOn, n2.AddedOn, "n2 addedOn mismatch") - testutils.AssertEqual(t, n2Record.EditedOn, n2.EditedOn, "n2 editedOn mismatch") - testutils.AssertEqual(t, n2Record.USN, n2.USN, "n2 usn mismatch") - testutils.AssertEqual(t, n2Record.Public, n2.Public, "n2 public mismatch") - testutils.AssertEqual(t, n2Record.Deleted, n2.Deleted, "n2 deleted mismatch") - testutils.AssertEqual(t, n2Record.Dirty, n2.Dirty, "n2 dirty mismatch") -} - -func TestNewBook(t *testing.T) { - testCases := []struct { - uuid string - label string - usn int - deleted bool - dirty bool - }{ - { - uuid: "b1-uuid", - label: "b1-label", - usn: 0, - deleted: false, - dirty: false, - }, - { - uuid: "b2-uuid", - label: "b2-label", - usn: 1008, - deleted: false, - dirty: true, - }, - } - - for idx, tc := range testCases { - got := NewBook(tc.uuid, tc.label, tc.usn, tc.deleted, tc.dirty) - - testutils.AssertEqual(t, got.UUID, tc.uuid, fmt.Sprintf("UUID mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Label, tc.label, fmt.Sprintf("Label mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.USN, tc.usn, fmt.Sprintf("USN mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Deleted, tc.deleted, fmt.Sprintf("Deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, got.Dirty, tc.dirty, fmt.Sprintf("Dirty mismatch for test case %d", idx)) - } -} - -func TestBookInsert(t *testing.T) { - testCases := []struct { - uuid string - label string - usn int - deleted bool - dirty bool - }{ - { - uuid: "b1-uuid", - label: "b1-label", - usn: 10808, - deleted: false, - dirty: false, - }, - { - uuid: "b1-uuid", - label: "b1-label", - usn: 10808, - deleted: false, - dirty: true, - }, - } - - for idx, tc := range testCases { - func() { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - b := Book{ - UUID: tc.uuid, - Label: tc.label, - USN: tc.usn, - Dirty: tc.dirty, - Deleted: tc.deleted, - } - - // execute - db := ctx.DB - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - if err := b.Insert(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var uuid, label string - var usn int - var deleted, dirty bool - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", tc.uuid), - &uuid, &label, &usn, &deleted, &dirty) - - testutils.AssertEqual(t, uuid, tc.uuid, fmt.Sprintf("uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, label, tc.label, fmt.Sprintf("label mismatch for test case %d", idx)) - testutils.AssertEqual(t, usn, tc.usn, fmt.Sprintf("usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, deleted, tc.deleted, fmt.Sprintf("deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, dirty, tc.dirty, fmt.Sprintf("dirty mismatch for test case %d", idx)) - }() - } -} - -func TestBookUpdate(t *testing.T) { - testCases := []struct { - uuid string - label string - usn int - deleted bool - dirty bool - newLabel string - newUSN int - newDeleted bool - newDirty bool - }{ - { - uuid: "b1-uuid", - label: "b1-label", - usn: 0, - deleted: false, - dirty: false, - newLabel: "b1-label-edited", - newUSN: 0, - newDeleted: false, - newDirty: true, - }, - { - uuid: "b1-uuid", - label: "b1-label", - usn: 0, - deleted: false, - dirty: false, - newLabel: "", - newUSN: 10, - newDeleted: true, - newDirty: false, - }, - } - - for idx, tc := range testCases { - func() { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - b1 := Book{ - UUID: "b1-uuid", - Label: "b1-label", - USN: 1, - Deleted: true, - Dirty: false, - } - b2 := Book{ - UUID: "b2-uuid", - Label: "b2-label", - USN: 1, - Deleted: true, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) - testutils.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) - } - - b1.Label = tc.newLabel - b1.USN = tc.newUSN - b1.Deleted = tc.newDeleted - b1.Dirty = tc.newDirty - - if err := b1.Update(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) - } - - tx.Commit() - - // test - var b1Record, b2Record Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", tc.uuid), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Deleted, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", b2.UUID), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) - - testutils.AssertEqual(t, b1Record.UUID, b1.UUID, fmt.Sprintf("b1 uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Label, tc.newLabel, fmt.Sprintf("b1 label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.USN, tc.newUSN, fmt.Sprintf("b1 usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Deleted, tc.newDeleted, fmt.Sprintf("b1 deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, b1Record.Dirty, tc.newDirty, fmt.Sprintf("b1 dirty mismatch for test case %d", idx)) - - testutils.AssertEqual(t, b2Record.UUID, b2.UUID, fmt.Sprintf("b2 uuid mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Label, b2.Label, fmt.Sprintf("b2 label mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.USN, b2.USN, fmt.Sprintf("b2 usn mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Deleted, b2.Deleted, fmt.Sprintf("b2 deleted mismatch for test case %d", idx)) - testutils.AssertEqual(t, b2Record.Dirty, b2.Dirty, fmt.Sprintf("b2 dirty mismatch for test case %d", idx)) - }() - } -} - -func TestBookUpdateUUID(t *testing.T) { - testCases := []struct { - newUUID string - }{ - { - newUUID: "b1-new-uuid", - }, - { - newUUID: "b2-new-uuid", - }, - } - - for idx, tc := range testCases { - t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { - - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - b1 := Book{ - UUID: "b1-uuid", - Label: "b1-label", - USN: 1, - Deleted: true, - Dirty: false, - } - b2 := Book{ - UUID: "b2-uuid", - Label: "b2-label", - USN: 1, - Deleted: true, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) - testutils.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - if err := b1.UpdateUUID(tx, tc.newUUID); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var b1Record, b2Record Book - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE label = ?", "b1-label"), - &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Deleted, &b1Record.Dirty) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE label = ?", "b2-label"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) - - testutils.AssertEqual(t, b1.UUID, tc.newUUID, "b1 original reference uuid mismatch") - testutils.AssertEqual(t, b1Record.UUID, tc.newUUID, "b1 uuid mismatch") - testutils.AssertEqual(t, b2Record.UUID, b2.UUID, "b2 uuid mismatch") - }) - } -} - -func TestBookExpunge(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - b1 := Book{ - UUID: "b1-uuid", - Label: "b1-label", - USN: 1, - Deleted: true, - Dirty: false, - } - b2 := Book{ - UUID: "b2-uuid", - Label: "b2-label", - USN: 1, - Deleted: true, - Dirty: false, - } - - db := ctx.DB - testutils.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) - testutils.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := b1.Expunge(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing").Error()) - } - - tx.Commit() - - // test - var bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - - var b2Record Book - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", "b2-uuid"), - &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) - - testutils.AssertEqual(t, b2Record.UUID, b2.UUID, "b2 uuid mismatch") - testutils.AssertEqual(t, b2Record.Label, b2.Label, "b2 label mismatch") - testutils.AssertEqual(t, b2Record.USN, b2.USN, "b2 usn mismatch") - testutils.AssertEqual(t, b2Record.Deleted, b2.Deleted, "b2 deleted mismatch") - testutils.AssertEqual(t, b2Record.Dirty, b2.Dirty, "b2 dirty mismatch") -} - -// TestNoteFTS tests that note full text search indices stay in sync with the notes after insert, update and delete -func TestNoteFTS(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // execute - insert - n := Note{ - UUID: "n1-uuid", - BookUUID: "b1-uuid", - Body: "foo bar", - AddedOn: 1542058875, - EditedOn: 0, - USN: 0, - Public: false, - Deleted: false, - Dirty: false, - } - db := ctx.DB - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := n.Insert(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "inserting").Error()) - } - - tx.Commit() - - // test - var noteCount, noteFtsCount, noteSearchCount int - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) - testutils.MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "foo"), ¬eSearchCount) - - testutils.AssertEqual(t, noteCount, 1, "noteCount mismatch") - testutils.AssertEqual(t, noteFtsCount, 1, "noteFtsCount mismatch") - testutils.AssertEqual(t, noteSearchCount, 1, "noteSearchCount mismatch") - - // execute - update - tx, err = db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - n.Body = "baz quz" - if err := n.Update(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "updating").Error()) - } - - tx.Commit() - - // test - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) - testutils.AssertEqual(t, noteCount, 1, "noteCount mismatch") - testutils.AssertEqual(t, noteFtsCount, 1, "noteFtsCount mismatch") - - testutils.MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "foo"), ¬eSearchCount) - testutils.AssertEqual(t, noteSearchCount, 0, "noteSearchCount for foo mismatch") - testutils.MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "baz"), ¬eSearchCount) - testutils.AssertEqual(t, noteSearchCount, 1, "noteSearchCount for baz mismatch") - - // execute - delete - tx, err = db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := n.Expunge(tx); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "expunging").Error()) - } - - tx.Commit() - - // test - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) - - testutils.AssertEqual(t, noteCount, 0, "noteCount mismatch") - testutils.AssertEqual(t, noteFtsCount, 0, "noteFtsCount mismatch") -} diff --git a/cli/core/operations.go b/cli/core/operations.go deleted file mode 100644 index 73ae8401..00000000 --- a/cli/core/operations.go +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "encoding/base64" - - "github.com/dnote/dnote/cli/infra" - "github.com/pkg/errors" -) - -// InsertSystem inserets a system configuration -func InsertSystem(db *infra.DB, key, val string) error { - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", key, val); err != nil { - return errors.Wrap(err, "saving system config") - } - - return nil -} - -// UpsertSystem inserts or updates a system configuration -func UpsertSystem(db *infra.DB, key, val string) error { - var count int - if err := db.QueryRow("SELECT count(*) FROM system WHERE key = ?", key).Scan(&count); err != nil { - return errors.Wrap(err, "counting system record") - } - - if count == 0 { - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", key, val); err != nil { - return errors.Wrap(err, "saving system config") - } - } else { - if _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", val, key); err != nil { - return errors.Wrap(err, "updating system config") - } - } - - return nil -} - -// UpdateSystem updates a system configuration -func UpdateSystem(db *infra.DB, key, val interface{}) error { - if _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", val, key); err != nil { - return errors.Wrap(err, "updating system config") - } - - return nil -} - -// GetSystem scans the given system configuration record onto the destination -func GetSystem(db *infra.DB, key string, dest interface{}) error { - if err := db.QueryRow("SELECT value FROM system WHERE key = ?", key).Scan(dest); err != nil { - return errors.Wrap(err, "finding system configuration record") - } - - return nil -} - -// DeleteSystem delets the given system record -func DeleteSystem(db *infra.DB, key string) error { - if _, err := db.Exec("DELETE FROM system WHERE key = ?", key); err != nil { - return errors.Wrap(err, "deleting system config") - } - - return nil -} - -// GetCipherKey retrieves the cipher key and decode the base64 into bytes. -func GetCipherKey(ctx infra.DnoteCtx) ([]byte, error) { - db, err := ctx.DB.Begin() - if err != nil { - return nil, errors.Wrap(err, "beginning transaction") - } - - var cipherKeyB64 string - err = GetSystem(db, infra.SystemCipherKey, &cipherKeyB64) - if err != nil { - return []byte{}, errors.Wrap(err, "getting enc key") - } - - cipherKey, err := base64.StdEncoding.DecodeString(cipherKeyB64) - if err != nil { - return nil, errors.Wrap(err, "decoding cipherKey from base64") - } - - return cipherKey, nil -} diff --git a/cli/core/operations_test.go b/cli/core/operations_test.go deleted file mode 100644 index 82c742ab..00000000 --- a/cli/core/operations_test.go +++ /dev/null @@ -1,239 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "fmt" - "testing" - - "github.com/dnote/dnote/cli/testutils" - "github.com/pkg/errors" -) - -func TestInsertSystem(t *testing.T) { - testCases := []struct { - key string - val string - }{ - { - key: "foo", - val: "1558089284", - }, - { - key: "baz", - val: "quz", - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // execute - db := ctx.DB - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := InsertSystem(tx, tc.key, tc.val); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing for test case").Error()) - } - - tx.Commit() - - // test - var key, val string - testutils.MustScan(t, "getting the saved record", - db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) - - testutils.AssertEqual(t, key, tc.key, "key mismatch for test case") - testutils.AssertEqual(t, val, tc.val, "val mismatch for test case") - }) - } -} - -func TestUpsertSystem(t *testing.T) { - testCases := []struct { - key string - val string - countDelta int - }{ - { - key: "foo", - val: "1558089284", - countDelta: 1, - }, - { - key: "baz", - val: "quz2", - countDelta: 0, - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") - - var initialSystemCount int - testutils.MustScan(t, "counting records", db.QueryRow("SELECT count(*) FROM system"), &initialSystemCount) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := UpsertSystem(tx, tc.key, tc.val); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing for test case").Error()) - } - - tx.Commit() - - // test - var key, val string - testutils.MustScan(t, "getting the saved record", - db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) - var systemCount int - testutils.MustScan(t, "counting records", - db.QueryRow("SELECT count(*) FROM system"), &systemCount) - - testutils.AssertEqual(t, key, tc.key, "key mismatch") - testutils.AssertEqual(t, val, tc.val, "val mismatch") - testutils.AssertEqual(t, systemCount, initialSystemCount+tc.countDelta, "count mismatch") - }) - } -} - -func TestGetSystem(t *testing.T) { - t.Run(fmt.Sprintf("get string value"), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // execute - db := ctx.DB - testutils.MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "bar") - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - var dest string - if err := GetSystem(tx, "foo", &dest); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing for test case").Error()) - } - tx.Commit() - - // test - testutils.AssertEqual(t, dest, "bar", "dest mismatch") - }) - - t.Run(fmt.Sprintf("get int64 value"), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // execute - db := ctx.DB - testutils.MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", 1234) - - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - var dest int64 - if err := GetSystem(tx, "foo", &dest); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing for test case").Error()) - } - tx.Commit() - - // test - testutils.AssertEqual(t, dest, int64(1234), "dest mismatch") - }) -} - -func TestUpdateSystem(t *testing.T) { - testCases := []struct { - key string - val string - countDelta int - }{ - { - key: "foo", - val: "1558089284", - }, - { - key: "foo", - val: "bar", - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("update %s %s", tc.key, tc.val), func(t *testing.T) { - // Setup - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "fuz") - testutils.MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") - - var initialSystemCount int - testutils.MustScan(t, "counting records", db.QueryRow("SELECT count(*) FROM system"), &initialSystemCount) - - // execute - tx, err := db.Begin() - if err != nil { - t.Fatalf(errors.Wrap(err, "beginning a transaction").Error()) - } - - if err := UpdateSystem(tx, tc.key, tc.val); err != nil { - tx.Rollback() - t.Fatalf(errors.Wrap(err, "executing for test case").Error()) - } - - tx.Commit() - - // test - var key, val string - testutils.MustScan(t, "getting the saved record", - db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) - var systemCount int - testutils.MustScan(t, "counting records", - db.QueryRow("SELECT count(*) FROM system"), &systemCount) - - testutils.AssertEqual(t, key, tc.key, "key mismatch") - testutils.AssertEqual(t, val, tc.val, "val mismatch") - testutils.AssertEqual(t, systemCount, initialSystemCount, "count mismatch") - }) - } -} diff --git a/cli/core/upgrade.go b/cli/core/upgrade.go deleted file mode 100644 index de3a3bab..00000000 --- a/cli/core/upgrade.go +++ /dev/null @@ -1,117 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package core - -import ( - "context" - "fmt" - "time" - - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" - "github.com/google/go-github/github" - "github.com/pkg/errors" -) - -// upgradeInterval is 3 weeks -var upgradeInterval int64 = 86400 * 7 * 3 - -// shouldCheckUpdate checks if update should be checked -func shouldCheckUpdate(ctx infra.DnoteCtx) (bool, error) { - db := ctx.DB - - var lastUpgrade int64 - err := db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastUpgrade).Scan(&lastUpgrade) - if err != nil { - return false, errors.Wrap(err, "getting last_udpate") - } - - now := time.Now().Unix() - - return now-lastUpgrade > upgradeInterval, nil -} - -func touchLastUpgrade(ctx infra.DnoteCtx) error { - db := ctx.DB - - now := time.Now().Unix() - _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", now, infra.SystemLastUpgrade) - if err != nil { - return errors.Wrap(err, "updating last_upgrade") - } - - return nil -} - -func checkVersion(ctx infra.DnoteCtx) error { - log.Infof("current version is %s\n", ctx.Version) - - // Fetch the latest version - gh := github.NewClient(nil) - releases, _, err := gh.Repositories.ListReleases(context.Background(), "dnote", "cli", nil) - if err != nil { - return errors.Wrap(err, "fetching releases") - } - - latest := releases[0] - latestVersion := (*latest.TagName)[1:] - - log.Infof("latest version is %s\n", latestVersion) - - if latestVersion == ctx.Version { - log.Success("you are up-to-date\n\n") - } else { - log.Infof("to upgrade, see https://github.com/dnote/dnote/cli/blob/master/README.md\n") - } - - return nil -} - -// CheckUpdate triggers update if needed -func CheckUpdate(ctx infra.DnoteCtx) error { - shouldCheck, err := shouldCheckUpdate(ctx) - if err != nil { - return errors.Wrap(err, "checking if dnote should check update") - } - if !shouldCheck { - return nil - } - - err = touchLastUpgrade(ctx) - if err != nil { - return errors.Wrap(err, "updating the last upgrade timestamp") - } - - fmt.Printf("\n") - willCheck, err := utils.AskConfirmation("check for upgrade?", true) - if err != nil { - return errors.Wrap(err, "getting user confirmation") - } - if !willCheck { - return nil - } - - err = checkVersion(ctx) - if err != nil { - return errors.Wrap(err, "checking version") - } - - return nil -} diff --git a/cli/crypt/utils.go b/cli/crypt/utils.go deleted file mode 100644 index 61f00800..00000000 --- a/cli/crypt/utils.go +++ /dev/null @@ -1,125 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -// Package crypt provides cryptographic funcitonalities -package crypt - -import ( - "crypto/aes" - "crypto/cipher" - "crypto/rand" - "crypto/sha256" - "encoding/base64" - "io" - - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "golang.org/x/crypto/hkdf" - "golang.org/x/crypto/pbkdf2" -) - -var aesGcmNonceSize = 12 - -func runHkdf(secret, salt, info []byte) ([]byte, error) { - r := hkdf.New(sha256.New, secret, salt, info) - - ret := make([]byte, 32) - _, err := io.ReadFull(r, ret) - if err != nil { - return []byte{}, errors.Wrap(err, "reading key bytes") - } - - return ret, nil -} - -// MakeKeys derives, from the given credential, a key set comprising of an encryption key -// and an authentication key -func MakeKeys(password, email []byte, iteration int) ([]byte, []byte, error) { - masterKey := pbkdf2.Key([]byte(password), []byte(email), iteration, 32, sha256.New) - log.Debug("email: %s, password: %s", email, password) - - authKey, err := runHkdf(masterKey, email, []byte("auth")) - if err != nil { - return nil, nil, errors.Wrap(err, "deriving auth key") - } - - return masterKey, authKey, nil -} - -// AesGcmEncrypt encrypts the plaintext using AES in a GCM mode. It returns -// a ciphertext prepended by a 12 byte pseudo-random nonce, encoded in base64. -func AesGcmEncrypt(key, plaintext []byte) (string, error) { - if key == nil { - return "", errors.New("no key provided") - } - - block, err := aes.NewCipher(key) - if err != nil { - return "", errors.Wrap(err, "initializing aes") - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - return "", errors.Wrap(err, "initializing gcm") - } - - nonce := make([]byte, aesGcmNonceSize) - if _, err := io.ReadFull(rand.Reader, nonce); err != nil { - return "", errors.Wrap(err, "generating nonce") - } - - ciphertext := aesgcm.Seal(nonce, nonce, []byte(plaintext), nil) - cipherKeyB64 := base64.StdEncoding.EncodeToString(ciphertext) - - return cipherKeyB64, nil -} - -// AesGcmDecrypt decrypts the encrypted data using AES in a GCM mode. The data should be -// a base64 encoded string in the format of 12 byte nonce followed by a ciphertext. -func AesGcmDecrypt(key []byte, dataB64 string) ([]byte, error) { - if key == nil { - return nil, errors.New("no key provided") - } - - data, err := base64.StdEncoding.DecodeString(dataB64) - if err != nil { - return nil, errors.Wrap(err, "decoding base64 data") - } - - block, err := aes.NewCipher(key) - if err != nil { - return nil, errors.Wrap(err, "initializing aes") - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - return nil, errors.Wrap(err, "initializing gcm") - } - - if len(data) < aesGcmNonceSize { - return nil, errors.Wrap(err, "malformed data") - } - - nonce, ciphertext := data[:aesGcmNonceSize], data[aesGcmNonceSize:] - plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil) - if err != nil { - return nil, errors.Wrap(err, "decrypting") - } - - return plaintext, nil -} diff --git a/cli/crypt/utils_test.go b/cli/crypt/utils_test.go deleted file mode 100644 index 729ddb5c..00000000 --- a/cli/crypt/utils_test.go +++ /dev/null @@ -1,118 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package crypt - -import ( - "crypto/aes" - "crypto/cipher" - "encoding/base64" - "fmt" - "testing" - - "github.com/dnote/dnote/cli/testutils" - "github.com/pkg/errors" -) - -func TestAesGcmEncrypt(t *testing.T) { - testCases := []struct { - key []byte - plaintext []byte - }{ - { - key: []byte("AES256Key-32Characters1234567890"), - plaintext: []byte("foo bar baz quz"), - }, - { - key: []byte("AES256Key-32Charactersabcdefghij"), - plaintext: []byte("1234 foo 5678 bar 7890 baz"), - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("key %s plaintext %s", tc.key, tc.plaintext), func(t *testing.T) { - // encrypt - dataB64, err := AesGcmEncrypt(tc.key, tc.plaintext) - if err != nil { - t.Fatal(errors.Wrap(err, "performing encryption")) - } - - // test that data can be decrypted - data, err := base64.StdEncoding.DecodeString(dataB64) - if err != nil { - t.Fatal(errors.Wrap(err, "decoding data from base64")) - } - - nonce, ciphertext := data[:12], data[12:] - - fmt.Println(string(data)) - - block, err := aes.NewCipher([]byte(tc.key)) - if err != nil { - t.Fatal(errors.Wrap(err, "initializing aes")) - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - t.Fatal(errors.Wrap(err, "initializing gcm")) - } - - plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil) - if err != nil { - t.Fatal(errors.Wrap(err, "decode")) - } - - testutils.AssertDeepEqual(t, plaintext, tc.plaintext, "plaintext mismatch") - }) - } -} - -func TestAesGcmDecrypt(t *testing.T) { - testCases := []struct { - key []byte - ciphertextB64 string - expectedPlaintext string - }{ - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "M2ov9hWMQ52v1S/zigwX3bJt4cVCV02uiRm/grKqN/rZxNkJrD7vK4Ii0g==", - expectedPlaintext: "foo bar baz quz", - }, - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "M4csFKUIUbD1FBEzLgHjscoKgN0lhMGJ0n2nKWiCkE/qSKlRP7kS", - expectedPlaintext: "foo\n1\nbar\n2", - }, - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "pe/fnw73MR1clmVIlRSJ5gDwBdnPly/DF7DsR5dJVz4dHZlv0b10WzvJEGOCHZEr+Q==", - expectedPlaintext: "föo\nbār\nbåz & qūz", - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("key %s ciphertext %s", tc.key, tc.ciphertextB64), func(t *testing.T) { - plaintext, err := AesGcmDecrypt(tc.key, tc.ciphertextB64) - if err != nil { - t.Fatal(errors.Wrap(err, "performing decryption")) - } - - testutils.AssertDeepEqual(t, plaintext, []byte(tc.expectedPlaintext), "plaintext mismatch") - }) - } -} diff --git a/cli/infra/main.go b/cli/infra/main.go deleted file mode 100644 index c64179c3..00000000 --- a/cli/infra/main.go +++ /dev/null @@ -1,225 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -// Package infra defines dnote structure -package infra - -import ( - "database/sql" - "encoding/base64" - "fmt" - "os" - "os/user" - - // use sqlite - _ "github.com/mattn/go-sqlite3" - - "github.com/pkg/errors" -) - -var ( - // DnoteDirName is the name of the directory containing dnote files - DnoteDirName = ".dnote" - - // SystemSchema is the key for schema in the system table - SystemSchema = "schema" - // SystemRemoteSchema is the key for remote schema in the system table - SystemRemoteSchema = "remote_schema" - // SystemLastSyncAt is the timestamp of the server at the last sync - SystemLastSyncAt = "last_sync_time" - // SystemLastMaxUSN is the user's max_usn from the server at the alst sync - SystemLastMaxUSN = "last_max_usn" - // SystemLastUpgrade is the timestamp at which the system more recently checked for an upgrade - SystemLastUpgrade = "last_upgrade" - // SystemCipherKey is the encryption key - SystemCipherKey = "enc_key" - // SystemSessionKey is the session key - SystemSessionKey = "session_token" - // SystemSessionKeyExpiry is the timestamp at which the session key will expire - SystemSessionKeyExpiry = "session_token_expiry" -) - -// DnoteCtx is a context holding the information of the current runtime -type DnoteCtx struct { - HomeDir string - DnoteDir string - APIEndpoint string - Version string - DB *DB - SessionKey string - SessionKeyExpiry int64 - CipherKey []byte -} - -// Config holds dnote configuration -type Config struct { - Editor string -} - -// NewCtx returns a new dnote context -func NewCtx(apiEndpoint, versionTag string) (DnoteCtx, error) { - homeDir, err := getHomeDir() - if err != nil { - return DnoteCtx{}, errors.Wrap(err, "Failed to get home dir") - } - dnoteDir := getDnoteDir(homeDir) - - dnoteDBPath := fmt.Sprintf("%s/dnote.db", dnoteDir) - db, err := OpenDB(dnoteDBPath) - if err != nil { - return DnoteCtx{}, errors.Wrap(err, "conntecting to db") - } - - ret := DnoteCtx{ - HomeDir: homeDir, - DnoteDir: dnoteDir, - APIEndpoint: apiEndpoint, - Version: versionTag, - DB: db, - } - - return ret, nil -} - -// SetupCtx populates context and returns a new context -func SetupCtx(ctx DnoteCtx) (DnoteCtx, error) { - db := ctx.DB - - var sessionKey, cipherKeyB64 string - var sessionKeyExpiry int64 - - err := db.QueryRow("SELECT value FROM system WHERE key = ?", SystemSessionKey).Scan(&sessionKey) - if err != nil && err != sql.ErrNoRows { - return ctx, errors.Wrap(err, "finding sesison key") - } - err = db.QueryRow("SELECT value FROM system WHERE key = ?", SystemCipherKey).Scan(&cipherKeyB64) - if err != nil && err != sql.ErrNoRows { - return ctx, errors.Wrap(err, "finding sesison key") - } - err = db.QueryRow("SELECT value FROM system WHERE key = ?", SystemSessionKeyExpiry).Scan(&sessionKeyExpiry) - if err != nil && err != sql.ErrNoRows { - return ctx, errors.Wrap(err, "finding sesison key expiry") - } - - cipherKey, err := base64.StdEncoding.DecodeString(cipherKeyB64) - if err != nil { - return ctx, errors.Wrap(err, "decoding cipherKey from base64") - } - - ret := DnoteCtx{ - HomeDir: ctx.HomeDir, - DnoteDir: ctx.DnoteDir, - APIEndpoint: ctx.APIEndpoint, - Version: ctx.Version, - DB: ctx.DB, - SessionKey: sessionKey, - SessionKeyExpiry: sessionKeyExpiry, - CipherKey: cipherKey, - } - - return ret, nil -} - -func getDnoteDir(homeDir string) string { - var ret string - - dnoteDirEnv := os.Getenv("DNOTE_DIR") - if dnoteDirEnv == "" { - ret = fmt.Sprintf("%s/%s", homeDir, DnoteDirName) - } else { - ret = dnoteDirEnv - } - - return ret -} - -func getHomeDir() (string, error) { - homeDirEnv := os.Getenv("DNOTE_HOME_DIR") - if homeDirEnv != "" { - return homeDirEnv, nil - } - - usr, err := user.Current() - if err != nil { - return "", errors.Wrap(err, "Failed to get current user") - } - - return usr.HomeDir, nil -} - -// InitDB initializes the database. -// Ideally this process must be a part of migration sequence. But it is performed -// seaprately because it is a prerequisite for legacy migration. -func InitDB(ctx DnoteCtx) error { - db := ctx.DB - - _, err := db.Exec(`CREATE TABLE IF NOT EXISTS notes - ( - id integer PRIMARY KEY AUTOINCREMENT, - uuid text NOT NULL, - book_uuid text NOT NULL, - content text NOT NULL, - added_on integer NOT NULL, - edited_on integer DEFAULT 0, - public bool DEFAULT false - )`) - if err != nil { - return errors.Wrap(err, "creating notes table") - } - - _, err = db.Exec(`CREATE TABLE IF NOT EXISTS books - ( - uuid text PRIMARY KEY, - label text NOT NULL - )`) - if err != nil { - return errors.Wrap(err, "creating books table") - } - - _, err = db.Exec(`CREATE TABLE IF NOT EXISTS system - ( - key string NOT NULL, - value text NOT NULL - )`) - if err != nil { - return errors.Wrap(err, "creating system table") - } - - _, err = db.Exec(`CREATE TABLE IF NOT EXISTS actions - ( - uuid text PRIMARY KEY, - schema integer NOT NULL, - type text NOT NULL, - data text NOT NULL, - timestamp integer NOT NULL - )`) - if err != nil { - return errors.Wrap(err, "creating actions table") - } - - _, err = db.Exec(` - CREATE UNIQUE INDEX IF NOT EXISTS idx_books_label ON books(label); - CREATE UNIQUE INDEX IF NOT EXISTS idx_notes_uuid ON notes(uuid); - CREATE UNIQUE INDEX IF NOT EXISTS idx_books_uuid ON books(uuid); - CREATE INDEX IF NOT EXISTS idx_notes_book_uuid ON notes(book_uuid);`) - if err != nil { - return errors.Wrap(err, "creating indices") - } - - return nil -} diff --git a/cli/log/output.go b/cli/log/output.go deleted file mode 100644 index 3bc0844b..00000000 --- a/cli/log/output.go +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package log - -import ( - "fmt" -) - -// PrintContent prints the note content with an appropriate format. -func PrintContent(content string) { - fmt.Printf("\n-----------------------content-----------------------\n") - fmt.Printf("%s", content) - fmt.Printf("\n-----------------------------------------------------\n") -} diff --git a/cli/main.go b/cli/main.go deleted file mode 100644 index 212345d1..00000000 --- a/cli/main.go +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package main - -import ( - "os" - - "github.com/dnote/dnote/cli/cmd/root" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - _ "github.com/mattn/go-sqlite3" - "github.com/pkg/errors" - - // commands - "github.com/dnote/dnote/cli/cmd/add" - "github.com/dnote/dnote/cli/cmd/cat" - "github.com/dnote/dnote/cli/cmd/edit" - "github.com/dnote/dnote/cli/cmd/find" - "github.com/dnote/dnote/cli/cmd/login" - "github.com/dnote/dnote/cli/cmd/logout" - "github.com/dnote/dnote/cli/cmd/ls" - "github.com/dnote/dnote/cli/cmd/remove" - "github.com/dnote/dnote/cli/cmd/sync" - "github.com/dnote/dnote/cli/cmd/version" - "github.com/dnote/dnote/cli/cmd/view" -) - -// apiEndpoint and versionTag are populated during link time -var apiEndpoint string -var versionTag = "master" - -func main() { - ctx, err := infra.NewCtx(apiEndpoint, versionTag) - if err != nil { - panic(errors.Wrap(err, "initializing context")) - } - defer ctx.DB.Close() - - if err := root.Prepare(ctx); err != nil { - panic(errors.Wrap(err, "preparing dnote run")) - } - - ctx, err = infra.SetupCtx(ctx) - if err != nil { - panic(errors.Wrap(err, "setting up context")) - } - - root.Register(remove.NewCmd(ctx)) - root.Register(edit.NewCmd(ctx)) - root.Register(login.NewCmd(ctx)) - root.Register(logout.NewCmd(ctx)) - root.Register(add.NewCmd(ctx)) - root.Register(ls.NewCmd(ctx)) - root.Register(sync.NewCmd(ctx)) - root.Register(version.NewCmd(ctx)) - root.Register(cat.NewCmd(ctx)) - root.Register(view.NewCmd(ctx)) - root.Register(find.NewCmd(ctx)) - - if err := root.Execute(); err != nil { - log.Errorf("%s\n", err.Error()) - os.Exit(1) - } -} diff --git a/cli/main_test.go b/cli/main_test.go deleted file mode 100644 index f34a7a78..00000000 --- a/cli/main_test.go +++ /dev/null @@ -1,339 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package main - -import ( - "fmt" - "log" - "os" - "os/exec" - "testing" - - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/testutils" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" -) - -var binaryName = "test-dnote" - -func TestMain(m *testing.M) { - if err := exec.Command("go", "build", "--tags", "fts5", "-o", binaryName).Run(); err != nil { - log.Print(errors.Wrap(err, "building a binary").Error()) - os.Exit(1) - } - - os.Exit(m.Run()) -} - -func TestInit(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // Execute - testutils.RunDnoteCmd(t, ctx, binaryName) - - // Test - if !utils.FileExists(fmt.Sprintf("%s", ctx.DnoteDir)) { - t.Errorf("dnote directory was not initialized") - } - if !utils.FileExists(fmt.Sprintf("%s/%s", ctx.DnoteDir, core.ConfigFilename)) { - t.Errorf("config file was not initialized") - } - - db := ctx.DB - - var notesTableCount, booksTableCount, systemTableCount int - testutils.MustScan(t, "counting notes", - db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "notes"), ¬esTableCount) - testutils.MustScan(t, "counting books", - db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "books"), &booksTableCount) - testutils.MustScan(t, "counting system", - db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "system"), &systemTableCount) - - testutils.AssertEqual(t, notesTableCount, 1, "notes table count mismatch") - testutils.AssertEqual(t, booksTableCount, 1, "books table count mismatch") - testutils.AssertEqual(t, systemTableCount, 1, "system table count mismatch") - - // test that all default system configurations are generated - var lastUpgrade, lastMaxUSN, lastSyncAt string - testutils.MustScan(t, "scanning last upgrade", - db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastUpgrade), &lastUpgrade) - testutils.MustScan(t, "scanning last max usn", - db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastMaxUSN), &lastMaxUSN) - testutils.MustScan(t, "scanning last sync at", - db.QueryRow("SELECT value FROM system WHERE key = ?", infra.SystemLastSyncAt), &lastSyncAt) - - testutils.AssertNotEqual(t, lastUpgrade, "", "last upgrade should not be empty") - testutils.AssertNotEqual(t, lastMaxUSN, "", "last max usn should not be empty") - testutils.AssertNotEqual(t, lastSyncAt, "", "last sync at should not be empty") -} - -func TestAddNote_NewBook_BodyFlag(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - // Execute - testutils.RunDnoteCmd(t, ctx, binaryName, "add", "js", "-c", "foo") - - // Test - db := ctx.DB - - var noteCount, bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - testutils.AssertEqualf(t, noteCount, 1, "note count mismatch") - - var book core.Book - testutils.MustScan(t, "getting book", db.QueryRow("SELECT uuid, dirty FROM books where label = ?", "js"), &book.UUID, &book.Dirty) - var note core.Note - testutils.MustScan(t, "getting note", - db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ?", book.UUID), ¬e.UUID, ¬e.Body, ¬e.AddedOn, ¬e.Dirty) - - testutils.AssertEqual(t, book.Dirty, true, "Book dirty mismatch") - - testutils.AssertNotEqual(t, note.UUID, "", "Note should have UUID") - testutils.AssertEqual(t, note.Body, "foo", "Note body mismatch") - testutils.AssertEqual(t, note.Dirty, true, "Note dirty mismatch") - testutils.AssertNotEqual(t, note.AddedOn, int64(0), "Note added_on mismatch") -} - -func TestAddNote_ExistingBook_BodyFlag(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.Setup3(t, ctx) - - // Execute - testutils.RunDnoteCmd(t, ctx, binaryName, "add", "js", "-c", "foo") - - // Test - db := ctx.DB - - var noteCount, bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - testutils.AssertEqualf(t, noteCount, 2, "note count mismatch") - - var n1, n2 core.Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Dirty) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes WHERE book_uuid = ? AND body = ?", "js-book-uuid", "foo"), &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Dirty) - - var book core.Book - testutils.MustScan(t, "getting book", db.QueryRow("SELECT dirty FROM books where label = ?", "js"), &book.Dirty) - - testutils.AssertEqual(t, book.Dirty, false, "Book dirty mismatch") - - testutils.AssertNotEqual(t, n1.UUID, "", "n1 should have UUID") - testutils.AssertEqual(t, n1.Body, "Booleans have toString()", "n1 body mismatch") - testutils.AssertEqual(t, n1.AddedOn, int64(1515199943), "n1 added_on mismatch") - testutils.AssertEqual(t, n1.Dirty, false, "n1 dirty mismatch") - - testutils.AssertNotEqual(t, n2.UUID, "", "n2 should have UUID") - testutils.AssertEqual(t, n2.Body, "foo", "n2 body mismatch") - testutils.AssertEqual(t, n2.Dirty, true, "n2 dirty mismatch") -} - -func TestEditNote_BodyFlag(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.Setup4(t, ctx) - - // Execute - testutils.RunDnoteCmd(t, ctx, binaryName, "edit", "js", "2", "-c", "foo bar") - - // Test - db := ctx.DB - - var noteCount, bookCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - - testutils.AssertEqualf(t, bookCount, 1, "book count mismatch") - testutils.AssertEqualf(t, noteCount, 2, "note count mismatch") - - var n1, n2 core.Note - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Dirty) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Dirty) - - testutils.AssertEqual(t, n1.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n1 should have UUID") - testutils.AssertEqual(t, n1.Body, "Booleans have toString()", "n1 body mismatch") - testutils.AssertEqual(t, n1.Dirty, false, "n1 dirty mismatch") - - testutils.AssertEqual(t, n2.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "Note should have UUID") - testutils.AssertEqual(t, n2.Body, "foo bar", "Note body mismatch") - testutils.AssertEqual(t, n2.Dirty, true, "n2 dirty mismatch") - testutils.AssertNotEqual(t, n2.EditedOn, 0, "Note edited_on mismatch") -} - -func TestRemoveNote(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.Setup2(t, ctx) - - // Execute - testutils.WaitDnoteCmd(t, ctx, testutils.UserConfirm, binaryName, "remove", "js", "1") - - // Test - db := ctx.DB - - var noteCount, bookCount, jsNoteCount, linuxNoteCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting js notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "js-book-uuid"), &jsNoteCount) - testutils.MustScan(t, "counting linux notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "linux-book-uuid"), &linuxNoteCount) - - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - testutils.AssertEqualf(t, noteCount, 3, "note count mismatch") - testutils.AssertEqual(t, jsNoteCount, 2, "js book should have 2 notes") - testutils.AssertEqual(t, linuxNoteCount, 1, "linux book book should have 1 note") - - var b1, b2 core.Book - var n1, n2, n3 core.Note - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT label, deleted, usn FROM books WHERE uuid = ?", "js-book-uuid"), - &b1.Label, &b1.Deleted, &b1.USN) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT label, deleted, usn FROM books WHERE uuid = ?", "linux-book-uuid"), - &b2.Label, &b2.Deleted, &b2.USN) - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), - &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Deleted, &n1.Dirty, &n1.USN) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), - &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Deleted, &n2.Dirty, &n2.USN) - testutils.MustScan(t, "getting n3", - db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "linux-book-uuid", "3e065d55-6d47-42f2-a6bf-f5844130b2d2"), - &n3.UUID, &n3.Body, &n3.AddedOn, &n3.Deleted, &n3.Dirty, &n3.USN) - - testutils.AssertEqual(t, b1.Label, "js", "b1 label mismatch") - testutils.AssertEqual(t, b1.Deleted, false, "b1 deleted mismatch") - testutils.AssertEqual(t, b1.Dirty, false, "b1 Dirty mismatch") - testutils.AssertEqual(t, b1.USN, 111, "b1 usn mismatch") - - testutils.AssertEqual(t, b2.Label, "linux", "b2 label mismatch") - testutils.AssertEqual(t, b2.Deleted, false, "b2 deleted mismatch") - testutils.AssertEqual(t, b2.Dirty, false, "b2 Dirty mismatch") - testutils.AssertEqual(t, b2.USN, 122, "b2 usn mismatch") - - testutils.AssertEqual(t, n1.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "n1 should have UUID") - testutils.AssertEqual(t, n1.Body, "", "n1 body mismatch") - testutils.AssertEqual(t, n1.Deleted, true, "n1 deleted mismatch") - testutils.AssertEqual(t, n1.Dirty, true, "n1 Dirty mismatch") - testutils.AssertEqual(t, n1.USN, 11, "n1 usn mismatch") - - testutils.AssertEqual(t, n2.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n2 should have UUID") - testutils.AssertEqual(t, n2.Body, "n2 body", "n2 body mismatch") - testutils.AssertEqual(t, n2.Deleted, false, "n2 deleted mismatch") - testutils.AssertEqual(t, n2.Dirty, false, "n2 Dirty mismatch") - testutils.AssertEqual(t, n2.USN, 12, "n2 usn mismatch") - - testutils.AssertEqual(t, n3.UUID, "3e065d55-6d47-42f2-a6bf-f5844130b2d2", "n3 should have UUID") - testutils.AssertEqual(t, n3.Body, "n3 body", "n3 body mismatch") - testutils.AssertEqual(t, n3.Deleted, false, "n3 deleted mismatch") - testutils.AssertEqual(t, n3.Dirty, false, "n3 Dirty mismatch") - testutils.AssertEqual(t, n3.USN, 13, "n3 usn mismatch") -} - -func TestRemoveBook(t *testing.T) { - // Set up - ctx := testutils.InitEnv(t, "./tmp", "./testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.Setup2(t, ctx) - - // Execute - testutils.WaitDnoteCmd(t, ctx, testutils.UserConfirm, binaryName, "remove", "-b", "js") - - // Test - db := ctx.DB - - var noteCount, bookCount, jsNoteCount, linuxNoteCount int - testutils.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) - testutils.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) - testutils.MustScan(t, "counting js notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "js-book-uuid"), &jsNoteCount) - testutils.MustScan(t, "counting linux notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "linux-book-uuid"), &linuxNoteCount) - - testutils.AssertEqualf(t, bookCount, 2, "book count mismatch") - testutils.AssertEqualf(t, noteCount, 3, "note count mismatch") - testutils.AssertEqual(t, jsNoteCount, 2, "js book should have 2 notes") - testutils.AssertEqual(t, linuxNoteCount, 1, "linux book book should have 1 note") - - var b1, b2 core.Book - var n1, n2, n3 core.Note - testutils.MustScan(t, "getting b1", - db.QueryRow("SELECT label, dirty, deleted, usn FROM books WHERE uuid = ?", "js-book-uuid"), - &b1.Label, &b1.Dirty, &b1.Deleted, &b1.USN) - testutils.MustScan(t, "getting b2", - db.QueryRow("SELECT label, dirty, deleted, usn FROM books WHERE uuid = ?", "linux-book-uuid"), - &b2.Label, &b2.Dirty, &b2.Deleted, &b2.USN) - testutils.MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), - &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Deleted, &n1.Dirty, &n1.USN) - testutils.MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), - &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Deleted, &n2.Dirty, &n2.USN) - testutils.MustScan(t, "getting n3", - db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "linux-book-uuid", "3e065d55-6d47-42f2-a6bf-f5844130b2d2"), - &n3.UUID, &n3.Body, &n3.AddedOn, &n3.Deleted, &n3.Dirty, &n3.USN) - - testutils.AssertNotEqual(t, b1.Label, "js", "b1 label mismatch") - testutils.AssertEqual(t, b1.Dirty, true, "b1 Dirty mismatch") - testutils.AssertEqual(t, b1.Deleted, true, "b1 deleted mismatch") - testutils.AssertEqual(t, b1.USN, 111, "b1 usn mismatch") - - testutils.AssertEqual(t, b2.Label, "linux", "b2 label mismatch") - testutils.AssertEqual(t, b2.Dirty, false, "b2 Dirty mismatch") - testutils.AssertEqual(t, b2.Deleted, false, "b2 deleted mismatch") - testutils.AssertEqual(t, b2.USN, 122, "b2 usn mismatch") - - testutils.AssertEqual(t, n1.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "n1 should have UUID") - testutils.AssertEqual(t, n1.Body, "", "n1 body mismatch") - testutils.AssertEqual(t, n1.Dirty, true, "n1 Dirty mismatch") - testutils.AssertEqual(t, n1.Deleted, true, "n1 deleted mismatch") - testutils.AssertEqual(t, n1.USN, 11, "n1 usn mismatch") - - testutils.AssertEqual(t, n2.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n2 should have UUID") - testutils.AssertEqual(t, n2.Body, "", "n2 body mismatch") - testutils.AssertEqual(t, n2.Dirty, true, "n2 Dirty mismatch") - testutils.AssertEqual(t, n2.Deleted, true, "n2 deleted mismatch") - testutils.AssertEqual(t, n2.USN, 12, "n2 usn mismatch") - - testutils.AssertEqual(t, n3.UUID, "3e065d55-6d47-42f2-a6bf-f5844130b2d2", "n3 should have UUID") - testutils.AssertEqual(t, n3.Body, "n3 body", "n3 body mismatch") - testutils.AssertEqual(t, n3.Dirty, false, "n3 Dirty mismatch") - testutils.AssertEqual(t, n3.Deleted, false, "n3 deleted mismatch") - testutils.AssertEqual(t, n3.USN, 13, "n3 usn mismatch") -} diff --git a/cli/migrate/legacy_test.go b/cli/migrate/legacy_test.go deleted file mode 100644 index 13100036..00000000 --- a/cli/migrate/legacy_test.go +++ /dev/null @@ -1,608 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package migrate - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "os" - "path/filepath" - "reflect" - "testing" - - "github.com/dnote/dnote/cli/testutils" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" - "gopkg.in/yaml.v2" -) - -func TestMigrateToV1(t *testing.T) { - - t.Run("yaml exists", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - yamlPath, err := filepath.Abs(filepath.Join(ctx.HomeDir, ".dnote-yaml-archived")) - if err != nil { - panic(errors.Wrap(err, "Failed to get absolute YAML path").Error()) - } - ioutil.WriteFile(yamlPath, []byte{}, 0644) - - // execute - if err := migrateToV1(ctx); err != nil { - t.Fatal(errors.Wrapf(err, "Failed to migrate").Error()) - } - - // test - if utils.FileExists(yamlPath) { - t.Fatal("YAML archive file has not been deleted") - } - }) - - t.Run("yaml does not exist", func(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - yamlPath, err := filepath.Abs(filepath.Join(ctx.HomeDir, ".dnote-yaml-archived")) - if err != nil { - panic(errors.Wrap(err, "Failed to get absolute YAML path").Error()) - } - - // execute - if err := migrateToV1(ctx); err != nil { - t.Fatal(errors.Wrapf(err, "Failed to migrate").Error()) - } - - // test - if utils.FileExists(yamlPath) { - t.Fatal("YAML archive file must not exist") - } - }) -} - -func TestMigrateToV2(t *testing.T) { - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.CopyFixture(ctx, "./fixtures/legacy-2-pre-dnote.json", "dnote") - - // execute - if err := migrateToV2(ctx); err != nil { - t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) - } - - // test - b := testutils.ReadFile(ctx, "dnote") - - var postDnote migrateToV2PostDnote - if err := json.Unmarshal(b, &postDnote); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) - } - - for _, book := range postDnote { - testutils.AssertNotEqual(t, book.Name, "", "Book name was not populated") - - for _, note := range book.Notes { - if len(note.UUID) == 8 { - t.Errorf("Note UUID was not migrated. It has length of %d", len(note.UUID)) - } - - testutils.AssertNotEqual(t, note.AddedOn, int64(0), "AddedOn was not carried over") - testutils.AssertEqual(t, note.EditedOn, int64(0), "EditedOn was not created properly") - } - } -} - -func TestMigrateToV3(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.CopyFixture(ctx, "./fixtures/legacy-3-pre-dnote.json", "dnote") - - // execute - if err := migrateToV3(ctx); err != nil { - t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) - } - - // test - b := testutils.ReadFile(ctx, "dnote") - var postDnote migrateToV3Dnote - if err := json.Unmarshal(b, &postDnote); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) - } - - b = testutils.ReadFile(ctx, "actions") - var actions []migrateToV3Action - if err := json.Unmarshal(b, &actions); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the actions").Error()) - } - - testutils.AssertEqual(t, len(actions), 6, "actions length mismatch") - - for _, book := range postDnote { - for _, note := range book.Notes { - testutils.AssertNotEqual(t, note.AddedOn, int64(0), "AddedOn was not carried over") - } - } -} - -func TestMigrateToV4(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - defer os.Setenv("EDITOR", "") - - testutils.CopyFixture(ctx, "./fixtures/legacy-4-pre-dnoterc.yaml", "dnoterc") - - // execute - os.Setenv("EDITOR", "vim") - if err := migrateToV4(ctx); err != nil { - t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) - } - - // test - b := testutils.ReadFile(ctx, "dnoterc") - var config migrateToV4PostConfig - if err := yaml.Unmarshal(b, &config); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) - } - - testutils.AssertEqual(t, config.APIKey, "Oev6e1082ORasdf9rjkfjkasdfjhgei", "api key mismatch") - testutils.AssertEqual(t, config.Editor, "vim", "editor mismatch") -} - -func TestMigrateToV5(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.CopyFixture(ctx, "./fixtures/legacy-5-pre-actions.json", "actions") - - // execute - if err := migrateToV5(ctx); err != nil { - t.Fatal(errors.Wrap(err, "migrating").Error()) - } - - // test - var oldActions []migrateToV5PreAction - testutils.ReadJSON("./fixtures/legacy-5-pre-actions.json", &oldActions) - - b := testutils.ReadFile(ctx, "actions") - var migratedActions []migrateToV5PostAction - if err := json.Unmarshal(b, &migratedActions); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling migrated actions").Error()) - } - - if len(oldActions) != len(migratedActions) { - t.Fatalf("There were %d actions but after migration there were %d", len(oldActions), len(migratedActions)) - } - - for idx := range migratedActions { - migrated := migratedActions[idx] - old := oldActions[idx] - - testutils.AssertNotEqual(t, migrated.UUID, "", fmt.Sprintf("uuid mismatch for migrated item with index %d", idx)) - testutils.AssertEqual(t, migrated.Schema, 1, fmt.Sprintf("schema mismatch for migrated item with index %d", idx)) - testutils.AssertEqual(t, migrated.Timestamp, old.Timestamp, fmt.Sprintf("timestamp mismatch for migrated item with index %d", idx)) - testutils.AssertEqual(t, migrated.Type, old.Type, fmt.Sprintf("timestamp mismatch for migrated item with index %d", idx)) - - switch migrated.Type { - case migrateToV5ActionAddNote: - var oldData, migratedData migrateToV5AddNoteData - if err := json.Unmarshal(old.Data, &oldData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) - } - if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) - } - - testutils.AssertEqual(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) - testutils.AssertEqual(t, oldData.Content, migratedData.Content, fmt.Sprintf("data content mismatch for item idx %d", idx)) - testutils.AssertEqual(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) - case migrateToV5ActionRemoveNote: - var oldData, migratedData migrateToV5RemoveNoteData - if err := json.Unmarshal(old.Data, &oldData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) - } - if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) - } - - testutils.AssertEqual(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) - testutils.AssertEqual(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) - case migrateToV5ActionAddBook: - var oldData, migratedData migrateToV5AddBookData - if err := json.Unmarshal(old.Data, &oldData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) - } - if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) - } - - testutils.AssertEqual(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) - case migrateToV5ActionRemoveBook: - var oldData, migratedData migrateToV5RemoveBookData - if err := json.Unmarshal(old.Data, &oldData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) - } - if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) - } - - testutils.AssertEqual(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) - case migrateToV5ActionEditNote: - var oldData migrateToV5PreEditNoteData - var migratedData migrateToV5PostEditNoteData - if err := json.Unmarshal(old.Data, &oldData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) - } - if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) - } - - testutils.AssertEqual(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) - testutils.AssertEqual(t, oldData.Content, migratedData.Content, fmt.Sprintf("data content mismatch for item idx %d", idx)) - testutils.AssertEqual(t, oldData.BookName, migratedData.FromBook, "book_name should have been renamed to from_book") - testutils.AssertEqual(t, migratedData.ToBook, "", "to_book should be empty") - } - } -} - -func TestMigrateToV6(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.CopyFixture(ctx, "./fixtures/legacy-6-pre-dnote.json", "dnote") - - // execute - if err := migrateToV6(ctx); err != nil { - t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) - } - - // test - b := testutils.ReadFile(ctx, "dnote") - var got migrateToV6PostDnote - if err := json.Unmarshal(b, &got); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) - } - - b = testutils.ReadFileAbs("./fixtures/legacy-6-post-dnote.json") - var expected migrateToV6PostDnote - if err := json.Unmarshal(b, &expected); err != nil { - t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) - } - - if ok := reflect.DeepEqual(expected, got); !ok { - t.Errorf("Payload does not match.\nActual: %+v\nExpected: %+v", got, expected) - } -} - -func TestMigrateToV7(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", true) - defer testutils.TeardownEnv(ctx) - - testutils.CopyFixture(ctx, "./fixtures/legacy-7-pre-actions.json", "actions") - - // execute - if err := migrateToV7(ctx); err != nil { - t.Fatal(errors.Wrap(err, "migrating").Error()) - } - - // test - b := testutils.ReadFile(ctx, "actions") - var got []migrateToV7Action - if err := json.Unmarshal(b, &got); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling the result").Error()) - } - - b2 := testutils.ReadFileAbs("./fixtures/legacy-7-post-actions.json") - var expected []migrateToV7Action - if err := json.Unmarshal(b, &expected); err != nil { - t.Fatal(errors.Wrap(err, "unmarshalling the result into Dnote").Error()) - } - - ok, err := testutils.IsEqualJSON(b, b2) - if err != nil { - t.Fatal(errors.Wrap(err, "comparing JSON").Error()) - } - - if !ok { - t.Errorf("Result does not match.\nActual: %+v\nExpected: %+v", got, expected) - } -} - -func TestMigrateToV8(t *testing.T) { - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-1-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - // set up - testutils.CopyFixture(ctx, "./fixtures/legacy-8-actions.json", "actions") - testutils.CopyFixture(ctx, "./fixtures/legacy-8-dnote.json", "dnote") - testutils.CopyFixture(ctx, "./fixtures/legacy-8-dnoterc.yaml", "dnoterc") - testutils.CopyFixture(ctx, "./fixtures/legacy-8-schema.yaml", "schema") - testutils.CopyFixture(ctx, "./fixtures/legacy-8-timestamps.yaml", "timestamps") - - // execute - if err := migrateToV8(ctx); err != nil { - t.Fatal(errors.Wrap(err, "migrating").Error()) - } - - // test - - // 1. test if files are migrated - dnoteFilePath := fmt.Sprintf("%s/dnote", ctx.DnoteDir) - dnotercPath := fmt.Sprintf("%s/dnoterc", ctx.DnoteDir) - schemaFilePath := fmt.Sprintf("%s/schema", ctx.DnoteDir) - timestampFilePath := fmt.Sprintf("%s/timestamps", ctx.DnoteDir) - if ok := utils.FileExists(dnoteFilePath); ok { - t.Errorf("%s still exists", dnoteFilePath) - } - if ok := utils.FileExists(schemaFilePath); ok { - t.Errorf("%s still exists", dnoteFilePath) - } - if ok := utils.FileExists(timestampFilePath); ok { - t.Errorf("%s still exists", dnoteFilePath) - } - if ok := utils.FileExists(dnotercPath); !ok { - t.Errorf("%s should exist", dnotercPath) - } - - // 2. test if notes and books are migrated - db := ctx.DB - - var bookCount, noteCount int - err := db.QueryRow("SELECT count(*) FROM books").Scan(&bookCount) - if err != nil { - panic(errors.Wrap(err, "counting books")) - } - err = db.QueryRow("SELECT count(*) FROM notes").Scan(¬eCount) - if err != nil { - panic(errors.Wrap(err, "counting notes")) - } - testutils.AssertEqual(t, bookCount, 2, "book count mismatch") - testutils.AssertEqual(t, noteCount, 3, "note count mismatch") - - type bookInfo struct { - label string - uuid string - } - type noteInfo struct { - id int - uuid string - bookUUID string - content string - addedOn int64 - editedOn int64 - public bool - } - - var b1, b2 bookInfo - var n1, n2, n3 noteInfo - err = db.QueryRow("SELECT label, uuid FROM books WHERE label = ?", "js").Scan(&b1.label, &b1.uuid) - if err != nil { - panic(errors.Wrap(err, "finding book 1")) - } - err = db.QueryRow("SELECT label, uuid FROM books WHERE label = ?", "css").Scan(&b2.label, &b2.uuid) - if err != nil { - panic(errors.Wrap(err, "finding book 2")) - } - err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "d69edb54-5b31-4cdd-a4a5-34f0a0bfa153").Scan(&n1.id, &n1.uuid, &n1.bookUUID, &n1.content, &n1.addedOn, &n1.editedOn, &n1.public) - if err != nil { - panic(errors.Wrap(err, "finding note 1")) - } - err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "35cbcab1-6a2a-4cc8-97e0-e73bbbd54626").Scan(&n2.id, &n2.uuid, &n2.bookUUID, &n2.content, &n2.addedOn, &n2.editedOn, &n2.public) - if err != nil { - panic(errors.Wrap(err, "finding note 2")) - } - err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a").Scan(&n3.id, &n3.uuid, &n3.bookUUID, &n3.content, &n3.addedOn, &n3.editedOn, &n3.public) - if err != nil { - panic(errors.Wrap(err, "finding note 3")) - } - - testutils.AssertNotEqual(t, b1.uuid, "", "book 1 uuid should have been generated") - testutils.AssertEqual(t, b1.label, "js", "book 1 label mismatch") - testutils.AssertNotEqual(t, b2.uuid, "", "book 2 uuid should have been generated") - testutils.AssertEqual(t, b2.label, "css", "book 2 label mismatch") - - testutils.AssertEqual(t, n1.uuid, "d69edb54-5b31-4cdd-a4a5-34f0a0bfa153", "note 1 uuid mismatch") - testutils.AssertNotEqual(t, n1.id, 0, "note 1 id should have been generated") - testutils.AssertEqual(t, n1.bookUUID, b2.uuid, "note 1 book_uuid mismatch") - testutils.AssertEqual(t, n1.content, "css test 1", "note 1 content mismatch") - testutils.AssertEqual(t, n1.addedOn, int64(1536977237), "note 1 added_on mismatch") - testutils.AssertEqual(t, n1.editedOn, int64(1536977253), "note 1 edited_on mismatch") - testutils.AssertEqual(t, n1.public, false, "note 1 public mismatch") - - testutils.AssertEqual(t, n2.uuid, "35cbcab1-6a2a-4cc8-97e0-e73bbbd54626", "note 2 uuid mismatch") - testutils.AssertNotEqual(t, n2.id, 0, "note 2 id should have been generated") - testutils.AssertEqual(t, n2.bookUUID, b1.uuid, "note 2 book_uuid mismatch") - testutils.AssertEqual(t, n2.content, "js test 1", "note 2 content mismatch") - testutils.AssertEqual(t, n2.addedOn, int64(1536977229), "note 2 added_on mismatch") - testutils.AssertEqual(t, n2.editedOn, int64(0), "note 2 edited_on mismatch") - testutils.AssertEqual(t, n2.public, false, "note 2 public mismatch") - - testutils.AssertEqual(t, n3.uuid, "7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a", "note 3 uuid mismatch") - testutils.AssertNotEqual(t, n3.id, 0, "note 3 id should have been generated") - testutils.AssertEqual(t, n3.bookUUID, b1.uuid, "note 3 book_uuid mismatch") - testutils.AssertEqual(t, n3.content, "js test 2", "note 3 content mismatch") - testutils.AssertEqual(t, n3.addedOn, int64(1536977230), "note 3 added_on mismatch") - testutils.AssertEqual(t, n3.editedOn, int64(0), "note 3 edited_on mismatch") - testutils.AssertEqual(t, n3.public, false, "note 3 public mismatch") - - // 3. test if actions are migrated - var actionCount int - err = db.QueryRow("SELECT count(*) FROM actions").Scan(&actionCount) - if err != nil { - panic(errors.Wrap(err, "counting actions")) - } - - testutils.AssertEqual(t, actionCount, 11, "action count mismatch") - - type actionInfo struct { - uuid string - schema int - actionType string - data string - timestamp int - } - - var a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11 actionInfo - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "6145c1b7-f286-4d9f-b0f6-00d274baefc6").Scan(&a1.uuid, &a1.schema, &a1.actionType, &a1.data, &a1.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a1")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "c048a56b-179c-4f31-9995-81e9b32b7dd6").Scan(&a2.uuid, &a2.schema, &a2.actionType, &a2.data, &a2.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a2")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "f557ef48-c304-47dc-adfb-46b7306e701f").Scan(&a3.uuid, &a3.schema, &a3.actionType, &a3.data, &a3.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a3")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "8d79db34-343d-4331-ae5b-24743f17ca7f").Scan(&a4.uuid, &a4.schema, &a4.actionType, &a4.data, &a4.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a4")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "b9c1ed4a-e6b3-41f2-983b-593ec7b8b7a1").Scan(&a5.uuid, &a5.schema, &a5.actionType, &a5.data, &a5.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a5")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "06ed7ef0-f171-4bd7-ae8e-97b5d06a4c49").Scan(&a6.uuid, &a6.schema, &a6.actionType, &a6.data, &a6.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a6")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "7f173cef-1688-4177-a373-145fcd822b2f").Scan(&a7.uuid, &a7.schema, &a7.actionType, &a7.data, &a7.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a7")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "64352e08-aa7a-45f4-b760-b3f38b5e11fa").Scan(&a8.uuid, &a8.schema, &a8.actionType, &a8.data, &a8.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a8")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "82e20a12-bda8-45f7-ac42-b453b6daa5ec").Scan(&a9.uuid, &a9.schema, &a9.actionType, &a9.data, &a9.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a9")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "a29055f4-ace4-44fd-8800-3396edbccaef").Scan(&a10.uuid, &a10.schema, &a10.actionType, &a10.data, &a10.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a10")) - } - err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "871a5562-1bd0-43c1-b550-5bbb727ac7c4").Scan(&a11.uuid, &a11.schema, &a11.actionType, &a11.data, &a11.timestamp) - if err != nil { - panic(errors.Wrap(err, "finding a11")) - } - - testutils.AssertEqual(t, a1.uuid, "6145c1b7-f286-4d9f-b0f6-00d274baefc6", "action 1 uuid mismatch") - testutils.AssertEqual(t, a1.schema, 1, "action 1 schema mismatch") - testutils.AssertEqual(t, a1.actionType, "add_book", "action 1 type mismatch") - testutils.AssertEqual(t, a1.data, `{"book_name":"js"}`, "action 1 data mismatch") - testutils.AssertEqual(t, a1.timestamp, 1536977229, "action 1 timestamp mismatch") - - testutils.AssertEqual(t, a2.uuid, "c048a56b-179c-4f31-9995-81e9b32b7dd6", "action 2 uuid mismatch") - testutils.AssertEqual(t, a2.schema, 2, "action 2 schema mismatch") - testutils.AssertEqual(t, a2.actionType, "add_note", "action 2 type mismatch") - testutils.AssertEqual(t, a2.data, `{"note_uuid":"35cbcab1-6a2a-4cc8-97e0-e73bbbd54626","book_name":"js","content":"js test 1","public":false}`, "action 2 data mismatch") - testutils.AssertEqual(t, a2.timestamp, 1536977229, "action 2 timestamp mismatch") - - testutils.AssertEqual(t, a3.uuid, "f557ef48-c304-47dc-adfb-46b7306e701f", "action 3 uuid mismatch") - testutils.AssertEqual(t, a3.schema, 2, "action 3 schema mismatch") - testutils.AssertEqual(t, a3.actionType, "add_note", "action 3 type mismatch") - testutils.AssertEqual(t, a3.data, `{"note_uuid":"7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a","book_name":"js","content":"js test 2","public":false}`, "action 3 data mismatch") - testutils.AssertEqual(t, a3.timestamp, 1536977230, "action 3 timestamp mismatch") - - testutils.AssertEqual(t, a4.uuid, "8d79db34-343d-4331-ae5b-24743f17ca7f", "action 4 uuid mismatch") - testutils.AssertEqual(t, a4.schema, 2, "action 4 schema mismatch") - testutils.AssertEqual(t, a4.actionType, "add_note", "action 4 type mismatch") - testutils.AssertEqual(t, a4.data, `{"note_uuid":"b23a88ba-b291-4294-9795-86b394db5dcf","book_name":"js","content":"js test 3","public":false}`, "action 4 data mismatch") - testutils.AssertEqual(t, a4.timestamp, 1536977234, "action 4 timestamp mismatch") - - testutils.AssertEqual(t, a5.uuid, "b9c1ed4a-e6b3-41f2-983b-593ec7b8b7a1", "action 5 uuid mismatch") - testutils.AssertEqual(t, a5.schema, 1, "action 5 schema mismatch") - testutils.AssertEqual(t, a5.actionType, "add_book", "action 5 type mismatch") - testutils.AssertEqual(t, a5.data, `{"book_name":"css"}`, "action 5 data mismatch") - testutils.AssertEqual(t, a5.timestamp, 1536977237, "action 5 timestamp mismatch") - - testutils.AssertEqual(t, a6.uuid, "06ed7ef0-f171-4bd7-ae8e-97b5d06a4c49", "action 6 uuid mismatch") - testutils.AssertEqual(t, a6.schema, 2, "action 6 schema mismatch") - testutils.AssertEqual(t, a6.actionType, "add_note", "action 6 type mismatch") - testutils.AssertEqual(t, a6.data, `{"note_uuid":"d69edb54-5b31-4cdd-a4a5-34f0a0bfa153","book_name":"css","content":"js test 3","public":false}`, "action 6 data mismatch") - testutils.AssertEqual(t, a6.timestamp, 1536977237, "action 6 timestamp mismatch") - - testutils.AssertEqual(t, a7.uuid, "7f173cef-1688-4177-a373-145fcd822b2f", "action 7 uuid mismatch") - testutils.AssertEqual(t, a7.schema, 2, "action 7 schema mismatch") - testutils.AssertEqual(t, a7.actionType, "edit_note", "action 7 type mismatch") - testutils.AssertEqual(t, a7.data, `{"note_uuid":"d69edb54-5b31-4cdd-a4a5-34f0a0bfa153","from_book":"css","to_book":null,"content":"css test 1","public":null}`, "action 7 data mismatch") - testutils.AssertEqual(t, a7.timestamp, 1536977253, "action 7 timestamp mismatch") - - testutils.AssertEqual(t, a8.uuid, "64352e08-aa7a-45f4-b760-b3f38b5e11fa", "action 8 uuid mismatch") - testutils.AssertEqual(t, a8.schema, 1, "action 8 schema mismatch") - testutils.AssertEqual(t, a8.actionType, "add_book", "action 8 type mismatch") - testutils.AssertEqual(t, a8.data, `{"book_name":"sql"}`, "action 8 data mismatch") - testutils.AssertEqual(t, a8.timestamp, 1536977261, "action 8 timestamp mismatch") - - testutils.AssertEqual(t, a9.uuid, "82e20a12-bda8-45f7-ac42-b453b6daa5ec", "action 9 uuid mismatch") - testutils.AssertEqual(t, a9.schema, 2, "action 9 schema mismatch") - testutils.AssertEqual(t, a9.actionType, "add_note", "action 9 type mismatch") - testutils.AssertEqual(t, a9.data, `{"note_uuid":"2f47d390-685b-4b84-89ac-704c6fb8d3fb","book_name":"sql","content":"blah","public":false}`, "action 9 data mismatch") - testutils.AssertEqual(t, a9.timestamp, 1536977261, "action 9 timestamp mismatch") - - testutils.AssertEqual(t, a10.uuid, "a29055f4-ace4-44fd-8800-3396edbccaef", "action 10 uuid mismatch") - testutils.AssertEqual(t, a10.schema, 1, "action 10 schema mismatch") - testutils.AssertEqual(t, a10.actionType, "remove_book", "action 10 type mismatch") - testutils.AssertEqual(t, a10.data, `{"book_name":"sql"}`, "action 10 data mismatch") - testutils.AssertEqual(t, a10.timestamp, 1536977268, "action 10 timestamp mismatch") - - testutils.AssertEqual(t, a11.uuid, "871a5562-1bd0-43c1-b550-5bbb727ac7c4", "action 11 uuid mismatch") - testutils.AssertEqual(t, a11.schema, 1, "action 11 schema mismatch") - testutils.AssertEqual(t, a11.actionType, "remove_note", "action 11 type mismatch") - testutils.AssertEqual(t, a11.data, `{"note_uuid":"b23a88ba-b291-4294-9795-86b394db5dcf","book_name":"js"}`, "action 11 data mismatch") - testutils.AssertEqual(t, a11.timestamp, 1536977274, "action 11 timestamp mismatch") - - // 3. test if system is migrated - var systemCount int - err = db.QueryRow("SELECT count(*) FROM system").Scan(&systemCount) - if err != nil { - panic(errors.Wrap(err, "counting system")) - } - - testutils.AssertEqual(t, systemCount, 3, "action count mismatch") - - var lastUpgrade, lastAction, bookmark int - err = db.QueryRow("SELECT value FROM system WHERE key = ?", "last_upgrade").Scan(&lastUpgrade) - if err != nil { - panic(errors.Wrap(err, "finding last_upgrade")) - } - err = db.QueryRow("SELECT value FROM system WHERE key = ?", "last_action").Scan(&lastAction) - if err != nil { - panic(errors.Wrap(err, "finding last_action")) - } - err = db.QueryRow("SELECT value FROM system WHERE key = ?", "bookmark").Scan(&bookmark) - if err != nil { - panic(errors.Wrap(err, "finding bookmark")) - } - - testutils.AssertEqual(t, lastUpgrade, 1536977220, "last_upgrade mismatch") - testutils.AssertEqual(t, lastAction, 1536977274, "last_action mismatch") - testutils.AssertEqual(t, bookmark, 9, "bookmark mismatch") -} diff --git a/cli/migrate/migrate_test.go b/cli/migrate/migrate_test.go deleted file mode 100644 index 3173d256..00000000 --- a/cli/migrate/migrate_test.go +++ /dev/null @@ -1,965 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package migrate - -import ( - "encoding/json" - "fmt" - "net/http" - "net/http/httptest" - "testing" - "time" - - "github.com/dnote/actions" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/testutils" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" -) - -func TestExecute_bump_schema(t *testing.T) { - testCases := []struct { - schemaKey string - }{ - { - schemaKey: infra.SystemSchema, - }, - { - schemaKey: infra.SystemRemoteSchema, - }, - } - - for _, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 8) - - m1 := migration{ - name: "noop", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - return nil - }, - } - m2 := migration{ - name: "noop", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - return nil - }, - } - - // execute - err := execute(ctx, m1, tc.schemaKey) - if err != nil { - t.Fatal(errors.Wrap(err, "failed to execute")) - } - err = execute(ctx, m2, tc.schemaKey) - if err != nil { - t.Fatal(errors.Wrap(err, "failed to execute")) - } - - // test - var schema int - testutils.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) - testutils.AssertEqual(t, schema, 10, "schema was not incremented properly") - }() - } -} - -func TestRun_nonfresh(t *testing.T) { - testCases := []struct { - mode int - schemaKey string - }{ - { - mode: LocalMode, - schemaKey: infra.SystemSchema, - }, - { - mode: RemoteMode, - schemaKey: infra.SystemRemoteSchema, - }, - } - - for _, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 2) - testutils.MustExec(t, "creating a temporary table for testing", db, - "CREATE TABLE migrate_run_test ( name string )") - - sequence := []migration{ - migration{ - name: "v1", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") - return nil - }, - }, - migration{ - name: "v2", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") - return nil - }, - }, - migration{ - name: "v3", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") - return nil - }, - }, - migration{ - name: "v4", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v4 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v4") - return nil - }, - }, - } - - // execute - err := Run(ctx, sequence, tc.mode) - if err != nil { - t.Fatal(errors.Wrap(err, "failed to run")) - } - - // test - var schema int - testutils.MustScan(t, fmt.Sprintf("getting schema for %s", tc.schemaKey), db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) - testutils.AssertEqual(t, schema, 4, fmt.Sprintf("schema was not updated for %s", tc.schemaKey)) - - var testRunCount int - testutils.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) - testutils.AssertEqual(t, testRunCount, 2, "test run count mismatch") - - var testRun1, testRun2 string - testutils.MustScan(t, "finding test run 1", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v3"), &testRun1) - testutils.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v4"), &testRun2) - }() - } - -} - -func TestRun_fresh(t *testing.T) { - testCases := []struct { - mode int - schemaKey string - }{ - { - mode: LocalMode, - schemaKey: infra.SystemSchema, - }, - { - mode: RemoteMode, - schemaKey: infra.SystemRemoteSchema, - }, - } - - for _, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "creating a temporary table for testing", db, - "CREATE TABLE migrate_run_test ( name string )") - - sequence := []migration{ - migration{ - name: "v1", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") - return nil - }, - }, - migration{ - name: "v2", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") - return nil - }, - }, - migration{ - name: "v3", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") - return nil - }, - }, - } - - // execute - err := Run(ctx, sequence, tc.mode) - if err != nil { - t.Fatal(errors.Wrap(err, "failed to run")) - } - - // test - var schema int - testutils.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) - testutils.AssertEqual(t, schema, 3, "schema was not updated") - - var testRunCount int - testutils.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) - testutils.AssertEqual(t, testRunCount, 3, "test run count mismatch") - - var testRun1, testRun2, testRun3 string - testutils.MustScan(t, "finding test run 1", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v1"), &testRun1) - testutils.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v2"), &testRun2) - testutils.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v3"), &testRun3) - }() - } -} - -func TestRun_up_to_date(t *testing.T) { - testCases := []struct { - mode int - schemaKey string - }{ - { - mode: LocalMode, - schemaKey: infra.SystemSchema, - }, - { - mode: RemoteMode, - schemaKey: infra.SystemRemoteSchema, - }, - } - - for _, tc := range testCases { - func() { - // set up - ctx := testutils.InitEnv(t, "../tmp", "../testutils/fixtures/schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - testutils.MustExec(t, "creating a temporary table for testing", db, - "CREATE TABLE migrate_run_test ( name string )") - - testutils.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 3) - - sequence := []migration{ - migration{ - name: "v1", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") - return nil - }, - }, - migration{ - name: "v2", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") - return nil - }, - }, - migration{ - name: "v3", - run: func(ctx infra.DnoteCtx, db *infra.DB) error { - testutils.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") - return nil - }, - }, - } - - // execute - err := Run(ctx, sequence, tc.mode) - if err != nil { - t.Fatal(errors.Wrap(err, "failed to run")) - } - - // test - var schema int - testutils.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) - testutils.AssertEqual(t, schema, 3, "schema was not updated") - - var testRunCount int - testutils.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) - testutils.AssertEqual(t, testRunCount, 0, "test run count mismatch") - }() - } -} - -func TestLocalMigration1(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-1-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) - a1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 1, "add_book", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.EditNoteDataV1{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: "", Content: "note 1"}) - a2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 1, "edit_note", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.EditNoteDataV1{NoteUUID: "note-2-uuid", FromBook: "js", ToBook: "", Content: "note 2"}) - a3UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 1, "edit_note", string(data), 1537829463) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm1.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var actionCount int - testutils.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) - testutils.AssertEqual(t, actionCount, 3, "action count mismatch") - - var a1, a2, a3 actions.Action - testutils.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), - &a1.Schema, &a1.Type, &a1.Data, &a1.Timestamp) - testutils.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), - &a2.Schema, &a2.Type, &a2.Data, &a2.Timestamp) - testutils.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), - &a3.Schema, &a3.Type, &a3.Data, &a3.Timestamp) - - var a1Data actions.AddBookDataV1 - var a2Data, a3Data actions.EditNoteDataV3 - testutils.MustUnmarshalJSON(t, a1.Data, &a1Data) - testutils.MustUnmarshalJSON(t, a2.Data, &a2Data) - testutils.MustUnmarshalJSON(t, a3.Data, &a3Data) - - testutils.AssertEqual(t, a1.Schema, 1, "a1 schema mismatch") - testutils.AssertEqual(t, a1.Type, "add_book", "a1 type mismatch") - testutils.AssertEqual(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") - testutils.AssertEqual(t, a1Data.BookName, "js", "a1 data book_name mismatch") - - testutils.AssertEqual(t, a2.Schema, 3, "a2 schema mismatch") - testutils.AssertEqual(t, a2.Type, "edit_note", "a2 type mismatch") - testutils.AssertEqual(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") - testutils.AssertEqual(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") - testutils.AssertEqual(t, a2Data.BookName, (*string)(nil), "a2 data book_name mismatch") - testutils.AssertEqual(t, *a2Data.Content, "note 1", "a2 data content mismatch") - testutils.AssertEqual(t, *a2Data.Public, false, "a2 data public mismatch") - - testutils.AssertEqual(t, a3.Schema, 3, "a3 schema mismatch") - testutils.AssertEqual(t, a3.Type, "edit_note", "a3 type mismatch") - testutils.AssertEqual(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") - testutils.AssertEqual(t, a3Data.NoteUUID, "note-2-uuid", "a3 data note_uuid mismatch") - testutils.AssertEqual(t, a3Data.BookName, (*string)(nil), "a3 data book_name mismatch") - testutils.AssertEqual(t, *a3Data.Content, "note 2", "a3 data content mismatch") - testutils.AssertEqual(t, *a3Data.Public, false, "a3 data public mismatch") -} - -func TestLocalMigration2(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-1-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - c1 := "note 1 - v1" - c2 := "note 1 - v2" - css := "css" - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") - - data := testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: "note-1-uuid", BookName: "js", Content: "note 1", Public: false}) - a1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 2, "add_note", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.EditNoteDataV2{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: nil, Content: &c1, Public: nil}) - a2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 2, "edit_note", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.EditNoteDataV2{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: &css, Content: &c2, Public: nil}) - a3UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 2, "edit_note", string(data), 1537829463) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm2.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var actionCount int - testutils.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) - testutils.AssertEqual(t, actionCount, 3, "action count mismatch") - - var a1, a2, a3 actions.Action - testutils.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), - &a1.Schema, &a1.Type, &a1.Data, &a1.Timestamp) - testutils.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), - &a2.Schema, &a2.Type, &a2.Data, &a2.Timestamp) - testutils.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), - &a3.Schema, &a3.Type, &a3.Data, &a3.Timestamp) - - var a1Data actions.AddNoteDataV2 - var a2Data, a3Data actions.EditNoteDataV3 - testutils.MustUnmarshalJSON(t, a1.Data, &a1Data) - testutils.MustUnmarshalJSON(t, a2.Data, &a2Data) - testutils.MustUnmarshalJSON(t, a3.Data, &a3Data) - - testutils.AssertEqual(t, a1.Schema, 2, "a1 schema mismatch") - testutils.AssertEqual(t, a1.Type, "add_note", "a1 type mismatch") - testutils.AssertEqual(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") - testutils.AssertEqual(t, a1Data.NoteUUID, "note-1-uuid", "a1 data note_uuid mismatch") - testutils.AssertEqual(t, a1Data.BookName, "js", "a1 data book_name mismatch") - testutils.AssertEqual(t, a1Data.Public, false, "a1 data public mismatch") - - testutils.AssertEqual(t, a2.Schema, 3, "a2 schema mismatch") - testutils.AssertEqual(t, a2.Type, "edit_note", "a2 type mismatch") - testutils.AssertEqual(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") - testutils.AssertEqual(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") - testutils.AssertEqual(t, a2Data.BookName, (*string)(nil), "a2 data book_name mismatch") - testutils.AssertEqual(t, *a2Data.Content, c1, "a2 data content mismatch") - testutils.AssertEqual(t, a2Data.Public, (*bool)(nil), "a2 data public mismatch") - - testutils.AssertEqual(t, a3.Schema, 3, "a3 schema mismatch") - testutils.AssertEqual(t, a3.Type, "edit_note", "a3 type mismatch") - testutils.AssertEqual(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") - testutils.AssertEqual(t, a3Data.NoteUUID, "note-1-uuid", "a3 data note_uuid mismatch") - testutils.AssertEqual(t, *a3Data.BookName, "css", "a3 data book_name mismatch") - testutils.AssertEqual(t, *a3Data.Content, c2, "a3 data content mismatch") - testutils.AssertEqual(t, a3Data.Public, (*bool)(nil), "a3 data public mismatch") -} - -func TestLocalMigration3(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-1-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - data := testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: "note-1-uuid", BookName: "js", Content: "note 1", Public: false}) - a1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 2, "add_note", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.RemoveNoteDataV1{NoteUUID: "note-1-uuid", BookName: "js"}) - a2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 1, "remove_note", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.RemoveNoteDataV1{NoteUUID: "note-2-uuid", BookName: "js"}) - a3UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 1, "remove_note", string(data), 1537829463) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm3.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var actionCount int - testutils.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) - testutils.AssertEqual(t, actionCount, 3, "action count mismatch") - - var a1, a2, a3 actions.Action - testutils.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), - &a1.Schema, &a1.Type, &a1.Data, &a1.Timestamp) - testutils.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), - &a2.Schema, &a2.Type, &a2.Data, &a2.Timestamp) - testutils.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), - &a3.Schema, &a3.Type, &a3.Data, &a3.Timestamp) - - var a1Data actions.AddNoteDataV2 - var a2Data, a3Data actions.RemoveNoteDataV2 - testutils.MustUnmarshalJSON(t, a1.Data, &a1Data) - testutils.MustUnmarshalJSON(t, a2.Data, &a2Data) - testutils.MustUnmarshalJSON(t, a3.Data, &a3Data) - - testutils.AssertEqual(t, a1.Schema, 2, "a1 schema mismatch") - testutils.AssertEqual(t, a1.Type, "add_note", "a1 type mismatch") - testutils.AssertEqual(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") - testutils.AssertEqual(t, a1Data.NoteUUID, "note-1-uuid", "a1 data note_uuid mismatch") - testutils.AssertEqual(t, a1Data.BookName, "js", "a1 data book_name mismatch") - testutils.AssertEqual(t, a1Data.Content, "note 1", "a1 data content mismatch") - testutils.AssertEqual(t, a1Data.Public, false, "a1 data public mismatch") - - testutils.AssertEqual(t, a2.Schema, 2, "a2 schema mismatch") - testutils.AssertEqual(t, a2.Type, "remove_note", "a2 type mismatch") - testutils.AssertEqual(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") - testutils.AssertEqual(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") - - testutils.AssertEqual(t, a3.Schema, 2, "a3 schema mismatch") - testutils.AssertEqual(t, a3.Type, "remove_note", "a3 type mismatch") - testutils.AssertEqual(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") - testutils.AssertEqual(t, a3Data.NoteUUID, "note-2-uuid", "a3 data note_uuid mismatch") -} - -func TestLocalMigration4(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-1-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n1UUID, b1UUID, "n1 content", time.Now().UnixNano()) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm4.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var n1Dirty, b1Dirty bool - var n1Deleted, b1Deleted bool - var n1USN, b1USN int - testutils.MustScan(t, "scanning the newly added dirty flag of n1", db.QueryRow("SELECT dirty, deleted, usn FROM notes WHERE uuid = ?", n1UUID), &n1Dirty, &n1Deleted, &n1USN) - testutils.MustScan(t, "scanning the newly added dirty flag of b1", db.QueryRow("SELECT dirty, deleted, usn FROM books WHERE uuid = ?", b1UUID), &b1Dirty, &b1Deleted, &b1USN) - - testutils.AssertEqual(t, n1Dirty, false, "n1 dirty flag should be false by default") - testutils.AssertEqual(t, b1Dirty, false, "b1 dirty flag should be false by default") - - testutils.AssertEqual(t, n1Deleted, false, "n1 deleted flag should be false by default") - testutils.AssertEqual(t, b1Deleted, false, "b1 deleted flag should be false by default") - - testutils.AssertEqual(t, n1USN, 0, "n1 usn flag should be 0 by default") - testutils.AssertEqual(t, b1USN, 0, "b1 usn flag should be 0 by default") -} - -func TestLocalMigration5(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-5-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") - b2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting js book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "js") - - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n1UUID, b1UUID, "n1 content", time.Now().UnixNano()) - n2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n2UUID, b1UUID, "n2 content", time.Now().UnixNano()) - n3UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n3UUID, b1UUID, "n3 content", time.Now().UnixNano()) - - data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) - testutils.MustExec(t, "inserting a1", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a1-uuid", 1, "add_book", string(data), 1537829463) - - data = testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: n1UUID, BookName: "css", Content: "n1 content", Public: false}) - testutils.MustExec(t, "inserting a2", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a2-uuid", 1, "add_note", string(data), 1537829463) - - updatedContent := "updated content" - data = testutils.MustMarshalJSON(t, actions.EditNoteDataV3{NoteUUID: n2UUID, BookName: (*string)(nil), Content: &updatedContent, Public: (*bool)(nil)}) - testutils.MustExec(t, "inserting a3", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a3-uuid", 1, "edit_note", string(data), 1537829463) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm5.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var b1Dirty, b2Dirty, n1Dirty, n2Dirty, n3Dirty bool - testutils.MustScan(t, "scanning the newly added dirty flag of b1", db.QueryRow("SELECT dirty FROM books WHERE uuid = ?", b1UUID), &b1Dirty) - testutils.MustScan(t, "scanning the newly added dirty flag of b2", db.QueryRow("SELECT dirty FROM books WHERE uuid = ?", b2UUID), &b2Dirty) - testutils.MustScan(t, "scanning the newly added dirty flag of n1", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n1UUID), &n1Dirty) - testutils.MustScan(t, "scanning the newly added dirty flag of n2", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n2UUID), &n2Dirty) - testutils.MustScan(t, "scanning the newly added dirty flag of n3", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n3UUID), &n3Dirty) - - testutils.AssertEqual(t, b1Dirty, false, "b1 dirty flag should be false by default") - testutils.AssertEqual(t, b2Dirty, true, "b2 dirty flag should be false by default") - testutils.AssertEqual(t, n1Dirty, true, "n1 dirty flag should be false by default") - testutils.AssertEqual(t, n2Dirty, true, "n2 dirty flag should be false by default") - testutils.AssertEqual(t, n3Dirty, false, "n3 dirty flag should be false by default") -} - -func TestLocalMigration6(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-5-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) - a1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting action", db, - "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 1, "add_book", string(data), 1537829463) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm5.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var count int - err = db.QueryRow("SELECT name FROM sqlite_master WHERE type='table' AND name = ?;", "actions").Scan(&count) - testutils.AssertEqual(t, count, 0, "actions table should have been deleted") -} - -func TestLocalMigration7_trash(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-7-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting trash book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "trash") - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm7.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var b1Label string - var b1Dirty bool - testutils.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) - testutils.AssertEqual(t, b1Label, "trash (2)", "b1 label was not migrated") - testutils.AssertEqual(t, b1Dirty, true, "b1 was not marked dirty") -} - -func TestLocalMigration7_conflicts(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-7-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm7.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var b1Label string - var b1Dirty bool - testutils.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) - testutils.AssertEqual(t, b1Label, "conflicts (2)", "b1 label was not migrated") - testutils.AssertEqual(t, b1Dirty, true, "b1 was not marked dirty") -} - -func TestLocalMigration7_conflicts_dup(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-7-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") - b2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "conflicts (2)") - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm7.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var b1Label, b2Label string - var b1Dirty, b2Dirty bool - testutils.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) - testutils.MustScan(t, "scanning b2 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b2UUID), &b2Label, &b2Dirty) - testutils.AssertEqual(t, b1Label, "conflicts (3)", "b1 label was not migrated") - testutils.AssertEqual(t, b2Label, "conflicts (2)", "b1 label was not migrated") - testutils.AssertEqual(t, b1Dirty, true, "b1 was not marked dirty") - testutils.AssertEqual(t, b2Dirty, false, "b2 should not have been marked dirty") -} - -func TestLocalMigration8(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-8-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") - - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting n1", db, `INSERT INTO notes - (id, uuid, book_uuid, content, added_on, edited_on, public, dirty, usn, deleted) VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 1, n1UUID, b1UUID, "n1 Body", 1, 2, true, true, 20, false) - n2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting n2", db, `INSERT INTO notes - (id, uuid, book_uuid, content, added_on, edited_on, public, dirty, usn, deleted) VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 2, n2UUID, b1UUID, "", 3, 4, false, true, 21, true) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm8.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - var n1BookUUID, n1Body string - var n1AddedOn, n1EditedOn int64 - var n1USN int - var n1Public, n1Dirty, n1Deleted bool - testutils.MustScan(t, "scanning n1", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n1UUID), &n1BookUUID, &n1Body, &n1AddedOn, &n1EditedOn, &n1USN, &n1Public, &n1Dirty, &n1Deleted) - - var n2BookUUID, n2Body string - var n2AddedOn, n2EditedOn int64 - var n2USN int - var n2Public, n2Dirty, n2Deleted bool - testutils.MustScan(t, "scanning n2", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n2UUID), &n2BookUUID, &n2Body, &n2AddedOn, &n2EditedOn, &n2USN, &n2Public, &n2Dirty, &n2Deleted) - - testutils.AssertEqual(t, n1BookUUID, b1UUID, "n1 BookUUID mismatch") - testutils.AssertEqual(t, n1Body, "n1 Body", "n1 Body mismatch") - testutils.AssertEqual(t, n1AddedOn, int64(1), "n1 AddedOn mismatch") - testutils.AssertEqual(t, n1EditedOn, int64(2), "n1 EditedOn mismatch") - testutils.AssertEqual(t, n1USN, 20, "n1 USN mismatch") - testutils.AssertEqual(t, n1Public, true, "n1 Public mismatch") - testutils.AssertEqual(t, n1Dirty, true, "n1 Dirty mismatch") - testutils.AssertEqual(t, n1Deleted, false, "n1 Deleted mismatch") - - testutils.AssertEqual(t, n2BookUUID, b1UUID, "n2 BookUUID mismatch") - testutils.AssertEqual(t, n2Body, "", "n2 Body mismatch") - testutils.AssertEqual(t, n2AddedOn, int64(3), "n2 AddedOn mismatch") - testutils.AssertEqual(t, n2EditedOn, int64(4), "n2 EditedOn mismatch") - testutils.AssertEqual(t, n2USN, 21, "n2 USN mismatch") - testutils.AssertEqual(t, n2Public, false, "n2 Public mismatch") - testutils.AssertEqual(t, n2Dirty, true, "n2 Dirty mismatch") - testutils.AssertEqual(t, n2Deleted, true, "n2 Deleted mismatch") -} - -func TestLocalMigration9(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/local-9-pre-schema.sql", false) - defer testutils.TeardownEnv(ctx) - - db := ctx.DB - - b1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") - - n1UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting n1", db, `INSERT INTO notes - (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n1UUID, b1UUID, "n1 Body", 1, 2, true, true, 20, false) - n2UUID := utils.GenerateUUID() - testutils.MustExec(t, "inserting n2", db, `INSERT INTO notes - (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES - (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n2UUID, b1UUID, "n2 Body", 3, 4, false, true, 21, false) - - // Execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = lm9.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // Test - - // assert that note_fts was populated with correct values - var noteFtsCount int - testutils.MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts;"), ¬eFtsCount) - testutils.AssertEqual(t, noteFtsCount, 2, "noteFtsCount mismatch") - - var resCount int - testutils.MustScan(t, "counting result", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "n1"), &resCount) - testutils.AssertEqual(t, resCount, 1, "noteFtsCount mismatch") -} - -func TestRemoteMigration1(t *testing.T) { - // set up - ctx := testutils.InitEnv(t, "../tmp", "./fixtures/remote-1-pre-schema.sql", false) - testutils.Login(t, &ctx) - defer testutils.TeardownEnv(ctx) - - JSBookUUID := "existing-js-book-uuid" - CSSBookUUID := "existing-css-book-uuid" - linuxBookUUID := "existing-linux-book-uuid" - newJSBookUUID := "new-js-book-uuid" - newCSSBookUUID := "new-css-book-uuid" - - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.String() == "/v1/books" { - res := []struct { - UUID string `json:"uuid"` - Label string `json:"label"` - }{ - { - UUID: newJSBookUUID, - Label: "js", - }, - { - UUID: newCSSBookUUID, - Label: "css", - }, - // book that only exists on the server. client must ignore. - { - UUID: "golang-book-uuid", - Label: "golang", - }, - } - - if err := json.NewEncoder(w).Encode(res); err != nil { - t.Fatal(errors.Wrap(err, "encoding response")) - } - } - })) - defer server.Close() - - ctx.APIEndpoint = server.URL - - db := ctx.DB - - testutils.MustExec(t, "inserting js book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", JSBookUUID, "js") - testutils.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", CSSBookUUID, "css") - testutils.MustExec(t, "inserting linux book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", linuxBookUUID, "linux") - testutils.MustExec(t, "inserting sessionKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemSessionKey, "someSessionKey") - testutils.MustExec(t, "inserting sessionKeyExpiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemSessionKeyExpiry, time.Now().Add(24*time.Hour).Unix()) - - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction")) - } - - err = rm1.run(ctx, tx) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "failed to run")) - } - - tx.Commit() - - // test - var postJSBookUUID, postCSSBookUUID, postLinuxBookUUID string - testutils.MustScan(t, "getting js book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "js"), &postJSBookUUID) - testutils.MustScan(t, "getting css book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "css"), &postCSSBookUUID) - testutils.MustScan(t, "getting linux book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "linux"), &postLinuxBookUUID) - - testutils.AssertEqual(t, postJSBookUUID, newJSBookUUID, "js book uuid was not updated correctly") - testutils.AssertEqual(t, postCSSBookUUID, newCSSBookUUID, "css book uuid was not updated correctly") - testutils.AssertEqual(t, postLinuxBookUUID, linuxBookUUID, "linux book uuid changed") -} diff --git a/cli/scripts/build.sh b/cli/scripts/build.sh deleted file mode 100755 index bb2423af..00000000 --- a/cli/scripts/build.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# -# build.sh compiles dnote binary for target platforms -# it is resonsible for creating distributable files that can -# be released by a human or a script -# use: ./scripts/build.sh 0.4.8 - -set -eu - -version="$1" -projectDir="$GOPATH/src/github.com/dnote/dnote" -basedir="$GOPATH/src/github.com/dnote/dnote/cli" -TMP="$basedir/build" - -command_exists () { - command -v "$1" >/dev/null 2>&1; -} - -if ! command_exists shasum; then - echo "please install shasum" - exit 1 -fi -if [ $# -eq 0 ]; then - echo "no version specified." - exit 1 -fi -if [[ $1 == v* ]]; then - echo "do not prefix version with v" - exit 1 -fi - -build() { - # init build dir - rm -rf "$TMP" - mkdir "$TMP" - - # fetch tool - go get -u github.com/karalabe/xgo - - pushd "$basedir" - - # build linux - xgo --targets="linux/amd64"\ - --tags "linux fts5"\ - -ldflags "-X main.apiEndpoint=https://api.dnote.io -X main.versionTag=$version" . - mkdir "$TMP/linux" - mv cli-linux-amd64 "$TMP/linux/dnote" - - # build darwin - xgo --targets="darwin/amd64"\ - --tags "darwin fts5"\ - -ldflags "-X main.apiEndpoint=https://api.dnote.io -X main.versionTag=$version" . - mkdir "$TMP/darwin" - mv cli-darwin-10.6-amd64 "$TMP/darwin/dnote" - - # build windows - xgo --targets="windows/amd64"\ - --tags "fts5"\ - -ldflags "-X main.apiEndpoint=https://api.dnote.io -X main.versionTag=$version" . - mkdir "$TMP/windows" - mv cli-windows-4.0-amd64.exe "$TMP/windows/dnote.exe" - - popd -} - -get_buildname() { - os=$1 - - echo "dnote_${version}_${os}_amd64" -} - -calc_checksum() { - os=$1 - - pushd "$TMP/$os" - - buildname=$(get_buildname "$os") - mv dnote "$buildname" - shasum -a 256 "$buildname" >> "$TMP/dnote_${version}_checksums.txt" - mv "$buildname" dnote - - popd -} - -build_tarball() { - os=$1 - buildname=$(get_buildname "$os") - - pushd "$TMP/$os" - - cp "$projectDir/licenses/GPLv3.txt" . - cp "$basedir/README.md" . - tar -zcvf "../${buildname}.tar.gz" ./* - - popd -} - -build - -calc_checksum darwin -calc_checksum linux - -build_tarball windows -build_tarball darwin -build_tarball linux - diff --git a/cli/scripts/dump_schema.sh b/cli/scripts/dump_schema.sh deleted file mode 100755 index e3224df9..00000000 --- a/cli/scripts/dump_schema.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -# dump_schema.sh dumps the current system's dnote schema to testutils package -# to be used while setting up tests - -sqlite3 ~/.dnote/dnote.db .schema > ./testutils/fixtures/schema.sql diff --git a/cli/scripts/release.sh b/cli/scripts/release.sh deleted file mode 100755 index 160a5fa2..00000000 --- a/cli/scripts/release.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# -# release.sh releases the tarballs and checksum in the build directory -# to GitHub and brew. It is important to build those files using build.sh -# use: ./scripts/release.sh v0.4.8 - -set -eu - -homebrewRepoDir="$GOPATH"/src/github.com/dnote/homebrew-dnote - -command_exists () { - command -v "$1" >/dev/null 2>&1; -} - -if [ $# -eq 0 ]; then - echo "no version specified." - exit 1 -fi -if [[ $1 == v* ]]; then - echo "do not prefix version with v" - exit 1 -fi - -if ! command_exists hub; then - echo "please install hub" - exit 1 -fi - -if [ ! -d "$homebrewRepoDir" ]; then - echo "homebrew-dnote not found locally. did you clone it?" - exit 1 -fi - -# 1. push tag -version=$1 -version_tag="cli-v$version" - -echo "* tagging and pushing the tag" -git tag -a "$version_tag" -m "Release $version_tag" -git push --tags - -# 2. release on GitHub -files=(./build/*.tar.gz ./build/*.txt) -file_args=() -for file in "${files[@]}"; do - file_args+=("--attach=$file") -done - -echo "* creating release" -set -x -hub release create \ - "${file_args[@]}" \ - --message="$version_tag"\ - "$version_tag" - -# 3. Release on Homebrew -homebrew_sha256=$(shasum -a 256 "./build/dnote_${version}_darwin_amd64.tar.gz" | cut -d ' ' -f 1) -(cd "$homebrewRepoDir" && ./release.sh "$version" "$homebrew_sha256") diff --git a/cli/scripts/test.sh b/cli/scripts/test.sh deleted file mode 100755 index 1af25c1b..00000000 --- a/cli/scripts/test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# run_server_test.sh runs server test files sequentially -# https://stackoverflow.com/questions/23715302/go-how-to-run-tests-for-multiple-packages - -set -eux - -basePath="$GOPATH/src/github.com/dnote/dnote/cli" - -# clear tmp dir in case not properly torn down -rm -rf "$basePath/tmp" - -# run test -pushd "$basePath" - -go test -a ./... \ - -p 1\ - --tags "fts5" - -popd diff --git a/cli/testutils/main.go b/cli/testutils/main.go deleted file mode 100644 index 9ce69022..00000000 --- a/cli/testutils/main.go +++ /dev/null @@ -1,363 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -// Package testutils provides utilities used in tests -package testutils - -import ( - "bytes" - "database/sql" - "encoding/json" - "fmt" - "io" - "io/ioutil" - "os" - "os/exec" - "path/filepath" - "reflect" - "strings" - "testing" - "time" - - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/utils" - "github.com/pkg/errors" -) - -// InitEnv sets up a test env and returns a new dnote context -func InitEnv(t *testing.T, dnotehomePath string, fixturePath string, migrated bool) infra.DnoteCtx { - os.Setenv("DNOTE_HOME_DIR", dnotehomePath) - ctx, err := infra.NewCtx("", "") - if err != nil { - t.Fatal(errors.Wrap(err, "getting new ctx")) - } - - // set up directory - if err := os.MkdirAll(ctx.DnoteDir, 0755); err != nil { - t.Fatal(err) - } - - // set up db - b := ReadFileAbs(fixturePath) - setupSQL := string(b) - - db := ctx.DB - if _, err := db.Exec(setupSQL); err != nil { - t.Fatal(errors.Wrap(err, "running schema sql")) - } - - if migrated { - // mark migrations as done. When adding new migrations, bump the numbers here. - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", infra.SystemSchema, 9); err != nil { - t.Fatal(errors.Wrap(err, "inserting schema")) - } - - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", infra.SystemRemoteSchema, 1); err != nil { - t.Fatal(errors.Wrap(err, "inserting remote schema")) - } - } - - return ctx -} - -// Login simulates a logged in user by inserting credentials in the local database -func Login(t *testing.T, ctx *infra.DnoteCtx) { - db := ctx.DB - - MustExec(t, "inserting sessionKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemSessionKey, "someSessionKey") - MustExec(t, "inserting sessionKeyExpiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemSessionKeyExpiry, time.Now().Add(24*time.Hour).Unix()) - MustExec(t, "inserting cipherKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", infra.SystemCipherKey, "QUVTMjU2S2V5LTMyQ2hhcmFjdGVyczEyMzQ1Njc4OTA=") - - ctx.SessionKey = "someSessionKey" - ctx.SessionKeyExpiry = time.Now().Add(24 * time.Hour).Unix() - ctx.CipherKey = []byte("AES256Key-32Characters1234567890") -} - -// TeardownEnv cleans up the test env represented by the given context -func TeardownEnv(ctx infra.DnoteCtx) { - ctx.DB.Close() - - if err := os.RemoveAll(ctx.DnoteDir); err != nil { - panic(err) - } -} - -// CopyFixture writes the content of the given fixture to the filename inside the dnote dir -func CopyFixture(ctx infra.DnoteCtx, fixturePath string, filename string) { - fp, err := filepath.Abs(fixturePath) - if err != nil { - panic(err) - } - dp, err := filepath.Abs(filepath.Join(ctx.DnoteDir, filename)) - if err != nil { - panic(err) - } - - err = utils.CopyFile(fp, dp) - if err != nil { - panic(err) - } -} - -// WriteFile writes a file with the given content and filename inside the dnote dir -func WriteFile(ctx infra.DnoteCtx, content []byte, filename string) { - dp, err := filepath.Abs(filepath.Join(ctx.DnoteDir, filename)) - if err != nil { - panic(err) - } - - if err := ioutil.WriteFile(dp, content, 0644); err != nil { - panic(err) - } -} - -// ReadFile reads the content of the file with the given name in dnote dir -func ReadFile(ctx infra.DnoteCtx, filename string) []byte { - path := filepath.Join(ctx.DnoteDir, filename) - - b, err := ioutil.ReadFile(path) - if err != nil { - panic(err) - } - - return b -} - -// ReadFileAbs reads the content of the file with the given file path by resolving -// it as an absolute path -func ReadFileAbs(relpath string) []byte { - fp, err := filepath.Abs(relpath) - if err != nil { - panic(err) - } - - b, err := ioutil.ReadFile(fp) - if err != nil { - panic(err) - } - - return b -} - -func checkEqual(a interface{}, b interface{}, message string) (bool, string) { - if a == b { - return true, "" - } - - var m string - if len(message) == 0 { - m = fmt.Sprintf("%v != %v", a, b) - } else { - m = message - } - errorMessage := fmt.Sprintf("%s. Actual: %+v. Expected: %+v.", m, a, b) - - return false, errorMessage -} - -// AssertEqual errors a test if the actual does not match the expected -func AssertEqual(t *testing.T, a interface{}, b interface{}, message string) { - ok, m := checkEqual(a, b, message) - if !ok { - t.Error(m) - } -} - -// AssertEqualf fails a test if the actual does not match the expected -func AssertEqualf(t *testing.T, a interface{}, b interface{}, message string) { - ok, m := checkEqual(a, b, message) - if !ok { - t.Fatal(m) - } -} - -// AssertNotEqual fails a test if the actual matches the expected -func AssertNotEqual(t *testing.T, a interface{}, b interface{}, message string) { - if a != b { - return - } - if len(message) == 0 { - message = fmt.Sprintf("%v == %v", a, b) - } - t.Errorf("%s. Actual: %+v. Expected: %+v.", message, a, b) -} - -// AssertDeepEqual fails a test if the actual does not deeply equal the expected -func AssertDeepEqual(t *testing.T, a interface{}, b interface{}, message string) { - if reflect.DeepEqual(a, b) { - return - } - - if len(message) == 0 { - message = fmt.Sprintf("%v != %v", a, b) - } - t.Errorf("%s.\nActual: %+v.\nExpected: %+v.", message, a, b) -} - -// ReadJSON reads JSON fixture to the struct at the destination address -func ReadJSON(path string, destination interface{}) { - var dat []byte - dat, err := ioutil.ReadFile(path) - if err != nil { - panic(errors.Wrap(err, "Failed to load fixture payload")) - } - if err := json.Unmarshal(dat, destination); err != nil { - panic(errors.Wrap(err, "Failed to get event")) - } -} - -// IsEqualJSON deeply compares two JSON byte slices -func IsEqualJSON(s1, s2 []byte) (bool, error) { - var o1 interface{} - var o2 interface{} - - if err := json.Unmarshal(s1, &o1); err != nil { - return false, errors.Wrap(err, "unmarshalling first JSON") - } - if err := json.Unmarshal(s2, &o2); err != nil { - return false, errors.Wrap(err, "unmarshalling second JSON") - } - - return reflect.DeepEqual(o1, o2), nil -} - -// MustExec executes the given SQL query and fails a test if an error occurs -func MustExec(t *testing.T, message string, db *infra.DB, query string, args ...interface{}) sql.Result { - result, err := db.Exec(query, args...) - if err != nil { - t.Fatal(errors.Wrap(errors.Wrap(err, "executing sql"), message)) - } - - return result -} - -// MustScan scans the given row and fails a test in case of any errors -func MustScan(t *testing.T, message string, row *sql.Row, args ...interface{}) { - err := row.Scan(args...) - if err != nil { - t.Fatal(errors.Wrap(errors.Wrap(err, "scanning a row"), message)) - } -} - -// NewDnoteCmd returns a new Dnote command and a pointer to stderr -func NewDnoteCmd(ctx infra.DnoteCtx, binaryName string, arg ...string) (*exec.Cmd, *bytes.Buffer, *bytes.Buffer, error) { - var stderr, stdout bytes.Buffer - - binaryPath, err := filepath.Abs(binaryName) - if err != nil { - return &exec.Cmd{}, &stderr, &stdout, errors.Wrap(err, "getting the absolute path to the test binary") - } - - cmd := exec.Command(binaryPath, arg...) - cmd.Env = []string{fmt.Sprintf("DNOTE_DIR=%s", ctx.DnoteDir), fmt.Sprintf("DNOTE_HOME_DIR=%s", ctx.HomeDir)} - cmd.Stderr = &stderr - cmd.Stdout = &stdout - - return cmd, &stderr, &stdout, nil -} - -// RunDnoteCmd runs a dnote command -func RunDnoteCmd(t *testing.T, ctx infra.DnoteCtx, binaryName string, arg ...string) { - t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) - - cmd, stderr, stdout, err := NewDnoteCmd(ctx, binaryName, arg...) - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "getting command").Error()) - } - - cmd.Env = append(cmd.Env, "DNOTE_DEBUG=1") - - if err := cmd.Run(); err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrapf(err, "running command %s", stderr.String())) - } - - // Print stdout if and only if test fails later - t.Logf("\n%s", stdout) -} - -// WaitDnoteCmd runs a dnote command and waits until the command is exited -func WaitDnoteCmd(t *testing.T, ctx infra.DnoteCtx, runFunc func(io.WriteCloser) error, binaryName string, arg ...string) { - t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) - - cmd, stderr, stdout, err := NewDnoteCmd(ctx, binaryName, arg...) - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "getting command").Error()) - } - - stdin, err := cmd.StdinPipe() - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "getting stdin %s")) - } - defer stdin.Close() - - // Start the program - err = cmd.Start() - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "starting command")) - } - - err = runFunc(stdin) - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "running with stdin")) - } - - err = cmd.Wait() - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrapf(err, "running command %s", stderr.String())) - } - - // Print stdout if and only if test fails later - t.Logf("\n%s", stdout) -} - -// UserConfirm simulates confirmation from the user by writing to stdin -func UserConfirm(stdin io.WriteCloser) error { - // confirm - if _, err := io.WriteString(stdin, "y\n"); err != nil { - return errors.Wrap(err, "indicating confirmation in stdin") - } - - return nil -} - -// MustMarshalJSON marshalls the given interface into JSON. -// If there is any error, it fails the test. -func MustMarshalJSON(t *testing.T, v interface{}) []byte { - b, err := json.Marshal(v) - if err != nil { - t.Fatalf("%s: marshalling data", t.Name()) - } - - return b -} - -// MustUnmarshalJSON marshalls the given interface into JSON. -// If there is any error, it fails the test. -func MustUnmarshalJSON(t *testing.T, data []byte, v interface{}) { - err := json.Unmarshal(data, v) - if err != nil { - t.Fatalf("%s: unmarshalling data", t.Name()) - } -} diff --git a/cli/testutils/setup.go b/cli/testutils/setup.go deleted file mode 100644 index 73b21d8a..00000000 --- a/cli/testutils/setup.go +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package testutils - -import ( - "github.com/dnote/dnote/cli/infra" - "testing" -) - -// Setup1 sets up a dnote env #1 -// dnote4.json -func Setup1(t *testing.T, ctx infra.DnoteCtx) { - db := ctx.DB - - b1UUID := "js-book-uuid" - b2UUID := "linux-book-uuid" - - MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "js") - MustExec(t, "setting up book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "linux") - - MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943) -} - -// Setup2 sets up a dnote env #2 -// dnote3.json -func Setup2(t *testing.T, ctx infra.DnoteCtx) { - db := ctx.DB - - b1UUID := "js-book-uuid" - b2UUID := "linux-book-uuid" - - MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b1UUID, "js", 111) - MustExec(t, "setting up book 2", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b2UUID, "linux", 122) - - MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", b1UUID, "n1 body", 1515199951, 11) - MustExec(t, "setting up note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "n2 body", 1515199943, 12) - MustExec(t, "setting up note 3", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "3e065d55-6d47-42f2-a6bf-f5844130b2d2", b2UUID, "n3 body", 1515199961, 13) -} - -// Setup3 sets up a dnote env #1 -// dnote1.json -func Setup3(t *testing.T, ctx infra.DnoteCtx) { - db := ctx.DB - - b1UUID := "js-book-uuid" - - MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "js") - - MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943) -} - -// Setup4 sets up a dnote env #1 -// dnote2.json -func Setup4(t *testing.T, ctx infra.DnoteCtx) { - db := ctx.DB - - b1UUID := "js-book-uuid" - - MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "js") - - MustExec(t, "setting up note 1", db, "INSERT INTO notes (rowid, uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?, ?)", 1, "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943) - MustExec(t, "setting up note 2", db, "INSERT INTO notes (rowid, uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?, ?)", 2, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", b1UUID, "Date object implements mathematical comparisons", 1515199951) -} diff --git a/cli/utils/utils.go b/cli/utils/utils.go deleted file mode 100644 index f808075c..00000000 --- a/cli/utils/utils.go +++ /dev/null @@ -1,250 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote CLI. - * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . - */ - -package utils - -import ( - "bufio" - "fmt" - "io" - "io/ioutil" - "net/http" - "os" - "path/filepath" - "strings" - "syscall" - - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/pkg/errors" - "github.com/satori/go.uuid" - "golang.org/x/crypto/ssh/terminal" -) - -// GenerateUUID returns a uid -func GenerateUUID() string { - return uuid.NewV4().String() -} - -func getInput() (string, error) { - reader := bufio.NewReader(os.Stdin) - input, err := reader.ReadString('\n') - if err != nil { - return "", errors.Wrap(err, "reading stdin") - } - - return strings.Trim(input, "\r\n"), nil -} - -// PromptInput prompts the user input and saves the result to the destination -func PromptInput(message string, dest *string) error { - log.Askf(message, false) - - input, err := getInput() - if err != nil { - return errors.Wrap(err, "getting user input") - } - - *dest = input - - return nil -} - -// PromptPassword prompts the user input a password and saves the result to the destination. -// The input is masked, meaning it is not echoed on the terminal. -func PromptPassword(message string, dest *string) error { - log.Askf(message, true) - - password, err := terminal.ReadPassword(int(syscall.Stdin)) - if err != nil { - return errors.Wrap(err, "getting user input") - } - - fmt.Println("") - - *dest = string(password) - - return nil -} - -// AskConfirmation prompts for user input to confirm a choice -func AskConfirmation(question string, optimistic bool) (bool, error) { - var choices string - if optimistic { - choices = "(Y/n)" - } else { - choices = "(y/N)" - } - - message := fmt.Sprintf("%s %s", question, choices) - - var input string - if err := PromptInput(message, &input); err != nil { - return false, errors.Wrap(err, "Failed to get user input") - } - - confirmed := input == "y" - - if optimistic { - confirmed = confirmed || input == "" - } - - return confirmed, nil -} - -// FileExists checks if the file exists at the given path -func FileExists(filepath string) bool { - _, err := os.Stat(filepath) - return !os.IsNotExist(err) -} - -// CopyDir copies a directory from src to dest, recursively copying nested -// directories -func CopyDir(src, dest string) error { - srcPath := filepath.Clean(src) - destPath := filepath.Clean(dest) - - fi, err := os.Stat(srcPath) - if err != nil { - return errors.Wrap(err, "getting the file info for the input") - } - if !fi.IsDir() { - return errors.New("source is not a directory") - } - - _, err = os.Stat(dest) - if err != nil && !os.IsNotExist(err) { - return errors.Wrap(err, "looking up the destination") - } - - err = os.MkdirAll(dest, fi.Mode()) - if err != nil { - return errors.Wrap(err, "creating destination") - } - - entries, err := ioutil.ReadDir(src) - if err != nil { - return errors.Wrap(err, "reading the directory listing for the input") - } - - for _, entry := range entries { - srcEntryPath := filepath.Join(srcPath, entry.Name()) - destEntryPath := filepath.Join(destPath, entry.Name()) - - if entry.IsDir() { - if err = CopyDir(srcEntryPath, destEntryPath); err != nil { - return errors.Wrapf(err, "copying %s", entry.Name()) - } - } else { - if err = CopyFile(srcEntryPath, destEntryPath); err != nil { - return errors.Wrapf(err, "copying %s", entry.Name()) - } - } - } - - return nil -} - -func getReq(ctx infra.DnoteCtx, path, method, body string) (*http.Request, error) { - endpoint := fmt.Sprintf("%s%s", ctx.APIEndpoint, path) - req, err := http.NewRequest(method, endpoint, strings.NewReader(body)) - if err != nil { - return nil, errors.Wrap(err, "constructing http request") - } - - req.Header.Set("CLI-Version", ctx.Version) - - return req, nil -} - -// DoAuthorizedReq does a http request to the given path in the api endpoint as a user, -// with the appropriate headers. The given path should include the preceding slash. -func DoAuthorizedReq(ctx infra.DnoteCtx, hc http.Client, method, path, body string) (*http.Response, error) { - if ctx.SessionKey == "" { - return nil, errors.New("no session key found") - } - - req, err := getReq(ctx, path, method, body) - if err != nil { - return nil, errors.Wrap(err, "getting request") - } - - credential := fmt.Sprintf("Bearer %s", ctx.SessionKey) - req.Header.Set("Authorization", credential) - - res, err := hc.Do(req) - if err != nil { - return res, errors.Wrap(err, "making http request") - } - - return res, nil -} - -// DoReq does a http request to the given path in the api endpoint -func DoReq(ctx infra.DnoteCtx, method, path, body string) (*http.Response, error) { - req, err := getReq(ctx, path, method, body) - if err != nil { - return nil, errors.Wrap(err, "getting request") - } - - hc := http.Client{} - res, err := hc.Do(req) - if err != nil { - return res, errors.Wrap(err, "making http request") - } - - return res, nil -} - -// CopyFile copies a file from the src to dest -func CopyFile(src, dest string) error { - in, err := os.Open(src) - if err != nil { - return errors.Wrap(err, "opening the input file") - } - defer in.Close() - - out, err := os.Create(dest) - if err != nil { - return errors.Wrap(err, "creating the output file") - } - - if _, err = io.Copy(out, in); err != nil { - return errors.Wrap(err, "copying the file content") - } - - if err = out.Sync(); err != nil { - return errors.Wrap(err, "flushing the output file to disk") - } - - fi, err := os.Stat(src) - if err != nil { - return errors.Wrap(err, "getting the file info for the input file") - } - - if err = os.Chmod(dest, fi.Mode()); err != nil { - return errors.Wrap(err, "copying permission to the output file") - } - - // Close the output file - if err = out.Close(); err != nil { - return errors.Wrap(err, "closing the output file") - } - - return nil -} diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..48dfc85c --- /dev/null +++ b/go.mod @@ -0,0 +1,43 @@ +module github.com/dnote/dnote + +go 1.25 + +require ( + github.com/dnote/actions v0.2.0 + github.com/fatih/color v1.18.0 + github.com/google/go-cmp v0.7.0 + github.com/google/go-github v17.0.0+incompatible + github.com/google/uuid v1.6.0 + github.com/gorilla/csrf v1.7.3 + github.com/gorilla/mux v1.8.1 + github.com/gorilla/schema v1.4.1 + github.com/mattn/go-sqlite3 v1.14.32 + github.com/pkg/errors v0.9.1 + github.com/radovskyb/watcher v1.0.7 + github.com/sergi/go-diff v1.3.1 + github.com/spf13/cobra v1.10.1 + golang.org/x/crypto v0.45.0 + golang.org/x/time v0.13.0 + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df + gopkg.in/yaml.v2 v2.4.0 + gorm.io/driver/sqlite v1.6.0 + gorm.io/gorm v1.30.0 +) + +require ( + github.com/google/go-querystring v1.1.0 // indirect + github.com/gorilla/securecookie v1.1.2 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/spf13/pflag v1.0.10 // indirect + github.com/stretchr/testify v1.8.1 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/term v0.37.0 // indirect + golang.org/x/text v0.31.0 // indirect + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..8b3c653a --- /dev/null +++ b/go.sum @@ -0,0 +1,103 @@ +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dnote/actions v0.2.0 h1:P1ut2/QRKwfAzIIB374vN9A4IanU94C/payEocvngYo= +github.com/dnote/actions v0.2.0/go.mod h1:bBIassLhppVQdbC3iaE92SHBpM1HOVe+xZoAlj9ROxw= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= +github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/csrf v1.7.3 h1:BHWt6FTLZAb2HtWT5KDBf6qgpZzvtbp9QWDRKZMXJC0= +github.com/gorilla/csrf v1.7.3/go.mod h1:F1Fj3KG23WYHE6gozCmBAezKookxbIvUJT+121wTuLk= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E= +github.com/gorilla/schema v1.4.1/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM= +github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA= +github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs= +github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE= +github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= +github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= +golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= +golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE= +gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.30.0 h1:qbT5aPv1UH8gI99OsRlvDToLxW5zR7FzS9acZDOZcgs= +gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= diff --git a/host/docker/.gitignore b/host/docker/.gitignore new file mode 100644 index 00000000..d10df00d --- /dev/null +++ b/host/docker/.gitignore @@ -0,0 +1,2 @@ +*.tar.gz +.env diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile new file mode 100644 index 00000000..71b3d1fa --- /dev/null +++ b/host/docker/Dockerfile @@ -0,0 +1,40 @@ +FROM busybox:glibc + +ARG TARGETPLATFORM +ARG version + +RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM is required" && exit 1) +RUN test -n "$version" || (echo "version is required" && exit 1) + +WORKDIR /tmp/tarballs + +# Copy all architecture tarballs +COPY dnote_server_*.tar.gz ./ + +# Select and extract the correct tarball based on target platform +RUN case "$TARGETPLATFORM" in \ + "linux/amd64") ARCH="amd64" ;; \ + "linux/arm64") ARCH="arm64" ;; \ + "linux/arm/v7") ARCH="arm" ;; \ + "linux/386") ARCH="386" ;; \ + *) echo "Unsupported platform: $TARGETPLATFORM" && exit 1 ;; \ + esac && \ + TARBALL="dnote_server_${version}_linux_${ARCH}.tar.gz" && \ + echo "Extracting $TARBALL for $TARGETPLATFORM" && \ + mkdir -p /dnote && \ + tar -xvzf "$TARBALL" -C /dnote + +WORKDIR /dnote + +# Set default database path for all processes (main server, docker exec, shells) +ENV DBPath=/data/dnote.db + +COPY entrypoint.sh . +ENTRYPOINT ["./entrypoint.sh"] + +CMD ./dnote-server start + +EXPOSE 3001 + +HEALTHCHECK --interval=30s --timeout=3s --start-period=10s \ + CMD wget --no-verbose --tries=1 -O /dev/null http://localhost:3001/health || exit 1 diff --git a/host/docker/build.sh b/host/docker/build.sh new file mode 100755 index 00000000..add55578 --- /dev/null +++ b/host/docker/build.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash +# Build Docker image for local testing +# +# Usage: +# # builds for host platform (auto-detected) +# ./build.sh 1.0.0 +# +# # builds arm64 +# ./build.sh 1.0.0 linux/arm64 +# +# # builds multiple platforms +# ./build.sh 1.0.0 "linux/amd64,linux/arm64,linux/arm/v7,linux/386" +set -eux + +version=$1 + +# Detect host platform if not specified +if [ -z "${2:-}" ]; then + HOST_ARCH=$(uname -m) + case "$HOST_ARCH" in + x86_64) platform="linux/amd64" ;; + aarch64|arm64) platform="linux/arm64" ;; + armv7l) platform="linux/arm/v7" ;; + i386|i686) platform="linux/386" ;; + *) + echo "Warning: Unsupported architecture: $HOST_ARCH, defaulting to linux/amd64" + platform="linux/amd64" + ;; + esac + echo "Auto-detected platform: $platform" +else + platform=$2 +fi + +dir=$(dirname "${BASH_SOURCE[0]}") +projectDir="$dir/../.." + +# Copy all Linux tarballs to Docker build context +cp "$projectDir/build/server/dnote_server_${version}_linux_amd64.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_arm64.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_arm.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_386.tar.gz" "$dir/" + +# Count platforms (check for comma) +if [[ "$platform" == *","* ]]; then + echo "Building for multiple platforms: $platform" + + # Check if multiarch builder exists, create if not + if ! docker buildx ls | grep -q "multiarch"; then + echo "Creating multiarch builder for multi-platform builds..." + docker buildx create --name multiarch --use + docker buildx inspect --bootstrap + else + echo "Using existing multiarch builder" + docker buildx use multiarch + fi + echo "" + + docker buildx build \ + --platform "$platform" \ + -t dnote/dnote:"$version" \ + -t dnote/dnote:latest \ + --build-arg version="$version" \ + "$dir" + + # Switch back to default builder + docker buildx use default +else + echo "Building for single platform: $platform" + echo "Image will be loaded to local Docker daemon" + + docker buildx build \ + --platform "$platform" \ + -t dnote/dnote:"$version" \ + -t dnote/dnote:latest \ + --build-arg version="$version" \ + --load \ + "$dir" +fi + +echo "" +echo "Build complete!" +if [[ "$platform" != *","* ]]; then + echo "Test with: docker run --rm dnote/dnote:$version ./dnote-server version" +fi diff --git a/host/docker/compose.yml b/host/docker/compose.yml new file mode 100644 index 00000000..2869033a --- /dev/null +++ b/host/docker/compose.yml @@ -0,0 +1,9 @@ +services: + dnote: + image: dnote/dnote:latest + container_name: dnote + ports: + - 3001:3001 + volumes: + - ./dnote_data:/data + restart: unless-stopped diff --git a/host/docker/entrypoint.sh b/host/docker/entrypoint.sh new file mode 100755 index 00000000..0fee185c --- /dev/null +++ b/host/docker/entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# Set default DBPath to /data if not specified +export DBPath=${DBPath:-/data/dnote.db} + +exec "$@" diff --git a/cli/install.sh b/install.sh similarity index 74% rename from cli/install.sh rename to install.sh index e690d380..bb09bd8f 100755 --- a/cli/install.sh +++ b/install.sh @@ -2,7 +2,7 @@ # # This script installs Dnote into your PATH (/usr/bin/local) # Use it like this: -# $ curl https://raw.githubusercontent.com/dnote/dnote/master/cli/install.sh | sh +# $ curl https://raw.githubusercontent.com/dnote/dnote/master/install.sh | sh # set -eu @@ -68,8 +68,14 @@ uname_os() { uname_arch() { arch=$(uname -m) - case $arch in + case $arch in x86_64) arch="amd64" ;; + aarch64) arch="arm64" ;; + arm64) arch="arm64" ;; + armv7l) arch="arm" ;; + armv6l) arch="arm" ;; + armv5l) arch="arm" ;; + arm) arch="arm" ;; x86) arch="386" ;; i686) arch="386" ;; i386) arch="386" ;; @@ -85,8 +91,17 @@ check_platform() { found=1 case "$platform" in - darwin/amd64) found=0;; + # Linux linux/amd64) found=0 ;; + linux/arm64) found=0 ;; + linux/arm) found=0 ;; + # macOS + darwin/amd64) found=0 ;; + darwin/arm64) found=0 ;; + # Windows + windows/amd64) found=0 ;; + # FreeBSD + freebsd/amd64) found=0 ;; esac return $found @@ -113,23 +128,26 @@ hash_sha256() { } verify_checksum() { - binary_path=$1 - filename=$2 - checksums=$3 + filepath=$1 + checksums=$2 + + filename=$(basename "$filepath") want=$(grep "${filename}" "${checksums}" 2>/dev/null | cut -d ' ' -f 1) if [ -z "$want" ]; then print_error "unable to find checksum for '${filename}' in '${checksums}'" exit 1 fi - got=$(hash_sha256 "$binary_path") + got=$(hash_sha256 "$filepath") if [ "$want" != "$got" ]; then - print_error "checksum for '$binary_path' did not verify ${want} vs $got" + print_error "checksum for '$filepath' did not verify ${want} vs $got" exit 1 fi } install_dnote() { + sudo_cmd="" + os=$(uname_os) arch=$(uname_arch) @@ -146,10 +164,22 @@ install_dnote() { tmpdir="$(mktemp -d)" bindir=${bindir:-/usr/local/bin} + if hash sudo 2>/dev/null; then + sudo_cmd="sudo" + echo "You need a root privilege to install Dnote binary to $bindir" + + if ! is_command "$sudo_cmd"; then + print_error "command not found: sudo. You need a root privilege to continue the installation." + exit 1; + fi + fi + + # create destination directory if not exists + $sudo_cmd mkdir -p "$bindir" # get the latest version - resp=$(http_get "https://api.github.com/repos/$owner/$repo/tags") - version=$(echo "$resp" | tr ',' '\n' | grep -m 1 "\"name\": \"cli" | cut -f4 -d'"') + resp=$(http_get "https://api.github.com/repos/$owner/$repo/releases") + version=$(echo "$resp" | tr ',' '\n' | grep -m 1 "\"tag_name\": \"cli" | cut -f4 -d'"') if [ -z "$version" ]; then print_error "Error fetching latest version. Please try again." @@ -173,20 +203,19 @@ install_dnote() { print_step "Downloading the checksum file for v$version" http_download "$tmpdir/$checksum" "$checksum_url" + print_step "Comparing checksums for binaries." + verify_checksum "$tmpdir/$tarball" "$tmpdir/$checksum" + # unzip tar print_step "Inflating the binary." (cd "${tmpdir}" && tar -xzf "${tarball}") - print_step "Comparing checksums for binaries." - verify_checksum "${tmpdir}/${binary}" "$filename" "$tmpdir/$checksum" - - install -d "${bindir}" - install "${tmpdir}/${binary}" "${bindir}/" + $sudo_cmd install -d "${bindir}" + $sudo_cmd install "${tmpdir}/${binary}" "${bindir}/" print_success "dnote v${version} was successfully installed in $bindir." } - exit_error() { # shellcheck disable=SC2181 if [ "$?" -ne 0 ]; then diff --git a/licenses/AGPLv3.txt b/licenses/AGPLv3.txt deleted file mode 100644 index 0ad25db4..00000000 --- a/licenses/AGPLv3.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/licenses/GPLv3.txt b/licenses/GPLv3.txt deleted file mode 100644 index f288702d..00000000 --- a/licenses/GPLv3.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/pkg/assert/assert.go b/pkg/assert/assert.go new file mode 100644 index 00000000..bb98fce0 --- /dev/null +++ b/pkg/assert/assert.go @@ -0,0 +1,145 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package assert provides functions to assert a condition in tests +package assert + +import ( + "encoding/json" + "fmt" + "io" + "net/http" + "reflect" + "runtime/debug" + "testing" + + "github.com/google/go-cmp/cmp" + "github.com/pkg/errors" +) + +func getErrorMessage(m string, a, b interface{}) string { + return fmt.Sprintf(`%s. +Actual: +======================== +%+v +======================== + +Expected: +======================== +%+v +======================== + +%s`, m, a, b, string(debug.Stack())) +} + +func checkEqual(a, b interface{}, message string) (bool, string) { + if a == b { + return true, "" + } + + var m string + if len(message) == 0 { + m = fmt.Sprintf("%v != %v", a, b) + } else { + m = message + } + errorMessage := getErrorMessage(m, a, b) + + return false, errorMessage +} + +// Equal errors a test if the actual does not match the expected +func Equal(t *testing.T, a, b interface{}, message string) { + ok, m := checkEqual(a, b, message) + if !ok { + t.Error(m) + } +} + +// Equalf fails a test if the actual does not match the expected +func Equalf(t *testing.T, a, b interface{}, message string) { + ok, m := checkEqual(a, b, message) + if !ok { + t.Fatal(m) + } +} + +// NotEqual fails a test if the actual matches the expected +func NotEqual(t *testing.T, a, b interface{}, message string) { + ok, m := checkEqual(a, b, message) + if ok { + t.Error(m) + } +} + +// NotEqualf fails a test if the actual matches the expected +func NotEqualf(t *testing.T, a, b interface{}, message string) { + ok, m := checkEqual(a, b, message) + if ok { + t.Fatal(m) + } +} + +// DeepEqual fails a test if the actual does not deeply equal the expected +func DeepEqual(t *testing.T, a, b interface{}, message string) { + if cmp.Equal(a, b) { + return + } + + if len(message) == 0 { + message = fmt.Sprintf("%v != %v", a, b) + } + + errorMessage := getErrorMessage(message, a, b) + errorMessage = fmt.Sprintf("%v\n%v", errorMessage, cmp.Diff(a, b)) + t.Error(errorMessage) +} + +// EqualJSON asserts that two JSON strings are equal +func EqualJSON(t *testing.T, a, b, message string) { + var o1 interface{} + var o2 interface{} + + err := json.Unmarshal([]byte(a), &o1) + if err != nil { + panic(fmt.Errorf("Error mashalling string 1 :: %s", err.Error())) + } + err = json.Unmarshal([]byte(b), &o2) + if err != nil { + panic(fmt.Errorf("Error mashalling string 2 :: %s", err.Error())) + } + + if reflect.DeepEqual(o1, o2) { + return + } + + if len(message) == 0 { + message = fmt.Sprintf("%v != %v", a, b) + } + t.Errorf("%s.\nActual: %+v.\nExpected: %+v.", message, a, b) +} + +// StatusCodeEquals asserts that the reponse's status code is equal to the +// expected +func StatusCodeEquals(t *testing.T, res *http.Response, expected int, message string) { + if res.StatusCode != expected { + body, err := io.ReadAll(res.Body) + if err != nil { + t.Fatal(errors.Wrap(err, "reading body")) + } + + t.Errorf("status code mismatch. %s: got %v want %v. Message was: '%s'", message, res.StatusCode, expected, string(body)) + } +} diff --git a/pkg/assert/prompt.go b/pkg/assert/prompt.go new file mode 100644 index 00000000..c21e6a42 --- /dev/null +++ b/pkg/assert/prompt.go @@ -0,0 +1,84 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package assert + +import ( + "bufio" + "io" + "strings" + "time" + + "github.com/pkg/errors" +) + +// WaitForPrompt waits for an expected prompt to appear in stdout with a timeout. +// Returns an error if the prompt is not found within the timeout period. +// Handles prompts with or without newlines by reading character by character. +func WaitForPrompt(stdout io.Reader, expectedPrompt string, timeout time.Duration) error { + type result struct { + found bool + err error + } + resultCh := make(chan result, 1) + + go func() { + reader := bufio.NewReader(stdout) + var buffer strings.Builder + found := false + + for { + b, err := reader.ReadByte() + if err != nil { + resultCh <- result{found: found, err: err} + return + } + + buffer.WriteByte(b) + if strings.Contains(buffer.String(), expectedPrompt) { + found = true + break + } + } + + resultCh <- result{found: found, err: nil} + }() + + select { + case res := <-resultCh: + if res.err != nil && res.err != io.EOF { + return errors.Wrap(res.err, "reading stdout") + } + if !res.found { + return errors.Errorf("expected prompt '%s' not found in stdout", expectedPrompt) + } + return nil + case <-time.After(timeout): + return errors.Errorf("timeout waiting for prompt '%s'", expectedPrompt) + } +} + +// RespondToPrompt is a helper that waits for a prompt and sends a response. +func RespondToPrompt(stdout io.Reader, stdin io.WriteCloser, expectedPrompt, response string, timeout time.Duration) error { + if err := WaitForPrompt(stdout, expectedPrompt, timeout); err != nil { + return err + } + + if _, err := io.WriteString(stdin, response); err != nil { + return errors.Wrap(err, "writing response to stdin") + } + + return nil +} diff --git a/cli/.gitignore b/pkg/cli/.gitignore similarity index 87% rename from cli/.gitignore rename to pkg/cli/.gitignore index 7de9e987..87f89ac4 100644 --- a/cli/.gitignore +++ b/pkg/cli/.gitignore @@ -1,6 +1,6 @@ main *.swo -tmp/ +tmp*/ /vendor test-dnote /dist diff --git a/cli/COMMANDS.md b/pkg/cli/COMMANDS.md similarity index 68% rename from cli/COMMANDS.md rename to pkg/cli/COMMANDS.md index ec26b444..c3402152 100644 --- a/cli/COMMANDS.md +++ b/pkg/cli/COMMANDS.md @@ -38,35 +38,41 @@ dnote view dnote view golang # See details of a note -dnote view golang 12 +dnote view 12 ``` ## dnote edit _alias: e_ -Edit a note. +Edit a note or a book. ```bash -# Launch a text editor to edit a note with the given index. -dnote edit linux 1 +# Launch a text editor to edit a note with the given id. +dnote edit 12 -# Edit a note with the given index in the specified book with a content. -dnote edit linux 1 -c "New Content" +# Edit a note with the given id in the specified book with a content. +dnote edit 12 -c "New Content" + +# Launch a text editor to edit a book name. +dnote edit js + +# Edit a book name by using a flag. +dnote edit js -n "javascript" ``` ## dnote remove -_alias: d_ +_alias: rm, d_ Remove either a note or a book. ```bash -# Remove the note with `index` in the specified book. -dnote remove JS 1 +# Remove a note with an id. +dnote remove 1 -# Remove the book with the `book name`. -dnote remove -b JS +# Remove a book with the `book name`. +dnote remove js ``` ## dnote find @@ -88,20 +94,14 @@ dnote find "merge sort" -b algorithm ## dnote sync -_Dnote Pro only_ - _alias: s_ -Sync notes with Dnote server. All your data is encrypted before being sent to the server. +Sync notes with Dnote server. ## dnote login -_Dnote Pro only_ - Start a login prompt. ## dnote logout -_Dnote Pro only_ - Log out of Dnote. diff --git a/pkg/cli/README.md b/pkg/cli/README.md new file mode 100644 index 00000000..d177e902 --- /dev/null +++ b/pkg/cli/README.md @@ -0,0 +1 @@ +This directory contains the command line interface project for Dnote. diff --git a/cli/client/client.go b/pkg/cli/client/client.go similarity index 52% rename from cli/client/client.go rename to pkg/cli/client/client.go index 739a52fd..2be0006d 100644 --- a/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package client provides interfaces for interacting with the Dnote server @@ -23,22 +20,190 @@ package client import ( "encoding/json" "fmt" - "io/ioutil" + "io" "net/http" "net/url" "strconv" "strings" "time" - "github.com/dnote/dnote/cli/crypt" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/utils" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" + "golang.org/x/time/rate" ) // ErrInvalidLogin is an error for invalid credentials for login var ErrInvalidLogin = errors.New("wrong credentials") +// ErrContentTypeMismatch is an error for invalid credentials for login +var ErrContentTypeMismatch = errors.New("content type mismatch") + +// HTTPError represents an HTTP error response from the server +type HTTPError struct { + StatusCode int + Message string +} + +func (e *HTTPError) Error() string { + return fmt.Sprintf(`response %d "%s"`, e.StatusCode, e.Message) +} + +// IsConflict returns true if the error is a 409 Conflict error +func (e *HTTPError) IsConflict() bool { + return e.StatusCode == 409 +} + +var contentTypeApplicationJSON = "application/json" +var contentTypeNone = "" + +// requestOptions contains options for requests +type requestOptions struct { + HTTPClient *http.Client + // ExpectedContentType is the Content-Type that the client is expecting from the server + ExpectedContentType *string +} + +const ( + // clientRateLimitPerSecond is the max requests per second the client will make + clientRateLimitPerSecond = 50 + // clientRateLimitBurst is the burst capacity for rate limiting + clientRateLimitBurst = 100 +) + +// rateLimitedTransport wraps an http.RoundTripper with rate limiting +type rateLimitedTransport struct { + transport http.RoundTripper + limiter *rate.Limiter +} + +func (t *rateLimitedTransport) RoundTrip(req *http.Request) (*http.Response, error) { + // Wait for rate limiter to allow the request + if err := t.limiter.Wait(req.Context()); err != nil { + return nil, err + } + return t.transport.RoundTrip(req) +} + +// NewRateLimitedHTTPClient creates an HTTP client with rate limiting +func NewRateLimitedHTTPClient() *http.Client { + // Calculate interval from rate: 1 second / requests per second + interval := time.Second / time.Duration(clientRateLimitPerSecond) + + transport := &rateLimitedTransport{ + transport: http.DefaultTransport, + limiter: rate.NewLimiter(rate.Every(interval), clientRateLimitBurst), + } + return &http.Client{ + Transport: transport, + } +} + +func getHTTPClient(ctx context.DnoteCtx, options *requestOptions) *http.Client { + if options != nil && options.HTTPClient != nil { + return options.HTTPClient + } + + if ctx.HTTPClient != nil { + return ctx.HTTPClient + } + + return &http.Client{} +} + +func getExpectedContentType(options *requestOptions) string { + if options != nil && options.ExpectedContentType != nil { + return *options.ExpectedContentType + } + + return contentTypeApplicationJSON +} + +func getReq(ctx context.DnoteCtx, path, method, body string) (*http.Request, error) { + endpoint := fmt.Sprintf("%s%s", ctx.APIEndpoint, path) + req, err := http.NewRequest(method, endpoint, strings.NewReader(body)) + if err != nil { + return nil, errors.Wrap(err, "constructing http request") + } + + req.Header.Set("CLI-Version", ctx.Version) + + if ctx.SessionKey != "" { + credential := fmt.Sprintf("Bearer %s", ctx.SessionKey) + req.Header.Set("Authorization", credential) + } + + return req, nil +} + +// checkRespErr checks if the given http response indicates an error. It returns a boolean indicating +// if the response is an error, and a decoded error message. +func checkRespErr(res *http.Response) error { + if res.StatusCode < 400 { + return nil + } + + body, err := io.ReadAll(res.Body) + if err != nil { + return errors.Wrapf(err, "server responded with %d but client could not read the response body", res.StatusCode) + } + + bodyStr := string(body) + return &HTTPError{ + StatusCode: res.StatusCode, + Message: strings.TrimRight(bodyStr, "\n"), + } +} + +func checkContentType(res *http.Response, options *requestOptions) error { + expected := getExpectedContentType(options) + + got := res.Header.Get("Content-Type") + if got != expected { + return errors.Wrapf(ErrContentTypeMismatch, "got: '%s' want: '%s'. Did you configure your endpoint correctly?", got, expected) + } + + return nil +} + +// doReq does a http request to the given path in the api endpoint +func doReq(ctx context.DnoteCtx, method, path, body string, options *requestOptions) (*http.Response, error) { + req, err := getReq(ctx, path, method, body) + if err != nil { + return nil, errors.Wrap(err, "getting request") + } + + log.Debug("HTTP %s %s\n", method, path) + + hc := getHTTPClient(ctx, options) + res, err := hc.Do(req) + if err != nil { + return res, errors.Wrap(err, "making http request") + } + + log.Debug("HTTP %d %s\n", res.StatusCode, res.Status) + + if err = checkRespErr(res); err != nil { + return res, errors.Wrap(err, "server responded with an error") + } + + if err = checkContentType(res, options); err != nil { + return res, errors.Wrap(err, "unexpected Content-Type") + } + + return res, nil +} + +// doAuthorizedReq does a http request to the given path in the api endpoint as a user, +// with the appropriate headers. The given path should include the preceding slash. +func doAuthorizedReq(ctx context.DnoteCtx, method, path, body string, options *requestOptions) (*http.Response, error) { + if ctx.SessionKey == "" { + return nil, errors.New("no session key found") + } + + return doReq(ctx, method, path, body, options) +} + // GetSyncStateResp is the response get sync state endpoint type GetSyncStateResp struct { FullSyncBefore int `json:"full_sync_before"` @@ -47,16 +212,15 @@ type GetSyncStateResp struct { } // GetSyncState gets the sync state response from the server -func GetSyncState(ctx infra.DnoteCtx) (GetSyncStateResp, error) { +func GetSyncState(ctx context.DnoteCtx) (GetSyncStateResp, error) { var ret GetSyncStateResp - hc := http.Client{} - res, err := utils.DoAuthorizedReq(ctx, hc, "GET", "/v1/sync/state", "") + res, err := doAuthorizedReq(ctx, "GET", "/v3/sync/state", "", nil) if err != nil { return ret, errors.Wrap(err, "constructing http request") } - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { return ret, errors.Wrap(err, "reading the response body") } @@ -79,7 +243,6 @@ type SyncFragNote struct { AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` Body string `json:"content"` - Public bool `json:"public"` Deleted bool `json:"deleted"` } @@ -112,16 +275,18 @@ type GetSyncFragmentResp struct { } // GetSyncFragment gets a sync fragment response from the server -func GetSyncFragment(ctx infra.DnoteCtx, afterUSN int) (GetSyncFragmentResp, error) { +func GetSyncFragment(ctx context.DnoteCtx, afterUSN int) (GetSyncFragmentResp, error) { v := url.Values{} v.Set("after_usn", strconv.Itoa(afterUSN)) queryStr := v.Encode() - path := fmt.Sprintf("/v1/sync/fragment?%s", queryStr) - hc := http.Client{} - res, err := utils.DoAuthorizedReq(ctx, hc, "GET", path, "") + path := fmt.Sprintf("/v3/sync/fragment?%s", queryStr) + res, err := doAuthorizedReq(ctx, "GET", path, "", nil) + if err != nil { + return GetSyncFragmentResp{}, errors.Wrap(err, "making the request") + } - body, err := ioutil.ReadAll(res.Body) + body, err := io.ReadAll(res.Body) if err != nil { return GetSyncFragmentResp{}, errors.Wrap(err, "reading the response body") } @@ -154,52 +319,21 @@ type CreateBookResp struct { Book RespBook `json:"book"` } -// checkRespErr checks if the given http response indicates an error. It returns a boolean indicating -// if the response is an error, and a decoded error message. -func checkRespErr(res *http.Response) (bool, string, error) { - if res.StatusCode < 400 { - return false, "", nil - } - - body, err := ioutil.ReadAll(res.Body) - if err != nil { - return true, "", errors.Wrapf(err, "server responded with %d but could not read the response body", res.StatusCode) - } - - bodyStr := string(body) - message := fmt.Sprintf(`response %d "%s"`, res.StatusCode, strings.TrimRight(bodyStr, "\n")) - return true, message, nil -} - // CreateBook creates a new book in the server -func CreateBook(ctx infra.DnoteCtx, label string) (CreateBookResp, error) { - encLabel, err := crypt.AesGcmEncrypt(ctx.CipherKey, []byte(label)) - if err != nil { - return CreateBookResp{}, errors.Wrap(err, "encrypting the label") - } - +func CreateBook(ctx context.DnoteCtx, label string) (CreateBookResp, error) { payload := CreateBookPayload{ - Name: encLabel, + Name: label, } b, err := json.Marshal(payload) if err != nil { return CreateBookResp{}, errors.Wrap(err, "marshaling payload") } - hc := http.Client{} - res, err := utils.DoAuthorizedReq(ctx, hc, "POST", "/v2/books", string(b)) + res, err := doAuthorizedReq(ctx, "POST", "/v3/books", string(b), nil) if err != nil { return CreateBookResp{}, errors.Wrap(err, "posting a book to the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return CreateBookResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return CreateBookResp{}, errors.New(message) - } - var resp CreateBookResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return resp, errors.Wrap(err, "decoding response payload") @@ -218,35 +352,21 @@ type UpdateBookResp struct { } // UpdateBook updates a book in the server -func UpdateBook(ctx infra.DnoteCtx, label, uuid string) (UpdateBookResp, error) { - encName, err := crypt.AesGcmEncrypt(ctx.CipherKey, []byte(label)) - if err != nil { - return UpdateBookResp{}, errors.Wrap(err, "encrypting the content") - } - +func UpdateBook(ctx context.DnoteCtx, label, uuid string) (UpdateBookResp, error) { payload := updateBookPayload{ - Name: &encName, + Name: &label, } b, err := json.Marshal(payload) if err != nil { return UpdateBookResp{}, errors.Wrap(err, "marshaling payload") } - hc := http.Client{} - endpoint := fmt.Sprintf("/v1/books/%s", uuid) - res, err := utils.DoAuthorizedReq(ctx, hc, "PATCH", endpoint, string(b)) + endpoint := fmt.Sprintf("/v3/books/%s", uuid) + res, err := doAuthorizedReq(ctx, "PATCH", endpoint, string(b), nil) if err != nil { return UpdateBookResp{}, errors.Wrap(err, "posting a book to the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return UpdateBookResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return UpdateBookResp{}, errors.New(message) - } - var resp UpdateBookResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return resp, errors.Wrap(err, "decoding payload") @@ -262,22 +382,13 @@ type DeleteBookResp struct { } // DeleteBook deletes a book in the server -func DeleteBook(ctx infra.DnoteCtx, uuid string) (DeleteBookResp, error) { - hc := http.Client{} - endpoint := fmt.Sprintf("/v1/books/%s", uuid) - res, err := utils.DoAuthorizedReq(ctx, hc, "DELETE", endpoint, "") +func DeleteBook(ctx context.DnoteCtx, uuid string) (DeleteBookResp, error) { + endpoint := fmt.Sprintf("/v3/books/%s", uuid) + res, err := doAuthorizedReq(ctx, "DELETE", endpoint, "", nil) if err != nil { return DeleteBookResp{}, errors.Wrap(err, "deleting a book in the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return DeleteBookResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return DeleteBookResp{}, errors.New(message) - } - var resp DeleteBookResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return resp, errors.Wrap(err, "decoding the response") @@ -320,35 +431,21 @@ type RespNote struct { } // CreateNote creates a note in the server -func CreateNote(ctx infra.DnoteCtx, bookUUID, content string) (CreateNoteResp, error) { - encBody, err := crypt.AesGcmEncrypt(ctx.CipherKey, []byte(content)) - if err != nil { - return CreateNoteResp{}, errors.Wrap(err, "encrypting the content") - } - +func CreateNote(ctx context.DnoteCtx, bookUUID, content string) (CreateNoteResp, error) { payload := CreateNotePayload{ BookUUID: bookUUID, - Body: encBody, + Body: content, } b, err := json.Marshal(payload) if err != nil { return CreateNoteResp{}, errors.Wrap(err, "marshaling payload") } - hc := http.Client{} - res, err := utils.DoAuthorizedReq(ctx, hc, "POST", "/v2/notes", string(b)) + res, err := doAuthorizedReq(ctx, "POST", "/v3/notes", string(b), nil) if err != nil { return CreateNoteResp{}, errors.Wrap(err, "posting a book to the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return CreateNoteResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return CreateNoteResp{}, errors.New(message) - } - var resp CreateNoteResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return CreateNoteResp{}, errors.Wrap(err, "decoding payload") @@ -360,7 +457,6 @@ func CreateNote(ctx infra.DnoteCtx, bookUUID, content string) (CreateNoteResp, e type updateNotePayload struct { BookUUID *string `json:"book_uuid"` Body *string `json:"content"` - Public *bool `json:"public"` } // UpdateNoteResp is the response from create book api @@ -370,37 +466,22 @@ type UpdateNoteResp struct { } // UpdateNote updates a note in the server -func UpdateNote(ctx infra.DnoteCtx, uuid, bookUUID, content string, public bool) (UpdateNoteResp, error) { - encBody, err := crypt.AesGcmEncrypt(ctx.CipherKey, []byte(content)) - if err != nil { - return UpdateNoteResp{}, errors.Wrap(err, "encrypting the content") - } - +func UpdateNote(ctx context.DnoteCtx, uuid, bookUUID, content string) (UpdateNoteResp, error) { payload := updateNotePayload{ BookUUID: &bookUUID, - Body: &encBody, - Public: &public, + Body: &content, } b, err := json.Marshal(payload) if err != nil { return UpdateNoteResp{}, errors.Wrap(err, "marshaling payload") } - hc := http.Client{} - endpoint := fmt.Sprintf("/v1/notes/%s", uuid) - res, err := utils.DoAuthorizedReq(ctx, hc, "PATCH", endpoint, string(b)) + endpoint := fmt.Sprintf("/v3/notes/%s", uuid) + res, err := doAuthorizedReq(ctx, "PATCH", endpoint, string(b), nil) if err != nil { return UpdateNoteResp{}, errors.Wrap(err, "patching a note to the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return UpdateNoteResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return UpdateNoteResp{}, errors.New(message) - } - var resp UpdateNoteResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return UpdateNoteResp{}, errors.Wrap(err, "decoding payload") @@ -416,22 +497,13 @@ type DeleteNoteResp struct { } // DeleteNote removes a note in the server -func DeleteNote(ctx infra.DnoteCtx, uuid string) (DeleteNoteResp, error) { - hc := http.Client{} - endpoint := fmt.Sprintf("/v1/notes/%s", uuid) - res, err := utils.DoAuthorizedReq(ctx, hc, "DELETE", endpoint, "") +func DeleteNote(ctx context.DnoteCtx, uuid string) (DeleteNoteResp, error) { + endpoint := fmt.Sprintf("/v3/notes/%s", uuid) + res, err := doAuthorizedReq(ctx, "DELETE", endpoint, "", nil) if err != nil { return DeleteNoteResp{}, errors.Wrap(err, "patching a note to the server") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return DeleteNoteResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return DeleteNoteResp{}, errors.New(message) - } - var resp DeleteNoteResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return DeleteNoteResp{}, errors.Wrap(err, "decoding payload") @@ -447,21 +519,12 @@ type GetBooksResp []struct { } // GetBooks gets books from the server -func GetBooks(ctx infra.DnoteCtx, sessionKey string) (GetBooksResp, error) { - hc := http.Client{} - res, err := utils.DoAuthorizedReq(ctx, hc, "GET", "/v1/books", "") +func GetBooks(ctx context.DnoteCtx, sessionKey string) (GetBooksResp, error) { + res, err := doAuthorizedReq(ctx, "GET", "/v3/books", "", nil) if err != nil { return GetBooksResp{}, errors.Wrap(err, "making http request") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return GetBooksResp{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return GetBooksResp{}, errors.New(message) - } - var resp GetBooksResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return GetBooksResp{}, errors.Wrap(err, "decoding payload") @@ -470,26 +533,18 @@ func GetBooks(ctx infra.DnoteCtx, sessionKey string) (GetBooksResp, error) { return resp, nil } -// PresigninResponse is a reponse from /v1/presignin endpoint +// PresigninResponse is a reponse from /v3/presignin endpoint type PresigninResponse struct { Iteration int `json:"iteration"` } // GetPresignin gets presignin credentials -func GetPresignin(ctx infra.DnoteCtx, email string) (PresigninResponse, error) { - res, err := utils.DoReq(ctx, "GET", fmt.Sprintf("/v1/presignin?email=%s", email), "") +func GetPresignin(ctx context.DnoteCtx, email string) (PresigninResponse, error) { + res, err := doReq(ctx, "GET", fmt.Sprintf("/v3/presignin?email=%s", email), "", nil) if err != nil { return PresigninResponse{}, errors.Wrap(err, "making http request") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return PresigninResponse{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return PresigninResponse{}, errors.New(message) - } - var resp PresigninResponse if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return PresigninResponse{}, errors.Wrap(err, "decoding payload") @@ -498,46 +553,38 @@ func GetPresignin(ctx infra.DnoteCtx, email string) (PresigninResponse, error) { return resp, nil } -// SigninPayload is a payload for /v1/signin +// SigninPayload is a payload for /v3/signin type SigninPayload struct { - Email string `json:"email"` - AuthKey string `json:"auth_key"` + Email string `json:"email"` + Passowrd string `json:"password"` } -// SigninResponse is a response from /v1/signin endpoint +// SigninResponse is a response from /v3/signin endpoint type SigninResponse struct { - Key string `json:"key"` - ExpiresAt int64 `json:"expires_at"` - CipherKeyEnc string `json:"cipher_key_enc"` + Key string `json:"key"` + ExpiresAt int64 `json:"expires_at"` } // Signin requests a session token -func Signin(ctx infra.DnoteCtx, email, authKey string) (SigninResponse, error) { +func Signin(ctx context.DnoteCtx, email, password string) (SigninResponse, error) { payload := SigninPayload{ - Email: email, - AuthKey: authKey, + Email: email, + Passowrd: password, } b, err := json.Marshal(payload) if err != nil { return SigninResponse{}, errors.Wrap(err, "marshaling payload") } - res, err := utils.DoReq(ctx, "POST", "/v1/signin", string(b)) + res, err := doReq(ctx, "POST", "/v3/signin", string(b), nil) if err != nil { + // Check if this is a 401 Unauthorized error + var httpErr *HTTPError + if errors.As(err, &httpErr) && httpErr.StatusCode == http.StatusUnauthorized { + return SigninResponse{}, ErrInvalidLogin + } return SigninResponse{}, errors.Wrap(err, "making http request") } - if res.StatusCode == http.StatusUnauthorized { - return SigninResponse{}, ErrInvalidLogin - } - - hasErr, message, err := checkRespErr(res) - if err != nil { - return SigninResponse{}, errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return SigninResponse{}, errors.New(message) - } - var resp SigninResponse if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { return SigninResponse{}, errors.Wrap(err, "decoding payload") @@ -547,26 +594,34 @@ func Signin(ctx infra.DnoteCtx, email, authKey string) (SigninResponse, error) { } // Signout deletes a user session on the server side -func Signout(ctx infra.DnoteCtx, sessionKey string) error { - hc := http.Client{ - // No need to follow redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { - return http.ErrUseLastResponse - }, +func Signout(ctx context.DnoteCtx, sessionKey string) error { + // Create a client that shares the transport (and thus rate limiter) from ctx.HTTPClient + // but doesn't follow redirects + var hc *http.Client + if ctx.HTTPClient != nil { + hc = &http.Client{ + Transport: ctx.HTTPClient.Transport, + CheckRedirect: func(req *http.Request, via []*http.Request) error { + return http.ErrUseLastResponse + }, + } + } else { + log.Warnf("No HTTP client configured for signout - falling back\n") + hc = &http.Client{ + CheckRedirect: func(req *http.Request, via []*http.Request) error { + return http.ErrUseLastResponse + }, + } } - res, err := utils.DoAuthorizedReq(ctx, hc, "POST", "/v1/signout", "") + opts := requestOptions{ + HTTPClient: hc, + ExpectedContentType: &contentTypeNone, + } + _, err := doAuthorizedReq(ctx, "POST", "/v3/signout", "", &opts) if err != nil { return errors.Wrap(err, "making http request") } - hasErr, message, err := checkRespErr(res) - if err != nil { - return errors.Wrap(err, "checking repsonse error") - } - if hasErr { - return errors.New(message) - } - return nil } diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go new file mode 100644 index 00000000..f83a0e6f --- /dev/null +++ b/pkg/cli/client/client_test.go @@ -0,0 +1,234 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package client + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "sync/atomic" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/pkg/errors" + "golang.org/x/time/rate" +) + +// startCommonTestServer starts a test HTTP server that simulates a common set of senarios +func startCommonTestServer() *httptest.Server { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + // internal server error + if r.URL.String() == "/bad-api/v3/signout" && r.Method == "POST" { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusInternalServerError) + return + } + + // catch-all + w.Header().Set("Content-Type", "text/html; charset=utf-8") + w.WriteHeader(http.StatusOK) + w.Write([]byte(`
`)) + })) + + return ts +} + +func TestSignIn(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/api/v3/signin" && r.Method == "POST" { + var payload SigninPayload + + err := json.NewDecoder(r.Body).Decode(&payload) + if err != nil { + t.Fatal(errors.Wrap(err, "decoding payload in the test server").Error()) + return + } + + if payload.Email == "alice@example.com" && payload.Passowrd == "pass1234" { + resp := testutils.MustMarshalJSON(t, SigninResponse{ + Key: "somekey", + ExpiresAt: int64(1596439890), + }) + + w.Header().Set("Content-Type", "application/json") + w.Write(resp) + } else { + w.WriteHeader(http.StatusUnauthorized) + } + + return + } + })) + defer ts.Close() + + commonTs := startCommonTestServer() + defer commonTs.Close() + + correctEndpoint := fmt.Sprintf("%s/api", ts.URL) + testClient := NewRateLimitedHTTPClient() + + t.Run("success", func(t *testing.T) { + result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") + if err != nil { + t.Errorf("got signin request error: %+v", err.Error()) + } + + assert.Equal(t, result.Key, "somekey", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(1596439890), "ExpiresAt mismatch") + }) + + t.Run("failure", func(t *testing.T) { + result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com", "incorrectpassword") + + assert.Equal(t, err, ErrInvalidLogin, "err mismatch") + assert.Equal(t, result.Key, "", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") + }) + + t.Run("server error", func(t *testing.T) { + endpoint := fmt.Sprintf("%s/bad-api", ts.URL) + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") + if err == nil { + t.Error("error should have been returned") + } + + assert.Equal(t, result.Key, "", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") + }) + + t.Run("accidentally pointing to a catch-all handler", func(t *testing.T) { + endpoint := fmt.Sprintf("%s", ts.URL) + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") + + assert.Equal(t, errors.Cause(err), ErrContentTypeMismatch, "error cause mismatch") + assert.Equal(t, result.Key, "", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") + }) + + t.Run("network error", func(t *testing.T) { + // Use an invalid endpoint that will fail to connect + endpoint := "http://localhost:99999/api" + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") + + if err == nil { + t.Error("error should have been returned for network failure") + } + assert.Equal(t, result.Key, "", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") + }) +} + +func TestSignOut(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/api/v3/signout" && r.Method == "POST" { + w.WriteHeader(http.StatusNoContent) + } + })) + defer ts.Close() + + commonTs := startCommonTestServer() + defer commonTs.Close() + + correctEndpoint := fmt.Sprintf("%s/api", ts.URL) + testClient := NewRateLimitedHTTPClient() + + t.Run("success", func(t *testing.T) { + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com") + if err != nil { + t.Errorf("got signout request error: %+v", err.Error()) + } + }) + + t.Run("server error", func(t *testing.T) { + endpoint := fmt.Sprintf("%s/bad-api", commonTs.URL) + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com") + if err == nil { + t.Error("error should have been returned") + } + }) + + t.Run("accidentally pointing to a catch-all handler", func(t *testing.T) { + endpoint := fmt.Sprintf("%s", commonTs.URL) + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com") + + assert.Equal(t, errors.Cause(err), ErrContentTypeMismatch, "error cause mismatch") + }) + + // Gracefully handle a case where http client was not initialized in the context. + t.Run("nil HTTPClient", func(t *testing.T) { + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: correctEndpoint}, "alice@example.com") + if err != nil { + t.Errorf("got signout request error: %+v", err.Error()) + } + }) +} + +func TestRateLimitedTransport(t *testing.T) { + var requestCount atomic.Int32 + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + requestCount.Add(1) + w.WriteHeader(http.StatusOK) + })) + defer ts.Close() + + transport := &rateLimitedTransport{ + transport: http.DefaultTransport, + limiter: rate.NewLimiter(10, 5), + } + client := &http.Client{Transport: transport} + + // Make 10 requests + start := time.Now() + numRequests := 10 + for i := range numRequests { + req, _ := http.NewRequest("GET", ts.URL, nil) + resp, err := client.Do(req) + if err != nil { + t.Fatalf("Request %d failed: %v", i, err) + } + resp.Body.Close() + } + elapsed := time.Since(start) + + // Burst of 5, then 5 more at 10 req/s = 500ms minimum + if elapsed < 500*time.Millisecond { + t.Errorf("Rate limit not enforced: 10 requests took %v, expected >= 500ms", elapsed) + } + + assert.Equal(t, int(requestCount.Load()), 10, "request count mismatch") +} + +func TestHTTPError(t *testing.T) { + t.Run("IsConflict returns true for 409", func(t *testing.T) { + conflictErr := &HTTPError{ + StatusCode: 409, + Message: "Conflict", + } + + assert.Equal(t, conflictErr.IsConflict(), true, "IsConflict() should return true for 409") + + notFoundErr := &HTTPError{ + StatusCode: 404, + Message: "Not Found", + } + + assert.Equal(t, notFoundErr.IsConflict(), false, "IsConflict() should return false for 404") + }) +} diff --git a/pkg/cli/cmd/add/add.go b/pkg/cli/cmd/add/add.go new file mode 100644 index 00000000..3e6d089d --- /dev/null +++ b/pkg/cli/cmd/add/add.go @@ -0,0 +1,198 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package add + +import ( + "database/sql" + "time" + "os" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/dnote/dnote/pkg/cli/upgrade" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/dnote/dnote/pkg/cli/validate" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +var contentFlag string + +var example = ` + * Open an editor to write content + dnote add git + + * Skip the editor by providing content directly + dnote add git -c "time is a part of the commit hash" + + * Send stdin content to a note + echo "a branch is just a pointer to a commit" | dnote add git + # or + dnote add git << EOF + pull is fetch with a merge + EOF` + +func preRun(cmd *cobra.Command, args []string) error { + if len(args) != 1 { + return errors.New("Incorrect number of argument") + } + + return nil +} + +// NewCmd returns a new add command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "add ", + Short: "Add a new note", + Aliases: []string{"a", "n", "new"}, + Example: example, + PreRunE: preRun, + RunE: newRun(ctx), + } + + f := cmd.Flags() + f.StringVarP(&contentFlag, "content", "c", "", "The new content for the note") + + return cmd +} + +func getContent(ctx context.DnoteCtx) (string, error) { + if contentFlag != "" { + return contentFlag, nil + } + + // check for piped content + fInfo, _ := os.Stdin.Stat() + if fInfo.Mode() & os.ModeCharDevice == 0 { + c, err := ui.ReadStdInput() + if err != nil { + return "", errors.Wrap(err, "Failed to get piped input") + } + return c, nil + } + + fpath, err := ui.GetTmpContentPath(ctx) + if err != nil { + return "", errors.Wrap(err, "getting temporarily content file path") + } + + c, err := ui.GetEditorInput(ctx, fpath) + if err != nil { + return "", errors.Wrap(err, "Failed to get editor input") + } + + return c, nil +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + bookName := args[0] + if err := validate.BookName(bookName); err != nil { + return errors.Wrap(err, "invalid book name") + } + + content, err := getContent(ctx) + if err != nil { + return errors.Wrap(err, "getting content") + } + if content == "" { + return errors.New("Empty content") + } + + ts := time.Now().UnixNano() + noteRowID, err := writeNote(ctx, bookName, content, ts) + if err != nil { + return errors.Wrap(err, "Failed to write note") + } + + log.Successf("added to %s\n", bookName) + + db := ctx.DB + info, err := database.GetNoteInfo(db, noteRowID) + if err != nil { + return err + } + + output.NoteInfo(os.Stdout, info) + + if err := upgrade.Check(ctx); err != nil { + log.Error(errors.Wrap(err, "automatically checking updates").Error()) + } + + return nil + } +} + +func writeNote(ctx context.DnoteCtx, bookLabel string, content string, ts int64) (int, error) { + tx, err := ctx.DB.Begin() + if err != nil { + return 0, errors.Wrap(err, "beginning a transaction") + } + + var bookUUID string + err = tx.QueryRow("SELECT uuid FROM books WHERE label = ?", bookLabel).Scan(&bookUUID) + if err == sql.ErrNoRows { + bookUUID, err = utils.GenerateUUID() + if err != nil { + return 0, errors.Wrap(err, "generating uuid") + } + + b := database.NewBook(bookUUID, bookLabel, 0, false, true) + err = b.Insert(tx) + if err != nil { + tx.Rollback() + return 0, errors.Wrap(err, "creating the book") + } + } else if err != nil { + return 0, errors.Wrap(err, "finding the book") + } + + noteUUID, err := utils.GenerateUUID() + if err != nil { + return 0, errors.Wrap(err, "generating uuid") + } + + n := database.NewNote(noteUUID, bookUUID, content, ts, 0, 0, false, true) + + err = n.Insert(tx) + if err != nil { + tx.Rollback() + return 0, errors.Wrap(err, "creating the note") + } + + var noteRowID int + err = tx.QueryRow(`SELECT notes.rowid + FROM notes + WHERE notes.uuid = ?`, noteUUID). + Scan(¬eRowID) + if err != nil { + tx.Rollback() + return noteRowID, errors.Wrap(err, "getting the note rowid") + } + + err = tx.Commit() + if err != nil { + tx.Rollback() + return noteRowID, errors.Wrap(err, "committing a transaction") + } + + return noteRowID, nil +} diff --git a/pkg/cli/cmd/edit/book.go b/pkg/cli/cmd/edit/book.go new file mode 100644 index 00000000..ab326e7f --- /dev/null +++ b/pkg/cli/cmd/edit/book.go @@ -0,0 +1,121 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package edit + +import ( + "strings" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/dnote/dnote/pkg/cli/validate" + "github.com/pkg/errors" +) + +func validateRunBookFlags() error { + if contentFlag != "" { + return errors.New("--content is invalid for editing a book") + } + if bookFlag != "" { + return errors.New("--book is invalid for editing a book") + } + + return nil +} + +func waitEditorBookName(ctx context.DnoteCtx) (string, error) { + fpath, err := ui.GetTmpContentPath(ctx) + if err != nil { + return "", errors.Wrap(err, "getting temporarily content file path") + } + + c, err := ui.GetEditorInput(ctx, fpath) + if err != nil { + return "", errors.Wrap(err, "getting editor input") + } + + // remove the newline at the end because files end with linebreaks in POSIX + c = strings.TrimSuffix(c, "\n") + c = strings.TrimSuffix(c, "\r\n") + + return c, nil +} + +func getName(ctx context.DnoteCtx) (string, error) { + if nameFlag != "" { + return nameFlag, nil + } + + c, err := waitEditorBookName(ctx) + if err != nil { + return "", errors.Wrap(err, "Failed to get editor input") + } + + return c, nil +} + +func runBook(ctx context.DnoteCtx, bookName string) error { + err := validateRunBookFlags() + if err != nil { + return errors.Wrap(err, "validating flags.") + } + + db := ctx.DB + uuid, err := database.GetBookUUID(db, bookName) + if err != nil { + return errors.Wrap(err, "getting book uuid") + } + + name, err := getName(ctx) + if err != nil { + return errors.Wrap(err, "getting name") + } + + err = validate.BookName(name) + if err != nil { + return errors.Wrap(err, "validating book name") + } + + tx, err := ctx.DB.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + err = database.UpdateBookName(tx, uuid, name) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "updating the book name") + } + + bookInfo, err := database.GetBookInfo(tx, uuid) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "getting book info") + } + + err = tx.Commit() + if err != nil { + tx.Rollback() + return errors.Wrap(err, "committing a transaction") + } + + log.Success("edited the book\n") + output.BookInfo(bookInfo) + + return nil +} diff --git a/pkg/cli/cmd/edit/edit.go b/pkg/cli/cmd/edit/edit.go new file mode 100644 index 00000000..16a7c413 --- /dev/null +++ b/pkg/cli/cmd/edit/edit.go @@ -0,0 +1,104 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package edit + +import ( + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +var contentFlag string +var bookFlag string +var nameFlag string + +var example = ` + * Edit a note by id + dnote edit 3 + + * Edit a note without launching an editor + dnote edit 3 -c "new content" + + * Move a note to another book + dnote edit 3 -b javascript + + * Rename a book + dnote edit javascript + + * Rename a book without launching an editor + dnote edit javascript -n js +` + +// NewCmd returns a new edit command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "edit ", + Short: "Edit a note or a book", + Aliases: []string{"e"}, + Example: example, + PreRunE: preRun, + RunE: newRun(ctx), + } + + f := cmd.Flags() + f.StringVarP(&contentFlag, "content", "c", "", "a new content for the note") + f.StringVarP(&bookFlag, "book", "b", "", "the name of the book to move the note to") + f.StringVarP(&nameFlag, "name", "n", "", "a new name for a book") + + return cmd +} + +func preRun(cmd *cobra.Command, args []string) error { + if len(args) != 1 && len(args) != 2 { + return errors.New("Incorrect number of argument") + } + + return nil +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + // DEPRECATED: Remove in 1.0.0 + if len(args) == 2 { + log.Plain(log.ColorYellow.Sprintf("DEPRECATED: you no longer need to pass book name to the view command. e.g. `dnote view 123`.\n\n")) + + target := args[1] + + if err := runNote(ctx, target); err != nil { + return errors.Wrap(err, "editing note") + } + + return nil + } + + target := args[0] + + if utils.IsNumber(target) { + if err := runNote(ctx, target); err != nil { + return errors.Wrap(err, "editing note") + } + } else { + if err := runBook(ctx, target); err != nil { + return errors.Wrap(err, "editing book") + } + } + + return nil + } +} diff --git a/pkg/cli/cmd/edit/note.go b/pkg/cli/cmd/edit/note.go new file mode 100644 index 00000000..cb837e11 --- /dev/null +++ b/pkg/cli/cmd/edit/note.go @@ -0,0 +1,172 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package edit + +import ( + "database/sql" + "os" + "strconv" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/pkg/errors" +) + +func validateRunNoteFlags() error { + if nameFlag != "" { + return errors.New("--name is invalid for editing a book") + } + + return nil +} + +func waitEditorNoteContent(ctx context.DnoteCtx, note database.Note) (string, error) { + fpath, err := ui.GetTmpContentPath(ctx) + if err != nil { + return "", errors.Wrap(err, "getting temporarily content file path") + } + + if err := os.WriteFile(fpath, []byte(note.Body), 0644); err != nil { + return "", errors.Wrap(err, "preparing tmp content file") + } + + c, err := ui.GetEditorInput(ctx, fpath) + if err != nil { + return "", errors.Wrap(err, "getting editor input") + } + + return c, nil +} + +func getContent(ctx context.DnoteCtx, note database.Note) (string, error) { + if contentFlag != "" { + return contentFlag, nil + } + + c, err := waitEditorNoteContent(ctx, note) + if err != nil { + return "", errors.Wrap(err, "getting content from editor") + } + + return c, nil +} + +func changeContent(ctx context.DnoteCtx, tx *database.DB, note database.Note, content string) error { + if note.Body == content { + return errors.New("Nothing changed") + } + + if err := database.UpdateNoteContent(tx, ctx.Clock, note.RowID, content); err != nil { + return errors.Wrap(err, "updating the note") + } + + return nil +} + +func moveBook(ctx context.DnoteCtx, tx *database.DB, note database.Note, bookName string) error { + targetBookUUID, err := database.GetBookUUID(tx, bookName) + if err != nil { + return errors.Wrap(err, "finding book uuid") + } + + if note.BookUUID == targetBookUUID { + return errors.New("book has not changed") + } + + if err := database.UpdateNoteBook(tx, ctx.Clock, note.RowID, targetBookUUID); err != nil { + return errors.Wrap(err, "moving book") + } + + return nil +} + +func updateNote(ctx context.DnoteCtx, tx *database.DB, note database.Note, bookName, content string) error { + if bookName != "" { + if err := moveBook(ctx, tx, note, bookName); err != nil { + return errors.Wrap(err, "moving book") + } + } + if content != "" { + if err := changeContent(ctx, tx, note, content); err != nil { + return errors.Wrap(err, "changing content") + } + } + + return nil +} + +func runNote(ctx context.DnoteCtx, rowIDArg string) error { + err := validateRunNoteFlags() + if err != nil { + return errors.Wrap(err, "validating flags.") + } + + rowID, err := strconv.Atoi(rowIDArg) + if err != nil { + return errors.Wrap(err, "invalid rowid") + } + + db := ctx.DB + note, err := database.GetActiveNote(db, rowID) + if err == sql.ErrNoRows { + return errors.Errorf("note %d not found", rowID) + } else if err != nil { + return errors.Wrap(err, "querying the book") + } + + content := contentFlag + + // If no flag was provided, launch an editor to get the content + if bookFlag == "" && contentFlag == "" { + c, err := getContent(ctx, note) + if err != nil { + return errors.Wrap(err, "getting content from editor") + } + + content = c + } + + tx, err := ctx.DB.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + err = updateNote(ctx, tx, note, bookFlag, content) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "updating note fields") + } + + noteInfo, err := database.GetNoteInfo(tx, rowID) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "getting note info") + } + + err = tx.Commit() + if err != nil { + tx.Rollback() + return errors.Wrap(err, "committing a transaction") + } + + log.Success("edited the note\n") + output.NoteInfo(os.Stdout, noteInfo) + + return nil +} diff --git a/cli/cmd/find/find.go b/pkg/cli/cmd/find/find.go similarity index 79% rename from cli/cmd/find/find.go rename to pkg/cli/cmd/find/find.go index b03fc4cc..4723bcb4 100644 --- a/cli/cmd/find/find.go +++ b/pkg/cli/cmd/find/find.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find @@ -23,9 +20,9 @@ import ( "fmt" "strings" - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -52,7 +49,7 @@ func preRun(cmd *cobra.Command, args []string) error { } // NewCmd returns a new remove command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { +func NewCmd(ctx context.DnoteCtx) *cobra.Command { cmd := &cobra.Command{ Use: "find", Short: "Find notes by keywords", @@ -130,7 +127,7 @@ func escapePhrase(s string) (string, error) { return b.String(), nil } -func doQuery(ctx infra.DnoteCtx, query, bookName string) (*sql.Rows, error) { +func doQuery(ctx context.DnoteCtx, query, bookName string) (*sql.Rows, error) { db := ctx.DB sql := `SELECT @@ -153,7 +150,7 @@ func doQuery(ctx infra.DnoteCtx, query, bookName string) (*sql.Rows, error) { return rows, err } -func newRun(ctx infra.DnoteCtx) core.RunEFunc { +func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { phrase, err := escapePhrase(args[0]) if err != nil { diff --git a/cli/cmd/find/lexer.go b/pkg/cli/cmd/find/lexer.go similarity index 71% rename from cli/cmd/find/lexer.go rename to pkg/cli/cmd/find/lexer.go index 2e9037bd..6115becc 100644 --- a/cli/cmd/find/lexer.go +++ b/pkg/cli/cmd/find/lexer.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find diff --git a/cli/cmd/find/lexer_test.go b/pkg/cli/cmd/find/lexer_test.go similarity index 79% rename from cli/cmd/find/lexer_test.go rename to pkg/cli/cmd/find/lexer_test.go index 55118695..3a74ad5a 100644 --- a/cli/cmd/find/lexer_test.go +++ b/pkg/cli/cmd/find/lexer_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find @@ -22,7 +19,7 @@ import ( "fmt" "testing" - "github.com/dnote/dnote/cli/testutils" + "github.com/dnote/dnote/pkg/assert" ) func TestScanToken(t *testing.T) { @@ -117,8 +114,8 @@ func TestScanToken(t *testing.T) { t.Run(fmt.Sprintf("test case %d", tcIdx), func(t *testing.T) { tok, nextIdx := scanToken(tc.idx, tc.input) - testutils.AssertEqual(t, nextIdx, tc.retIdx, "retIdx mismatch") - testutils.AssertDeepEqual(t, tok, tc.retTok, "retTok mismatch") + assert.Equal(t, nextIdx, tc.retIdx, "retIdx mismatch") + assert.DeepEqual(t, tok, tc.retTok, "retTok mismatch") }) } } @@ -225,7 +222,7 @@ func TestTokenize(t *testing.T) { t.Run(fmt.Sprintf("test case %d", tcIdx), func(t *testing.T) { tokens := tokenize(tc.input) - testutils.AssertDeepEqual(t, tokens, tc.tokens, "tokens mismatch") + assert.DeepEqual(t, tokens, tc.tokens, "tokens mismatch") }) } } diff --git a/pkg/cli/cmd/login/login.go b/pkg/cli/cmd/login/login.go new file mode 100644 index 00000000..c9b1dfd5 --- /dev/null +++ b/pkg/cli/cmd/login/login.go @@ -0,0 +1,184 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package login + +import ( + "fmt" + "net/url" + "strconv" + + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +var example = ` + dnote login` + +var usernameFlag, passwordFlag, apiEndpointFlag string + +// NewCmd returns a new login command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "login", + Short: "Login to dnote server", + Example: example, + RunE: newRun(ctx), + } + + f := cmd.Flags() + f.StringVarP(&usernameFlag, "username", "u", "", "email address for authentication") + f.StringVarP(&passwordFlag, "password", "p", "", "password for authentication") + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") + + return cmd +} + +// Do dervies credentials on the client side and requests a session token from the server +func Do(ctx context.DnoteCtx, email, password string) error { + signinResp, err := client.Signin(ctx, email, password) + if err != nil { + return errors.Wrap(err, "requesting session") + } + + db := ctx.DB + tx, err := db.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + if err := database.UpsertSystem(tx, consts.SystemSessionKey, signinResp.Key); err != nil { + return errors.Wrap(err, "saving session key") + } + if err := database.UpsertSystem(tx, consts.SystemSessionKeyExpiry, strconv.FormatInt(signinResp.ExpiresAt, 10)); err != nil { + return errors.Wrap(err, "saving session key") + } + + tx.Commit() + + return nil +} + +func getUsername() (string, error) { + if usernameFlag != "" { + return usernameFlag, nil + } + + var email string + if err := ui.PromptInput("email", &email); err != nil { + return "", errors.Wrap(err, "getting email input") + } + if email == "" { + return "", errors.New("Email is empty") + } + + return email, nil +} + +func getPassword() (string, error) { + if passwordFlag != "" { + return passwordFlag, nil + } + + var password string + if err := ui.PromptPassword("password", &password); err != nil { + return "", errors.Wrap(err, "getting password input") + } + if password == "" { + return "", errors.New("Password is empty") + } + + return password, nil +} + +func getBaseURL(rawURL string) (string, error) { + u, err := url.Parse(rawURL) + if err != nil { + return "", errors.Wrap(err, "parsing url") + } + + if u.Scheme == "" || u.Host == "" { + return "", nil + } + + return fmt.Sprintf("%s://%s", u.Scheme, u.Host), nil +} + +func getServerDisplayURL(ctx context.DnoteCtx) string { + baseURL, err := getBaseURL(ctx.APIEndpoint) + if err != nil { + return "" + } + + return baseURL +} + +func getGreeting(ctx context.DnoteCtx) string { + base := "Welcome to Dnote" + + serverURL := getServerDisplayURL(ctx) + if serverURL == "" { + return fmt.Sprintf("%s\n", base) + } + + return fmt.Sprintf("%s (%s)\n", base, serverURL) +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + + greeting := getGreeting(ctx) + log.Plain(greeting) + + email, err := getUsername() + if err != nil { + return errors.Wrap(err, "getting email input") + } + + password, err := getPassword() + if err != nil { + return errors.Wrap(err, "getting password input") + } + if password == "" { + return errors.New("Password is empty") + } + + log.Debug("Logging in with email: %s and password: (length %d)\n", email, len(password)) + + err = Do(ctx, email, password) + if errors.Cause(err) == client.ErrInvalidLogin { + log.Error("wrong login\n") + return nil + } else if err != nil { + return errors.Wrap(err, "logging in") + } + + log.Success("logged in\n") + + return nil + } + +} diff --git a/pkg/cli/cmd/login/login_test.go b/pkg/cli/cmd/login/login_test.go new file mode 100644 index 00000000..6d5917cc --- /dev/null +++ b/pkg/cli/cmd/login/login_test.go @@ -0,0 +1,67 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package login + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" +) + +func TestGetServerDisplayURL(t *testing.T) { + testCases := []struct { + apiEndpoint string + expected string + }{ + { + apiEndpoint: "https://dnote.mydomain.com/api", + expected: "https://dnote.mydomain.com", + }, + { + apiEndpoint: "https://mysubdomain.mydomain.com/dnote/api", + expected: "https://mysubdomain.mydomain.com", + }, + { + apiEndpoint: "https://dnote.mysubdomain.mydomain.com/api", + expected: "https://dnote.mysubdomain.mydomain.com", + }, + { + apiEndpoint: "some-string", + expected: "", + }, + { + apiEndpoint: "", + expected: "", + }, + { + apiEndpoint: "https://", + expected: "", + }, + { + apiEndpoint: "https://abc", + expected: "https://abc", + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("for input %s", tc.apiEndpoint), func(t *testing.T) { + got := getServerDisplayURL(context.DnoteCtx{APIEndpoint: tc.apiEndpoint}) + assert.Equal(t, got, tc.expected, "result mismatch") + }) + } +} diff --git a/pkg/cli/cmd/logout/logout.go b/pkg/cli/cmd/logout/logout.go new file mode 100644 index 00000000..98cd69eb --- /dev/null +++ b/pkg/cli/cmd/logout/logout.go @@ -0,0 +1,106 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package logout + +import ( + "database/sql" + + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +// ErrNotLoggedIn is an error for logging out when not logged in +var ErrNotLoggedIn = errors.New("not logged in") + +var example = ` + dnote logout` + +var apiEndpointFlag string + +// NewCmd returns a new logout command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "logout", + Short: "Logout from the server", + Example: example, + RunE: newRun(ctx), + } + + f := cmd.Flags() + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") + + return cmd +} + +// Do performs logout +func Do(ctx context.DnoteCtx) error { + db := ctx.DB + tx, err := db.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + var key string + err = database.GetSystem(tx, consts.SystemSessionKey, &key) + if errors.Cause(err) == sql.ErrNoRows { + return ErrNotLoggedIn + } else if err != nil { + return errors.Wrap(err, "getting session key") + } + + err = client.Signout(ctx, key) + if err != nil { + return errors.Wrap(err, "requesting logout") + } + + if err := database.DeleteSystem(tx, consts.SystemSessionKey); err != nil { + return errors.Wrap(err, "deleting session key") + } + if err := database.DeleteSystem(tx, consts.SystemSessionKeyExpiry); err != nil { + return errors.Wrap(err, "deleting session key expiry") + } + + tx.Commit() + + return nil +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + + err := Do(ctx) + if err == ErrNotLoggedIn { + log.Error("not logged in\n") + return nil + } else if err != nil { + return errors.Wrap(err, "logging out") + } + + log.Success("logged out\n") + + return nil + } +} diff --git a/pkg/cli/cmd/remove/remove.go b/pkg/cli/cmd/remove/remove.go new file mode 100644 index 00000000..18224c0f --- /dev/null +++ b/pkg/cli/cmd/remove/remove.go @@ -0,0 +1,212 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package remove + +import ( + "fmt" + "os" + "strconv" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +var bookFlag string +var yesFlag bool + +var example = ` + * Delete a note by id + dnote delete 2 + + * Delete a book by name + dnote delete js +` + +// NewCmd returns a new remove command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "remove ", + Short: "Remove a note or a book", + Aliases: []string{"rm", "d", "delete"}, + Example: example, + PreRunE: preRun, + RunE: newRun(ctx), + } + + f := cmd.Flags() + f.StringVarP(&bookFlag, "book", "b", "", "The book name to delete") + f.BoolVarP(&yesFlag, "yes", "y", false, "Assume yes to the prompts and run in non-interactive mode") + + f.MarkDeprecated("book", "Pass the book name as an argument. e.g. `dnote rm book_name`") + + return cmd +} + +func preRun(cmd *cobra.Command, args []string) error { + if len(args) != 1 && len(args) != 2 { + return errors.New("Incorrect number of argument") + } + + return nil +} + +func maybeConfirm(message string, defaultValue bool) (bool, error) { + if yesFlag { + return true, nil + } + + return ui.Confirm(message, defaultValue) +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + // DEPRECATED: Remove in 1.0.0 + if bookFlag != "" { + if err := runBook(ctx, bookFlag); err != nil { + return errors.Wrap(err, "removing the book") + } + + return nil + } + + // DEPRECATED: Remove in 1.0.0 + if len(args) == 2 { + log.Plain(log.ColorYellow.Sprintf("DEPRECATED: you no longer need to pass book name to the remove command. e.g. `dnote remove 123`.\n\n")) + + target := args[1] + if err := runNote(ctx, target); err != nil { + return errors.Wrap(err, "removing the note") + } + + return nil + } + + target := args[0] + + if utils.IsNumber(target) { + if err := runNote(ctx, target); err != nil { + return errors.Wrap(err, "removing the note") + } + } else { + if err := runBook(ctx, target); err != nil { + return errors.Wrap(err, "removing the book") + } + } + + return nil + } +} + +func runNote(ctx context.DnoteCtx, rowIDArg string) error { + db := ctx.DB + + noteRowID, err := strconv.Atoi(rowIDArg) + if err != nil { + return errors.Wrap(err, "invalid rowid") + } + + noteInfo, err := database.GetNoteInfo(db, noteRowID) + if err != nil { + return err + } + + output.NoteInfo(os.Stdout, noteInfo) + + ok, err := maybeConfirm("remove this note?", false) + if err != nil { + return errors.Wrap(err, "getting confirmation") + } + if !ok { + log.Warnf("aborted by user\n") + return nil + } + + tx, err := db.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + if _, err = tx.Exec("UPDATE notes SET deleted = ?, dirty = ?, body = ? WHERE uuid = ?", true, true, "", noteInfo.UUID); err != nil { + tx.Rollback() + return errors.Wrap(err, "removing the note") + } + + err = tx.Commit() + if err != nil { + tx.Rollback() + return errors.Wrap(err, "comitting transaction") + } + + log.Successf("removed from %s\n", noteInfo.BookLabel) + + return nil +} + +func runBook(ctx context.DnoteCtx, bookLabel string) error { + db := ctx.DB + + bookUUID, err := database.GetBookUUID(db, bookLabel) + if err != nil { + return errors.Wrap(err, "finding book uuid") + } + + ok, err := maybeConfirm(fmt.Sprintf("delete book '%s' and all its notes?", bookLabel), false) + if err != nil { + return errors.Wrap(err, "getting confirmation") + } + if !ok { + log.Warnf("aborted by user\n") + return nil + } + + tx, err := db.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + if _, err = tx.Exec("UPDATE notes SET deleted = ?, dirty = ?, body = ? WHERE book_uuid = ?", true, true, "", bookUUID); err != nil { + tx.Rollback() + return errors.Wrap(err, "removing notes in the book") + } + + // override the label with a random string + uniqLabel, err := utils.GenerateUUID() + if err != nil { + return errors.Wrap(err, "generating uuid to override with") + } + + if _, err = tx.Exec("UPDATE books SET deleted = ?, dirty = ?, label = ? WHERE uuid = ?", true, true, uniqLabel, bookUUID); err != nil { + tx.Rollback() + return errors.Wrap(err, "removing the book") + } + + err = tx.Commit() + if err != nil { + tx.Rollback() + return errors.Wrap(err, "committing transaction") + } + + log.Success("removed book\n") + + return nil +} diff --git a/pkg/cli/cmd/root/root.go b/pkg/cli/cmd/root/root.go new file mode 100644 index 00000000..6da096bf --- /dev/null +++ b/pkg/cli/cmd/root/root.go @@ -0,0 +1,56 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package root + +import ( + "github.com/spf13/cobra" +) + +var dbPathFlag string + +var root = &cobra.Command{ + Use: "dnote", + Short: "Dnote - a simple command line notebook", + SilenceErrors: true, + SilenceUsage: true, + CompletionOptions: cobra.CompletionOptions{ + DisableDefaultCmd: true, + }, +} + +func init() { + root.PersistentFlags().StringVar(&dbPathFlag, "dbPath", "", "the path to the database file (defaults to standard location)") +} + +// GetRoot returns the root command +func GetRoot() *cobra.Command { + return root +} + +// GetDBPathFlag returns the value of the --dbPath flag +func GetDBPathFlag() string { + return dbPathFlag +} + +// Register adds a new command +func Register(cmd *cobra.Command) { + root.AddCommand(cmd) +} + +// Execute runs the main command +func Execute() error { + return root.Execute() +} diff --git a/pkg/cli/cmd/sync/merge.go b/pkg/cli/cmd/sync/merge.go new file mode 100644 index 00000000..0e4d15be --- /dev/null +++ b/pkg/cli/cmd/sync/merge.go @@ -0,0 +1,201 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "database/sql" + "fmt" + "strings" + + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/dnote/dnote/pkg/cli/utils/diff" + "github.com/pkg/errors" +) + +const ( + modeNormal = iota + modeRemote + modeLocal +) + +const ( + conflictLabelLocal = "<<<<<<< Local\n" + conflictLabelServer = ">>>>>>> Server\n" + conflictLabelDivide = "=======\n" +) + +func sanitize(s string) string { + var textBuilder strings.Builder + textBuilder.WriteString(s) + if !strings.HasSuffix(s, "\n") { + textBuilder.WriteString("\n") + } + + return textBuilder.String() +} + +// reportBodyConflict returns a conflict report of the local and the remote version +// of a body +func reportBodyConflict(localBody, remoteBody string) string { + diffs := diff.Do(localBody, remoteBody) + + var ret strings.Builder + mode := modeNormal + maxIdx := len(diffs) - 1 + + for idx, d := range diffs { + if d.Type == diff.DiffEqual { + if mode != modeNormal { + mode = modeNormal + ret.WriteString(conflictLabelServer) + } + + ret.WriteString(d.Text) + } + + // within the conflict area, append a linebreak to the text if it is missing one + // to make sure conflict labels are separated by new lines + sanitized := sanitize(d.Text) + + if d.Type == diff.DiffDelete { + if mode == modeNormal { + mode = modeLocal + ret.WriteString(conflictLabelLocal) + } + + ret.WriteString(sanitized) + } + + if d.Type == diff.DiffInsert { + if mode == modeLocal { + mode = modeRemote + ret.WriteString(conflictLabelDivide) + } + + ret.WriteString(sanitized) + + if idx == maxIdx { + ret.WriteString(conflictLabelServer) + } + } + } + + return ret.String() +} + +func maxInt64(a, b int64) int64 { + if a > b { + return a + } + + return b +} + +func reportBookConflict(tx *database.DB, body, localBookUUID, serverBookUUID string) (string, error) { + var builder strings.Builder + + var localBookName, serverBookName string + if err := tx.QueryRow("SELECT label FROM books WHERE uuid = ?", localBookUUID).Scan(&localBookName); err != nil { + return "", errors.Wrapf(err, "getting book label for %s", localBookUUID) + } + if err := tx.QueryRow("SELECT label FROM books WHERE uuid = ?", serverBookUUID).Scan(&serverBookName); err != nil { + return "", errors.Wrapf(err, "getting book label for %s", serverBookUUID) + } + + builder.WriteString(conflictLabelLocal) + builder.WriteString(fmt.Sprintf("Moved to the book %s\n", localBookName)) + builder.WriteString(conflictLabelDivide) + builder.WriteString(fmt.Sprintf("Moved to the book %s\n", serverBookName)) + builder.WriteString(conflictLabelServer) + builder.WriteString("\n") + builder.WriteString(body) + + return builder.String(), nil +} + +func getConflictsBookUUID(tx *database.DB) (string, error) { + var ret string + + err := tx.QueryRow("SELECT uuid FROM books WHERE label = ?", "conflicts").Scan(&ret) + if err == sql.ErrNoRows { + // Create a conflicts book + ret, err = utils.GenerateUUID() + if err != nil { + return "", err + } + + b := database.NewBook(ret, "conflicts", 0, false, true) + err = b.Insert(tx) + if err != nil { + tx.Rollback() + return "", errors.Wrap(err, "creating the conflicts book") + } + } else if err != nil { + return "", errors.Wrap(err, "getting uuid for conflicts book") + } + + return ret, nil +} + +// noteMergeReport holds the result of a field-by-field merge of two copies of notes +type noteMergeReport struct { + body string + bookUUID string + editedOn int64 +} + +// mergeNoteFields performs a field-by-field merge between the local and the server copy. It returns a merge report +// between the local and the server copy of the note. +func mergeNoteFields(tx *database.DB, localNote database.Note, serverNote client.SyncFragNote) (*noteMergeReport, error) { + if !localNote.Dirty { + return ¬eMergeReport{ + body: serverNote.Body, + bookUUID: serverNote.BookUUID, + editedOn: serverNote.EditedOn, + }, nil + } + + body := reportBodyConflict(localNote.Body, serverNote.Body) + + var bookUUID string + if serverNote.BookUUID != localNote.BookUUID { + b, err := reportBookConflict(tx, body, localNote.BookUUID, serverNote.BookUUID) + if err != nil { + return nil, errors.Wrapf(err, "reporting book conflict for note %s", localNote.UUID) + } + + body = b + + conflictsBookUUID, err := getConflictsBookUUID(tx) + if err != nil { + return nil, errors.Wrap(err, "getting the conflicts book uuid") + } + + bookUUID = conflictsBookUUID + } else { + bookUUID = serverNote.BookUUID + } + + ret := noteMergeReport{ + body: body, + bookUUID: bookUUID, + editedOn: maxInt64(localNote.EditedOn, serverNote.EditedOn), + } + + return &ret, nil +} diff --git a/pkg/cli/cmd/sync/merge_test.go b/pkg/cli/cmd/sync/merge_test.go new file mode 100644 index 00000000..e6f4839e --- /dev/null +++ b/pkg/cli/cmd/sync/merge_test.go @@ -0,0 +1,151 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestReportConflict(t *testing.T) { + testCases := []struct { + local string + server string + expected string + }{ + { + local: "\n", + server: "\n", + expected: "\n", + }, + { + local: "", + server: "", + expected: "", + }, + { + local: "foo", + server: "foo", + expected: "foo", + }, + { + local: "foo\nbar", + server: "foo\nbar", + expected: "foo\nbar", + }, + { + local: "foo-local", + server: "foo-server", + expected: `<<<<<<< Local +foo-local +======= +foo-server +>>>>>>> Server +`, + }, + { + local: "foo\n", + server: "bar\n", + expected: `<<<<<<< Local +foo +======= +bar +>>>>>>> Server +`, + }, + { + local: "foo\n", + server: "\n", + expected: `<<<<<<< Local +foo +======= + +>>>>>>> Server +`, + }, + + { + local: "\n", + server: "foo\n", + expected: `<<<<<<< Local + +======= +foo +>>>>>>> Server +`, + }, + { + local: "foo\n\nquz\nbaz\n", + server: "foo\n\nbar\nbaz\n", + expected: `foo + +<<<<<<< Local +quz +======= +bar +>>>>>>> Server +baz +`, + }, + { + local: "foo\n\nquz\nbaz\n\nqux quz\nfuz\n", + server: "foo\n\nbar\nbaz\n\nqux quz\nfuuz\n", + expected: `foo + +<<<<<<< Local +quz +======= +bar +>>>>>>> Server +baz + +qux quz +<<<<<<< Local +fuz +======= +fuuz +>>>>>>> Server +`, + }, + { + local: "foo\nquz\nbaz\nbar\n", + server: "foo\nquzz\nbazz\nbar\n", + expected: `foo +<<<<<<< Local +quz +======= +quzz +>>>>>>> Server +<<<<<<< Local +baz +======= +bazz +>>>>>>> Server +bar +`, + }, + } + + for idx, tc := range testCases { + result := reportBodyConflict(tc.local, tc.server) + + t.Run(fmt.Sprintf("test case %d", idx), func(t *testing.T) { + assert.DeepEqual(t, result, tc.expected, "result mismatch") + }) + } +} diff --git a/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go similarity index 58% rename from cli/cmd/sync/sync.go rename to pkg/cli/cmd/sync/sync.go index ee846b34..6cb506ae 100644 --- a/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync @@ -22,12 +19,15 @@ import ( "database/sql" "fmt" - "github.com/dnote/dnote/cli/client" - "github.com/dnote/dnote/cli/core" - "github.com/dnote/dnote/cli/crypt" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/migrate" + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/migrate" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/dnote/dnote/pkg/cli/upgrade" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -41,9 +41,10 @@ var example = ` dnote sync` var isFullSync bool +var apiEndpointFlag string // NewCmd returns a new sync command -func NewCmd(ctx infra.DnoteCtx) *cobra.Command { +func NewCmd(ctx context.DnoteCtx) *cobra.Command { cmd := &cobra.Command{ Use: "sync", Aliases: []string{"s"}, @@ -54,24 +55,25 @@ func NewCmd(ctx infra.DnoteCtx) *cobra.Command { f := cmd.Flags() f.BoolVarP(&isFullSync, "full", "f", false, "perform a full sync instead of incrementally syncing only the changed data.") + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") return cmd } -func getLastSyncAt(tx *infra.DB) (int, error) { +func getLastSyncAt(tx *database.DB) (int, error) { var ret int - if err := core.GetSystem(tx, infra.SystemLastSyncAt, &ret); err != nil { + if err := database.GetSystem(tx, consts.SystemLastSyncAt, &ret); err != nil { return ret, errors.Wrap(err, "querying last sync time") } return ret, nil } -func getLastMaxUSN(tx *infra.DB) (int, error) { +func getLastMaxUSN(tx *database.DB) (int, error) { var ret int - if err := core.GetSystem(tx, infra.SystemLastMaxUSN, &ret); err != nil { + if err := database.GetSystem(tx, consts.SystemLastMaxUSN, &ret); err != nil { return ret, errors.Wrap(err, "querying last user max_usn") } @@ -85,6 +87,7 @@ type syncList struct { ExpungedNotes map[string]bool ExpungedBooks map[string]bool MaxUSN int + UserMaxUSN int // Server's actual max USN (for distinguishing empty fragment vs empty server) MaxCurrentTime int64 } @@ -92,35 +95,21 @@ func (l syncList) getLength() int { return len(l.Notes) + len(l.Books) + len(l.ExpungedNotes) + len(l.ExpungedBooks) } -// processFragments categorizes items in sync fragments into a sync list. It also decrypts any -// encrypted data in sync fragments. -func processFragments(fragments []client.SyncFragment, cipherKey []byte) (syncList, error) { +// processFragments categorizes items in sync fragments into a sync list. +func processFragments(fragments []client.SyncFragment) (syncList, error) { notes := map[string]client.SyncFragNote{} books := map[string]client.SyncFragBook{} expungedNotes := map[string]bool{} expungedBooks := map[string]bool{} var maxUSN int + var userMaxUSN int var maxCurrentTime int64 for _, fragment := range fragments { for _, note := range fragment.Notes { - log.Debug("decrypting note %s\n", note.UUID) - bodyDec, err := crypt.AesGcmDecrypt(cipherKey, note.Body) - if err != nil { - return syncList{}, errors.Wrapf(err, "decrypting body for note %s", note.UUID) - } - - note.Body = string(bodyDec) notes[note.UUID] = note } for _, book := range fragment.Books { - log.Debug("decrypting book %s\n", book.UUID) - labelDec, err := crypt.AesGcmDecrypt(cipherKey, book.Label) - if err != nil { - return syncList{}, errors.Wrapf(err, "decrypting label for book %s", book.UUID) - } - - book.Label = string(labelDec) books[book.UUID] = book } for _, uuid := range fragment.ExpungedBooks { @@ -133,6 +122,9 @@ func processFragments(fragments []client.SyncFragment, cipherKey []byte) (syncLi if fragment.FragMaxUSN > maxUSN { maxUSN = fragment.FragMaxUSN } + if fragment.UserMaxUSN > userMaxUSN { + userMaxUSN = fragment.UserMaxUSN + } if fragment.CurrentTime > maxCurrentTime { maxCurrentTime = fragment.CurrentTime } @@ -144,6 +136,7 @@ func processFragments(fragments []client.SyncFragment, cipherKey []byte) (syncLi ExpungedNotes: expungedNotes, ExpungedBooks: expungedBooks, MaxUSN: maxUSN, + UserMaxUSN: userMaxUSN, MaxCurrentTime: maxCurrentTime, } @@ -152,13 +145,13 @@ func processFragments(fragments []client.SyncFragment, cipherKey []byte) (syncLi // getSyncList gets a list of all sync fragments after the specified usn // and aggregates them into a syncList data structure -func getSyncList(ctx infra.DnoteCtx, afterUSN int) (syncList, error) { +func getSyncList(ctx context.DnoteCtx, afterUSN int) (syncList, error) { fragments, err := getSyncFragments(ctx, afterUSN) if err != nil { return syncList{}, errors.Wrap(err, "getting sync fragments") } - ret, err := processFragments(fragments, ctx.CipherKey) + ret, err := processFragments(fragments) if err != nil { return syncList{}, errors.Wrap(err, "making sync list") } @@ -168,7 +161,7 @@ func getSyncList(ctx infra.DnoteCtx, afterUSN int) (syncList, error) { // getSyncFragments repeatedly gets all sync fragments after the specified usn until there is no more new data // remaining and returns the buffered list -func getSyncFragments(ctx infra.DnoteCtx, afterUSN int) ([]client.SyncFragment, error) { +func getSyncFragments(ctx context.DnoteCtx, afterUSN int) ([]client.SyncFragment, error) { var buf []client.SyncFragment nextAfterUSN := afterUSN @@ -190,18 +183,75 @@ func getSyncFragments(ctx infra.DnoteCtx, afterUSN int) ([]client.SyncFragment, } } - log.Debug("received sync fragments: %+v\n", buf) + log.Debug("received sync fragments: %+v\n", redactSyncFragments(buf)) return buf, nil } +// redactSyncFragments returns a deep copy of sync fragments with sensitive fields (note body, book label) removed for safe logging +func redactSyncFragments(fragments []client.SyncFragment) []client.SyncFragment { + redacted := make([]client.SyncFragment, len(fragments)) + for i, frag := range fragments { + // Create new notes with redacted bodies + notes := make([]client.SyncFragNote, len(frag.Notes)) + for j, note := range frag.Notes { + notes[j] = client.SyncFragNote{ + UUID: note.UUID, + BookUUID: note.BookUUID, + USN: note.USN, + CreatedAt: note.CreatedAt, + UpdatedAt: note.UpdatedAt, + AddedOn: note.AddedOn, + EditedOn: note.EditedOn, + Body: func() string { + if note.Body != "" { + return "" + } + return "" + }(), + Deleted: note.Deleted, + } + } + + // Create new books with redacted labels + books := make([]client.SyncFragBook, len(frag.Books)) + for j, book := range frag.Books { + books[j] = client.SyncFragBook{ + UUID: book.UUID, + USN: book.USN, + CreatedAt: book.CreatedAt, + UpdatedAt: book.UpdatedAt, + AddedOn: book.AddedOn, + Label: func() string { + if book.Label != "" { + return "" + } + return "" + }(), + Deleted: book.Deleted, + } + } + + redacted[i] = client.SyncFragment{ + FragMaxUSN: frag.FragMaxUSN, + UserMaxUSN: frag.UserMaxUSN, + CurrentTime: frag.CurrentTime, + Notes: notes, + Books: books, + ExpungedNotes: frag.ExpungedNotes, + ExpungedBooks: frag.ExpungedBooks, + } + } + return redacted +} + // resolveLabel resolves a book label conflict by repeatedly appending an increasing integer // to the label until it finds a unique label. It returns the first non-conflicting label. -func resolveLabel(tx *infra.DB, label string) (string, error) { +func resolveLabel(tx *database.DB, label string) (string, error) { var ret string for i := 2; ; i++ { - ret = fmt.Sprintf("%s (%d)", label, i) + ret = fmt.Sprintf("%s_%d", label, i) var cnt int if err := tx.QueryRow("SELECT count(*) FROM books WHERE label = ?", ret).Scan(&cnt); err != nil { @@ -218,7 +268,7 @@ func resolveLabel(tx *infra.DB, label string) (string, error) { // mergeBook inserts or updates the given book in the local database. // If a book with a duplicate label exists locally, it renames the duplicate by appending a number. -func mergeBook(tx *infra.DB, b client.SyncFragBook, mode int) error { +func mergeBook(tx *database.DB, b client.SyncFragBook, mode int) error { var count int if err := tx.QueryRow("SELECT count(*) FROM books WHERE label = ?", b.Label).Scan(&count); err != nil { return errors.Wrapf(err, "checking for books with a duplicate label %s", b.Label) @@ -231,18 +281,18 @@ func mergeBook(tx *infra.DB, b client.SyncFragBook, mode int) error { return errors.Wrap(err, "getting a new book label for conflict resolution") } - if _, err := tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE label = ?", newLabel, true, b.Label); err != nil { + if _, err := tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE label = ? AND uuid != ?", newLabel, true, b.Label, b.UUID); err != nil { return errors.Wrap(err, "resolving duplicate book label") } } if mode == modeInsert { - book := core.NewBook(b.UUID, b.Label, b.USN, false, false) + book := database.NewBook(b.UUID, b.Label, b.USN, false, false) if err := book.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", b.UUID) } } else if mode == modeUpdate { - // TODO: if the client copy is dirty, perform field-by-field merge and report conflict instead of overwriting + // The state from the server overwrites the local state. In other words, the server change always wins. if _, err := tx.Exec("UPDATE books SET usn = ?, uuid = ?, label = ?, deleted = ? WHERE uuid = ?", b.USN, b.UUID, b.Label, b.Deleted, b.UUID); err != nil { return errors.Wrapf(err, "updating local book %s", b.UUID) @@ -252,7 +302,7 @@ func mergeBook(tx *infra.DB, b client.SyncFragBook, mode int) error { return nil } -func stepSyncBook(tx *infra.DB, b client.SyncFragBook) error { +func stepSyncBook(tx *database.DB, b client.SyncFragBook) error { var localUSN int var dirty bool err := tx.QueryRow("SELECT usn, dirty FROM books WHERE uuid = ?", b.UUID).Scan(&localUSN, &dirty) @@ -276,7 +326,7 @@ func stepSyncBook(tx *infra.DB, b client.SyncFragBook) error { return nil } -func mergeNote(tx *infra.DB, serverNote client.SyncFragNote, localNote core.Note) error { +func mergeNote(tx *database.DB, serverNote client.SyncFragNote, localNote database.Note) error { var bookDeleted bool err := tx.QueryRow("SELECT deleted FROM books WHERE uuid = ?", localNote.BookUUID).Scan(&bookDeleted) if err != nil { @@ -288,36 +338,40 @@ func mergeNote(tx *infra.DB, serverNote client.SyncFragNote, localNote core.Note return nil } - // if the local copy is deleted, and the it was edited on the server, override with server values and mark it not dirty. + // if the local copy is deleted, and it was edited on the server, override with server values and mark it not dirty. if localNote.Deleted { - if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ?, public = ?, dirty = ? WHERE uuid = ?", - serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, serverNote.Public, false, serverNote.UUID); err != nil { + if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ?, dirty = ? WHERE uuid = ?", + serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, false, serverNote.UUID); err != nil { return errors.Wrapf(err, "updating local note %s", serverNote.UUID) } return nil } - // TODO: if the client copy is dirty, perform field-by-field merge and report conflict instead of overwriting - if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ?, public = ? WHERE uuid = ?", - serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, serverNote.Public, serverNote.UUID); err != nil { + mr, err := mergeNoteFields(tx, localNote, serverNote) + if err != nil { + return errors.Wrapf(err, "reporting note conflict for note %s", localNote.UUID) + } + + if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ? WHERE uuid = ?", + serverNote.USN, mr.bookUUID, mr.body, mr.editedOn, serverNote.Deleted, serverNote.UUID); err != nil { return errors.Wrapf(err, "updating local note %s", serverNote.UUID) } return nil } -func stepSyncNote(tx *infra.DB, n client.SyncFragNote) error { - var localNote core.Note - err := tx.QueryRow("SELECT usn, book_uuid, dirty, deleted FROM notes WHERE uuid = ?", n.UUID). - Scan(&localNote.USN, &localNote.BookUUID, &localNote.Dirty, &localNote.Deleted) +func stepSyncNote(tx *database.DB, n client.SyncFragNote) error { + var localNote database.Note + err := tx.QueryRow("SELECT body, usn, book_uuid, dirty, deleted FROM notes WHERE uuid = ?", n.UUID). + Scan(&localNote.Body, &localNote.USN, &localNote.BookUUID, &localNote.Dirty, &localNote.Deleted) if err != nil && err != sql.ErrNoRows { return errors.Wrapf(err, "getting local note %s", n.UUID) } // if note exists in the server and does not exist in the client, insert the note. if err == sql.ErrNoRows { - note := core.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -331,17 +385,17 @@ func stepSyncNote(tx *infra.DB, n client.SyncFragNote) error { return nil } -func fullSyncNote(tx *infra.DB, n client.SyncFragNote) error { - var localNote core.Note - err := tx.QueryRow("SELECT usn,book_uuid, dirty, deleted FROM notes WHERE uuid = ?", n.UUID). - Scan(&localNote.USN, &localNote.BookUUID, &localNote.Dirty, &localNote.Deleted) +func fullSyncNote(tx *database.DB, n client.SyncFragNote) error { + var localNote database.Note + err := tx.QueryRow("SELECT body, usn, book_uuid, dirty, deleted FROM notes WHERE uuid = ?", n.UUID). + Scan(&localNote.Body, &localNote.USN, &localNote.BookUUID, &localNote.Dirty, &localNote.Deleted) if err != nil && err != sql.ErrNoRows { return errors.Wrapf(err, "getting local note %s", n.UUID) } // if note exists in the server and does not exist in the client, insert the note. if err == sql.ErrNoRows { - note := core.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -355,7 +409,7 @@ func fullSyncNote(tx *infra.DB, n client.SyncFragNote) error { return nil } -func syncDeleteNote(tx *infra.DB, noteUUID string) error { +func syncDeleteNote(tx *database.DB, noteUUID string) error { var localUSN int var dirty bool err := tx.QueryRow("SELECT usn, dirty FROM notes WHERE uuid = ?", noteUUID).Scan(&localUSN, &dirty) @@ -380,7 +434,7 @@ func syncDeleteNote(tx *infra.DB, noteUUID string) error { } // checkNotesPristine checks that none of the notes in the given book are dirty -func checkNotesPristine(tx *infra.DB, bookUUID string) (bool, error) { +func checkNotesPristine(tx *database.DB, bookUUID string) (bool, error) { var count int if err := tx.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ? AND dirty = ?", bookUUID, true).Scan(&count); err != nil { return false, errors.Wrapf(err, "counting notes that are dirty in book %s", bookUUID) @@ -393,7 +447,7 @@ func checkNotesPristine(tx *infra.DB, bookUUID string) (bool, error) { return true, nil } -func syncDeleteBook(tx *infra.DB, bookUUID string) error { +func syncDeleteBook(tx *database.DB, bookUUID string) error { var localUSN int var dirty bool err := tx.QueryRow("SELECT usn, dirty FROM books WHERE uuid = ?", bookUUID).Scan(&localUSN, &dirty) @@ -439,7 +493,7 @@ func syncDeleteBook(tx *infra.DB, bookUUID string) error { return nil } -func fullSyncBook(tx *infra.DB, b client.SyncFragBook) error { +func fullSyncBook(tx *database.DB, b client.SyncFragBook) error { var localUSN int var dirty bool err := tx.QueryRow("SELECT usn, dirty FROM books WHERE uuid = ?", b.UUID).Scan(&localUSN, &dirty) @@ -491,7 +545,7 @@ func checkBookInList(uuid string, list *syncList) bool { // judging by the full list of resources in the server. Concretely, the only acceptable // situation in which a local note is not present in the server is if it is new and has not been // uploaded (i.e. dirty and usn is 0). Otherwise, it is a result of some kind of error and should be cleaned. -func cleanLocalNotes(tx *infra.DB, fullList *syncList) error { +func cleanLocalNotes(tx *database.DB, fullList *syncList) error { rows, err := tx.Query("SELECT uuid, usn, dirty FROM notes") if err != nil { return errors.Wrap(err, "getting local notes") @@ -499,7 +553,7 @@ func cleanLocalNotes(tx *infra.DB, fullList *syncList) error { defer rows.Close() for rows.Next() { - var note core.Note + var note database.Note if err := rows.Scan(¬e.UUID, ¬e.USN, ¬e.Dirty); err != nil { return errors.Wrap(err, "scanning a row for local note") } @@ -517,7 +571,7 @@ func cleanLocalNotes(tx *infra.DB, fullList *syncList) error { } // cleanLocalBooks deletes from the local database any books that are in invalid state -func cleanLocalBooks(tx *infra.DB, fullList *syncList) error { +func cleanLocalBooks(tx *database.DB, fullList *syncList) error { rows, err := tx.Query("SELECT uuid, usn, dirty FROM books") if err != nil { return errors.Wrap(err, "getting local books") @@ -525,7 +579,7 @@ func cleanLocalBooks(tx *infra.DB, fullList *syncList) error { defer rows.Close() for rows.Next() { - var book core.Book + var book database.Book if err := rows.Scan(&book.UUID, &book.USN, &book.Dirty); err != nil { return errors.Wrap(err, "scanning a row for local book") } @@ -542,10 +596,12 @@ func cleanLocalBooks(tx *infra.DB, fullList *syncList) error { return nil } -func fullSync(ctx infra.DnoteCtx, tx *infra.DB) error { +func fullSync(ctx context.DnoteCtx, tx *database.DB) error { log.Debug("performing a full sync\n") log.Info("resolving delta.") + log.DebugNewline() + list, err := getSyncList(ctx, 0) if err != nil { return errors.Wrap(err, "getting sync list") @@ -553,6 +609,8 @@ func fullSync(ctx infra.DnoteCtx, tx *infra.DB) error { fmt.Printf(" (total %d).", list.getLength()) + log.DebugNewline() + // clean resources that are in erroneous states if err := cleanLocalNotes(tx, &list); err != nil { return errors.Wrap(err, "cleaning up local notes") @@ -583,7 +641,7 @@ func fullSync(ctx infra.DnoteCtx, tx *infra.DB) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -593,11 +651,13 @@ func fullSync(ctx infra.DnoteCtx, tx *infra.DB) error { return nil } -func stepSync(ctx infra.DnoteCtx, tx *infra.DB, afterUSN int) error { +func stepSync(ctx context.DnoteCtx, tx *database.DB, afterUSN int) error { log.Debug("performing a step sync\n") log.Info("resolving delta.") + log.DebugNewline() + list, err := getSyncList(ctx, afterUSN) if err != nil { return errors.Wrap(err, "getting sync list") @@ -627,7 +687,7 @@ func stepSync(ctx infra.DnoteCtx, tx *infra.DB, afterUSN int) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -637,7 +697,21 @@ func stepSync(ctx infra.DnoteCtx, tx *infra.DB, afterUSN int) error { return nil } -func sendBooks(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { +// isConflictError checks if an error is a 409 Conflict error from the server +func isConflictError(err error) bool { + if err == nil { + return false + } + + var httpErr *client.HTTPError + if errors.As(err, &httpErr) { + return httpErr.IsConflict() + } + + return false +} + +func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { isBehind := false rows, err := tx.Query("SELECT uuid, label, usn, deleted FROM books WHERE dirty") @@ -647,7 +721,7 @@ func sendBooks(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { defer rows.Close() for rows.Next() { - var book core.Book + var book database.Book if err = rows.Scan(&book.UUID, &book.Label, &book.USN, &book.Deleted); err != nil { return isBehind, errors.Wrap(err, "scanning a syncable book") @@ -669,7 +743,9 @@ func sendBooks(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { } else { resp, err := client.CreateBook(ctx, book.Label) if err != nil { - return isBehind, errors.Wrap(err, "creating a book") + log.Debug("error creating book (will retry after stepSync): %v\n", err) + isBehind = true + continue } _, err = tx.Exec("UPDATE notes SET book_uuid = ? WHERE book_uuid = ?", resp.Book.UUID, book.UUID) @@ -741,23 +817,105 @@ func sendBooks(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { return isBehind, nil } -func sendNotes(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { +// findOrphanedNotes returns a list of all orphaned notes +func findOrphanedNotes(db *database.DB) (int, []struct{ noteUUID, bookUUID string }, error) { + var orphanCount int + err := db.QueryRow(` + SELECT COUNT(*) FROM notes n + WHERE NOT EXISTS ( + SELECT 1 FROM books b + WHERE b.uuid = n.book_uuid + AND NOT b.deleted + ) + `).Scan(&orphanCount) + if err != nil { + return 0, nil, err + } + + if orphanCount == 0 { + return 0, nil, nil + } + + rows, err := db.Query(` + SELECT n.uuid, n.book_uuid + FROM notes n + WHERE NOT EXISTS ( + SELECT 1 FROM books b + WHERE b.uuid = n.book_uuid + AND NOT b.deleted + ) + `) + if err != nil { + return orphanCount, nil, err + } + defer rows.Close() + + var orphans []struct{ noteUUID, bookUUID string } + for rows.Next() { + var noteUUID, bookUUID string + if err := rows.Scan(¬eUUID, &bookUUID); err != nil { + continue + } + orphans = append(orphans, struct{ noteUUID, bookUUID string }{noteUUID, bookUUID}) + } + + return orphanCount, orphans, nil +} + +func warnOrphanedNotes(tx *database.DB) { + count, orphans, err := findOrphanedNotes(tx) + if err != nil { + log.Debug("error checking orphaned notes: %v\n", err) + return + } + + if count == 0 { + return + } + + log.Debug("Found %d orphaned notes (book doesn't exist locally):\n", count) + for _, o := range orphans { + log.Debug("note %s (book %s)\n", o.noteUUID, o.bookUUID) + } +} + +// checkPostSyncIntegrity checks for data integrity issues after sync and warns the user +func checkPostSyncIntegrity(db *database.DB) { + count, orphans, err := findOrphanedNotes(db) + if err != nil { + log.Debug("error checking orphaned notes: %v\n", err) + return + } + + if count == 0 { + return + } + + log.Warnf("Found %d orphaned notes (referencing non-existent or deleted books):\n", count) + for _, o := range orphans { + log.Plainf(" - note %s (missing book: %s)\n", o.noteUUID, o.bookUUID) + } +} + +func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { isBehind := false - rows, err := tx.Query("SELECT uuid, book_uuid, body, public, deleted, usn, added_on FROM notes WHERE dirty") + warnOrphanedNotes(tx) + + rows, err := tx.Query("SELECT uuid, book_uuid, body, deleted, usn, added_on FROM notes WHERE dirty") if err != nil { return isBehind, errors.Wrap(err, "getting syncable notes") } defer rows.Close() for rows.Next() { - var note core.Note + var note database.Note - if err = rows.Scan(¬e.UUID, ¬e.BookUUID, ¬e.Body, ¬e.Public, ¬e.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { + if err = rows.Scan(¬e.UUID, ¬e.BookUUID, ¬e.Body, ¬e.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { return isBehind, errors.Wrap(err, "scanning a syncable note") } - log.Debug("sending note %s\n", note.UUID) + log.Debug("sending note %s (book: %s)\n", note.UUID, note.BookUUID) var respUSN int @@ -774,7 +932,9 @@ func sendNotes(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { } else { resp, err := client.CreateNote(ctx, note.BookUUID, note.Body) if err != nil { - return isBehind, errors.Wrap(err, "creating a note") + log.Debug("failed to create note %s (book: %s): %v\n", note.UUID, note.BookUUID, err) + isBehind = true + continue } note.Dirty = false @@ -805,7 +965,7 @@ func sendNotes(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { respUSN = resp.Result.USN } else { - resp, err := client.UpdateNote(ctx, note.UUID, note.BookUUID, note.Body, note.Public) + resp, err := client.UpdateNote(ctx, note.UUID, note.BookUUID, note.Body) if err != nil { return isBehind, errors.Wrap(err, "updating a note") } @@ -841,7 +1001,7 @@ func sendNotes(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { return isBehind, nil } -func sendChanges(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { +func sendChanges(ctx context.DnoteCtx, tx *database.DB) (bool, error) { log.Info("sending changes.") var delta int @@ -849,6 +1009,8 @@ func sendChanges(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { fmt.Printf(" (total %d).", delta) + log.DebugNewline() + behind1, err := sendBooks(ctx, tx) if err != nil { return behind1, errors.Wrap(err, "sending books") @@ -866,26 +1028,40 @@ func sendChanges(ctx infra.DnoteCtx, tx *infra.DB) (bool, error) { return isBehind, nil } -func updateLastMaxUSN(tx *infra.DB, val int) error { - if err := core.UpdateSystem(tx, infra.SystemLastMaxUSN, val); err != nil { - return errors.Wrapf(err, "updating %s", infra.SystemLastMaxUSN) +func updateLastMaxUSN(tx *database.DB, val int) error { + if err := database.UpdateSystem(tx, consts.SystemLastMaxUSN, val); err != nil { + return errors.Wrapf(err, "updating %s", consts.SystemLastMaxUSN) } return nil } -func updateLastSyncAt(tx *infra.DB, val int64) error { - if err := core.UpdateSystem(tx, infra.SystemLastSyncAt, val); err != nil { - return errors.Wrapf(err, "updating %s", infra.SystemLastSyncAt) +func updateLastSyncAt(tx *database.DB, val int64) error { + if err := database.UpdateSystem(tx, consts.SystemLastSyncAt, val); err != nil { + return errors.Wrapf(err, "updating %s", consts.SystemLastSyncAt) } return nil } -func saveSyncState(tx *infra.DB, serverTime int64, serverMaxUSN int) error { - if err := updateLastMaxUSN(tx, serverMaxUSN); err != nil { - return errors.Wrap(err, "updating last max usn") +func saveSyncState(tx *database.DB, serverTime int64, serverMaxUSN int, userMaxUSN int) error { + // Handle last_max_usn update based on server state: + // - If serverMaxUSN > 0: we got data, update to serverMaxUSN + // - If serverMaxUSN == 0 && userMaxUSN > 0: empty fragment (caught up), preserve existing + // - If serverMaxUSN == 0 && userMaxUSN == 0: empty server, reset to 0 + if serverMaxUSN > 0 { + if err := updateLastMaxUSN(tx, serverMaxUSN); err != nil { + return errors.Wrap(err, "updating last max usn") + } + } else if userMaxUSN == 0 { + // Server is empty, reset to 0 + if err := updateLastMaxUSN(tx, 0); err != nil { + return errors.Wrap(err, "updating last max usn") + } } + // else: empty fragment but server has data, preserve existing last_max_usn + + // Always update last_sync_at (we did communicate with server) if err := updateLastSyncAt(tx, serverTime); err != nil { return errors.Wrap(err, "updating last sync at") } @@ -893,9 +1069,34 @@ func saveSyncState(tx *infra.DB, serverTime int64, serverMaxUSN int) error { return nil } -func newRun(ctx infra.DnoteCtx) core.RunEFunc { +// prepareEmptyServerSync marks all local books and notes as dirty when syncing to an empty server. +// This is typically used when switching to a new empty server but wanting to upload existing local data. +// Returns true if preparation was done, false otherwise. +func prepareEmptyServerSync(tx *database.DB) error { + // Mark all books and notes as dirty and reset USN to 0 + if _, err := tx.Exec("UPDATE books SET usn = 0, dirty = 1 WHERE deleted = 0"); err != nil { + return errors.Wrap(err, "marking books as dirty") + } + if _, err := tx.Exec("UPDATE notes SET usn = 0, dirty = 1 WHERE deleted = 0"); err != nil { + return errors.Wrap(err, "marking notes as dirty") + } + + // Reset lastMaxUSN to 0 to match the server + if err := updateLastMaxUSN(tx, 0); err != nil { + return errors.Wrap(err, "resetting last max usn") + } + + return nil +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { - if ctx.SessionKey == "" || ctx.CipherKey == nil { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + + if ctx.SessionKey == "" { return errors.New("not logged in") } @@ -923,6 +1124,74 @@ func newRun(ctx infra.DnoteCtx) core.RunEFunc { log.Debug("lastSyncAt: %d, lastMaxUSN: %d, syncState: %+v\n", lastSyncAt, lastMaxUSN, syncState) + // Handle a case where server has MaxUSN=0 but local has data (server switch) + var bookCount, noteCount int + if err := tx.QueryRow("SELECT count(*) FROM books WHERE deleted = 0").Scan(&bookCount); err != nil { + return errors.Wrap(err, "counting local books") + } + if err := tx.QueryRow("SELECT count(*) FROM notes WHERE deleted = 0").Scan(¬eCount); err != nil { + return errors.Wrap(err, "counting local notes") + } + + // If a client has previously synced (lastMaxUSN > 0) but the server was never synced to (MaxUSN = 0), + // and the client has undeleted books or notes, allow to upload all data to the server. + // The client might have switched servers or the server might need to be restored for any reasons. + if syncState.MaxUSN == 0 && lastMaxUSN > 0 && (bookCount > 0 || noteCount > 0) { + log.Debug("empty server detected: server.MaxUSN=%d, local.MaxUSN=%d, books=%d, notes=%d\n", + syncState.MaxUSN, lastMaxUSN, bookCount, noteCount) + + log.Warnf("The server is empty but you have local data. Maybe you switched servers?\n") + log.Debug("server state: MaxUSN = 0 (empty)\n") + log.Debug("local state: %d books, %d notes (MaxUSN = %d)\n", bookCount, noteCount, lastMaxUSN) + + confirmed, err := ui.Confirm(fmt.Sprintf("Upload %d books and %d notes to the server?", bookCount, noteCount), false) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "getting user confirmation") + } + + if !confirmed { + tx.Rollback() + return errors.New("sync cancelled by user") + } + + fmt.Println() // Add newline after confirmation. + + if err := prepareEmptyServerSync(tx); err != nil { + return errors.Wrap(err, "preparing for empty server sync") + } + + // Re-fetch lastMaxUSN after prepareEmptyServerSync + lastMaxUSN, err = getLastMaxUSN(tx) + if err != nil { + return errors.Wrap(err, "getting the last max_usn after prepare") + } + + log.Debug("prepared empty server sync: marked %d books and %d notes as dirty\n", bookCount, noteCount) + } + + // If full sync will be triggered by FullSyncBefore (not manual --full flag), + // and client has more data than server, prepare local data for upload to avoid orphaning notes. + // The lastMaxUSN > syncState.MaxUSN check prevents duplicate uploads when switching + // back to a server that already has our data. + if !isFullSync && lastSyncAt < syncState.FullSyncBefore && lastMaxUSN > syncState.MaxUSN { + log.Debug("full sync triggered by FullSyncBefore: preparing local data for upload\n") + log.Debug("server.FullSyncBefore=%d, local.lastSyncAt=%d, local.MaxUSN=%d, server.MaxUSN=%d, books=%d, notes=%d\n", + syncState.FullSyncBefore, lastSyncAt, lastMaxUSN, syncState.MaxUSN, bookCount, noteCount) + + if err := prepareEmptyServerSync(tx); err != nil { + return errors.Wrap(err, "preparing local data for full sync") + } + + // Re-fetch lastMaxUSN after prepareEmptyServerSync + lastMaxUSN, err = getLastMaxUSN(tx) + if err != nil { + return errors.Wrap(err, "getting the last max_usn after prepare") + } + + log.Debug("prepared for full sync: marked %d books and %d notes as dirty\n", bookCount, noteCount) + } + var syncErr error if isFullSync || lastSyncAt < syncState.FullSyncBefore { syncErr = fullSync(ctx, tx) @@ -961,13 +1230,25 @@ func newRun(ctx infra.DnoteCtx) core.RunEFunc { tx.Rollback() return errors.Wrap(err, "performing the follow-up step sync") } + + // After syncing server changes (which resolves conflicts), send local changes again + // This uploads books/notes that were skipped due to 409 conflicts + _, err = sendChanges(ctx, tx) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "sending changes after conflict resolution") + } } - tx.Commit() + if err := tx.Commit(); err != nil { + return errors.Wrap(err, "committing transaction") + } log.Success("success\n") - if err := core.CheckUpdate(ctx); err != nil { + checkPostSyncIntegrity(ctx.DB) + + if err := upgrade.Check(ctx); err != nil { log.Error(errors.Wrap(err, "automatically checking updates").Error()) } diff --git a/pkg/cli/cmd/sync/sync_test.go b/pkg/cli/cmd/sync/sync_test.go new file mode 100644 index 00000000..ae3b94ff --- /dev/null +++ b/pkg/cli/cmd/sync/sync_test.go @@ -0,0 +1,3287 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "sort" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/pkg/errors" +) + +func TestProcessFragments(t *testing.T) { + fragments := []client.SyncFragment{ + { + FragMaxUSN: 10, + UserMaxUSN: 10, + CurrentTime: 1550436136, + Notes: []client.SyncFragNote{ + { + UUID: "45546de0-40ed-45cf-9bfc-62ce729a7d3d", + Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n Donec ac libero efficitur, posuere dui non, egestas lectus.\n Aliquam urna ligula, sagittis eu volutpat vel, consequat et augue.\n\n Ut mi urna, dignissim a ex eget, venenatis accumsan sem. Praesent facilisis, ligula hendrerit auctor varius, mauris metus hendrerit dolor, sit amet pulvinar.", + }, + { + UUID: "a25a5336-afe9-46c4-b881-acab911c0bc3", + Body: "foo bar baz quz\nqux", + }, + }, + Books: []client.SyncFragBook{ + { + UUID: "e8ac6f25-d95b-435a-9fae-094f7506a5ac", + Label: "foo", + }, + { + UUID: "05fd8b95-ddcd-4071-9380-4358ffb8a436", + Label: "foo-bar-baz-1000", + }, + }, + ExpungedNotes: []string{}, + ExpungedBooks: []string{}, + }, + } + + // exec + sl, err := processFragments(fragments) + if err != nil { + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + expected := syncList{ + Notes: map[string]client.SyncFragNote{ + "45546de0-40ed-45cf-9bfc-62ce729a7d3d": { + UUID: "45546de0-40ed-45cf-9bfc-62ce729a7d3d", + Body: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n Donec ac libero efficitur, posuere dui non, egestas lectus.\n Aliquam urna ligula, sagittis eu volutpat vel, consequat et augue.\n\n Ut mi urna, dignissim a ex eget, venenatis accumsan sem. Praesent facilisis, ligula hendrerit auctor varius, mauris metus hendrerit dolor, sit amet pulvinar.", + }, + "a25a5336-afe9-46c4-b881-acab911c0bc3": { + UUID: "a25a5336-afe9-46c4-b881-acab911c0bc3", + Body: "foo bar baz quz\nqux", + }, + }, + Books: map[string]client.SyncFragBook{ + "e8ac6f25-d95b-435a-9fae-094f7506a5ac": { + UUID: "e8ac6f25-d95b-435a-9fae-094f7506a5ac", + Label: "foo", + }, + "05fd8b95-ddcd-4071-9380-4358ffb8a436": { + UUID: "05fd8b95-ddcd-4071-9380-4358ffb8a436", + Label: "foo-bar-baz-1000", + }, + }, + ExpungedNotes: map[string]bool{}, + ExpungedBooks: map[string]bool{}, + MaxUSN: 10, + UserMaxUSN: 10, + MaxCurrentTime: 1550436136, + } + + // test + assert.DeepEqual(t, sl, expected, "syncList mismatch") +} + +func TestGetLastSyncAt(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + database.MustExec(t, "setting up last_sync_at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, 1541108743) + + // exec + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + got, err := getLastSyncAt(tx) + if err != nil { + t.Fatal(errors.Wrap(err, "getting last_sync_at").Error()) + } + + tx.Commit() + + // test + assert.Equal(t, got, 1541108743, "last_sync_at mismatch") +} + +func TestGetLastMaxUSN(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + database.MustExec(t, "setting up last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 20001) + + // exec + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + got, err := getLastMaxUSN(tx) + if err != nil { + t.Fatal(errors.Wrap(err, "getting last_max_usn").Error()) + } + + tx.Commit() + + // test + assert.Equal(t, got, 20001, "last_max_usn mismatch") +} + +func TestResolveLabel(t *testing.T) { + testCases := []struct { + input string + expected string + }{ + { + input: "js", + expected: "js_2", + }, + { + input: "css", + expected: "css_3", + }, + { + input: "linux", + expected: "linux_4", + }, + { + input: "cool_ideas", + expected: "cool_ideas_2", + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "js") + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b2-uuid", "css_2") + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b3-uuid", "linux_(1)") + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b4-uuid", "linux_2") + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b5-uuid", "linux_3") + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b6-uuid", "cool_ideas") + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + got, err := resolveLabel(tx, tc.input) + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + tx.Rollback() + + assert.Equal(t, got, tc.expected, fmt.Sprintf("output mismatch for test case %d", idx)) + }() + } +} + +func TestSyncDeleteNote(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := syncDeleteNote(tx, "nonexistent-note-uuid"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 0, "book count mismatch") + }) + + t.Run("local copy is dirty", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) + database.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 11, "n2 body", 1541108743, false, true) + + var n1 database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + var n2 database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), + &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Deleted, &n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction for test case").Error()) + } + + if err := syncDeleteNote(tx, "n1-uuid"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + // do not delete note if local copy is dirty + assert.Equalf(t, noteCount, 2, "note count mismatch for test case") + assert.Equalf(t, bookCount, 1, "book count mismatch for test case") + + var n1Record database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n1.UUID), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Deleted, &n1Record.Dirty) + var n2Record database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, n1Record.UUID, n1.UUID, "n1 UUID mismatch for test case") + assert.Equal(t, n1Record.BookUUID, n1.BookUUID, "n1 BookUUID mismatch for test case") + assert.Equal(t, n1Record.USN, n1.USN, "n1 USN mismatch for test case") + assert.Equal(t, n1Record.AddedOn, n1.AddedOn, "n1 AddedOn mismatch for test case") + assert.Equal(t, n1Record.EditedOn, n1.EditedOn, "n1 EditedOn mismatch for test case") + assert.Equal(t, n1Record.Body, n1.Body, "n1 Body mismatch for test case") + assert.Equal(t, n1Record.Deleted, n1.Deleted, "n1 Deleted mismatch for test case") + assert.Equal(t, n1Record.Dirty, n1.Dirty, "n1 Dirty mismatch for test case") + + assert.Equal(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") + assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") + assert.Equal(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") + assert.Equal(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") + assert.Equal(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") + assert.Equal(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") + assert.Equal(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") + assert.Equal(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") + }) + + t.Run("local copy is not dirty", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) + database.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 11, "n2 body", 1541108743, false, false) + + var n1 database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + var n2 database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), + &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Deleted, &n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction for test case").Error()) + } + + if err := syncDeleteNote(tx, "n1-uuid"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, "note count mismatch for test case") + assert.Equalf(t, bookCount, 1, "book count mismatch for test case") + + var n2Record database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") + assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") + assert.Equal(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") + assert.Equal(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") + assert.Equal(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") + assert.Equal(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") + assert.Equal(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") + assert.Equal(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") + }) +} + +func TestSyncDeleteBook(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "b1-label") + + var b1 database.Book + database.MustScan(t, "getting b1 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1.UUID, &b1.Label, &b1.USN, &b1.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := syncDeleteBook(tx, "nonexistent-book-uuid"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var b1Record database.Book + database.MustScan(t, "getting b1 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch for test case") + assert.Equal(t, b1Record.Label, b1.Label, "b1 Label mismatch for test case") + assert.Equal(t, b1Record.USN, b1.USN, "b1 USN mismatch for test case") + assert.Equal(t, b1Record.Dirty, b1.Dirty, "b1 Dirty mismatch for test case") + }) + + t.Run("local copy is dirty", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 12, true) + database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) + + var b1 database.Book + database.MustScan(t, "getting b1 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), + &b1.UUID, &b1.Label, &b1.USN, &b1.Dirty) + var n1 database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction for test case").Error()) + } + + if err := syncDeleteBook(tx, b1UUID); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + // do not delete note if local copy is dirty + assert.Equalf(t, noteCount, 1, "note count mismatch for test case") + assert.Equalf(t, bookCount, 1, "book count mismatch for test case") + + var b1Record database.Book + database.MustScan(t, "getting b1Record for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + var n1Record database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n1.UUID), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Deleted, &n1Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch for test case") + assert.Equal(t, b1Record.Label, b1.Label, "b1 Label mismatch for test case") + assert.Equal(t, b1Record.USN, b1.USN, "b1 USN mismatch for test case") + assert.Equal(t, b1Record.Dirty, b1.Dirty, "b1 Dirty mismatch for test case") + + assert.Equal(t, n1Record.UUID, n1.UUID, "n1 UUID mismatch for test case") + assert.Equal(t, n1Record.BookUUID, n1.BookUUID, "n1 BookUUID mismatch for test case") + assert.Equal(t, n1Record.USN, n1.USN, "n1 USN mismatch for test case") + assert.Equal(t, n1Record.AddedOn, n1.AddedOn, "n1 AddedOn mismatch for test case") + assert.Equal(t, n1Record.EditedOn, n1.EditedOn, "n1 EditedOn mismatch for test case") + assert.Equal(t, n1Record.Body, n1.Body, "n1 Body mismatch for test case") + assert.Equal(t, n1Record.Deleted, n1.Deleted, "n1 Deleted mismatch for test case") + assert.Equal(t, n1Record.Dirty, n1.Dirty, "n1 Dirty mismatch for test case") + }) + + t.Run("local copy is not dirty", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + b2UUID := testutils.MustGenerateUUID(t) + + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) + database.MustExec(t, "inserting b2 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") + database.MustExec(t, "inserting n2 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b2UUID, 11, "n2 body", 1541108743, false, false) + + var b2 database.Book + database.MustScan(t, "getting b2 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), + &b2.UUID, &b2.Label, &b2.USN, &b2.Dirty) + var n2 database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", "n2-uuid"), + &n2.UUID, &n2.BookUUID, &n2.USN, &n2.AddedOn, &n2.EditedOn, &n2.Body, &n2.Deleted, &n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction for test case").Error()) + } + + if err := syncDeleteBook(tx, b1UUID); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, "note count mismatch for test case") + assert.Equalf(t, bookCount, 1, "book count mismatch for test case") + + var b2Record database.Book + database.MustScan(t, "getting b2 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + var n2Record database.Note + database.MustScan(t, "getting n2 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.USN, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.Body, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, b2Record.UUID, b2.UUID, "b2 UUID mismatch for test case") + assert.Equal(t, b2Record.Label, b2.Label, "b2 Label mismatch for test case") + assert.Equal(t, b2Record.USN, b2.USN, "b2 USN mismatch for test case") + assert.Equal(t, b2Record.Dirty, b2.Dirty, "b2 Dirty mismatch for test case") + + assert.Equal(t, n2Record.UUID, n2.UUID, "n2 UUID mismatch for test case") + assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 BookUUID mismatch for test case") + assert.Equal(t, n2Record.USN, n2.USN, "n2 USN mismatch for test case") + assert.Equal(t, n2Record.AddedOn, n2.AddedOn, "n2 AddedOn mismatch for test case") + assert.Equal(t, n2Record.EditedOn, n2.EditedOn, "n2 EditedOn mismatch for test case") + assert.Equal(t, n2Record.Body, n2.Body, "n2 Body mismatch for test case") + assert.Equal(t, n2Record.Deleted, n2.Deleted, "n2 Deleted mismatch for test case") + assert.Equal(t, n2Record.Dirty, n2.Dirty, "n2 Dirty mismatch for test case") + }) + + t.Run("local copy has at least one note that is dirty", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction for test case").Error()) + } + + if err := syncDeleteBook(tx, b1UUID); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes for test case", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books for test case", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + assert.Equalf(t, noteCount, 1, "note count mismatch for test case") + assert.Equalf(t, bookCount, 1, "book count mismatch for test case") + + var b1Record database.Book + database.MustScan(t, "getting b1 for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + var n1Record database.Note + database.MustScan(t, "getting n1 for test case", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, body,deleted, dirty FROM notes WHERE uuid = ?", "n1-uuid"), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.Body, &n1Record.Deleted, &n1Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1UUID, "b1 UUID mismatch for test case") + assert.Equal(t, b1Record.Label, "b1-label", "b1 Label mismatch for test case") + assert.Equal(t, b1Record.Dirty, true, "b1 Dirty mismatch for test case") + + assert.Equal(t, n1Record.UUID, "n1-uuid", "n1 UUID mismatch for test case") + assert.Equal(t, n1Record.BookUUID, b1UUID, "n1 BookUUID mismatch for test case") + assert.Equal(t, n1Record.USN, 10, "n1 USN mismatch for test case") + assert.Equal(t, n1Record.AddedOn, int64(1541108743), "n1 AddedOn mismatch for test case") + assert.Equal(t, n1Record.Body, "n1 body", "n1 Body mismatch for test case") + assert.Equal(t, n1Record.Deleted, false, "n1 Deleted mismatch for test case") + assert.Equal(t, n1Record.Dirty, true, "n1 Dirty mismatch for test case") + }) +} + +func TestFullSyncNote(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + n := client.SyncFragNote{ + UUID: "n1-uuid", + BookUUID: b1UUID, + USN: 128, + AddedOn: 1541232118, + EditedOn: 1541219321, + Body: "n1-body", + Deleted: false, + } + + if err := fullSyncNote(tx, n); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, "note count mismatch") + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var n1 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + + assert.Equal(t, n1.UUID, n.UUID, "n1 UUID mismatch") + assert.Equal(t, n1.BookUUID, n.BookUUID, "n1 BookUUID mismatch") + assert.Equal(t, n1.USN, n.USN, "n1 USN mismatch") + assert.Equal(t, n1.AddedOn, n.AddedOn, "n1 AddedOn mismatch") + assert.Equal(t, n1.EditedOn, n.EditedOn, "n1 EditedOn mismatch") + assert.Equal(t, n1.Body, n.Body, "n1 Body mismatch") + assert.Equal(t, n1.Deleted, n.Deleted, "n1 Deleted mismatch") + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + }) + + t.Run("exists on server and client", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + b2UUID := testutils.MustGenerateUUID(t) + conflictBookUUID := testutils.MustGenerateUUID(t) + + testCases := []struct { + addedOn int64 + clientUSN int + clientEditedOn int64 + clientBody string + clientDeleted bool + clientBookUUID string + clientDirty bool + serverUSN int + serverEditedOn int64 + serverBody string + serverDeleted bool + serverBookUUID string + expectedUSN int + expectedAddedOn int64 + expectedEditedOn int64 + expectedBody string + expectedDeleted bool + expectedBookUUID string + expectedDirty bool + }{ + // server has higher usn and client is dirty + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: `<<<<<<< Local +Moved to the book b1-label +======= +Moved to the book b2-label +>>>>>>> Server + +<<<<<<< Local +n1 body +======= +n1 body edited +>>>>>>> Server +`, + expectedDeleted: false, + expectedBookUUID: conflictBookUUID, + expectedDirty: true, + }, + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b1UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: `<<<<<<< Local +n1 body +======= +n1 body edited +>>>>>>> Server +`, + expectedDeleted: false, + expectedBookUUID: b1UUID, + expectedDirty: true, + }, + // server has higher usn and client deleted locally + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "", + clientDeleted: true, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body server", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body server", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: false, + }, + // server has higher usn and client is not dirty + { + clientDirty: false, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body edited", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: false, + }, + // they're in sync + { + clientDirty: true, + clientUSN: 21, + clientEditedOn: 1541219321, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b2UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: true, + }, + // they have the same usn but client is dirty + // not sure if this is a possible scenario but if it happens, the local copy will + // be uploaded to the server anyway. + { + clientDirty: true, + clientUSN: 21, + clientEditedOn: 1541219320, + clientBody: "n1 body client", + clientDeleted: false, + clientBookUUID: b2UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body server", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219320, + expectedBody: "n1 body client", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") + database.MustExec(t, fmt.Sprintf("inserting conflitcs book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", conflictBookUUID, "conflicts") + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, tc.clientBookUUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientDeleted, tc.clientDirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + // update all fields but uuid and bump usn + n := client.SyncFragNote{ + UUID: n1UUID, + BookUUID: tc.serverBookUUID, + USN: tc.serverUSN, + AddedOn: tc.addedOn, + EditedOn: tc.serverEditedOn, + Body: tc.serverBody, + Deleted: tc.serverDeleted, + } + + if err := fullSyncNote(tx, n); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) + assert.Equalf(t, bookCount, 3, fmt.Sprintf("book count mismatch for test case %d", idx)) + + var n1 database.Note + database.MustScan(t, fmt.Sprintf("getting n1 for test case %d", idx), + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + + assert.Equal(t, n1.UUID, n.UUID, fmt.Sprintf("n1 UUID mismatch for test case %d", idx)) + assert.Equal(t, n1.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1 BookUUID mismatch for test case %d", idx)) + assert.Equal(t, n1.USN, tc.expectedUSN, fmt.Sprintf("n1 USN mismatch for test case %d", idx)) + assert.Equal(t, n1.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1 AddedOn mismatch for test case %d", idx)) + assert.Equal(t, n1.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1 EditedOn mismatch for test case %d", idx)) + assert.Equal(t, n1.Body, tc.expectedBody, fmt.Sprintf("n1 Body mismatch for test case %d", idx)) + assert.Equal(t, n1.Deleted, tc.expectedDeleted, fmt.Sprintf("n1 Deleted mismatch for test case %d", idx)) + assert.Equal(t, n1.Dirty, tc.expectedDirty, fmt.Sprintf("n1 Dirty mismatch for test case %d", idx)) + }() + } + }) +} + +func TestFullSyncBook(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b2UUID := testutils.MustGenerateUUID(t) + b := client.SyncFragBook{ + UUID: b2UUID, + USN: 1, + AddedOn: 1541108743, + Label: "b2-label", + Deleted: false, + } + + if err := fullSyncBook(tx, b); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 2, "book count mismatch") + + var b1, b2 database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), + &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), + &b2.UUID, &b2.USN, &b2.Label, &b2.Dirty, &b2.Deleted) + + assert.Equal(t, b1.UUID, b1UUID, "b1 UUID mismatch") + assert.Equal(t, b1.USN, 555, "b1 USN mismatch") + assert.Equal(t, b1.Label, "b1-label", "b1 Label mismatch") + assert.Equal(t, b1.Dirty, true, "b1 Dirty mismatch") + assert.Equal(t, b1.Deleted, false, "b1 Deleted mismatch") + + assert.Equal(t, b2.UUID, b2UUID, "b2 UUID mismatch") + assert.Equal(t, b2.USN, b.USN, "b2 USN mismatch") + assert.Equal(t, b2.Label, b.Label, "b2 Label mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + assert.Equal(t, b2.Deleted, b.Deleted, "b2 Deleted mismatch") + }) + + t.Run("exists on server and client", func(t *testing.T) { + testCases := []struct { + clientDirty bool + clientUSN int + clientLabel string + clientDeleted bool + serverUSN int + serverLabel string + serverDeleted bool + expectedUSN int + expectedLabel string + expectedDeleted bool + }{ + // server has higher usn and client is dirty + { + clientDirty: true, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label-updated", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label-updated", + expectedDeleted: false, + }, + { + clientDirty: true, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "", + serverDeleted: true, + expectedUSN: 3, + expectedLabel: "", + expectedDeleted: true, + }, + // server has higher usn and client is not dirty + { + clientDirty: false, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label-updated", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label-updated", + expectedDeleted: false, + }, + // they are in sync + { + clientDirty: false, + clientUSN: 3, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label", + expectedDeleted: false, + }, + // they have the same usn but client is dirty + { + clientDirty: true, + clientUSN: 3, + clientLabel: "b2-label-client", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label-client", + expectedDeleted: false, + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + // update all fields but uuid and bump usn + b := client.SyncFragBook{ + UUID: b1UUID, + USN: tc.serverUSN, + Label: tc.serverLabel, + Deleted: tc.serverDeleted, + } + + if err := fullSyncBook(tx, b); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, fmt.Sprintf("note count mismatch for test case %d", idx)) + assert.Equalf(t, bookCount, 1, fmt.Sprintf("book count mismatch for test case %d", idx)) + + var b1 database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), + &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) + + assert.Equal(t, b1.UUID, b1UUID, fmt.Sprintf("b1 UUID mismatch for idx %d", idx)) + assert.Equal(t, b1.USN, tc.expectedUSN, fmt.Sprintf("b1 USN mismatch for test case %d", idx)) + assert.Equal(t, b1.Label, tc.expectedLabel, fmt.Sprintf("b1 Label mismatch for test case %d", idx)) + assert.Equal(t, b1.Dirty, tc.clientDirty, fmt.Sprintf("b1 Dirty mismatch for test case %d", idx)) + assert.Equal(t, b1.Deleted, tc.expectedDeleted, fmt.Sprintf("b1 Deleted mismatch for test case %d", idx)) + }() + } + }) +} + +func TestStepSyncNote(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + n := client.SyncFragNote{ + UUID: "n1-uuid", + BookUUID: b1UUID, + USN: 128, + AddedOn: 1541232118, + EditedOn: 1541219321, + Body: "n1-body", + Deleted: false, + } + + if err := stepSyncNote(tx, n); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, "note count mismatch") + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var n1 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + + assert.Equal(t, n1.UUID, n.UUID, "n1 UUID mismatch") + assert.Equal(t, n1.BookUUID, n.BookUUID, "n1 BookUUID mismatch") + assert.Equal(t, n1.USN, n.USN, "n1 USN mismatch") + assert.Equal(t, n1.AddedOn, n.AddedOn, "n1 AddedOn mismatch") + assert.Equal(t, n1.EditedOn, n.EditedOn, "n1 EditedOn mismatch") + assert.Equal(t, n1.Body, n.Body, "n1 Body mismatch") + assert.Equal(t, n1.Deleted, n.Deleted, "n1 Deleted mismatch") + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + }) + + t.Run("exists on server and client", func(t *testing.T) { + b1UUID := testutils.MustGenerateUUID(t) + b2UUID := testutils.MustGenerateUUID(t) + conflictBookUUID := testutils.MustGenerateUUID(t) + + testCases := []struct { + addedOn int64 + clientUSN int + clientEditedOn int64 + clientBody string + clientDeleted bool + clientBookUUID string + clientDirty bool + serverUSN int + serverEditedOn int64 + serverBody string + serverDeleted bool + serverBookUUID string + expectedUSN int + expectedAddedOn int64 + expectedEditedOn int64 + expectedBody string + expectedDeleted bool + expectedBookUUID string + expectedDirty bool + }{ + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: `<<<<<<< Local +Moved to the book b1-label +======= +Moved to the book b2-label +>>>>>>> Server + +<<<<<<< Local +n1 body +======= +n1 body edited +>>>>>>> Server +`, + expectedDeleted: false, + expectedBookUUID: conflictBookUUID, + expectedDirty: true, + }, + // if deleted locally, resurrect it + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 1541219321, + clientBody: "", + clientDeleted: true, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body edited", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: false, + }, + { + clientDirty: false, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body edited", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: false, + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") + database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") + database.MustExec(t, fmt.Sprintf("inserting conflitcs book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", conflictBookUUID, "conflicts") + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, tc.clientBookUUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientDeleted, tc.clientDirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + // update all fields but uuid and bump usn + n := client.SyncFragNote{ + UUID: n1UUID, + BookUUID: tc.serverBookUUID, + USN: tc.serverUSN, + AddedOn: tc.addedOn, + EditedOn: tc.serverEditedOn, + Body: tc.serverBody, + Deleted: tc.serverDeleted, + } + + if err := stepSyncNote(tx, n); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) + assert.Equalf(t, bookCount, 3, fmt.Sprintf("book count mismatch for test case %d", idx)) + + var n1 database.Note + database.MustScan(t, fmt.Sprintf("getting n1 for test case %d", idx), + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n.UUID), + &n1.UUID, &n1.BookUUID, &n1.USN, &n1.AddedOn, &n1.EditedOn, &n1.Body, &n1.Deleted, &n1.Dirty) + + assert.Equal(t, n1.UUID, n.UUID, fmt.Sprintf("n1 UUID mismatch for test case %d", idx)) + assert.Equal(t, n1.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1 BookUUID mismatch for test case %d", idx)) + assert.Equal(t, n1.USN, tc.expectedUSN, fmt.Sprintf("n1 USN mismatch for test case %d", idx)) + assert.Equal(t, n1.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1 AddedOn mismatch for test case %d", idx)) + assert.Equal(t, n1.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1 EditedOn mismatch for test case %d", idx)) + assert.Equal(t, n1.Body, tc.expectedBody, fmt.Sprintf("n1 Body mismatch for test case %d", idx)) + assert.Equal(t, n1.Deleted, tc.expectedDeleted, fmt.Sprintf("n1 Deleted mismatch for test case %d", idx)) + assert.Equal(t, n1.Dirty, tc.expectedDirty, fmt.Sprintf("n1 Dirty mismatch for test case %d", idx)) + }() + } + }) +} + +func TestStepSyncBook(t *testing.T) { + t.Run("exists on server only", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b2UUID := testutils.MustGenerateUUID(t) + b := client.SyncFragBook{ + UUID: b2UUID, + USN: 1, + AddedOn: 1541108743, + Label: "b2-label", + Deleted: false, + } + + if err := stepSyncBook(tx, b); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 2, "book count mismatch") + + var b1, b2 database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), + &b1.UUID, &b1.USN, &b1.Label, &b1.Dirty, &b1.Deleted) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), + &b2.UUID, &b2.USN, &b2.Label, &b2.Dirty, &b2.Deleted) + + assert.Equal(t, b1.UUID, b1UUID, "b1 UUID mismatch") + assert.Equal(t, b1.USN, 555, "b1 USN mismatch") + assert.Equal(t, b1.Label, "b1-label", "b1 Label mismatch") + assert.Equal(t, b1.Dirty, true, "b1 Dirty mismatch") + assert.Equal(t, b1.Deleted, false, "b1 Deleted mismatch") + + assert.Equal(t, b2.UUID, b2UUID, "b2 UUID mismatch") + assert.Equal(t, b2.USN, b.USN, "b2 USN mismatch") + assert.Equal(t, b2.Label, b.Label, "b2 Label mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + assert.Equal(t, b2.Deleted, b.Deleted, "b2 Deleted mismatch") + }) + + t.Run("exists on server and client", func(t *testing.T) { + testCases := []struct { + clientDirty bool + clientUSN int + clientLabel string + clientDeleted bool + serverUSN int + serverLabel string + serverDeleted bool + expectedUSN int + expectedLabel string + expectedDeleted bool + anotherBookLabel string + expectedAnotherBookLabel string + expectedAnotherBookDirty bool + }{ + { + clientDirty: true, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label-updated", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label-updated", + expectedDeleted: false, + anotherBookLabel: "foo", + expectedAnotherBookLabel: "foo", + expectedAnotherBookDirty: false, + }, + { + clientDirty: false, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "b2-label-updated", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "b2-label-updated", + expectedDeleted: false, + anotherBookLabel: "foo", + expectedAnotherBookLabel: "foo", + expectedAnotherBookDirty: false, + }, + { + clientDirty: false, + clientUSN: 1, + clientLabel: "b2-label", + clientDeleted: false, + serverUSN: 3, + serverLabel: "foo", + serverDeleted: false, + expectedUSN: 3, + expectedLabel: "foo", + expectedDeleted: false, + anotherBookLabel: "foo", + expectedAnotherBookLabel: "foo_2", + expectedAnotherBookDirty: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) + b2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b2UUID, 2, tc.anotherBookLabel, false, false) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + // update all fields but uuid and bump usn + b := client.SyncFragBook{ + UUID: b1UUID, + USN: tc.serverUSN, + Label: tc.serverLabel, + Deleted: tc.serverDeleted, + } + + if err := fullSyncBook(tx, b); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, fmt.Sprintf("note count mismatch for test case %d", idx)) + assert.Equalf(t, bookCount, 2, fmt.Sprintf("book count mismatch for test case %d", idx)) + + var b1Record, b2Record database.Book + database.MustScan(t, "getting b1Record", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b1UUID), + &b1Record.UUID, &b1Record.USN, &b1Record.Label, &b1Record.Dirty, &b1Record.Deleted) + database.MustScan(t, "getting b2Record", + db.QueryRow("SELECT uuid, usn, label, dirty, deleted FROM books WHERE uuid = ?", b2UUID), + &b2Record.UUID, &b2Record.USN, &b2Record.Label, &b2Record.Dirty, &b2Record.Deleted) + + assert.Equal(t, b1Record.UUID, b1UUID, fmt.Sprintf("b1Record UUID mismatch for idx %d", idx)) + assert.Equal(t, b1Record.USN, tc.expectedUSN, fmt.Sprintf("b1Record USN mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Label, tc.expectedLabel, fmt.Sprintf("b1Record Label mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Dirty, tc.clientDirty, fmt.Sprintf("b1Record Dirty mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Deleted, tc.expectedDeleted, fmt.Sprintf("b1Record Deleted mismatch for test case %d", idx)) + + assert.Equal(t, b2Record.UUID, b2UUID, fmt.Sprintf("b2Record UUID mismatch for idx %d", idx)) + assert.Equal(t, b2Record.USN, 2, fmt.Sprintf("b2Record USN mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Label, tc.expectedAnotherBookLabel, fmt.Sprintf("b2Record Label mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Dirty, tc.expectedAnotherBookDirty, fmt.Sprintf("b2Record Dirty mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Deleted, false, fmt.Sprintf("b2Record Deleted mismatch for test case %d", idx)) + }() + } + }) +} + +func TestMergeBook(t *testing.T) { + t.Run("insert, no duplicates", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b1 := client.SyncFragBook{ + UUID: "b1-uuid", + USN: 12, + AddedOn: 1541108743, + Label: "b1-label", + Deleted: false, + } + + if err := mergeBook(tx, b1, modeInsert); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var b1Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1.UUID, "b1 UUID mismatch") + assert.Equal(t, b1Record.Label, b1.Label, "b1 Label mismatch") + assert.Equal(t, b1Record.USN, b1.USN, "b1 USN mismatch") + }) + + t.Run("insert, 1 duplicate", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b := client.SyncFragBook{ + UUID: "b2-uuid", + USN: 12, + AddedOn: 1541108743, + Label: "foo", + Deleted: false, + } + + if err := mergeBook(tx, b, modeInsert); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 2, "book count mismatch") + + var b1Record, b2Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + + assert.Equal(t, b1Record.Label, "foo_2", "b1 Label mismatch") + assert.Equal(t, b1Record.USN, 1, "b1 USN mismatch") + assert.Equal(t, b1Record.Dirty, true, "b1 should have been marked dirty") + + assert.Equal(t, b2Record.Label, "foo", "b2 Label mismatch") + assert.Equal(t, b2Record.USN, 12, "b2 USN mismatch") + assert.Equal(t, b2Record.Dirty, false, "b2 Dirty mismatch") + }) + + t.Run("insert, 3 duplicates", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "foo_2", true, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b3-uuid", 3, "foo_3", false, false) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b := client.SyncFragBook{ + UUID: "b4-uuid", + USN: 12, + AddedOn: 1541108743, + Label: "foo", + Deleted: false, + } + + if err := mergeBook(tx, b, modeInsert); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 4, "book count mismatch") + + var b1Record, b2Record, b3Record, b4Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + database.MustScan(t, "getting b3", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b3-uuid"), + &b3Record.UUID, &b3Record.Label, &b3Record.USN, &b3Record.Dirty) + database.MustScan(t, "getting b4", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b4-uuid"), + &b4Record.UUID, &b4Record.Label, &b4Record.USN, &b4Record.Dirty) + + assert.Equal(t, b1Record.Label, "foo_4", "b1 Label mismatch") + assert.Equal(t, b1Record.USN, 1, "b1 USN mismatch") + assert.Equal(t, b1Record.Dirty, true, "b1 Dirty mismatch") + + assert.Equal(t, b2Record.Label, "foo_2", "b2 Label mismatch") + assert.Equal(t, b2Record.USN, 2, "b2 USN mismatch") + assert.Equal(t, b2Record.Dirty, true, "b2 Dirty mismatch") + + assert.Equal(t, b3Record.Label, "foo_3", "b3 Label mismatch") + assert.Equal(t, b3Record.USN, 3, "b3 USN mismatch") + assert.Equal(t, b3Record.Dirty, false, "b3 Dirty mismatch") + + assert.Equal(t, b4Record.Label, "foo", "b4 Label mismatch") + assert.Equal(t, b4Record.USN, 12, "b4 USN mismatch") + assert.Equal(t, b4Record.Dirty, false, "b4 Dirty mismatch") + }) + + t.Run("update, no duplicates", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 1, "b1-label", false, false) + + b1 := client.SyncFragBook{ + UUID: b1UUID, + USN: 12, + AddedOn: 1541108743, + Label: "b1-label-edited", + Deleted: false, + } + + if err := mergeBook(tx, b1, modeUpdate); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var b1Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1UUID, "b1 UUID mismatch") + assert.Equal(t, b1Record.Label, "b1-label-edited", "b1 Label mismatch") + assert.Equal(t, b1Record.USN, 12, "b1 USN mismatch") + }) + + t.Run("update, 1 duplicate", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b := client.SyncFragBook{ + UUID: "b1-uuid", + USN: 12, + AddedOn: 1541108743, + Label: "bar", + Deleted: false, + } + + if err := mergeBook(tx, b, modeUpdate); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 2, "book count mismatch") + + var b1Record, b2Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + + assert.Equal(t, b1Record.Label, "bar", "b1 Label mismatch") + assert.Equal(t, b1Record.USN, 12, "b1 USN mismatch") + assert.Equal(t, b1Record.Dirty, false, "b1 Dirty mismatch") + + assert.Equal(t, b2Record.Label, "bar_2", "b2 Label mismatch") + assert.Equal(t, b2Record.USN, 2, "b2 USN mismatch") + assert.Equal(t, b2Record.Dirty, true, "b2 Dirty mismatch") + }) + + t.Run("update, 3 duplicate", func(t *testing.T) { + // set uj + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b3-uuid", 3, "bar_2", true, false) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b4-uuid", 4, "bar_3", false, false) + + // test + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + b := client.SyncFragBook{ + UUID: "b1-uuid", + USN: 12, + AddedOn: 1541108743, + Label: "bar", + Deleted: false, + } + + if err := mergeBook(tx, b, modeUpdate); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // execute + var noteCount, bookCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 0, "note count mismatch") + assert.Equalf(t, bookCount, 4, "book count mismatch") + + var b1Record, b2Record, b3Record, b4Record database.Book + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b1-uuid"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b2-uuid"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + database.MustScan(t, "getting b3", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b3-uuid"), + &b3Record.UUID, &b3Record.Label, &b3Record.USN, &b3Record.Dirty) + database.MustScan(t, "getting b4", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "b4-uuid"), + &b4Record.UUID, &b4Record.Label, &b4Record.USN, &b4Record.Dirty) + + assert.Equal(t, b1Record.Label, "bar", "b1 Label mismatch") + assert.Equal(t, b1Record.USN, 12, "b1 USN mismatch") + assert.Equal(t, b1Record.Dirty, false, "b1 Dirty mismatch") + + assert.Equal(t, b2Record.Label, "bar_4", "b2 Label mismatch") + assert.Equal(t, b2Record.USN, 2, "b2 USN mismatch") + assert.Equal(t, b2Record.Dirty, true, "b2 Dirty mismatch") + + assert.Equal(t, b3Record.Label, "bar_2", "b3 Label mismatch") + assert.Equal(t, b3Record.USN, 3, "b3 USN mismatch") + assert.Equal(t, b3Record.Dirty, true, "b3 Dirty mismatch") + + assert.Equal(t, b4Record.Label, "bar_3", "b4 Label mismatch") + assert.Equal(t, b4Record.USN, 4, "b4 USN mismatch") + assert.Equal(t, b4Record.Dirty, false, "b4 Dirty mismatch") + }) +} + +func TestSaveServerState(t *testing.T) { + t.Run("with data received", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) + + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 8) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + serverTime := int64(1541108743) + serverMaxUSN := 100 + userMaxUSN := 100 + + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var lastSyncedAt int64 + var lastMaxUSN int + + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + + assert.Equal(t, lastSyncedAt, serverTime, "last synced at mismatch") + assert.Equal(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") + }) + + t.Run("with empty fragment but server has data - preserves last_max_usn", func(t *testing.T) { + // This tests the fix for the infinite sync bug where empty fragments + // would reset last_max_usn to 0, causing the client to re-download all data. + // When serverMaxUSN=0 (no data in fragment) but userMaxUSN>0 (server has data), + // we're caught up and should preserve the existing last_max_usn. + + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) + + existingLastMaxUSN := 100 + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, existingLastMaxUSN) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + serverTime := int64(1541108743) + serverMaxUSN := 0 // Empty fragment (no data in this sync) + userMaxUSN := 150 // Server's actual max USN (higher than ours) + + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var lastSyncedAt int64 + var lastMaxUSN int + + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + + assert.Equal(t, lastSyncedAt, serverTime, "last synced at should be updated") + // last_max_usn should NOT be updated to 0, it should preserve the existing value + assert.Equal(t, lastMaxUSN, existingLastMaxUSN, "last max usn should be preserved when fragment is empty but server has data") + }) + + t.Run("with empty server - resets last_max_usn to 0", func(t *testing.T) { + // When both serverMaxUSN=0 and userMaxUSN=0, the server is truly empty + // and we should reset last_max_usn to 0. + + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) + + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 50) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + serverTime := int64(1541108743) + serverMaxUSN := 0 // Empty fragment + userMaxUSN := 0 // Server is actually empty + + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var lastSyncedAt int64 + var lastMaxUSN int + + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + + assert.Equal(t, lastSyncedAt, serverTime, "last synced at should be updated") + assert.Equal(t, lastMaxUSN, 0, "last max usn should be reset to 0 when server is empty") + }) +} + +// TestSendBooks tests that books are put to correct 'buckets' by running a test server and recording the +// uuid from the incoming data. It also tests that the uuid of the created books and book_uuids of their notes +// are updated accordingly based on the server response. +func TestSendBooks(t *testing.T) { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 0) + + // should be ignored + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) + database.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b2-uuid", "b2-label", 2, false, false) + // should be created + database.MustExec(t, "inserting b3", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 0, false, true) + database.MustExec(t, "inserting b4", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b4-uuid", "b4-label", 0, false, true) + // should be only expunged locally without syncing to server + database.MustExec(t, "inserting b5", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b5-uuid", "b5-label", 0, true, true) + // should be deleted + database.MustExec(t, "inserting b6", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b6-uuid", "b6-label", 10, true, true) + // should be updated + database.MustExec(t, "inserting b7", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b7-uuid", "b7-label", 11, false, true) + database.MustExec(t, "inserting b8", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b8-uuid", "b8-label", 18, false, true) + + // some random notes + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 10, "n1 body", 1541108743, false, false) + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", "b5-uuid", 10, "n2 body", 1541108743, false, false) + database.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", "b6-uuid", 10, "n3 body", 1541108743, false, false) + database.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n4-uuid", "b7-uuid", 10, "n4 body", 1541108743, false, false) + // notes that belong to the created book. Their book_uuid should be updated. + database.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", "b3-uuid", 10, "n5 body", 1541108743, false, false) + database.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", "b3-uuid", 10, "n6 body", 1541108743, false, false) + database.MustExec(t, "inserting n7", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n7-uuid", "b4-uuid", 10, "n7 body", 1541108743, false, false) + + var createdLabels []string + var updatesUUIDs []string + var deletedUUIDs []string + + // fire up a test server + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/books" && r.Method == "POST" { + var payload client.CreateBookPayload + + err := json.NewDecoder(r.Body).Decode(&payload) + if err != nil { + t.Fatal(errors.Wrap(err, "decoding payload in the test server").Error()) + return + } + + createdLabels = append(createdLabels, payload.Name) + + resp := client.CreateBookResp{ + Book: client.RespBook{ + UUID: fmt.Sprintf("server-%s-uuid", payload.Name), + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + + p := strings.Split(r.URL.Path, "/") + if len(p) == 4 && p[0] == "" && p[1] == "v3" && p[2] == "books" { + if r.Method == "PATCH" { + uuid := p[3] + updatesUUIDs = append(updatesUUIDs, uuid) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte("{}")) + return + } else if r.Method == "DELETE" { + uuid := p[3] + deletedUUIDs = append(deletedUUIDs, uuid) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte("{}")) + return + } + } + + t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) + })) + defer ts.Close() + + ctx.APIEndpoint = ts.URL + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if _, err := sendBooks(ctx, tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + + // First, sort data so that they can be asserted + sort.SliceStable(createdLabels, func(i, j int) bool { + return strings.Compare(createdLabels[i], createdLabels[j]) < 0 + }) + + assert.DeepEqual(t, createdLabels, []string{"b3-label", "b4-label"}, "createdLabels mismatch") + assert.DeepEqual(t, updatesUUIDs, []string{"b7-uuid", "b8-uuid"}, "updatesUUIDs mismatch") + assert.DeepEqual(t, deletedUUIDs, []string{"b6-uuid"}, "deletedUUIDs mismatch") + + var b1, b2, b3, b4, b7, b8 database.Book + database.MustScan(t, "getting b1", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b1-label"), &b1.UUID, &b1.Dirty) + database.MustScan(t, "getting b2", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b2-label"), &b2.UUID, &b2.Dirty) + database.MustScan(t, "getting b3", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b3-label"), &b3.UUID, &b3.Dirty) + database.MustScan(t, "getting b4", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b4-label"), &b4.UUID, &b4.Dirty) + database.MustScan(t, "getting b7", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b7-label"), &b7.UUID, &b7.Dirty) + database.MustScan(t, "getting b8", db.QueryRow("SELECT uuid, dirty FROM books WHERE label = ?", "b8-label"), &b8.UUID, &b8.Dirty) + + var bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + assert.Equalf(t, bookCount, 6, "book count mismatch") + + assert.Equal(t, b1.Dirty, false, "b1 Dirty mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + assert.Equal(t, b3.Dirty, false, "b3 Dirty mismatch") + assert.Equal(t, b4.Dirty, false, "b4 Dirty mismatch") + assert.Equal(t, b7.Dirty, false, "b7 Dirty mismatch") + assert.Equal(t, b8.Dirty, false, "b8 Dirty mismatch") + assert.Equal(t, b1.UUID, "b1-uuid", "b1 UUID mismatch") + assert.Equal(t, b2.UUID, "b2-uuid", "b2 UUID mismatch") + // uuids of created books should have been updated + assert.Equal(t, b3.UUID, "server-b3-label-uuid", "b3 UUID mismatch") + assert.Equal(t, b4.UUID, "server-b4-label-uuid", "b4 UUID mismatch") + assert.Equal(t, b7.UUID, "b7-uuid", "b7 UUID mismatch") + assert.Equal(t, b8.UUID, "b8-uuid", "b8 UUID mismatch") + + var n1, n2, n3, n4, n5, n6, n7 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n1 body"), &n1.BookUUID) + database.MustScan(t, "getting n2", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n2 body"), &n2.BookUUID) + database.MustScan(t, "getting n3", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n3 body"), &n3.BookUUID) + database.MustScan(t, "getting n4", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n4 body"), &n4.BookUUID) + database.MustScan(t, "getting n5", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n5 body"), &n5.BookUUID) + database.MustScan(t, "getting n6", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n6 body"), &n6.BookUUID) + database.MustScan(t, "getting n7", db.QueryRow("SELECT book_uuid FROM notes WHERE body = ?", "n7 body"), &n7.BookUUID) + assert.Equal(t, n1.BookUUID, "b1-uuid", "n1 bookUUID mismatch") + assert.Equal(t, n2.BookUUID, "b5-uuid", "n2 bookUUID mismatch") + assert.Equal(t, n3.BookUUID, "b6-uuid", "n3 bookUUID mismatch") + assert.Equal(t, n4.BookUUID, "b7-uuid", "n4 bookUUID mismatch") + assert.Equal(t, n5.BookUUID, "server-b3-label-uuid", "n5 bookUUID mismatch") + assert.Equal(t, n6.BookUUID, "server-b3-label-uuid", "n6 bookUUID mismatch") + assert.Equal(t, n7.BookUUID, "server-b4-label-uuid", "n7 bookUUID mismatch") +} + +func TestSendBooks_isBehind(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/books" && r.Method == "POST" { + var payload client.CreateBookPayload + + err := json.NewDecoder(r.Body).Decode(&payload) + if err != nil { + t.Fatal(errors.Wrap(err, "decoding payload in the test server").Error()) + return + } + + resp := client.CreateBookResp{ + Book: client.RespBook{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + + p := strings.Split(r.URL.Path, "/") + if len(p) == 4 && p[0] == "" && p[1] == "v3" && p[2] == "books" { + if r.Method == "PATCH" { + resp := client.UpdateBookResp{ + Book: client.RespBook{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } else if r.Method == "DELETE" { + resp := client.DeleteBookResp{ + Book: client.RespBook{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + } + + t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) + })) + defer ts.Close() + + t.Run("create book", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + ctx.APIEndpoint = ts.URL + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 0, false, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendBooks(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) + + t.Run("delete book", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + ctx.APIEndpoint = ts.URL + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, true, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendBooks(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) + + t.Run("update book", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + ctx.APIEndpoint = ts.URL + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 11, false, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendBooks(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) +} + +// TestSendNotes tests that notes are put to correct 'buckets' by running a test server and recording the +// uuid from the incoming data. +func TestSendNotes(t *testing.T) { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 0) + + b1UUID := "b1-uuid" + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 1, false, false) + + // should be ignored + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1-body", 1541108743, false, false) + // should be created + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 0, "n2-body", 1541108743, false, true) + // should be updated + database.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", b1UUID, 11, "n3-body", 1541108743, false, true) + // should be only expunged locally without syncing to server + database.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n4-uuid", b1UUID, 0, "n4-body", 1541108743, true, true) + // should be deleted + database.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", b1UUID, 17, "n5-body", 1541108743, true, true) + // should be created + database.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", b1UUID, 0, "n6-body", 1541108743, false, true) + // should be ignored + database.MustExec(t, "inserting n7", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n7-uuid", b1UUID, 12, "n7-body", 1541108743, false, false) + // should be updated + database.MustExec(t, "inserting n8", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n8-uuid", b1UUID, 17, "n8-body", 1541108743, false, true) + // should be deleted + database.MustExec(t, "inserting n9", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n9-uuid", b1UUID, 17, "n9-body", 1541108743, true, true) + // should be created + database.MustExec(t, "inserting n10", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n10-uuid", b1UUID, 0, "n10-body", 1541108743, false, true) + + var createdBodys []string + var updatedUUIDs []string + var deletedUUIDs []string + + // fire up a test server + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/notes" && r.Method == "POST" { + var payload client.CreateNotePayload + + err := json.NewDecoder(r.Body).Decode(&payload) + if err != nil { + t.Fatal(errors.Wrap(err, "decoding payload in the test server").Error()) + return + } + + createdBodys = append(createdBodys, payload.Body) + + resp := client.CreateNoteResp{ + Result: client.RespNote{ + UUID: fmt.Sprintf("server-%s-uuid", payload.Body), + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + + p := strings.Split(r.URL.Path, "/") + if len(p) == 4 && p[0] == "" && p[1] == "v3" && p[2] == "notes" { + if r.Method == "PATCH" { + uuid := p[3] + updatedUUIDs = append(updatedUUIDs, uuid) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte("{}")) + return + } else if r.Method == "DELETE" { + uuid := p[3] + deletedUUIDs = append(deletedUUIDs, uuid) + + w.Header().Set("Content-Type", "application/json") + w.Write([]byte("{}")) + return + } + } + + t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) + })) + defer ts.Close() + + ctx.APIEndpoint = ts.URL + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if _, err := sendNotes(ctx, tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + sort.SliceStable(createdBodys, func(i, j int) bool { + return strings.Compare(createdBodys[i], createdBodys[j]) < 0 + }) + + assert.DeepEqual(t, createdBodys, []string{"n10-body", "n2-body", "n6-body"}, "createdBodys mismatch") + assert.DeepEqual(t, updatedUUIDs, []string{"n3-uuid", "n8-uuid"}, "updatedUUIDs mismatch") + assert.DeepEqual(t, deletedUUIDs, []string{"n5-uuid", "n9-uuid"}, "deletedUUIDs mismatch") + + var noteCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + assert.Equalf(t, noteCount, 7, "note count mismatch") + + var n1, n2, n3, n6, n7, n8, n10 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n1-body"), &n1.UUID, &n1.AddedOn, &n1.Dirty) + database.MustScan(t, "getting n2", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n2-body"), &n2.UUID, &n2.AddedOn, &n2.Dirty) + database.MustScan(t, "getting n3", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n3-body"), &n3.UUID, &n3.AddedOn, &n3.Dirty) + database.MustScan(t, "getting n6", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n6-body"), &n6.UUID, &n6.AddedOn, &n6.Dirty) + database.MustScan(t, "getting n7", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n7-body"), &n7.UUID, &n7.AddedOn, &n7.Dirty) + database.MustScan(t, "getting n8", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n8-body"), &n8.UUID, &n8.AddedOn, &n8.Dirty) + database.MustScan(t, "getting n10", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n10-body"), &n10.UUID, &n10.AddedOn, &n10.Dirty) + + assert.Equalf(t, noteCount, 7, "note count mismatch") + + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + assert.Equal(t, n2.Dirty, false, "n2 Dirty mismatch") + assert.Equal(t, n3.Dirty, false, "n3 Dirty mismatch") + assert.Equal(t, n6.Dirty, false, "n6 Dirty mismatch") + assert.Equal(t, n7.Dirty, false, "n7 Dirty mismatch") + assert.Equal(t, n8.Dirty, false, "n8 Dirty mismatch") + assert.Equal(t, n10.Dirty, false, "n10 Dirty mismatch") + + assert.Equal(t, n1.AddedOn, int64(1541108743), "n1 AddedOn mismatch") + assert.Equal(t, n2.AddedOn, int64(1541108743), "n2 AddedOn mismatch") + assert.Equal(t, n3.AddedOn, int64(1541108743), "n3 AddedOn mismatch") + assert.Equal(t, n6.AddedOn, int64(1541108743), "n6 AddedOn mismatch") + assert.Equal(t, n7.AddedOn, int64(1541108743), "n7 AddedOn mismatch") + assert.Equal(t, n8.AddedOn, int64(1541108743), "n8 AddedOn mismatch") + assert.Equal(t, n10.AddedOn, int64(1541108743), "n10 AddedOn mismatch") + + // UUIDs of created notes should have been updated with those from the server response + assert.Equal(t, n1.UUID, "n1-uuid", "n1 UUID mismatch") + assert.Equal(t, n2.UUID, "server-n2-body-uuid", "n2 UUID mismatch") + assert.Equal(t, n3.UUID, "n3-uuid", "n3 UUID mismatch") + assert.Equal(t, n6.UUID, "server-n6-body-uuid", "n6 UUID mismatch") + assert.Equal(t, n7.UUID, "n7-uuid", "n7 UUID mismatch") + assert.Equal(t, n8.UUID, "n8-uuid", "n8 UUID mismatch") + assert.Equal(t, n10.UUID, "server-n10-body-uuid", "n10 UUID mismatch") +} + +func TestSendNotes_addedOn(t *testing.T) { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + + db := ctx.DB + + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 0) + + // should be created + b1UUID := "b1-uuid" + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 0, "n1-body", 1541108743, false, true) + + // fire up a test server + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/notes" && r.Method == "POST" { + resp := client.CreateNoteResp{ + Result: client.RespNote{ + UUID: testutils.MustGenerateUUID(t), + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + + t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) + })) + defer ts.Close() + + ctx.APIEndpoint = ts.URL + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if _, err := sendNotes(ctx, tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var n1 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT uuid, added_on, dirty FROM notes WHERE body = ?", "n1-body"), &n1.UUID, &n1.AddedOn, &n1.Dirty) + assert.Equal(t, n1.AddedOn, int64(1541108743), "n1 AddedOn mismatch") +} + +func TestSendNotes_isBehind(t *testing.T) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/notes" && r.Method == "POST" { + var payload client.CreateBookPayload + + err := json.NewDecoder(r.Body).Decode(&payload) + if err != nil { + t.Fatal(errors.Wrap(err, "decoding payload in the test server").Error()) + return + } + + resp := client.CreateNoteResp{ + Result: client.RespNote{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + + p := strings.Split(r.URL.Path, "/") + if len(p) == 4 && p[0] == "" && p[1] == "v3" && p[2] == "notes" { + if r.Method == "PATCH" { + resp := client.UpdateNoteResp{ + Result: client.RespNote{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } else if r.Method == "DELETE" { + resp := client.DeleteNoteResp{ + Result: client.RespNote{ + USN: 11, + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(resp); err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + return + } + } + + t.Fatalf("unrecognized endpoint reached Method: %s Path: %s", r.Method, r.URL.Path) + })) + defer ts.Close() + + t.Run("create note", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + ctx.APIEndpoint = ts.URL + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 1, "n1 body", 1541108743, false, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendNotes(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) + + t.Run("delete note", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + ctx.APIEndpoint = ts.URL + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 2, "n1 body", 1541108743, true, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendNotes(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) + + t.Run("update note", func(t *testing.T) { + testCases := []struct { + systemLastMaxUSN int + expectedIsBehind bool + }{ + { + systemLastMaxUSN: 10, + expectedIsBehind: false, + }, + { + systemLastMaxUSN: 9, + expectedIsBehind: true, + }, + } + + for idx, tc := range testCases { + func() { + // set up + ctx := context.InitTestCtx(t) + testutils.Login(t, &ctx) + ctx.APIEndpoint = ts.URL + + db := ctx.DB + + database.MustExec(t, fmt.Sprintf("inserting last max usn for test case %d", idx), db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, tc.systemLastMaxUSN) + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 8, "n1 body", 1541108743, false, true) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + isBehind, err := sendNotes(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + assert.Equal(t, isBehind, tc.expectedIsBehind, fmt.Sprintf("isBehind mismatch for test case %d", idx)) + }() + } + }) +} + +func TestMergeNote(t *testing.T) { + b1UUID := "b1-uuid" + b2UUID := "b2-uuid" + conflictBookUUID := testutils.MustGenerateUUID(t) + + testCases := []struct { + addedOn int64 + clientUSN int + clientEditedOn int64 + clientBody string + clientDeleted bool + clientBookUUID string + clientDirty bool + serverUSN int + serverEditedOn int64 + serverBody string + serverDeleted bool + serverBookUUID string + expectedUSN int + expectedAddedOn int64 + expectedEditedOn int64 + expectedBody string + expectedDeleted bool + expectedBookUUID string + expectedDirty bool + }{ + // local copy is not dirty + { + clientDirty: false, + clientUSN: 1, + clientEditedOn: 0, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b1UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body edited", + expectedDeleted: false, + expectedBookUUID: b1UUID, + expectedDirty: false, + }, + // local copy is dirty and needs conflict resolution + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 1541219320, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b1UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: `<<<<<<< Local +n1 body +======= +n1 body edited +>>>>>>> Server +`, + expectedDeleted: false, + expectedBookUUID: b1UUID, + expectedDirty: true, + }, + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 1541219319, + clientBody: "n1 body", + clientDeleted: false, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: `<<<<<<< Local +Moved to the book b1-label +======= +Moved to the book b2-label +>>>>>>> Server + +<<<<<<< Local +n1 body +======= +n1 body edited +>>>>>>> Server +`, + expectedDeleted: false, + expectedBookUUID: conflictBookUUID, + expectedDirty: true, + }, + // deleted locally and edited on server + { + clientDirty: true, + clientUSN: 1, + clientEditedOn: 1541219321, + clientBody: "", + clientDeleted: true, + clientBookUUID: b1UUID, + addedOn: 1541232118, + serverUSN: 21, + serverEditedOn: 1541219321, + serverBody: "n1 body edited", + serverDeleted: false, + serverBookUUID: b2UUID, + expectedUSN: 21, + expectedAddedOn: 1541232118, + expectedEditedOn: 1541219321, + expectedBody: "n1 body edited", + expectedDeleted: false, + expectedBookUUID: b2UUID, + expectedDirty: false, + }, + } + + for idx, tc := range testCases { + func() { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 5, false) + database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b2UUID, "b2-label", 6, false) + database.MustExec(t, fmt.Sprintf("inserting conflitcs book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", conflictBookUUID, "conflicts") + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, b1UUID, tc.clientUSN, tc.addedOn, tc.clientEditedOn, tc.clientBody, tc.clientDeleted, tc.clientDirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + // update all fields but uuid and bump usn + fragNote := client.SyncFragNote{ + UUID: n1UUID, + BookUUID: tc.serverBookUUID, + USN: tc.serverUSN, + AddedOn: tc.addedOn, + EditedOn: tc.serverEditedOn, + Body: tc.serverBody, + Deleted: tc.serverDeleted, + } + var localNote database.Note + database.MustScan(t, fmt.Sprintf("getting localNote for test case %d", idx), + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n1UUID), + &localNote.UUID, &localNote.BookUUID, &localNote.USN, &localNote.AddedOn, &localNote.EditedOn, &localNote.Body, &localNote.Deleted, &localNote.Dirty) + + if err := mergeNote(tx, fragNote, localNote); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var noteCount, bookCount int + database.MustScan(t, fmt.Sprintf("counting notes for test case %d", idx), db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, fmt.Sprintf("counting books for test case %d", idx), db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, noteCount, 1, fmt.Sprintf("note count mismatch for test case %d", idx)) + assert.Equalf(t, bookCount, 3, fmt.Sprintf("book count mismatch for test case %d", idx)) + + var n1Record database.Note + database.MustScan(t, fmt.Sprintf("getting n1Record for test case %d", idx), + db.QueryRow("SELECT uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty FROM notes WHERE uuid = ?", n1UUID), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.USN, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.Body, &n1Record.Deleted, &n1Record.Dirty) + var b1Record database.Book + database.MustScan(t, "getting b1Record for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b1UUID), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Dirty) + var b2Record database.Book + database.MustScan(t, "getting b2Record for test case", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", b2UUID), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1UUID, fmt.Sprintf("b1Record UUID mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Label, "b1-label", fmt.Sprintf("b1Record Label mismatch for test case %d", idx)) + assert.Equal(t, b1Record.USN, 5, fmt.Sprintf("b1Record USN mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Dirty, false, fmt.Sprintf("b1Record Dirty mismatch for test case %d", idx)) + + assert.Equal(t, b2Record.UUID, b2UUID, fmt.Sprintf("b2Record UUID mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Label, "b2-label", fmt.Sprintf("b2Record Label mismatch for test case %d", idx)) + assert.Equal(t, b2Record.USN, 6, fmt.Sprintf("b2Record USN mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Dirty, false, fmt.Sprintf("b2Record Dirty mismatch for test case %d", idx)) + + assert.Equal(t, n1Record.UUID, n1UUID, fmt.Sprintf("n1Record UUID mismatch for test case %d", idx)) + assert.Equal(t, n1Record.BookUUID, tc.expectedBookUUID, fmt.Sprintf("n1Record BookUUID mismatch for test case %d", idx)) + assert.Equal(t, n1Record.USN, tc.expectedUSN, fmt.Sprintf("n1Record USN mismatch for test case %d", idx)) + assert.Equal(t, n1Record.AddedOn, tc.expectedAddedOn, fmt.Sprintf("n1Record AddedOn mismatch for test case %d", idx)) + assert.Equal(t, n1Record.EditedOn, tc.expectedEditedOn, fmt.Sprintf("n1Record EditedOn mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Body, tc.expectedBody, fmt.Sprintf("n1Record Body mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Deleted, tc.expectedDeleted, fmt.Sprintf("n1Record Deleted mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Dirty, tc.expectedDirty, fmt.Sprintf("n1Record Dirty mismatch for test case %d", idx)) + }() + } +} + +func TestCheckBookPristine(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false) + database.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b2-uuid", "b2-label", 6, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", 1541108743, "n1 body", false) + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n2-uuid", "b1-uuid", 1541108743, "n2 body", false) + database.MustExec(t, "inserting n3", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n3-uuid", "b1-uuid", 1541108743, "n3 body", true) + database.MustExec(t, "inserting n4", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n4-uuid", "b2-uuid", 1541108743, "n4 body", false) + database.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, added_on, body, dirty) VALUES (?, ?, ?, ?, ?)", "n5-uuid", "b2-uuid", 1541108743, "n5 body", false) + + t.Run("b1", func(t *testing.T) { + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + got, err := checkNotesPristine(tx, "b1-uuid") + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + assert.Equal(t, got, false, "b1 should not be pristine") + }) + + t.Run("b2", func(t *testing.T) { + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + got, err := checkNotesPristine(tx, "b2-uuid") + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + assert.Equal(t, got, true, "b2 should be pristine") + }) +} + +func TestCheckNoteInList(t *testing.T) { + list := syncList{ + Notes: map[string]client.SyncFragNote{ + "n1-uuid": { + UUID: "n1-uuid", + }, + "n2-uuid": { + UUID: "n2-uuid", + }, + }, + Books: map[string]client.SyncFragBook{ + "b1-uuid": { + UUID: "b1-uuid", + }, + "b2-uuid": { + UUID: "b2-uuid", + }, + }, + ExpungedNotes: map[string]bool{ + "n3-uuid": true, + "n4-uuid": true, + }, + ExpungedBooks: map[string]bool{ + "b3-uuid": true, + "b4-uuid": true, + }, + MaxUSN: 1, + MaxCurrentTime: 2, + } + + testCases := []struct { + uuid string + expected bool + }{ + { + uuid: "n1-uuid", + expected: true, + }, + { + uuid: "n2-uuid", + expected: true, + }, + { + uuid: "n3-uuid", + expected: true, + }, + { + uuid: "n4-uuid", + expected: true, + }, + { + uuid: "nonexistent-note-uuid", + expected: false, + }, + } + + for idx, tc := range testCases { + got := checkNoteInList(tc.uuid, &list) + assert.Equal(t, got, tc.expected, fmt.Sprintf("result mismatch for test case %d", idx)) + } +} + +func TestCheckBookInList(t *testing.T) { + list := syncList{ + Notes: map[string]client.SyncFragNote{ + "n1-uuid": { + UUID: "n1-uuid", + }, + "n2-uuid": { + UUID: "n2-uuid", + }, + }, + Books: map[string]client.SyncFragBook{ + "b1-uuid": { + UUID: "b1-uuid", + }, + "b2-uuid": { + UUID: "b2-uuid", + }, + }, + ExpungedNotes: map[string]bool{ + "n3-uuid": true, + "n4-uuid": true, + }, + ExpungedBooks: map[string]bool{ + "b3-uuid": true, + "b4-uuid": true, + }, + MaxUSN: 1, + MaxCurrentTime: 2, + } + + testCases := []struct { + uuid string + expected bool + }{ + { + uuid: "b1-uuid", + expected: true, + }, + { + uuid: "b2-uuid", + expected: true, + }, + { + uuid: "b3-uuid", + expected: true, + }, + { + uuid: "b4-uuid", + expected: true, + }, + { + uuid: "nonexistent-book-uuid", + expected: false, + }, + } + + for idx, tc := range testCases { + got := checkBookInList(tc.uuid, &list) + assert.Equal(t, got, tc.expected, fmt.Sprintf("result mismatch for test case %d", idx)) + } +} + +func TestCleanLocalNotes(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + list := syncList{ + Notes: map[string]client.SyncFragNote{ + "n1-uuid": { + UUID: "n1-uuid", + }, + "n2-uuid": { + UUID: "n2-uuid", + }, + }, + Books: map[string]client.SyncFragBook{ + "b1-uuid": { + UUID: "b1-uuid", + }, + "b2-uuid": { + UUID: "b2-uuid", + }, + }, + ExpungedNotes: map[string]bool{ + "n3-uuid": true, + "n4-uuid": true, + }, + ExpungedBooks: map[string]bool{ + "b3-uuid": true, + "b4-uuid": true, + }, + MaxUSN: 1, + MaxCurrentTime: 2, + } + + b1UUID := "b1-uuid" + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 1, false, false) + + // exists in the list + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", b1UUID, 0, "n2 body", 1541108743, false, true) + // non-existent in the list but in valid state + // (created in the cli and hasn't been uploaded) + database.MustExec(t, "inserting n6", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n6-uuid", b1UUID, 0, "n6 body", 1541108743, false, true) + // non-existent in the list and in an invalid state + database.MustExec(t, "inserting n5", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n5-uuid", b1UUID, 7, "n5 body", 1541108743, true, true) + database.MustExec(t, "inserting n9", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n9-uuid", b1UUID, 17, "n9 body", 1541108743, true, false) + database.MustExec(t, "inserting n10", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n10-uuid", b1UUID, 0, "n10 body", 1541108743, false, false) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := cleanLocalNotes(tx, &list); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount int + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + assert.Equal(t, noteCount, 3, "note count mismatch") + + var n1, n2, n6 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n1-uuid"), &n1.Dirty) + database.MustScan(t, "getting n2", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n2-uuid"), &n2.Dirty) + database.MustScan(t, "getting n6", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", "n6-uuid"), &n6.Dirty) +} + +func TestCleanLocalBooks(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + list := syncList{ + Notes: map[string]client.SyncFragNote{ + "n1-uuid": { + UUID: "n1-uuid", + }, + "n2-uuid": { + UUID: "n2-uuid", + }, + }, + Books: map[string]client.SyncFragBook{ + "b1-uuid": { + UUID: "b1-uuid", + }, + "b2-uuid": { + UUID: "b2-uuid", + }, + }, + ExpungedNotes: map[string]bool{ + "n3-uuid": true, + "n4-uuid": true, + }, + ExpungedBooks: map[string]bool{ + "b3-uuid": true, + "b4-uuid": true, + }, + MaxUSN: 1, + MaxCurrentTime: 2, + } + + // existent in the server + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 1, false, false) + database.MustExec(t, "inserting b3", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 0, false, true) + // non-existent in the server but in valid state + database.MustExec(t, "inserting b5", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b5-uuid", "b5-label", 0, true, true) + // non-existent in the server and in an invalid state + database.MustExec(t, "inserting b6", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b6-uuid", "b6-label", 10, true, true) + database.MustExec(t, "inserting b7", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b7-uuid", "b7-label", 11, false, false) + database.MustExec(t, "inserting b8", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b8-uuid", "b8-label", 0, false, false) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := cleanLocalBooks(tx, &list); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + assert.Equal(t, bookCount, 3, "note count mismatch") + + var b1, b3, b5 database.Book + database.MustScan(t, "getting b1", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b1-uuid"), &b1.Label) + database.MustScan(t, "getting b3", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b3-uuid"), &b3.Label) + database.MustScan(t, "getting b5", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b5-uuid"), &b5.Label) +} + +func TestPrepareEmptyServerSync(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + + // Setup: local has synced data (usn > 0, dirty = false) and some deleted items + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false, false) + database.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b2-uuid", "b2-label", 8, false, false) + database.MustExec(t, "inserting b3 deleted", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 6, true, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", "note 1", 6, false, false, 1541108743) + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", "b2-uuid", "note 2", 9, false, false, 1541108743) + database.MustExec(t, "inserting n3 deleted", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", "b1-uuid", "note 3", 7, true, false, 1541108743) + database.MustExec(t, "setting last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 9) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning transaction")) + } + + if err := prepareEmptyServerSync(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing prepareEmptyServerSync")) + } + + tx.Commit() + + // test - verify non-deleted items are marked dirty with usn=0, deleted items unchanged + var b1, b2, b3 database.Book + database.MustScan(t, "getting b1", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b1-uuid"), &b1.USN, &b1.Dirty, &b1.Deleted) + database.MustScan(t, "getting b2", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b2-uuid"), &b2.USN, &b2.Dirty, &b2.Deleted) + database.MustScan(t, "getting b3", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b3-uuid"), &b3.USN, &b3.Dirty, &b3.Deleted) + + assert.Equal(t, b1.USN, 0, "b1 USN should be reset to 0") + assert.Equal(t, b1.Dirty, true, "b1 should be marked dirty") + assert.Equal(t, b1.Deleted, false, "b1 should not be deleted") + + assert.Equal(t, b2.USN, 0, "b2 USN should be reset to 0") + assert.Equal(t, b2.Dirty, true, "b2 should be marked dirty") + assert.Equal(t, b2.Deleted, false, "b2 should not be deleted") + + assert.Equal(t, b3.USN, 6, "b3 USN should remain unchanged (deleted item)") + assert.Equal(t, b3.Dirty, false, "b3 should not be marked dirty (deleted item)") + assert.Equal(t, b3.Deleted, true, "b3 should remain deleted") + + var n1, n2, n3 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n1-uuid"), &n1.USN, &n1.Dirty, &n1.Deleted) + database.MustScan(t, "getting n2", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n2-uuid"), &n2.USN, &n2.Dirty, &n2.Deleted) + database.MustScan(t, "getting n3", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n3-uuid"), &n3.USN, &n3.Dirty, &n3.Deleted) + + assert.Equal(t, n1.USN, 0, "n1 USN should be reset to 0") + assert.Equal(t, n1.Dirty, true, "n1 should be marked dirty") + assert.Equal(t, n1.Deleted, false, "n1 should not be deleted") + + assert.Equal(t, n2.USN, 0, "n2 USN should be reset to 0") + assert.Equal(t, n2.Dirty, true, "n2 should be marked dirty") + assert.Equal(t, n2.Deleted, false, "n2 should not be deleted") + + assert.Equal(t, n3.USN, 7, "n3 USN should remain unchanged (deleted item)") + assert.Equal(t, n3.Dirty, false, "n3 should not be marked dirty (deleted item)") + assert.Equal(t, n3.Deleted, true, "n3 should remain deleted") + + var lastMaxUSN int + database.MustScan(t, "getting last_max_usn", db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + assert.Equal(t, lastMaxUSN, 0, "last_max_usn should be reset to 0") +} diff --git a/pkg/cli/cmd/version/version.go b/pkg/cli/cmd/version/version.go new file mode 100644 index 00000000..79892204 --- /dev/null +++ b/pkg/cli/cmd/version/version.go @@ -0,0 +1,37 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package version + +import ( + "fmt" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/spf13/cobra" +) + +// NewCmd returns a new version command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "version", + Short: "Print the version number of Dnote", + Long: "Print the version number of Dnote", + Run: func(cmd *cobra.Command, args []string) { + fmt.Printf("dnote %s\n", ctx.Version) + }, + } + + return cmd +} diff --git a/pkg/cli/cmd/view/book.go b/pkg/cli/cmd/view/book.go new file mode 100644 index 00000000..698a7de5 --- /dev/null +++ b/pkg/cli/cmd/view/book.go @@ -0,0 +1,149 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "database/sql" + "fmt" + "io" + "strings" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/pkg/errors" +) + +// bookInfo is an information about the book to be printed on screen +type bookInfo struct { + BookLabel string + NoteCount int +} + +// noteInfo is an information about the note to be printed on screen +type noteInfo struct { + RowID int + Body string +} + +// getNewlineIdx returns the index of newline character in a string +func getNewlineIdx(str string) int { + // Check for \r\n first + if idx := strings.Index(str, "\r\n"); idx != -1 { + return idx + } + + // Then check for \n + return strings.Index(str, "\n") +} + +// formatBody returns an excerpt of the given raw note content and a boolean +// indicating if the returned string has been excertped +func formatBody(noteBody string) (string, bool) { + trimmed := strings.TrimRight(noteBody, "\r\n") + newlineIdx := getNewlineIdx(trimmed) + + if newlineIdx > -1 { + ret := strings.Trim(trimmed[0:newlineIdx], " ") + + return ret, true + } + + return strings.Trim(trimmed, " "), false +} + +func printBookLine(w io.Writer, info bookInfo, nameOnly bool) { + if nameOnly { + fmt.Fprintln(w, info.BookLabel) + } else { + fmt.Fprintf(w, "%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) + } +} + +func listBooks(ctx context.DnoteCtx, w io.Writer, nameOnly bool) error { + db := ctx.DB + + rows, err := db.Query(`SELECT books.label, count(notes.uuid) note_count + FROM books + LEFT JOIN notes ON notes.book_uuid = books.uuid AND notes.deleted = false + WHERE books.deleted = false + GROUP BY books.uuid + ORDER BY books.label ASC;`) + if err != nil { + return errors.Wrap(err, "querying books") + } + defer rows.Close() + + infos := []bookInfo{} + for rows.Next() { + var info bookInfo + err = rows.Scan(&info.BookLabel, &info.NoteCount) + if err != nil { + return errors.Wrap(err, "scanning a row") + } + + infos = append(infos, info) + } + + for _, info := range infos { + printBookLine(w, info, nameOnly) + } + + return nil +} + +func listNotes(ctx context.DnoteCtx, w io.Writer, bookName string) error { + db := ctx.DB + + var bookUUID string + err := db.QueryRow("SELECT uuid FROM books WHERE label = ?", bookName).Scan(&bookUUID) + if err == sql.ErrNoRows { + return errors.New("book not found") + } else if err != nil { + return errors.Wrap(err, "querying the book") + } + + rows, err := db.Query(`SELECT rowid, body FROM notes WHERE book_uuid = ? AND deleted = ? ORDER BY added_on ASC;`, bookUUID, false) + if err != nil { + return errors.Wrap(err, "querying notes") + } + defer rows.Close() + + infos := []noteInfo{} + for rows.Next() { + var info noteInfo + err = rows.Scan(&info.RowID, &info.Body) + if err != nil { + return errors.Wrap(err, "scanning a row") + } + + infos = append(infos, info) + } + + fmt.Fprintf(w, "on book %s\n", bookName) + + for _, info := range infos { + body, isExcerpt := formatBody(info.Body) + + rowid := log.ColorYellow.Sprintf("(%d)", info.RowID) + if isExcerpt { + body = fmt.Sprintf("%s %s", body, log.ColorYellow.Sprintf("[---More---]")) + } + + fmt.Fprintf(w, "%s %s\n", rowid, body) + } + + return nil +} diff --git a/pkg/cli/cmd/view/book_test.go b/pkg/cli/cmd/view/book_test.go new file mode 100644 index 00000000..226d5d04 --- /dev/null +++ b/pkg/cli/cmd/view/book_test.go @@ -0,0 +1,184 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "bytes" + "fmt" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" +) + +func TestGetNewlineIdx(t *testing.T) { + testCases := []struct { + input string + expected int + }{ + { + input: "hello\nworld", + expected: 5, + }, + { + input: "hello\r\nworld", + expected: 5, + }, + { + input: "no newline here", + expected: -1, + }, + { + input: "", + expected: -1, + }, + { + input: "\n", + expected: 0, + }, + { + input: "\r\n", + expected: 0, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("input: %q", tc.input), func(t *testing.T) { + got := getNewlineIdx(tc.input) + assert.Equal(t, got, tc.expected, "newline index mismatch") + }) + } +} + +func TestFormatBody(t *testing.T) { + testCases := []struct { + input string + expectedBody string + expectedExcerpt bool + }{ + { + input: "single line", + expectedBody: "single line", + expectedExcerpt: false, + }, + { + input: "first line\nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: "first line\r\nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: " spaced line ", + expectedBody: "spaced line", + expectedExcerpt: false, + }, + { + input: " first line \nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: "", + expectedBody: "", + expectedExcerpt: false, + }, + { + input: "line with trailing newline\n", + expectedBody: "line with trailing newline", + expectedExcerpt: false, + }, + { + input: "line with trailing newlines\n\n", + expectedBody: "line with trailing newlines", + expectedExcerpt: false, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("input: %q", tc.input), func(t *testing.T) { + gotBody, gotExcerpt := formatBody(tc.input) + assert.Equal(t, gotBody, tc.expectedBody, "formatted body mismatch") + assert.Equal(t, gotExcerpt, tc.expectedExcerpt, "excerpt flag mismatch") + }) + } +} + +func TestListNotes(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "js-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "javascript") + database.MustExec(t, "inserting note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-1", bookUUID, "first note", 1515199943) + database.MustExec(t, "inserting note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-2", bookUUID, "multiline note\nwith second line", 1515199945) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + // Execute + err := listNotes(ctx, &buf, "javascript") + if err != nil { + t.Fatal(err) + } + + got := buf.String() + + // Verify output + assert.Equal(t, strings.Contains(got, "on book javascript"), true, "should show book name") + assert.Equal(t, strings.Contains(got, "first note"), true, "should contain first note") + assert.Equal(t, strings.Contains(got, "multiline note"), true, "should show first line of multiline note") + assert.Equal(t, strings.Contains(got, "[---More---]"), true, "should show more indicator for multiline note") + assert.Equal(t, strings.Contains(got, "with second line"), false, "should not show second line of multiline note") +} + +func TestListBooks(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + defer db.Close() + + b1UUID := "js-book-uuid" + b2UUID := "linux-book-uuid" + + database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "javascript") + database.MustExec(t, "inserting book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "linux") + + // Add notes to test count + database.MustExec(t, "inserting note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-1", b1UUID, "note body 1", 1515199943) + database.MustExec(t, "inserting note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-2", b1UUID, "note body 2", 1515199944) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + // Execute + err := listBooks(ctx, &buf, false) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + + // Verify output + assert.Equal(t, strings.Contains(got, "javascript"), true, "should contain javascript book") + assert.Equal(t, strings.Contains(got, "linux"), true, "should contain linux book") + assert.Equal(t, strings.Contains(got, "(2)"), true, "should show 2 notes for javascript") +} diff --git a/pkg/cli/cmd/view/note.go b/pkg/cli/cmd/view/note.go new file mode 100644 index 00000000..f853dd9a --- /dev/null +++ b/pkg/cli/cmd/view/note.go @@ -0,0 +1,47 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "io" + "strconv" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/pkg/errors" +) + +func viewNote(ctx context.DnoteCtx, w io.Writer, noteRowIDArg string, contentOnly bool) error { + noteRowID, err := strconv.Atoi(noteRowIDArg) + if err != nil { + return errors.Wrap(err, "invalid rowid") + } + + db := ctx.DB + info, err := database.GetNoteInfo(db, noteRowID) + if err != nil { + return err + } + + if contentOnly { + output.NoteContent(w, info) + } else { + output.NoteInfo(w, info) + } + + return nil +} diff --git a/pkg/cli/cmd/view/note_test.go b/pkg/cli/cmd/view/note_test.go new file mode 100644 index 00000000..36e9aa84 --- /dev/null +++ b/pkg/cli/cmd/view/note_test.go @@ -0,0 +1,90 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "bytes" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" +) + +func TestViewNote(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "test-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "golang") + database.MustExec(t, "inserting note", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", + "note-uuid", bookUUID, "test note content", 1515199943000000000) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "1", false) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + assert.Equal(t, strings.Contains(got, "test note content"), true, "should contain note content") +} + +func TestViewNoteContentOnly(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "test-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "golang") + database.MustExec(t, "inserting note", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", + "note-uuid", bookUUID, "test note content", 1515199943000000000) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "1", true) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + assert.Equal(t, got, "test note content", "should contain only note content") +} + +func TestViewNoteInvalidRowID(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "not-a-number", false) + assert.NotEqual(t, err, nil, "should return error for invalid rowid") +} + +func TestViewNoteNotFound(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "999", false) + assert.NotEqual(t, err, nil, "should return error for non-existent note") +} diff --git a/pkg/cli/cmd/view/view.go b/pkg/cli/cmd/view/view.go new file mode 100644 index 00000000..57b17dbd --- /dev/null +++ b/pkg/cli/cmd/view/view.go @@ -0,0 +1,92 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "os" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +var example = ` + * View all books + dnote view + + * List notes in a book + dnote view javascript + + * View a particular note in a book + dnote view javascript 0 + ` + +var nameOnly bool +var contentOnly bool + +func preRun(cmd *cobra.Command, args []string) error { + if len(args) > 2 { + return errors.New("Incorrect number of argument") + } + + return nil +} + +// NewCmd returns a new view command +func NewCmd(ctx context.DnoteCtx) *cobra.Command { + cmd := &cobra.Command{ + Use: "view ", + Aliases: []string{"v"}, + Short: "List books, notes or view a content", + Example: example, + RunE: newRun(ctx), + PreRunE: preRun, + } + + f := cmd.Flags() + f.BoolVarP(&nameOnly, "name-only", "", false, "print book names only") + f.BoolVarP(&contentOnly, "content-only", "", false, "print the note content only") + + return cmd +} + +func newRun(ctx context.DnoteCtx) infra.RunEFunc { + return func(cmd *cobra.Command, args []string) error { + if len(args) == 0 { + // List all books + return listBooks(ctx, os.Stdout, nameOnly) + } else if len(args) == 1 { + if nameOnly { + return errors.New("--name-only flag is only valid when viewing books") + } + + if utils.IsNumber(args[0]) { + // View a note by index + return viewNote(ctx, os.Stdout, args[0], contentOnly) + } else { + // List notes in a book + return listNotes(ctx, os.Stdout, args[0]) + } + } else if len(args) == 2 { + // View a note in a book (book name + note index) + return viewNote(ctx, os.Stdout, args[1], contentOnly) + } + + return errors.New("Incorrect number of arguments") + } +} diff --git a/pkg/cli/config/config.go b/pkg/cli/config/config.go new file mode 100644 index 00000000..065100c0 --- /dev/null +++ b/pkg/cli/config/config.go @@ -0,0 +1,94 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package config + +import ( + "fmt" + "os" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" + "gopkg.in/yaml.v2" +) + +// Config holds dnote configuration +type Config struct { + Editor string `yaml:"editor"` + APIEndpoint string `yaml:"apiEndpoint"` + EnableUpgradeCheck bool `yaml:"enableUpgradeCheck"` +} + +func checkLegacyPath(ctx context.DnoteCtx) (string, bool) { + legacyPath := fmt.Sprintf("%s/%s", ctx.Paths.LegacyDnote, consts.ConfigFilename) + + ok, err := utils.FileExists(legacyPath) + if err != nil { + log.Error(errors.Wrapf(err, "checking legacy dnote directory at %s", legacyPath).Error()) + } + if ok { + return legacyPath, true + } + + return "", false +} + +// GetPath returns the path to the dnote config file +func GetPath(ctx context.DnoteCtx) string { + legacyPath, ok := checkLegacyPath(ctx) + if ok { + return legacyPath + } + + return fmt.Sprintf("%s/%s/%s", ctx.Paths.Config, consts.DnoteDirName, consts.ConfigFilename) +} + +// Read reads the config file +func Read(ctx context.DnoteCtx) (Config, error) { + var ret Config + + configPath := GetPath(ctx) + b, err := os.ReadFile(configPath) + if err != nil { + return ret, errors.Wrap(err, "reading config file") + } + + err = yaml.Unmarshal(b, &ret) + if err != nil { + return ret, errors.Wrap(err, "unmarshalling config") + } + + return ret, nil +} + +// Write writes the config to the config file +func Write(ctx context.DnoteCtx, cf Config) error { + path := GetPath(ctx) + + b, err := yaml.Marshal(cf) + if err != nil { + return errors.Wrap(err, "marshalling config into YAML") + } + + err = os.WriteFile(path, b, 0644) + if err != nil { + return errors.Wrap(err, "writing the config file") + } + + return nil +} diff --git a/pkg/cli/consts/consts.go b/pkg/cli/consts/consts.go new file mode 100644 index 00000000..0f49c152 --- /dev/null +++ b/pkg/cli/consts/consts.go @@ -0,0 +1,47 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package consts provides definitions of constants +package consts + +var ( + // LegacyDnoteDirName is the name of the legacy directory containing dnote files + LegacyDnoteDirName = ".dnote" + // DnoteDirName is the name of the directory containing dnote files + DnoteDirName = "dnote" + // DnoteDBFileName is a filename for the Dnote SQLite database + DnoteDBFileName = "dnote.db" + // TmpContentFileBase is the base for the filename for a temporary content + TmpContentFileBase = "DNOTE_TMPCONTENT" + // TmpContentFileExt is the extension for the temporary content file + TmpContentFileExt = "md" + // ConfigFilename is the name of the config file + ConfigFilename = "dnoterc" + + // SystemSchema is the key for schema in the system table + SystemSchema = "schema" + // SystemRemoteSchema is the key for remote schema in the system table + SystemRemoteSchema = "remote_schema" + // SystemLastSyncAt is the timestamp of the server at the last sync + SystemLastSyncAt = "last_sync_time" + // SystemLastMaxUSN is the user's max_usn from the server at the alst sync + SystemLastMaxUSN = "last_max_usn" + // SystemLastUpgrade is the timestamp at which the system more recently checked for an upgrade + SystemLastUpgrade = "last_upgrade" + // SystemSessionKey is the session key + SystemSessionKey = "session_token" + // SystemSessionKeyExpiry is the timestamp at which the session key will expire + SystemSessionKeyExpiry = "session_token_expiry" +) diff --git a/pkg/cli/context/ctx.go b/pkg/cli/context/ctx.go new file mode 100644 index 00000000..971d9145 --- /dev/null +++ b/pkg/cli/context/ctx.go @@ -0,0 +1,61 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package context defines dnote context +package context + +import ( + "net/http" + + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/clock" +) + +// Paths contain directory definitions +type Paths struct { + Home string + Config string + Data string + Cache string + LegacyDnote string +} + +// DnoteCtx is a context holding the information of the current runtime +type DnoteCtx struct { + Paths Paths + APIEndpoint string + Version string + DB *database.DB + SessionKey string + SessionKeyExpiry int64 + Editor string + Clock clock.Clock + EnableUpgradeCheck bool + HTTPClient *http.Client +} + +// Redact replaces private information from the context with a set of +// placeholder values. +func Redact(ctx DnoteCtx) DnoteCtx { + var sessionKey string + if ctx.SessionKey != "" { + sessionKey = "1" + } else { + sessionKey = "0" + } + ctx.SessionKey = sessionKey + + return ctx +} diff --git a/pkg/cli/context/files.go b/pkg/cli/context/files.go new file mode 100644 index 00000000..1abbcd47 --- /dev/null +++ b/pkg/cli/context/files.go @@ -0,0 +1,48 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package context + +import ( + "path/filepath" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +// InitDnoteDirs creates the dnote directories if they don't already exist. +func InitDnoteDirs(paths Paths) error { + if paths.Config != "" { + configDir := filepath.Join(paths.Config, consts.DnoteDirName) + if err := utils.EnsureDir(configDir); err != nil { + return errors.Wrap(err, "initializing config dir") + } + } + if paths.Data != "" { + dataDir := filepath.Join(paths.Data, consts.DnoteDirName) + if err := utils.EnsureDir(dataDir); err != nil { + return errors.Wrap(err, "initializing data dir") + } + } + if paths.Cache != "" { + cacheDir := filepath.Join(paths.Cache, consts.DnoteDirName) + if err := utils.EnsureDir(cacheDir); err != nil { + return errors.Wrap(err, "initializing cache dir") + } + } + + return nil +} diff --git a/pkg/cli/context/files_test.go b/pkg/cli/context/files_test.go new file mode 100644 index 00000000..49d62dc9 --- /dev/null +++ b/pkg/cli/context/files_test.go @@ -0,0 +1,62 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package context + +import ( + "os" + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" +) + +func assertDirsExist(t *testing.T, paths Paths) { + configDir := filepath.Join(paths.Config, consts.DnoteDirName) + info, err := os.Stat(configDir) + assert.Equal(t, err, nil, "config dir should exist") + assert.Equal(t, info.IsDir(), true, "config should be a directory") + + dataDir := filepath.Join(paths.Data, consts.DnoteDirName) + info, err = os.Stat(dataDir) + assert.Equal(t, err, nil, "data dir should exist") + assert.Equal(t, info.IsDir(), true, "data should be a directory") + + cacheDir := filepath.Join(paths.Cache, consts.DnoteDirName) + info, err = os.Stat(cacheDir) + assert.Equal(t, err, nil, "cache dir should exist") + assert.Equal(t, info.IsDir(), true, "cache should be a directory") +} + +func TestInitDnoteDirs(t *testing.T) { + tmpDir := t.TempDir() + + paths := Paths{ + Config: filepath.Join(tmpDir, "config"), + Data: filepath.Join(tmpDir, "data"), + Cache: filepath.Join(tmpDir, "cache"), + } + + // Initialize directories + err := InitDnoteDirs(paths) + assert.Equal(t, err, nil, "InitDnoteDirs should succeed") + assertDirsExist(t, paths) + + // Call again - should be idempotent + err = InitDnoteDirs(paths) + assert.Equal(t, err, nil, "InitDnoteDirs should succeed when dirs already exist") + assertDirsExist(t, paths) +} diff --git a/pkg/cli/context/testutils.go b/pkg/cli/context/testutils.go new file mode 100644 index 00000000..cb477475 --- /dev/null +++ b/pkg/cli/context/testutils.go @@ -0,0 +1,100 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package context + +import ( + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/clock" + "github.com/pkg/errors" +) + +// getDefaultTestPaths creates default test paths with all paths pointing to a temp directory +func getDefaultTestPaths(t *testing.T) Paths { + tmpDir := t.TempDir() + return Paths{ + Home: tmpDir, + Cache: tmpDir, + Config: tmpDir, + Data: tmpDir, + } +} + + +// InitTestCtx initializes a test context with an in-memory database +// and a temporary directory for all paths +func InitTestCtx(t *testing.T) DnoteCtx { + paths := getDefaultTestPaths(t) + db := database.InitTestMemoryDB(t) + + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) + } + + return DnoteCtx{ + DB: db, + Paths: paths, + Clock: clock.NewMock(), // Use a mock clock to test times + } +} + +// InitTestCtxWithDB initializes a test context with the provided database +// and a temporary directory for all paths. +// Used when you need full control over database initialization (e.g. migration tests). +func InitTestCtxWithDB(t *testing.T, db *database.DB) DnoteCtx { + paths := getDefaultTestPaths(t) + + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) + } + + return DnoteCtx{ + DB: db, + Paths: paths, + Clock: clock.NewMock(), // Use a mock clock to test times + } +} + +// InitTestCtxWithFileDB initializes a test context with a file-based database +// at the expected path. +func InitTestCtxWithFileDB(t *testing.T) DnoteCtx { + paths := getDefaultTestPaths(t) + + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) + } + + dbPath := filepath.Join(paths.Data, consts.DnoteDirName, consts.DnoteDBFileName) + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database")) + } + + if _, err := db.Exec(database.GetDefaultSchemaSQL()); err != nil { + t.Fatal(errors.Wrap(err, "running schema sql")) + } + + t.Cleanup(func() { db.Close() }) + + return DnoteCtx{ + DB: db, + Paths: paths, + Clock: clock.NewMock(), // Use a mock clock to test times + } +} diff --git a/cli/core/models.go b/pkg/cli/database/models.go similarity index 65% rename from cli/core/models.go rename to pkg/cli/database/models.go index b41e05d8..e8e463bb 100644 --- a/cli/core/models.go +++ b/pkg/cli/database/models.go @@ -1,25 +1,21 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package core +package database import ( - "github.com/dnote/dnote/cli/infra" "github.com/pkg/errors" ) @@ -35,19 +31,19 @@ type Book struct { // Note represents a note type Note struct { + RowID int `json:"rowid"` UUID string `json:"uuid"` BookUUID string `json:"book_uuid"` Body string `json:"content"` AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` USN int `json:"usn"` - Public bool `json:"public"` Deleted bool `json:"deleted"` Dirty bool `json:"dirty"` } // NewNote constructs a note with the given data -func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, public, deleted, dirty bool) Note { +func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, deleted, dirty bool) Note { return Note{ UUID: uuid, BookUUID: bookUUID, @@ -55,16 +51,15 @@ func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, publ AddedOn: addedOn, EditedOn: editedOn, USN: usn, - Public: public, Deleted: deleted, Dirty: dirty, } } // Insert inserts a new note -func (n Note) Insert(db *infra.DB) error { - _, err := db.Exec("INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", - n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, n.Dirty) +func (n Note) Insert(db *DB) error { + _, err := db.Exec("INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", + n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty) if err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -74,9 +69,9 @@ func (n Note) Insert(db *infra.DB) error { } // Update updates the note with the given data -func (n Note) Update(db *infra.DB) error { - _, err := db.Exec("UPDATE notes SET book_uuid = ?, body = ?, added_on = ?, edited_on = ?, usn = ?, public = ?, deleted = ?, dirty = ? WHERE uuid = ?", - n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, n.Dirty, n.UUID) +func (n Note) Update(db *DB) error { + _, err := db.Exec("UPDATE notes SET book_uuid = ?, body = ?, added_on = ?, edited_on = ?, usn = ?, deleted = ?, dirty = ? WHERE uuid = ?", + n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty, n.UUID) if err != nil { return errors.Wrapf(err, "updating the note with uuid %s", n.UUID) @@ -86,7 +81,7 @@ func (n Note) Update(db *infra.DB) error { } // UpdateUUID updates the uuid of a book -func (n *Note) UpdateUUID(db *infra.DB, newUUID string) error { +func (n *Note) UpdateUUID(db *DB, newUUID string) error { _, err := db.Exec("UPDATE notes SET uuid = ? WHERE uuid = ?", newUUID, n.UUID) if err != nil { @@ -99,7 +94,7 @@ func (n *Note) UpdateUUID(db *infra.DB, newUUID string) error { } // Expunge hard-deletes the note from the database -func (n Note) Expunge(db *infra.DB) error { +func (n Note) Expunge(db *DB) error { _, err := db.Exec("DELETE FROM notes WHERE uuid = ?", n.UUID) if err != nil { return errors.Wrap(err, "expunging a note locally") @@ -120,7 +115,7 @@ func NewBook(uuid, label string, usn int, deleted, dirty bool) Book { } // Insert inserts a new book -func (b Book) Insert(db *infra.DB) error { +func (b Book) Insert(db *DB) error { _, err := db.Exec("INSERT INTO books (uuid, label, usn, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b.UUID, b.Label, b.USN, b.Dirty, b.Deleted) @@ -132,7 +127,7 @@ func (b Book) Insert(db *infra.DB) error { } // Update updates the book with the given data -func (b Book) Update(db *infra.DB) error { +func (b Book) Update(db *DB) error { _, err := db.Exec("UPDATE books SET label = ?, usn = ?, dirty = ?, deleted = ? WHERE uuid = ?", b.Label, b.USN, b.Dirty, b.Deleted, b.UUID) @@ -144,7 +139,7 @@ func (b Book) Update(db *infra.DB) error { } // UpdateUUID updates the uuid of a book -func (b *Book) UpdateUUID(db *infra.DB, newUUID string) error { +func (b *Book) UpdateUUID(db *DB, newUUID string) error { _, err := db.Exec("UPDATE books SET uuid = ? WHERE uuid = ?", newUUID, b.UUID) if err != nil { @@ -157,7 +152,7 @@ func (b *Book) UpdateUUID(db *infra.DB, newUUID string) error { } // Expunge hard-deletes the book from the database -func (b Book) Expunge(db *infra.DB) error { +func (b Book) Expunge(db *DB) error { _, err := db.Exec("DELETE FROM books WHERE uuid = ?", b.UUID) if err != nil { return errors.Wrap(err, "expunging a book locally") diff --git a/pkg/cli/database/models_test.go b/pkg/cli/database/models_test.go new file mode 100644 index 00000000..6d0a45f0 --- /dev/null +++ b/pkg/cli/database/models_test.go @@ -0,0 +1,851 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package database + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/pkg/errors" +) + +func TestNewNote(t *testing.T) { + testCases := []struct { + uuid string + bookUUID string + body string + addedOn int64 + editedOn int64 + usn int + deleted bool + dirty bool + }{ + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 0, + deleted: false, + dirty: false, + }, + { + uuid: "n2-uuid", + bookUUID: "b2-uuid", + body: "n2-body", + addedOn: 1542058875, + editedOn: 1542058876, + usn: 1008, + deleted: true, + dirty: true, + }, + } + + for idx, tc := range testCases { + got := NewNote(tc.uuid, tc.bookUUID, tc.body, tc.addedOn, tc.editedOn, tc.usn, tc.deleted, tc.dirty) + + assert.Equal(t, got.UUID, tc.uuid, fmt.Sprintf("UUID mismatch for test case %d", idx)) + assert.Equal(t, got.BookUUID, tc.bookUUID, fmt.Sprintf("BookUUID mismatch for test case %d", idx)) + assert.Equal(t, got.Body, tc.body, fmt.Sprintf("Body mismatch for test case %d", idx)) + assert.Equal(t, got.AddedOn, tc.addedOn, fmt.Sprintf("AddedOn mismatch for test case %d", idx)) + assert.Equal(t, got.EditedOn, tc.editedOn, fmt.Sprintf("EditedOn mismatch for test case %d", idx)) + assert.Equal(t, got.USN, tc.usn, fmt.Sprintf("USN mismatch for test case %d", idx)) + assert.Equal(t, got.Deleted, tc.deleted, fmt.Sprintf("Deleted mismatch for test case %d", idx)) + assert.Equal(t, got.Dirty, tc.dirty, fmt.Sprintf("Dirty mismatch for test case %d", idx)) + } +} + +func TestNoteInsert(t *testing.T) { + testCases := []struct { + uuid string + bookUUID string + body string + addedOn int64 + editedOn int64 + usn int + deleted bool + dirty bool + }{ + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 0, + deleted: false, + dirty: false, + }, + { + uuid: "n2-uuid", + bookUUID: "b2-uuid", + body: "n2-body", + addedOn: 1542058875, + editedOn: 1542058876, + usn: 1008, + deleted: true, + dirty: true, + }, + } + + for idx, tc := range testCases { + func() { + // Setup + db := InitTestMemoryDB(t) + + n := Note{ + UUID: tc.uuid, + BookUUID: tc.bookUUID, + Body: tc.body, + AddedOn: tc.addedOn, + EditedOn: tc.editedOn, + USN: tc.usn, + Deleted: tc.deleted, + Dirty: tc.dirty, + } + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + if err := n.Insert(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var uuid, bookUUID, body string + var addedOn, editedOn int64 + var usn int + var deleted, dirty bool + MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), + &uuid, &bookUUID, &body, &addedOn, &editedOn, &usn, &deleted, &dirty) + + assert.Equal(t, uuid, tc.uuid, fmt.Sprintf("uuid mismatch for test case %d", idx)) + assert.Equal(t, bookUUID, tc.bookUUID, fmt.Sprintf("bookUUID mismatch for test case %d", idx)) + assert.Equal(t, body, tc.body, fmt.Sprintf("body mismatch for test case %d", idx)) + assert.Equal(t, addedOn, tc.addedOn, fmt.Sprintf("addedOn mismatch for test case %d", idx)) + assert.Equal(t, editedOn, tc.editedOn, fmt.Sprintf("editedOn mismatch for test case %d", idx)) + assert.Equal(t, usn, tc.usn, fmt.Sprintf("usn mismatch for test case %d", idx)) + assert.Equal(t, deleted, tc.deleted, fmt.Sprintf("deleted mismatch for test case %d", idx)) + assert.Equal(t, dirty, tc.dirty, fmt.Sprintf("dirty mismatch for test case %d", idx)) + }() + } +} + +func TestNoteUpdate(t *testing.T) { + testCases := []struct { + uuid string + bookUUID string + body string + addedOn int64 + editedOn int64 + usn int + deleted bool + dirty bool + newBookUUID string + newBody string + newEditedOn int64 + newUSN int + newDeleted bool + newDirty bool + }{ + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 0, + deleted: false, + dirty: false, + newBookUUID: "b1-uuid", + newBody: "n1-body edited", + newEditedOn: 1542058879, + newUSN: 0, + newDeleted: false, + newDirty: false, + }, + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 0, + deleted: false, + dirty: true, + newBookUUID: "b2-uuid", + newBody: "n1-body", + newEditedOn: 1542058879, + newUSN: 0, + newDeleted: false, + newDirty: false, + }, + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 10, + deleted: false, + dirty: false, + newBookUUID: "", + newBody: "", + newEditedOn: 1542058879, + newUSN: 151, + newDeleted: true, + newDirty: false, + }, + { + uuid: "n1-uuid", + bookUUID: "b1-uuid", + body: "n1-body", + addedOn: 1542058875, + editedOn: 0, + usn: 0, + deleted: false, + dirty: false, + newBookUUID: "", + newBody: "", + newEditedOn: 1542058879, + newUSN: 15, + newDeleted: true, + newDirty: false, + }, + } + + for idx, tc := range testCases { + func() { + // Setup + db := InitTestMemoryDB(t) + + n1 := Note{ + UUID: tc.uuid, + BookUUID: tc.bookUUID, + Body: tc.body, + AddedOn: tc.addedOn, + EditedOn: tc.editedOn, + USN: tc.usn, + Deleted: tc.deleted, + Dirty: tc.dirty, + } + n2 := Note{ + UUID: "n2-uuid", + BookUUID: "b10-uuid", + Body: "n2 body", + AddedOn: 1542058875, + EditedOn: 0, + USN: 39, + Deleted: false, + Dirty: false, + } + + MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Deleted, n1.Dirty) + MustExec(t, fmt.Sprintf("inserting n2 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Deleted, n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + n1.BookUUID = tc.newBookUUID + n1.Body = tc.newBody + n1.EditedOn = tc.newEditedOn + n1.USN = tc.newUSN + n1.Deleted = tc.newDeleted + n1.Dirty = tc.newDirty + + if err := n1.Update(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var n1Record, n2Record Note + MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.Body, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.USN, &n1Record.Deleted, &n1Record.Dirty) + MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, n1Record.UUID, n1.UUID, fmt.Sprintf("n1 uuid mismatch for test case %d", idx)) + assert.Equal(t, n1Record.BookUUID, tc.newBookUUID, fmt.Sprintf("n1 bookUUID mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Body, tc.newBody, fmt.Sprintf("n1 body mismatch for test case %d", idx)) + assert.Equal(t, n1Record.AddedOn, n1.AddedOn, fmt.Sprintf("n1 addedOn mismatch for test case %d", idx)) + assert.Equal(t, n1Record.EditedOn, tc.newEditedOn, fmt.Sprintf("n1 editedOn mismatch for test case %d", idx)) + assert.Equal(t, n1Record.USN, tc.newUSN, fmt.Sprintf("n1 usn mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Deleted, tc.newDeleted, fmt.Sprintf("n1 deleted mismatch for test case %d", idx)) + assert.Equal(t, n1Record.Dirty, tc.newDirty, fmt.Sprintf("n1 dirty mismatch for test case %d", idx)) + + assert.Equal(t, n2Record.UUID, n2.UUID, fmt.Sprintf("n2 uuid mismatch for test case %d", idx)) + assert.Equal(t, n2Record.BookUUID, n2.BookUUID, fmt.Sprintf("n2 bookUUID mismatch for test case %d", idx)) + assert.Equal(t, n2Record.Body, n2.Body, fmt.Sprintf("n2 body mismatch for test case %d", idx)) + assert.Equal(t, n2Record.AddedOn, n2.AddedOn, fmt.Sprintf("n2 addedOn mismatch for test case %d", idx)) + assert.Equal(t, n2Record.EditedOn, n2.EditedOn, fmt.Sprintf("n2 editedOn mismatch for test case %d", idx)) + assert.Equal(t, n2Record.USN, n2.USN, fmt.Sprintf("n2 usn mismatch for test case %d", idx)) + assert.Equal(t, n2Record.Deleted, n2.Deleted, fmt.Sprintf("n2 deleted mismatch for test case %d", idx)) + assert.Equal(t, n2Record.Dirty, n2.Dirty, fmt.Sprintf("n2 dirty mismatch for test case %d", idx)) + }() + } +} + +func TestNoteUpdateUUID(t *testing.T) { + testCases := []struct { + newUUID string + }{ + { + newUUID: "n1-new-uuid", + }, + { + newUUID: "n2-new-uuid", + }, + } + + for idx, tc := range testCases { + t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + n1 := Note{ + UUID: "n1-uuid", + BookUUID: "b1-uuid", + AddedOn: 1542058874, + Body: "n1-body", + USN: 1, + Deleted: true, + Dirty: false, + } + n2 := Note{ + UUID: "n2-uuid", + BookUUID: "b1-uuid", + AddedOn: 1542058874, + Body: "n2-body", + USN: 1, + Deleted: true, + Dirty: false, + } + + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.Body, n1.AddedOn, n1.USN, n1.Deleted, n1.Dirty) + MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.Body, n2.AddedOn, n2.USN, n2.Deleted, n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + if err := n1.UpdateUUID(tx, tc.newUUID); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var n1Record, n2Record Note + MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, usn, deleted, dirty FROM notes WHERE body = ?", "n1-body"), + &n1Record.UUID, &n1Record.Body, &n1Record.USN, &n1Record.Deleted, &n1Record.Dirty) + MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, body, usn, deleted, dirty FROM notes WHERE body = ?", "n2-body"), + &n2Record.UUID, &n2Record.Body, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, n1.UUID, tc.newUUID, "n1 original reference uuid mismatch") + assert.Equal(t, n1Record.UUID, tc.newUUID, "n1 uuid mismatch") + assert.Equal(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") + }) + } +} + +func TestNoteExpunge(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + n1 := Note{ + UUID: "n1-uuid", + BookUUID: "b9-uuid", + Body: "n1 body", + AddedOn: 1542058874, + EditedOn: 0, + USN: 22, + Deleted: false, + Dirty: false, + } + n2 := Note{ + UUID: "n2-uuid", + BookUUID: "b10-uuid", + Body: "n2 body", + AddedOn: 1542058875, + EditedOn: 0, + USN: 39, + Deleted: false, + Dirty: false, + } + + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Deleted, n1.Dirty) + MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Deleted, n2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := n1.Expunge(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var noteCount int + MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, noteCount, 1, "note count mismatch") + + var n2Record Note + MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) + + assert.Equal(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") + assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 bookUUID mismatch") + assert.Equal(t, n2Record.Body, n2.Body, "n2 body mismatch") + assert.Equal(t, n2Record.AddedOn, n2.AddedOn, "n2 addedOn mismatch") + assert.Equal(t, n2Record.EditedOn, n2.EditedOn, "n2 editedOn mismatch") + assert.Equal(t, n2Record.USN, n2.USN, "n2 usn mismatch") + assert.Equal(t, n2Record.Deleted, n2.Deleted, "n2 deleted mismatch") + assert.Equal(t, n2Record.Dirty, n2.Dirty, "n2 dirty mismatch") +} + +func TestNewBook(t *testing.T) { + testCases := []struct { + uuid string + label string + usn int + deleted bool + dirty bool + }{ + { + uuid: "b1-uuid", + label: "b1-label", + usn: 0, + deleted: false, + dirty: false, + }, + { + uuid: "b2-uuid", + label: "b2-label", + usn: 1008, + deleted: false, + dirty: true, + }, + } + + for idx, tc := range testCases { + got := NewBook(tc.uuid, tc.label, tc.usn, tc.deleted, tc.dirty) + + assert.Equal(t, got.UUID, tc.uuid, fmt.Sprintf("UUID mismatch for test case %d", idx)) + assert.Equal(t, got.Label, tc.label, fmt.Sprintf("Label mismatch for test case %d", idx)) + assert.Equal(t, got.USN, tc.usn, fmt.Sprintf("USN mismatch for test case %d", idx)) + assert.Equal(t, got.Deleted, tc.deleted, fmt.Sprintf("Deleted mismatch for test case %d", idx)) + assert.Equal(t, got.Dirty, tc.dirty, fmt.Sprintf("Dirty mismatch for test case %d", idx)) + } +} + +func TestBookInsert(t *testing.T) { + testCases := []struct { + uuid string + label string + usn int + deleted bool + dirty bool + }{ + { + uuid: "b1-uuid", + label: "b1-label", + usn: 10808, + deleted: false, + dirty: false, + }, + { + uuid: "b1-uuid", + label: "b1-label", + usn: 10808, + deleted: false, + dirty: true, + }, + } + + for idx, tc := range testCases { + func() { + // Setup + db := InitTestMemoryDB(t) + + b := Book{ + UUID: tc.uuid, + Label: tc.label, + USN: tc.usn, + Dirty: tc.dirty, + Deleted: tc.deleted, + } + + // execute + + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + if err := b.Insert(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var uuid, label string + var usn int + var deleted, dirty bool + MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", tc.uuid), + &uuid, &label, &usn, &deleted, &dirty) + + assert.Equal(t, uuid, tc.uuid, fmt.Sprintf("uuid mismatch for test case %d", idx)) + assert.Equal(t, label, tc.label, fmt.Sprintf("label mismatch for test case %d", idx)) + assert.Equal(t, usn, tc.usn, fmt.Sprintf("usn mismatch for test case %d", idx)) + assert.Equal(t, deleted, tc.deleted, fmt.Sprintf("deleted mismatch for test case %d", idx)) + assert.Equal(t, dirty, tc.dirty, fmt.Sprintf("dirty mismatch for test case %d", idx)) + }() + } +} + +func TestBookUpdate(t *testing.T) { + testCases := []struct { + uuid string + label string + usn int + deleted bool + dirty bool + newLabel string + newUSN int + newDeleted bool + newDirty bool + }{ + { + uuid: "b1-uuid", + label: "b1-label", + usn: 0, + deleted: false, + dirty: false, + newLabel: "b1-label-edited", + newUSN: 0, + newDeleted: false, + newDirty: true, + }, + { + uuid: "b1-uuid", + label: "b1-label", + usn: 0, + deleted: false, + dirty: false, + newLabel: "", + newUSN: 10, + newDeleted: true, + newDirty: false, + }, + } + + for idx, tc := range testCases { + func() { + // Setup + db := InitTestMemoryDB(t) + + b1 := Book{ + UUID: "b1-uuid", + Label: "b1-label", + USN: 1, + Deleted: true, + Dirty: false, + } + b2 := Book{ + UUID: "b2-uuid", + Label: "b2-label", + USN: 1, + Deleted: true, + Dirty: false, + } + + MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) + MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, fmt.Sprintf("beginning a transaction for test case %d", idx)).Error()) + } + + b1.Label = tc.newLabel + b1.USN = tc.newUSN + b1.Deleted = tc.newDeleted + b1.Dirty = tc.newDirty + + if err := b1.Update(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, fmt.Sprintf("executing for test case %d", idx)).Error()) + } + + tx.Commit() + + // test + var b1Record, b2Record Book + MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", tc.uuid), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Deleted, &b1Record.Dirty) + MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", b2.UUID), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) + + assert.Equal(t, b1Record.UUID, b1.UUID, fmt.Sprintf("b1 uuid mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Label, tc.newLabel, fmt.Sprintf("b1 label mismatch for test case %d", idx)) + assert.Equal(t, b1Record.USN, tc.newUSN, fmt.Sprintf("b1 usn mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Deleted, tc.newDeleted, fmt.Sprintf("b1 deleted mismatch for test case %d", idx)) + assert.Equal(t, b1Record.Dirty, tc.newDirty, fmt.Sprintf("b1 dirty mismatch for test case %d", idx)) + + assert.Equal(t, b2Record.UUID, b2.UUID, fmt.Sprintf("b2 uuid mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Label, b2.Label, fmt.Sprintf("b2 label mismatch for test case %d", idx)) + assert.Equal(t, b2Record.USN, b2.USN, fmt.Sprintf("b2 usn mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Deleted, b2.Deleted, fmt.Sprintf("b2 deleted mismatch for test case %d", idx)) + assert.Equal(t, b2Record.Dirty, b2.Dirty, fmt.Sprintf("b2 dirty mismatch for test case %d", idx)) + }() + } +} + +func TestBookUpdateUUID(t *testing.T) { + testCases := []struct { + newUUID string + }{ + { + newUUID: "b1-new-uuid", + }, + { + newUUID: "b2-new-uuid", + }, + } + + for idx, tc := range testCases { + t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { + + // Setup + db := InitTestMemoryDB(t) + + b1 := Book{ + UUID: "b1-uuid", + Label: "b1-label", + USN: 1, + Deleted: true, + Dirty: false, + } + b2 := Book{ + UUID: "b2-uuid", + Label: "b2-label", + USN: 1, + Deleted: true, + Dirty: false, + } + + MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) + MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + if err := b1.UpdateUUID(tx, tc.newUUID); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var b1Record, b2Record Book + MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE label = ?", "b1-label"), + &b1Record.UUID, &b1Record.Label, &b1Record.USN, &b1Record.Deleted, &b1Record.Dirty) + MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE label = ?", "b2-label"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) + + assert.Equal(t, b1.UUID, tc.newUUID, "b1 original reference uuid mismatch") + assert.Equal(t, b1Record.UUID, tc.newUUID, "b1 uuid mismatch") + assert.Equal(t, b2Record.UUID, b2.UUID, "b2 uuid mismatch") + }) + } +} + +func TestBookExpunge(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + b1 := Book{ + UUID: "b1-uuid", + Label: "b1-label", + USN: 1, + Deleted: true, + Dirty: false, + } + b2 := Book{ + UUID: "b2-uuid", + Label: "b2-label", + USN: 1, + Deleted: true, + Dirty: false, + } + + MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1.UUID, b1.Label, b1.USN, b1.Deleted, b1.Dirty) + MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2.UUID, b2.Label, b2.USN, b2.Deleted, b2.Dirty) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := b1.Expunge(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var bookCount int + MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + + assert.Equalf(t, bookCount, 1, "book count mismatch") + + var b2Record Book + MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, deleted, dirty FROM books WHERE uuid = ?", "b2-uuid"), + &b2Record.UUID, &b2Record.Label, &b2Record.USN, &b2Record.Deleted, &b2Record.Dirty) + + assert.Equal(t, b2Record.UUID, b2.UUID, "b2 uuid mismatch") + assert.Equal(t, b2Record.Label, b2.Label, "b2 label mismatch") + assert.Equal(t, b2Record.USN, b2.USN, "b2 usn mismatch") + assert.Equal(t, b2Record.Deleted, b2.Deleted, "b2 deleted mismatch") + assert.Equal(t, b2Record.Dirty, b2.Dirty, "b2 dirty mismatch") +} + +// TestNoteFTS tests that note full text search indices stay in sync with the notes after insert, update and delete +func TestNoteFTS(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + // execute - insert + n := Note{ + UUID: "n1-uuid", + BookUUID: "b1-uuid", + Body: "foo bar", + AddedOn: 1542058875, + EditedOn: 0, + USN: 0, + Deleted: false, + Dirty: false, + } + + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := n.Insert(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "inserting").Error()) + } + + tx.Commit() + + // test + var noteCount, noteFtsCount, noteSearchCount int + MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) + MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "foo"), ¬eSearchCount) + + assert.Equal(t, noteCount, 1, "noteCount mismatch") + assert.Equal(t, noteFtsCount, 1, "noteFtsCount mismatch") + assert.Equal(t, noteSearchCount, 1, "noteSearchCount mismatch") + + // execute - update + tx, err = db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + n.Body = "baz quz" + if err := n.Update(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "updating").Error()) + } + + tx.Commit() + + // test + MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) + assert.Equal(t, noteCount, 1, "noteCount mismatch") + assert.Equal(t, noteFtsCount, 1, "noteFtsCount mismatch") + + MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "foo"), ¬eSearchCount) + assert.Equal(t, noteSearchCount, 0, "noteSearchCount for foo mismatch") + MustScan(t, "counting search results", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "baz"), ¬eSearchCount) + assert.Equal(t, noteSearchCount, 1, "noteSearchCount for baz mismatch") + + // execute - delete + tx, err = db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := n.Expunge(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "expunging").Error()) + } + + tx.Commit() + + // test + MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts"), ¬eFtsCount) + + assert.Equal(t, noteCount, 0, "noteCount mismatch") + assert.Equal(t, noteFtsCount, 0, "noteFtsCount mismatch") +} diff --git a/pkg/cli/database/queries.go b/pkg/cli/database/queries.go new file mode 100644 index 00000000..2209c8f3 --- /dev/null +++ b/pkg/cli/database/queries.go @@ -0,0 +1,219 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package database + +import ( + "database/sql" + + "github.com/dnote/dnote/pkg/clock" + "github.com/pkg/errors" +) + +// GetSystem scans the given system configuration record onto the destination +func GetSystem(db *DB, key string, dest interface{}) error { + if err := db.QueryRow("SELECT value FROM system WHERE key = ?", key).Scan(dest); err != nil { + return errors.Wrap(err, "finding system configuration record") + } + + return nil +} + +// InsertSystem inserets a system configuration +func InsertSystem(db *DB, key, val string) error { + if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", key, val); err != nil { + return errors.Wrap(err, "saving system config") + } + + return nil +} + +// UpsertSystem inserts or updates a system configuration +func UpsertSystem(db *DB, key, val string) error { + var count int + if err := db.QueryRow("SELECT count(*) FROM system WHERE key = ?", key).Scan(&count); err != nil { + return errors.Wrap(err, "counting system record") + } + + if count == 0 { + if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", key, val); err != nil { + return errors.Wrap(err, "saving system config") + } + } else { + if _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", val, key); err != nil { + return errors.Wrap(err, "updating system config") + } + } + + return nil +} + +// UpdateSystem updates a system configuration +func UpdateSystem(db *DB, key, val interface{}) error { + if _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", val, key); err != nil { + return errors.Wrap(err, "updating system config") + } + + return nil +} + +// DeleteSystem delets the given system record +func DeleteSystem(db *DB, key string) error { + if _, err := db.Exec("DELETE FROM system WHERE key = ?", key); err != nil { + return errors.Wrap(err, "deleting system config") + } + + return nil +} + +// NoteInfo is a basic information about a note +type NoteInfo struct { + RowID int + BookLabel string + UUID string + Content string + AddedOn int64 + EditedOn int64 +} + +// GetNoteInfo returns a NoteInfo for the note with the given noteRowID +func GetNoteInfo(db *DB, noteRowID int) (NoteInfo, error) { + var ret NoteInfo + + err := db.QueryRow(`SELECT books.label, notes.uuid, notes.body, notes.added_on, notes.edited_on, notes.rowid + FROM notes + INNER JOIN books ON books.uuid = notes.book_uuid + WHERE notes.rowid = ? AND notes.deleted = false`, noteRowID). + Scan(&ret.BookLabel, &ret.UUID, &ret.Content, &ret.AddedOn, &ret.EditedOn, &ret.RowID) + if err == sql.ErrNoRows { + return ret, errors.Errorf("note %d not found", noteRowID) + } else if err != nil { + return ret, errors.Wrap(err, "querying the note") + } + + return ret, nil +} + +// BookInfo is a basic information about a book +type BookInfo struct { + RowID int + UUID string + Name string +} + +// GetBookInfo returns a BookInfo for the book with the given uuid +func GetBookInfo(db *DB, uuid string) (BookInfo, error) { + var ret BookInfo + + err := db.QueryRow(`SELECT books.rowid, books.uuid, books.label + FROM books + WHERE books.uuid = ? AND books.deleted = false`, uuid). + Scan(&ret.RowID, &ret.UUID, &ret.Name) + if err == sql.ErrNoRows { + return ret, errors.Errorf("book %s not found", uuid) + } else if err != nil { + return ret, errors.Wrap(err, "querying the note") + } + + return ret, nil +} + +// GetBookUUID returns a uuid of a book given a label +func GetBookUUID(db *DB, label string) (string, error) { + var ret string + err := db.QueryRow("SELECT uuid FROM books WHERE label = ?", label).Scan(&ret) + if err == sql.ErrNoRows { + return ret, errors.Errorf("book '%s' not found", label) + } else if err != nil { + return ret, errors.Wrap(err, "querying the book") + } + + return ret, nil +} + +// UpdateBookName updates a book name +func UpdateBookName(db *DB, uuid string, name string) error { + _, err := db.Exec(`UPDATE books + SET label = ?, dirty = ? + WHERE uuid = ?`, name, true, uuid) + if err != nil { + return errors.Wrap(err, "updating the book") + } + + return nil +} + +// GetActiveNote gets the note which has the given rowid and is not deleted +func GetActiveNote(db *DB, rowid int) (Note, error) { + var ret Note + + err := db.QueryRow(`SELECT + rowid, + uuid, + book_uuid, + body, + added_on, + edited_on, + usn, + deleted, + dirty + FROM notes WHERE rowid = ? AND deleted = false;`, rowid).Scan( + &ret.RowID, + &ret.UUID, + &ret.BookUUID, + &ret.Body, + &ret.AddedOn, + &ret.EditedOn, + &ret.USN, + &ret.Deleted, + &ret.Dirty, + ) + + if err == sql.ErrNoRows { + return ret, err + } else if err != nil { + return ret, errors.Wrap(err, "finding the note") + } + + return ret, nil +} + +// UpdateNoteContent updates the note content and marks the note as dirty +func UpdateNoteContent(db *DB, c clock.Clock, rowID int, content string) error { + ts := c.Now().UnixNano() + + _, err := db.Exec(`UPDATE notes + SET body = ?, edited_on = ?, dirty = ? + WHERE rowid = ?`, content, ts, true, rowID) + if err != nil { + return errors.Wrap(err, "updating the note") + } + + return nil +} + +// UpdateNoteBook moves the note to a different book and marks the note as dirty +func UpdateNoteBook(db *DB, c clock.Clock, rowID int, bookUUID string) error { + ts := c.Now().UnixNano() + + _, err := db.Exec(`UPDATE notes + SET book_uuid = ?, edited_on = ?, dirty = ? + WHERE rowid = ?`, bookUUID, ts, true, rowID) + if err != nil { + return errors.Wrap(err, "updating the note") + } + + return nil +} diff --git a/pkg/cli/database/queries_test.go b/pkg/cli/database/queries_test.go new file mode 100644 index 00000000..e394fe95 --- /dev/null +++ b/pkg/cli/database/queries_test.go @@ -0,0 +1,370 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package database + +import ( + "database/sql" + "fmt" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/clock" + "github.com/pkg/errors" +) + +func TestInsertSystem(t *testing.T) { + testCases := []struct { + key string + val string + }{ + { + key: "foo", + val: "1558089284", + }, + { + key: "baz", + val: "quz", + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := InsertSystem(tx, tc.key, tc.val); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing for test case").Error()) + } + + tx.Commit() + + // test + var key, val string + MustScan(t, "getting the saved record", + db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) + + assert.Equal(t, key, tc.key, "key mismatch for test case") + assert.Equal(t, val, tc.val, "val mismatch for test case") + }) + } +} + +func TestUpsertSystem(t *testing.T) { + testCases := []struct { + key string + val string + countDelta int + }{ + { + key: "foo", + val: "1558089284", + countDelta: 1, + }, + { + key: "baz", + val: "quz2", + countDelta: 0, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") + + var initialSystemCount int + MustScan(t, "counting records", db.QueryRow("SELECT count(*) FROM system"), &initialSystemCount) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := UpsertSystem(tx, tc.key, tc.val); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing for test case").Error()) + } + + tx.Commit() + + // test + var key, val string + MustScan(t, "getting the saved record", + db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) + var systemCount int + MustScan(t, "counting records", + db.QueryRow("SELECT count(*) FROM system"), &systemCount) + + assert.Equal(t, key, tc.key, "key mismatch") + assert.Equal(t, val, tc.val, "val mismatch") + assert.Equal(t, systemCount, initialSystemCount+tc.countDelta, "count mismatch") + }) + } +} + +func TestGetSystem(t *testing.T) { + t.Run(fmt.Sprintf("get string value"), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + // execute + MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "bar") + + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + var dest string + if err := GetSystem(tx, "foo", &dest); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing for test case").Error()) + } + tx.Commit() + + // test + assert.Equal(t, dest, "bar", "dest mismatch") + }) + + t.Run(fmt.Sprintf("get int64 value"), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + // execute + MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", 1234) + + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + var dest int64 + if err := GetSystem(tx, "foo", &dest); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing for test case").Error()) + } + tx.Commit() + + // test + assert.Equal(t, dest, int64(1234), "dest mismatch") + }) +} + +func TestUpdateSystem(t *testing.T) { + testCases := []struct { + key string + val string + countDelta int + }{ + { + key: "foo", + val: "1558089284", + }, + { + key: "foo", + val: "bar", + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("update %s %s", tc.key, tc.val), func(t *testing.T) { + // Setup + db := InitTestMemoryDB(t) + + MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "fuz") + MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") + + var initialSystemCount int + MustScan(t, "counting records", db.QueryRow("SELECT count(*) FROM system"), &initialSystemCount) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + if err := UpdateSystem(tx, tc.key, tc.val); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing for test case").Error()) + } + + tx.Commit() + + // test + var key, val string + MustScan(t, "getting the saved record", + db.QueryRow("SELECT key, value FROM system WHERE key = ?", tc.key), &key, &val) + var systemCount int + MustScan(t, "counting records", + db.QueryRow("SELECT count(*) FROM system"), &systemCount) + + assert.Equal(t, key, tc.key, "key mismatch") + assert.Equal(t, val, tc.val, "val mismatch") + assert.Equal(t, systemCount, initialSystemCount, "count mismatch") + }) + } +} + +func TestGetActiveNote(t *testing.T) { + t.Run("not deleted", func(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + n1UUID := "n1-uuid" + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, false, true) + + var n1RowID int + MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) + + // execute + got, err := GetActiveNote(db, n1RowID) + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + // test + assert.Equal(t, got.RowID, n1RowID, "RowID mismatch") + assert.Equal(t, got.UUID, n1UUID, "UUID mismatch") + assert.Equal(t, got.BookUUID, "b1-uuid", "BookUUID mismatch") + assert.Equal(t, got.Body, "n1 content", "Body mismatch") + assert.Equal(t, got.AddedOn, int64(1542058875), "AddedOn mismatch") + assert.Equal(t, got.EditedOn, int64(1542058876), "EditedOn mismatch") + assert.Equal(t, got.USN, 1, "USN mismatch") + assert.Equal(t, got.Deleted, false, "Deleted mismatch") + assert.Equal(t, got.Dirty, true, "Dirty mismatch") + }) + + t.Run("deleted", func(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + n1UUID := "n1-uuid" + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, true, true) + + var n1RowID int + MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) + + // execute + _, err := GetActiveNote(db, n1RowID) + + // test + if err == nil { + t.Error("Should have returned an error") + } + if err != nil && err != sql.ErrNoRows { + t.Error(errors.Wrap(err, "executing")) + } + }) +} + +func TestUpdateNoteContent(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + uuid := "n1-uuid" + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", uuid, "b1-uuid", "n1 content", 1542058875, 0, 1, false, false) + + var rowid int + MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) + + // execute + c := clock.NewMock() + now := time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) + c.SetNow(now) + + err := UpdateNoteContent(db, c, rowid, "n1 content updated") + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + var content string + var editedOn int + var dirty bool + + MustScan(t, "getting the note record", db.QueryRow("SELECT body, edited_on, dirty FROM notes WHERE rowid = ?", rowid), &content, &editedOn, &dirty) + + assert.Equal(t, content, "n1 content updated", "content mismatch") + assert.Equal(t, int64(editedOn), now.UnixNano(), "editedOn mismatch") + assert.Equal(t, dirty, true, "dirty mismatch") +} + +func TestUpdateNoteBook(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + b1UUID := "b1-uuid" + b2UUID := "b2-uuid" + MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 8, false, false) + MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2UUID, "b2-label", 9, false, false) + + uuid := "n1-uuid" + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", uuid, b1UUID, "n1 content", 1542058875, 0, 1, false, false) + + var rowid int + MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) + + // execute + c := clock.NewMock() + now := time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) + c.SetNow(now) + + err := UpdateNoteBook(db, c, rowid, b2UUID) + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + var bookUUID string + var editedOn int + var dirty bool + + MustScan(t, "getting the note record", db.QueryRow("SELECT book_uuid, edited_on, dirty FROM notes WHERE rowid = ?", rowid), &bookUUID, &editedOn, &dirty) + + assert.Equal(t, bookUUID, b2UUID, "content mismatch") + assert.Equal(t, int64(editedOn), now.UnixNano(), "editedOn mismatch") + assert.Equal(t, dirty, true, "dirty mismatch") +} + +func TestUpdateBookName(t *testing.T) { + // set up + db := InitTestMemoryDB(t) + + b1UUID := "b1-uuid" + MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 8, false, false) + + // execute + err := UpdateBookName(db, b1UUID, "b1-label-edited") + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + // test + var b1 Book + MustScan(t, "getting the note record", db.QueryRow("SELECT uuid, label, dirty, usn, deleted FROM books WHERE uuid = ?", b1UUID), &b1.UUID, &b1.Label, &b1.Dirty, &b1.USN, &b1.Deleted) + assert.Equal(t, b1.UUID, b1UUID, "UUID mismatch") + assert.Equal(t, b1.Label, "b1-label-edited", "Label mismatch") + assert.Equal(t, b1.Dirty, true, "Dirty mismatch") + assert.Equal(t, b1.USN, 8, "USN mismatch") + assert.Equal(t, b1.Deleted, false, "Deleted mismatch") +} diff --git a/pkg/cli/database/schema.sql b/pkg/cli/database/schema.sql new file mode 100644 index 00000000..9a9de094 --- /dev/null +++ b/pkg/cli/database/schema.sql @@ -0,0 +1,40 @@ +-- This is the final state of the CLI database after all migrations. +-- Auto-generated by generate-schema.go. Do not edit manually. +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'"); +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; + +-- Migration version data. +INSERT INTO system (key, value) VALUES ('schema', 14); +INSERT INTO system (key, value) VALUES ('remote_schema', 1); diff --git a/pkg/cli/database/schema/main.go b/pkg/cli/database/schema/main.go new file mode 100644 index 00000000..6c75e4d0 --- /dev/null +++ b/pkg/cli/database/schema/main.go @@ -0,0 +1,163 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Command schema generates the CLI database schema.sql file. +package main + +import ( + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/dnote/dnote/pkg/cli/config" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/migrate" +) + +func main() { + tmpDir, err := os.MkdirTemp("", "dnote-schema-gen-*") + if err != nil { + fmt.Fprintf(os.Stderr, "Error: %v\n", err) + os.Exit(1) + } + defer os.RemoveAll(tmpDir) + + schemaPath := filepath.Join("pkg", "cli", "database", "schema.sql") + + if err := run(tmpDir, schemaPath); err != nil { + fmt.Fprintf(os.Stderr, "Error: %v\n", err) + os.Exit(1) + } +} + +func run(tmpDir, outputPath string) error { + schema, err := generateSchema(tmpDir) + if err != nil { + return err + } + + if err := os.WriteFile(outputPath, []byte(schema), 0644); err != nil { + return fmt.Errorf("writing schema file: %w", err) + } + + fmt.Printf("Schema generated successfully at %s\n", outputPath) + return nil +} + +// generateSchema creates a fresh database, runs all migrations, and extracts the schema +func generateSchema(tmpDir string) (string, error) { + // Create dnote directory structure in temp dir + dnoteDir := filepath.Join(tmpDir, "dnote") + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + return "", fmt.Errorf("creating dnote dir: %w", err) + } + + // Use a file-based database + dbPath := filepath.Join(tmpDir, "schema.db") + + // Create context + ctx := context.DnoteCtx{ + Paths: context.Paths{ + Home: tmpDir, + Config: tmpDir, + Data: tmpDir, + Cache: tmpDir, + }, + Version: "schema-gen", + } + + // Open database + db, err := database.Open(dbPath) + if err != nil { + return "", fmt.Errorf("opening database: %w", err) + } + defer db.Close() + ctx.DB = db + + // Initialize database with base tables + if err := infra.InitDB(ctx); err != nil { + return "", fmt.Errorf("initializing database: %w", err) + } + + // Initialize system data + if err := infra.InitSystem(ctx); err != nil { + return "", fmt.Errorf("initializing system: %w", err) + } + + // Create minimal config file + if err := config.Write(ctx, config.Config{}); err != nil { + return "", fmt.Errorf("writing initial config: %w", err) + } + + // Run all local migrations + if err := migrate.Run(ctx, migrate.LocalSequence, migrate.LocalMode); err != nil { + return "", fmt.Errorf("running migrations: %w", err) + } + + // Extract schema before closing database + schema, err := extractSchema(db) + if err != nil { + return "", fmt.Errorf("extracting schema: %w", err) + } + + // Add INSERT statements for migration versions. + systemData := "\n-- Migration version data.\n" + systemData += fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s', %d);\n", consts.SystemSchema, len(migrate.LocalSequence)) + systemData += fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s', %d);\n", consts.SystemRemoteSchema, len(migrate.RemoteSequence)) + + return schema + systemData, nil +} + +// extractSchema extracts the complete schema by querying sqlite_master +func extractSchema(db *database.DB) (string, error) { + // Query sqlite_master for all schema objects, excluding FTS shadow tables + // FTS shadow tables are internal tables automatically created by FTS virtual tables + rows, err := db.Conn.Query(`SELECT sql FROM sqlite_master + WHERE sql IS NOT NULL + AND name NOT LIKE 'sqlite_%' + AND (type != 'table' + OR (type = 'table' AND name NOT IN ( + SELECT m1.name FROM sqlite_master m1 + JOIN sqlite_master m2 ON m1.name LIKE m2.name || '_%' + WHERE m2.type = 'table' AND m2.sql LIKE '%VIRTUAL TABLE%' + )))`) + if err != nil { + return "", fmt.Errorf("querying sqlite_master: %w", err) + } + defer rows.Close() + + var schemas []string + for rows.Next() { + var sql string + if err := rows.Scan(&sql); err != nil { + return "", fmt.Errorf("scanning row: %w", err) + } + schemas = append(schemas, sql) + } + + if err := rows.Err(); err != nil { + return "", fmt.Errorf("iterating rows: %w", err) + } + + // Add autogenerated header comment + header := `-- This is the final state of the CLI database after all migrations. +-- Auto-generated by generate-schema.go. Do not edit manually. +` + return header + strings.Join(schemas, ";\n") + ";\n", nil +} diff --git a/pkg/cli/database/schema/main_test.go b/pkg/cli/database/schema/main_test.go new file mode 100644 index 00000000..26898ef3 --- /dev/null +++ b/pkg/cli/database/schema/main_test.go @@ -0,0 +1,81 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import ( + "fmt" + "os" + "path/filepath" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" +) + +func TestRun(t *testing.T) { + tmpDir := t.TempDir() + outputPath := filepath.Join(tmpDir, "schema.sql") + + // Run the function + if err := run(tmpDir, outputPath); err != nil { + t.Fatalf("run() failed: %v", err) + } + + // Verify schema.sql was created + content, err := os.ReadFile(outputPath) + if err != nil { + t.Fatalf("reading schema.sql: %v", err) + } + + schema := string(content) + + // Verify it has the header + assert.Equal(t, strings.HasPrefix(schema, "-- This is the final state"), true, "schema.sql should have header comment") + + // Verify schema contains expected tables + expectedTables := []string{ + "CREATE TABLE books", + "CREATE TABLE system", + "CREATE TABLE \"notes\"", + "CREATE VIRTUAL TABLE note_fts", + } + + for _, expected := range expectedTables { + assert.Equal(t, strings.Contains(schema, expected), true, fmt.Sprintf("schema should contain %s", expected)) + } + + // Verify schema contains triggers + expectedTriggers := []string{ + "CREATE TRIGGER notes_after_insert", + "CREATE TRIGGER notes_after_delete", + "CREATE TRIGGER notes_after_update", + } + + for _, expected := range expectedTriggers { + assert.Equal(t, strings.Contains(schema, expected), true, fmt.Sprintf("schema should contain %s", expected)) + } + + // Verify schema does not contain sqlite internal tables + assert.Equal(t, strings.Contains(schema, "sqlite_sequence"), false, "schema should not contain sqlite_sequence") + + // Verify system key-value pairs for schema versions are present + expectedSchemaKey := fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s',", consts.SystemSchema) + assert.Equal(t, strings.Contains(schema, expectedSchemaKey), true, "schema should contain schema version INSERT statement") + + expectedRemoteSchemaKey := fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s',", consts.SystemRemoteSchema) + assert.Equal(t, strings.Contains(schema, expectedRemoteSchemaKey), true, "schema should contain remote_schema version INSERT statement") +} diff --git a/cli/infra/sql.go b/pkg/cli/database/sql.go similarity index 66% rename from cli/infra/sql.go rename to pkg/cli/database/sql.go index 17327e27..0af3c7fd 100644 --- a/cli/infra/sql.go +++ b/pkg/cli/database/sql.go @@ -1,27 +1,26 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package infra +package database import ( "database/sql" "github.com/pkg/errors" + // use sqlite + _ "github.com/mattn/go-sqlite3" ) // SQLCommon is the minimal interface required by a db connection @@ -45,27 +44,8 @@ type sqlTx interface { // DB contains information about the current database connection type DB struct { - Conn SQLCommon -} - -// OpenDB initializes a new connection to the sqlite database -func OpenDB(dbPath string) (*DB, error) { - dbConn, err := sql.Open("sqlite3", dbPath) - if err != nil { - return nil, errors.Wrap(err, "opening db connection") - } - - // Send a ping to ensure that the connection is established - // if err := dbConn.Ping(); err != nil { - // dbConn.Close() - // return nil, errors.Wrap(err, "ping") - // } - - db := &DB{ - Conn: dbConn, - } - - return db, nil + Conn SQLCommon + Filepath string } // Begin begins a transaction @@ -85,9 +65,7 @@ func (d *DB) Begin() (*DB, error) { // Commit commits a transaction func (d *DB) Commit() error { if db, ok := d.Conn.(sqlTx); ok && db != nil { - if err := db.Commit(); err != nil { - return err - } + return db.Commit() } return errors.New("invalid transaction") @@ -136,3 +114,18 @@ func (d *DB) Close() error { return errors.New("can't close db") } + +// Open initializes a new connection to the sqlite database +func Open(dbPath string) (*DB, error) { + dbConn, err := sql.Open("sqlite3", dbPath) + if err != nil { + return nil, errors.Wrap(err, "opening db connection") + } + + db := &DB{ + Conn: dbConn, + Filepath: dbPath, + } + + return db, nil +} diff --git a/pkg/cli/database/testutils.go b/pkg/cli/database/testutils.go new file mode 100644 index 00000000..23633d53 --- /dev/null +++ b/pkg/cli/database/testutils.go @@ -0,0 +1,129 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package database + +import ( + "database/sql" + _ "embed" + "fmt" + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +//go:embed schema.sql +var defaultSchemaSQL string + +// GetDefaultSchemaSQL returns the default schema SQL for tests +func GetDefaultSchemaSQL() string { + return defaultSchemaSQL +} + +// MustScan scans the given row and fails a test in case of any errors +func MustScan(t *testing.T, message string, row *sql.Row, args ...interface{}) { + err := row.Scan(args...) + if err != nil { + t.Fatal(errors.Wrap(errors.Wrap(err, "scanning a row"), message)) + } +} + +// MustExec executes the given SQL query and fails a test if an error occurs +func MustExec(t *testing.T, message string, db *DB, query string, args ...interface{}) sql.Result { + result, err := db.Exec(query, args...) + if err != nil { + t.Fatal(errors.Wrap(errors.Wrap(err, "executing sql"), message)) + } + + return result +} + +// InitTestMemoryDB initializes an in-memory test database with the default schema. +func InitTestMemoryDB(t *testing.T) *DB { + return InitTestMemoryDBRaw(t, "") +} + +// InitTestFileDB initializes a file-based test database with the default schema. +func InitTestFileDB(t *testing.T) (*DB, string) { + uuid := mustGenerateTestUUID(t) + dbPath := filepath.Join(t.TempDir(), fmt.Sprintf("dnote-%s.db", uuid)) + db := InitTestFileDBRaw(t, dbPath) + return db, dbPath +} + +// InitTestFileDBRaw initializes a file-based test database at the specified path with the default schema. +func InitTestFileDBRaw(t *testing.T, dbPath string) *DB { + db, err := Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database")) + } + + if _, err := db.Exec(defaultSchemaSQL); err != nil { + t.Fatal(errors.Wrap(err, "running schema sql")) + } + + t.Cleanup(func() { db.Close() }) + return db +} + +// InitTestMemoryDBRaw initializes an in-memory test database without marking migrations complete. +// If schemaPath is empty, uses the default schema. Used for migration testing. +func InitTestMemoryDBRaw(t *testing.T, schemaPath string) *DB { + uuid := mustGenerateTestUUID(t) + dbName := fmt.Sprintf("file:%s?mode=memory&cache=shared", uuid) + + db, err := Open(dbName) + if err != nil { + t.Fatal(errors.Wrap(err, "opening in-memory database")) + } + + var schemaSQL string + if schemaPath != "" { + schemaSQL = string(utils.ReadFileAbs(schemaPath)) + } else { + schemaSQL = defaultSchemaSQL + } + + if _, err := db.Exec(schemaSQL); err != nil { + t.Fatal(errors.Wrap(err, "running schema sql")) + } + + t.Cleanup(func() { db.Close() }) + return db +} + +// OpenTestDB opens the database connection to a test database +// without initializing any schema +func OpenTestDB(t *testing.T, dnoteDir string) *DB { + dbPath := fmt.Sprintf("%s/%s/%s", dnoteDir, consts.DnoteDirName, consts.DnoteDBFileName) + db, err := Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database connection to the test database")) + } + + return db +} + +// mustGenerateTestUUID generates a UUID for test databases and fails the test on error +func mustGenerateTestUUID(t *testing.T) string { + uuid, err := utils.GenerateUUID() + if err != nil { + t.Fatal(errors.Wrap(err, "generating UUID for test database")) + } + return uuid +} diff --git a/pkg/cli/dnote-completion.bash b/pkg/cli/dnote-completion.bash new file mode 100644 index 00000000..34a996b4 --- /dev/null +++ b/pkg/cli/dnote-completion.bash @@ -0,0 +1,48 @@ +#/usr/bin/env bash +__dnote_debug() +{ + if [[ -n ${BASH_COMP_DEBUG_FILE} ]]; then + echo "$*" >> "${BASH_COMP_DEBUG_FILE}" + fi +} + +# commands are the valid commands +commands=("add" "view" "edit" "remove" "find" "sync" "login" "logout" "help" "version") + +_complete_root_command() { + COMPREPLY=($(compgen -W "${commands[*]}" "${current_word}")) +} + +_complete_view_command() { + names=$(dnote view --name-only) + query=${COMP_WORDS[*]:2} + + __dnote_debug "${FUNCNAME[0]} query: ${query}" + + while read -r line; do + if [[ ${line} == *"${query}"* ]]; then + COMPREPLY+=("${line}") + fi + done <<< "$names" +} + +_dnote_completions() { + local current_word="${COMP_WORDS[${COMP_CWORD}]}" + + __dnote_debug "COMP_WORDS: ${COMP_WORDS[*]} COMP_CWORD: ${COMP_CWORD} current_word: ${current_word}" + + if [[ "${COMP_CWORD}" -eq 1 ]]; then + _complete_root_command + elif [[ "${COMP_CWORD}" -ge 2 ]]; then + cmd=${COMP_WORDS[1]} + + __dnote_debug "cmd: ${cmd}" + + if [[ ( "${cmd}" == view ) || ( "${cmd}" == v ) || ( "${cmd}" == add ) || ( "${cmd}" == a ) ]]; then + _complete_view_command + fi + fi + +} + +complete -F _dnote_completions dnote diff --git a/pkg/cli/dnote-completion.zsh b/pkg/cli/dnote-completion.zsh new file mode 100644 index 00000000..c8b33486 --- /dev/null +++ b/pkg/cli/dnote-completion.zsh @@ -0,0 +1,39 @@ +#compdef dnote + +local -a _1st_arguments + +_1st_arguments=( + 'add:add a new note' + 'view:list books, notes, or view a content' + 'edit:edit a note or a book' + 'remove:remove a note or a book' + 'find:find notes by keywords' + 'sync:sync data with the server' + 'login:login to the dnote server' + 'logout:logout from the dnote server' + 'version:print the current version' + 'help:get help about any command' +) + +get_booknames() { + local names=$(dnote view --name-only) + local -a ret + + while read -r line; do + ret+=("${line}") + done <<< "$names" + + echo "$ret" +} + +if (( CURRENT == 2 )); then + _describe -t commands "dnote subcommand" _1st_arguments + return +elif (( CURRENT == 3 )); then + case "$words[2]" in + v|view|a|add) + _alternative \ + "names:book names:($(get_booknames))" + esac +fi + diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go new file mode 100644 index 00000000..a6cbd1aa --- /dev/null +++ b/pkg/cli/infra/init.go @@ -0,0 +1,371 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package infra provides operations and definitions for the +// local infrastructure for Dnote +package infra + +import ( + "database/sql" + "fmt" + "os" + "strconv" + "time" + + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/config" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/migrate" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/dirs" + "github.com/pkg/errors" + "github.com/spf13/cobra" +) + +const ( + // DefaultAPIEndpoint is the default API endpoint used when none is configured + DefaultAPIEndpoint = "http://localhost:3001/api" +) + +// RunEFunc is a function type of dnote commands +type RunEFunc func(*cobra.Command, []string) error + +func checkLegacyDBPath() (string, bool) { + legacyDnoteDir := getLegacyDnotePath(dirs.Home) + ok, err := utils.FileExists(legacyDnoteDir) + if ok { + return legacyDnoteDir, true + } + + if err != nil { + log.Error(errors.Wrapf(err, "checking legacy dnote directory at %s", legacyDnoteDir).Error()) + } + + return "", false +} + +func getDBPath(paths context.Paths, customPath string) string { + // If custom path is provided, use it + if customPath != "" { + return customPath + } + + legacyDnoteDir, ok := checkLegacyDBPath() + if ok { + return fmt.Sprintf("%s/%s", legacyDnoteDir, consts.DnoteDBFileName) + } + + return fmt.Sprintf("%s/%s/%s", paths.Data, consts.DnoteDirName, consts.DnoteDBFileName) +} + +// newBaseCtx creates a minimal context with paths and database connection. +// This base context is used for file and database initialization before +// being enriched with config values by setupCtx. +func newBaseCtx(versionTag, customDBPath string) (context.DnoteCtx, error) { + dnoteDir := getLegacyDnotePath(dirs.Home) + paths := context.Paths{ + Home: dirs.Home, + Config: dirs.ConfigHome, + Data: dirs.DataHome, + Cache: dirs.CacheHome, + LegacyDnote: dnoteDir, + } + + dbPath := getDBPath(paths, customDBPath) + + db, err := database.Open(dbPath) + if err != nil { + return context.DnoteCtx{}, errors.Wrap(err, "conntecting to db") + } + + ctx := context.DnoteCtx{ + Paths: paths, + Version: versionTag, + DB: db, + } + + return ctx, nil +} + +// Init initializes the Dnote environment and returns a new dnote context +// apiEndpoint is used when creating a new config file (e.g., from ldflags during tests) +func Init(versionTag, apiEndpoint, dbPath string) (*context.DnoteCtx, error) { + ctx, err := newBaseCtx(versionTag, dbPath) + if err != nil { + return nil, errors.Wrap(err, "initializing a context") + } + + if err := initFiles(ctx, apiEndpoint); err != nil { + return nil, errors.Wrap(err, "initializing files") + } + + if err := InitDB(ctx); err != nil { + return nil, errors.Wrap(err, "initializing database") + } + if err := InitSystem(ctx); err != nil { + return nil, errors.Wrap(err, "initializing system data") + } + + if err := migrate.Legacy(ctx); err != nil { + return nil, errors.Wrap(err, "running legacy migration") + } + if err := migrate.Run(ctx, migrate.LocalSequence, migrate.LocalMode); err != nil { + return nil, errors.Wrap(err, "running migration") + } + + ctx, err = setupCtx(ctx) + if err != nil { + return nil, errors.Wrap(err, "setting up the context") + } + + log.Debug("context: %+v\n", context.Redact(ctx)) + + return &ctx, nil +} + +// setupCtx enriches the base context with values from config file and database. +// This is called after files and database have been initialized. +func setupCtx(ctx context.DnoteCtx) (context.DnoteCtx, error) { + db := ctx.DB + + var sessionKey string + var sessionKeyExpiry int64 + + err := db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemSessionKey).Scan(&sessionKey) + if err != nil && err != sql.ErrNoRows { + return ctx, errors.Wrap(err, "finding sesison key") + } + err = db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemSessionKeyExpiry).Scan(&sessionKeyExpiry) + if err != nil && err != sql.ErrNoRows { + return ctx, errors.Wrap(err, "finding sesison key expiry") + } + + cf, err := config.Read(ctx) + if err != nil { + return ctx, errors.Wrap(err, "reading config") + } + + ret := context.DnoteCtx{ + Paths: ctx.Paths, + Version: ctx.Version, + DB: ctx.DB, + SessionKey: sessionKey, + SessionKeyExpiry: sessionKeyExpiry, + APIEndpoint: cf.APIEndpoint, + Editor: cf.Editor, + Clock: clock.New(), + EnableUpgradeCheck: cf.EnableUpgradeCheck, + HTTPClient: client.NewRateLimitedHTTPClient(), + } + + return ret, nil +} + +// getLegacyDnotePath returns a legacy dnote directory path placed under +// the user's home directory +func getLegacyDnotePath(homeDir string) string { + return fmt.Sprintf("%s/%s", homeDir, consts.LegacyDnoteDirName) +} + +// InitDB initializes the database. +// Ideally this process must be a part of migration sequence. But it is performed +// seaprately because it is a prerequisite for legacy migration. +func InitDB(ctx context.DnoteCtx) error { + log.Debug("initializing the database\n") + + db := ctx.DB + + _, err := db.Exec(`CREATE TABLE IF NOT EXISTS notes + ( + id integer PRIMARY KEY AUTOINCREMENT, + uuid text NOT NULL, + book_uuid text NOT NULL, + content text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + public bool DEFAULT false + )`) + if err != nil { + return errors.Wrap(err, "creating notes table") + } + + _, err = db.Exec(`CREATE TABLE IF NOT EXISTS books + ( + uuid text PRIMARY KEY, + label text NOT NULL + )`) + if err != nil { + return errors.Wrap(err, "creating books table") + } + + _, err = db.Exec(`CREATE TABLE IF NOT EXISTS system + ( + key string NOT NULL, + value text NOT NULL + )`) + if err != nil { + return errors.Wrap(err, "creating system table") + } + + _, err = db.Exec(`CREATE TABLE IF NOT EXISTS actions + ( + uuid text PRIMARY KEY, + schema integer NOT NULL, + type text NOT NULL, + data text NOT NULL, + timestamp integer NOT NULL + )`) + if err != nil { + return errors.Wrap(err, "creating actions table") + } + + _, err = db.Exec(` + CREATE UNIQUE INDEX IF NOT EXISTS idx_books_label ON books(label); + CREATE UNIQUE INDEX IF NOT EXISTS idx_notes_uuid ON notes(uuid); + CREATE UNIQUE INDEX IF NOT EXISTS idx_books_uuid ON books(uuid); + CREATE INDEX IF NOT EXISTS idx_notes_book_uuid ON notes(book_uuid);`) + if err != nil { + return errors.Wrap(err, "creating indices") + } + + return nil +} + +func initSystemKV(db *database.DB, key string, val string) error { + var count int + if err := db.QueryRow("SELECT count(*) FROM system WHERE key = ?", key).Scan(&count); err != nil { + return errors.Wrapf(err, "counting %s", key) + } + + if count > 0 { + return nil + } + + if _, err := db.Exec("INSERT INTO system (key, value) VALUES (?, ?)", key, val); err != nil { + db.Rollback() + return errors.Wrapf(err, "inserting %s %s", key, val) + } + + return nil +} + +// InitSystem inserts system data if missing +func InitSystem(ctx context.DnoteCtx) error { + log.Debug("initializing the system\n") + + db := ctx.DB + + tx, err := db.Begin() + if err != nil { + return errors.Wrap(err, "beginning a transaction") + } + + nowStr := strconv.FormatInt(time.Now().Unix(), 10) + if err := initSystemKV(tx, consts.SystemLastUpgrade, nowStr); err != nil { + return errors.Wrapf(err, "initializing system config for %s", consts.SystemLastUpgrade) + } + if err := initSystemKV(tx, consts.SystemLastMaxUSN, "0"); err != nil { + return errors.Wrapf(err, "initializing system config for %s", consts.SystemLastMaxUSN) + } + if err := initSystemKV(tx, consts.SystemLastSyncAt, "0"); err != nil { + return errors.Wrapf(err, "initializing system config for %s", consts.SystemLastSyncAt) + } + + if err := tx.Commit(); err != nil { + return errors.Wrap(err, "committing transaction") + } + + return nil +} + +// getEditorCommand returns the system's editor command with appropriate flags, +// if necessary, to make the command wait until editor is close to exit. +func getEditorCommand() string { + editor := os.Getenv("EDITOR") + + var ret string + + switch editor { + case "atom": + ret = "atom -w" + case "subl": + ret = "subl -n -w" + case "code": + ret = "code -n -w" + case "mate": + ret = "mate -w" + case "vim": + ret = "vim" + case "nano": + ret = "nano" + case "emacs": + ret = "emacs" + case "nvim": + ret = "nvim" + default: + ret = "vi" + } + + return ret +} + + +// initConfigFile populates a new config file if it does not exist yet +func initConfigFile(ctx context.DnoteCtx, apiEndpoint string) error { + path := config.GetPath(ctx) + ok, err := utils.FileExists(path) + if err != nil { + return errors.Wrap(err, "checking if config exists") + } + if ok { + return nil + } + + editor := getEditorCommand() + + // Use default API endpoint if none provided + endpoint := apiEndpoint + if endpoint == "" { + endpoint = DefaultAPIEndpoint + } + + cf := config.Config{ + Editor: editor, + APIEndpoint: endpoint, + EnableUpgradeCheck: true, + } + + if err := config.Write(ctx, cf); err != nil { + return errors.Wrap(err, "writing config") + } + + return nil +} + +// initFiles creates, if necessary, the dnote directory and files inside +func initFiles(ctx context.DnoteCtx, apiEndpoint string) error { + if err := context.InitDnoteDirs(ctx.Paths); err != nil { + return errors.Wrap(err, "creating the dnote dir") + } + if err := initConfigFile(ctx, apiEndpoint); err != nil { + return errors.Wrap(err, "generating the config file") + } + + return nil +} diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go new file mode 100644 index 00000000..8c698624 --- /dev/null +++ b/pkg/cli/infra/init_test.go @@ -0,0 +1,126 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package infra + +import ( + "fmt" + "os" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/config" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/dirs" + "github.com/pkg/errors" +) + +func TestInitSystemKV(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + + var originalCount int + database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + if err := initSystemKV(tx, "testKey", "testVal"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing")) + } + + tx.Commit() + + // Test + var count int + database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &count) + assert.Equal(t, count, originalCount+1, "system count mismatch") + + var val string + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", "testKey"), &val) + assert.Equal(t, val, "testVal", "system value mismatch") +} + +func TestInitSystemKV_existing(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + + database.MustExec(t, "inserting a system config", db, "INSERT INTO system (key, value) VALUES (?, ?)", "testKey", "testVal") + + var originalCount int + database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + if err := initSystemKV(tx, "testKey", "newTestVal"); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing")) + } + + tx.Commit() + + // Test + var count int + database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &count) + assert.Equal(t, count, originalCount, "system count mismatch") + + var val string + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", "testKey"), &val) + assert.Equal(t, val, "testVal", "system value should not have been updated") +} + +func TestInit_APIEndpoint(t *testing.T) { + // Create a temporary directory for test + tmpDir, err := os.MkdirTemp("", "dnote-init-test-*") + if err != nil { + t.Fatal(errors.Wrap(err, "creating temp dir")) + } + defer os.RemoveAll(tmpDir) + + // Set up environment to use our temp directory + t.Setenv("XDG_CONFIG_HOME", fmt.Sprintf("%s/config", tmpDir)) + t.Setenv("XDG_DATA_HOME", fmt.Sprintf("%s/data", tmpDir)) + t.Setenv("XDG_CACHE_HOME", fmt.Sprintf("%s/cache", tmpDir)) + + // Force dirs package to reload with new environment + dirs.Reload() + + // Initialize - should create config with default apiEndpoint + ctx, err := Init("test-version", "", "") + if err != nil { + t.Fatal(errors.Wrap(err, "initializing")) + } + defer ctx.DB.Close() + + // Read the config that was created + cf, err := config.Read(*ctx) + if err != nil { + t.Fatal(errors.Wrap(err, "reading config")) + } + + // Context should use the apiEndpoint from config + assert.Equal(t, ctx.APIEndpoint, DefaultAPIEndpoint, "context should use apiEndpoint from config") + assert.Equal(t, cf.APIEndpoint, DefaultAPIEndpoint, "context should use apiEndpoint from config") +} diff --git a/cli/log/log.go b/pkg/cli/log/log.go similarity index 71% rename from cli/log/log.go rename to pkg/cli/log/log.go index 358eadc7..0bc569b6 100644 --- a/cli/log/log.go +++ b/pkg/cli/log/log.go @@ -1,27 +1,30 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package log import ( "fmt" - "github.com/dnote/color" "os" + + "github.com/fatih/color" +) + +const ( + debugEnvName = "DNOTE_DEBUG" + debugEnvValue = "1" ) var ( @@ -81,7 +84,7 @@ func Error(msg string) { // Errorf prints an error message with optional format verbs func Errorf(msg string, v ...interface{}) { - fmt.Fprintf(color.Output, "%s%s %s", indent, ColorRed.Sprintf("⨯"), fmt.Sprintf(msg, v...)) + fmt.Fprintf(color.Output, "%s%s %s", indent, ColorRed.Sprintf("%s", "⨯"), fmt.Sprintf(msg, v...)) } // Printf prints an normal message @@ -96,17 +99,29 @@ func Askf(msg string, masked bool, v ...interface{}) { var symbol string if masked { - symbol = ColorGray.Sprintf(symbolChar) + symbol = ColorGray.Sprintf("%s", symbolChar) } else { - symbol = ColorGreen.Sprintf(symbolChar) + symbol = ColorGreen.Sprintf("%s", symbolChar) } fmt.Fprintf(color.Output, "%s%s %s: ", indent, symbol, fmt.Sprintf(msg, v...)) } +// isDebug returns true if debug mode is enabled +func isDebug() bool { + return os.Getenv(debugEnvName) == debugEnvValue +} + // Debug prints to the console if DNOTE_DEBUG is set func Debug(msg string, v ...interface{}) { - if os.Getenv("DNOTE_DEBUG") == "1" { + if isDebug() { fmt.Fprintf(color.Output, "%s %s", ColorGray.Sprint("DEBUG:"), fmt.Sprintf(msg, v...)) } } + +// DebugNewline prints a newline only in debug mode +func DebugNewline() { + if isDebug() { + fmt.Println() + } +} diff --git a/pkg/cli/main.go b/pkg/cli/main.go new file mode 100644 index 00000000..2fb1c564 --- /dev/null +++ b/pkg/cli/main.go @@ -0,0 +1,89 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import ( + "os" + "strings" + + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/log" + _ "github.com/mattn/go-sqlite3" + "github.com/pkg/errors" + + // commands + "github.com/dnote/dnote/pkg/cli/cmd/add" + "github.com/dnote/dnote/pkg/cli/cmd/edit" + "github.com/dnote/dnote/pkg/cli/cmd/find" + "github.com/dnote/dnote/pkg/cli/cmd/login" + "github.com/dnote/dnote/pkg/cli/cmd/logout" + "github.com/dnote/dnote/pkg/cli/cmd/remove" + "github.com/dnote/dnote/pkg/cli/cmd/root" + "github.com/dnote/dnote/pkg/cli/cmd/sync" + "github.com/dnote/dnote/pkg/cli/cmd/version" + "github.com/dnote/dnote/pkg/cli/cmd/view" +) + +// apiEndpoint and versionTag are populated during link time +var apiEndpoint string +var versionTag = "master" + +// parseDBPath extracts --dbPath flag value from command line arguments +// regardless of where it appears (before or after subcommand). +// Returns empty string if not found. +func parseDBPath(args []string) string { + for i, arg := range args { + // Handle --dbPath=value + if strings.HasPrefix(arg, "--dbPath=") { + return strings.TrimPrefix(arg, "--dbPath=") + } + // Handle --dbPath value + if arg == "--dbPath" && i+1 < len(args) { + return args[i+1] + } + } + return "" +} + +func main() { + // Parse flags early to get --dbPath before initializing database + // We need to manually parse --dbPath because it can appear after the subcommand + // (e.g., "dnote sync --full --dbPath=./custom.db") and root.ParseFlags only + // parses flags before the subcommand. + dbPath := parseDBPath(os.Args[1:]) + + // Initialize context - defaultAPIEndpoint is used when creating new config file + ctx, err := infra.Init(versionTag, apiEndpoint, dbPath) + if err != nil { + panic(errors.Wrap(err, "initializing context")) + } + defer ctx.DB.Close() + + root.Register(remove.NewCmd(*ctx)) + root.Register(edit.NewCmd(*ctx)) + root.Register(login.NewCmd(*ctx)) + root.Register(logout.NewCmd(*ctx)) + root.Register(add.NewCmd(*ctx)) + root.Register(sync.NewCmd(*ctx)) + root.Register(version.NewCmd(*ctx)) + root.Register(view.NewCmd(*ctx)) + root.Register(find.NewCmd(*ctx)) + + if err := root.Execute(); err != nil { + log.Errorf("%s\n", err.Error()) + os.Exit(1) + } +} diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go new file mode 100644 index 00000000..727a5c3e --- /dev/null +++ b/pkg/cli/main_test.go @@ -0,0 +1,633 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import ( + "fmt" + "log" + "os" + "os/exec" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +var binaryName = "test-dnote" + +// setupTestEnv creates a unique test directory for parallel test execution +func setupTestEnv(t *testing.T) (string, testutils.RunDnoteCmdOptions) { + testDir := t.TempDir() + opts := testutils.RunDnoteCmdOptions{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", testDir), + fmt.Sprintf("XDG_DATA_HOME=%s", testDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", testDir), + }, + } + return testDir, opts +} + +func TestMain(m *testing.M) { + if err := exec.Command("go", "build", "--tags", "fts5", "-o", binaryName).Run(); err != nil { + log.Print(errors.Wrap(err, "building a binary").Error()) + os.Exit(1) + } + + os.Exit(m.Run()) +} + +func TestInit(t *testing.T) { + testDir, opts := setupTestEnv(t) + + // Execute + // run an arbitrary command "view" due to https://github.com/spf13/cobra/issues/1056 + testutils.RunDnoteCmd(t, opts, binaryName, "view") + + db := database.OpenTestDB(t, testDir) + + // Test + ok, err := utils.FileExists(testDir) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if dnote dir exists")) + } + if !ok { + t.Errorf("dnote directory was not initialized") + } + + ok, err = utils.FileExists(fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.ConfigFilename)) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if dnote config exists")) + } + if !ok { + t.Errorf("config file was not initialized") + } + + var notesTableCount, booksTableCount, systemTableCount int + database.MustScan(t, "counting notes", + db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "notes"), ¬esTableCount) + database.MustScan(t, "counting books", + db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "books"), &booksTableCount) + database.MustScan(t, "counting system", + db.QueryRow("SELECT count(*) FROM sqlite_master WHERE type = ? AND name = ?", "table", "system"), &systemTableCount) + + assert.Equal(t, notesTableCount, 1, "notes table count mismatch") + assert.Equal(t, booksTableCount, 1, "books table count mismatch") + assert.Equal(t, systemTableCount, 1, "system table count mismatch") + + // test that all default system configurations are generated + var lastUpgrade, lastMaxUSN, lastSyncAt string + database.MustScan(t, "scanning last upgrade", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastUpgrade), &lastUpgrade) + database.MustScan(t, "scanning last max usn", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + database.MustScan(t, "scanning last sync at", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncAt) + + assert.NotEqual(t, lastUpgrade, "", "last upgrade should not be empty") + assert.NotEqual(t, lastMaxUSN, "", "last max usn should not be empty") + assert.NotEqual(t, lastSyncAt, "", "last sync at should not be empty") +} + +func TestAddNote(t *testing.T) { + t.Run("new book", func(t *testing.T) { + testDir, opts := setupTestEnv(t) + + // Set up and execute + testutils.RunDnoteCmd(t, opts, binaryName, "add", "js", "-c", "foo") + testutils.MustWaitDnoteCmd(t, opts, testutils.UserContent, binaryName, "add", "js") + + db := database.OpenTestDB(t, testDir) + + // Test + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 1, "book count mismatch") + assert.Equalf(t, noteCount, 2, "note count mismatch") + + var book database.Book + database.MustScan(t, "getting book", db.QueryRow("SELECT uuid, dirty FROM books where label = ?", "js"), &book.UUID, &book.Dirty) + var note database.Note + database.MustScan(t, "getting note", + db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ?", book.UUID), ¬e.UUID, ¬e.Body, ¬e.AddedOn, ¬e.Dirty) + + assert.Equal(t, book.Dirty, true, "Book dirty mismatch") + + assert.NotEqual(t, note.UUID, "", "Note should have UUID") + assert.Equal(t, note.Body, "foo", "Note body mismatch") + assert.Equal(t, note.Dirty, true, "Note dirty mismatch") + assert.NotEqual(t, note.AddedOn, int64(0), "Note added_on mismatch") + }) + + t.Run("existing book", func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup3(t, db) + + // Execute + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "add", "js", "-c", "foo") + + // Test + + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 1, "book count mismatch") + assert.Equalf(t, noteCount, 2, "note count mismatch") + + var n1, n2 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Dirty) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes WHERE book_uuid = ? AND body = ?", "js-book-uuid", "foo"), &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Dirty) + + var book database.Book + database.MustScan(t, "getting book", db.QueryRow("SELECT dirty FROM books where label = ?", "js"), &book.Dirty) + + assert.Equal(t, book.Dirty, false, "Book dirty mismatch") + + assert.NotEqual(t, n1.UUID, "", "n1 should have UUID") + assert.Equal(t, n1.Body, "Booleans have toString()", "n1 body mismatch") + assert.Equal(t, n1.AddedOn, int64(1515199943), "n1 added_on mismatch") + assert.Equal(t, n1.Dirty, false, "n1 dirty mismatch") + + assert.NotEqual(t, n2.UUID, "", "n2 should have UUID") + assert.Equal(t, n2.Body, "foo", "n2 body mismatch") + assert.Equal(t, n2.Dirty, true, "n2 dirty mismatch") + }) +} + +func TestEditNote(t *testing.T) { + t.Run("content flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + // Execute + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-c", "foo bar") + + // Test + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 1, "book count mismatch") + assert.Equalf(t, noteCount, 2, "note count mismatch") + + var n1, n2 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Dirty) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, body, added_on, dirty FROM notes where book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Dirty) + + assert.Equal(t, n1.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n1 should have UUID") + assert.Equal(t, n1.Body, "Booleans have toString()", "n1 body mismatch") + assert.Equal(t, n1.Dirty, false, "n1 dirty mismatch") + + assert.Equal(t, n2.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "Note should have UUID") + assert.Equal(t, n2.Body, "foo bar", "Note body mismatch") + assert.Equal(t, n2.Dirty, true, "n2 dirty mismatch") + assert.NotEqual(t, n2.EditedOn, 0, "Note edited_on mismatch") + }) + + t.Run("book flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup5(t, db) + + // Execute + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux") + + // Test + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 2, "book count mismatch") + assert.Equalf(t, noteCount, 2, "note count mismatch") + + var n1, n2 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, dirty FROM notes where uuid = ?", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), &n1.UUID, &n1.BookUUID, &n1.Body, &n1.AddedOn, &n1.Dirty) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, dirty FROM notes where uuid = ?", "43827b9a-c2b0-4c06-a290-97991c896653"), &n2.UUID, &n2.BookUUID, &n2.Body, &n2.AddedOn, &n2.Dirty) + + assert.Equal(t, n1.BookUUID, "js-book-uuid", "n1 BookUUID mismatch") + assert.Equal(t, n1.Body, "n1 body", "n1 Body mismatch") + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + assert.Equal(t, n1.EditedOn, int64(0), "n1 EditedOn mismatch") + + assert.Equal(t, n2.BookUUID, "linux-book-uuid", "n2 BookUUID mismatch") + assert.Equal(t, n2.Body, "n2 body", "n2 Body mismatch") + assert.Equal(t, n2.Dirty, true, "n2 Dirty mismatch") + assert.NotEqual(t, n2.EditedOn, 0, "n2 EditedOn mismatch") + }) + + t.Run("book flag and content flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup5(t, db) + + // Execute + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux", "-c", "n2 body updated") + + // Test + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 2, "book count mismatch") + assert.Equalf(t, noteCount, 2, "note count mismatch") + + var n1, n2 database.Note + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, dirty FROM notes where uuid = ?", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), &n1.UUID, &n1.BookUUID, &n1.Body, &n1.AddedOn, &n1.Dirty) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, book_uuid, body, added_on, dirty FROM notes where uuid = ?", "43827b9a-c2b0-4c06-a290-97991c896653"), &n2.UUID, &n2.BookUUID, &n2.Body, &n2.AddedOn, &n2.Dirty) + + assert.Equal(t, n1.BookUUID, "js-book-uuid", "n1 BookUUID mismatch") + assert.Equal(t, n1.Body, "n1 body", "n1 Body mismatch") + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + assert.Equal(t, n1.EditedOn, int64(0), "n1 EditedOn mismatch") + + assert.Equal(t, n2.BookUUID, "linux-book-uuid", "n2 BookUUID mismatch") + assert.Equal(t, n2.Body, "n2 body updated", "n2 Body mismatch") + assert.Equal(t, n2.Dirty, true, "n2 Dirty mismatch") + assert.NotEqual(t, n2.EditedOn, 0, "n2 EditedOn mismatch") + }) +} + +func TestEditBook(t *testing.T) { + t.Run("name flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup1(t, db) + + // Execute + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "js", "-n", "js-edited") + + // Test + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 2, "book count mismatch") + assert.Equalf(t, noteCount, 1, "note count mismatch") + + var b1, b2 database.Book + var n1 database.Note + database.MustScan(t, "getting b1", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "js-book-uuid"), &b1.UUID, &b1.Label, &b1.USN, &b1.Dirty) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT uuid, label, usn, dirty FROM books WHERE uuid = ?", "linux-book-uuid"), &b2.UUID, &b2.Label, &b2.USN, &b2.Dirty) + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), + &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Deleted, &n1.Dirty, &n1.USN) + + assert.Equal(t, b1.UUID, "js-book-uuid", "b1 should have UUID") + assert.Equal(t, b1.Label, "js-edited", "b1 Label mismatch") + assert.Equal(t, b1.USN, 0, "b1 USN mismatch") + assert.Equal(t, b1.Dirty, true, "b1 Dirty mismatch") + + assert.Equal(t, b2.UUID, "linux-book-uuid", "b2 should have UUID") + assert.Equal(t, b2.Label, "linux", "b2 Label mismatch") + assert.Equal(t, b2.USN, 0, "b2 USN mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + + assert.Equal(t, n1.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n1 UUID mismatch") + assert.Equal(t, n1.Body, "Booleans have toString()", "n1 Body mismatch") + assert.Equal(t, n1.AddedOn, int64(1515199943), "n1 AddedOn mismatch") + assert.Equal(t, n1.Deleted, false, "n1 Deleted mismatch") + assert.Equal(t, n1.Dirty, false, "n1 Dirty mismatch") + assert.Equal(t, n1.USN, 0, "n1 USN mismatch") + }) +} + +func TestRemoveNote(t *testing.T) { + testCases := []struct { + yesFlag bool + }{ + { + yesFlag: false, + }, + { + yesFlag: true, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("--yes=%t", tc.yesFlag), func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup2(t, db) + + // Execute + if tc.yesFlag { + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "1") + } else { + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "--dbPath", dbPath, "remove", "1") + } + + // Test + var noteCount, bookCount, jsNoteCount, linuxNoteCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting js notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "js-book-uuid"), &jsNoteCount) + database.MustScan(t, "counting linux notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "linux-book-uuid"), &linuxNoteCount) + + assert.Equalf(t, bookCount, 2, "book count mismatch") + assert.Equalf(t, noteCount, 3, "note count mismatch") + assert.Equal(t, jsNoteCount, 2, "js book should have 2 notes") + assert.Equal(t, linuxNoteCount, 1, "linux book book should have 1 note") + + var b1, b2 database.Book + var n1, n2, n3 database.Note + database.MustScan(t, "getting b1", + db.QueryRow("SELECT label, deleted, usn FROM books WHERE uuid = ?", "js-book-uuid"), + &b1.Label, &b1.Deleted, &b1.USN) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT label, deleted, usn FROM books WHERE uuid = ?", "linux-book-uuid"), + &b2.Label, &b2.Deleted, &b2.USN) + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), + &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Deleted, &n1.Dirty, &n1.USN) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), + &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Deleted, &n2.Dirty, &n2.USN) + database.MustScan(t, "getting n3", + db.QueryRow("SELECT uuid, body, added_on, deleted, dirty, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "linux-book-uuid", "3e065d55-6d47-42f2-a6bf-f5844130b2d2"), + &n3.UUID, &n3.Body, &n3.AddedOn, &n3.Deleted, &n3.Dirty, &n3.USN) + + assert.Equal(t, b1.Label, "js", "b1 label mismatch") + assert.Equal(t, b1.Deleted, false, "b1 deleted mismatch") + assert.Equal(t, b1.Dirty, false, "b1 Dirty mismatch") + assert.Equal(t, b1.USN, 111, "b1 usn mismatch") + + assert.Equal(t, b2.Label, "linux", "b2 label mismatch") + assert.Equal(t, b2.Deleted, false, "b2 deleted mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + assert.Equal(t, b2.USN, 122, "b2 usn mismatch") + + assert.Equal(t, n1.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "n1 should have UUID") + assert.Equal(t, n1.Body, "", "n1 body mismatch") + assert.Equal(t, n1.Deleted, true, "n1 deleted mismatch") + assert.Equal(t, n1.Dirty, true, "n1 Dirty mismatch") + assert.Equal(t, n1.USN, 11, "n1 usn mismatch") + + assert.Equal(t, n2.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n2 should have UUID") + assert.Equal(t, n2.Body, "n2 body", "n2 body mismatch") + assert.Equal(t, n2.Deleted, false, "n2 deleted mismatch") + assert.Equal(t, n2.Dirty, false, "n2 Dirty mismatch") + assert.Equal(t, n2.USN, 12, "n2 usn mismatch") + + assert.Equal(t, n3.UUID, "3e065d55-6d47-42f2-a6bf-f5844130b2d2", "n3 should have UUID") + assert.Equal(t, n3.Body, "n3 body", "n3 body mismatch") + assert.Equal(t, n3.Deleted, false, "n3 deleted mismatch") + assert.Equal(t, n3.Dirty, false, "n3 Dirty mismatch") + assert.Equal(t, n3.USN, 13, "n3 usn mismatch") + }) + } +} + +func TestRemoveBook(t *testing.T) { + testCases := []struct { + yesFlag bool + }{ + { + yesFlag: false, + }, + { + yesFlag: true, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("--yes=%t", tc.yesFlag), func(t *testing.T) { + _, opts := setupTestEnv(t) + + // Setup + db, dbPath := database.InitTestFileDB(t) + testutils.Setup2(t, db) + + // Execute + if tc.yesFlag { + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "js") + } else { + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "--dbPath", dbPath, "remove", "js") + } + + // Test + var noteCount, bookCount, jsNoteCount, linuxNoteCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + database.MustScan(t, "counting js notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "js-book-uuid"), &jsNoteCount) + database.MustScan(t, "counting linux notes", db.QueryRow("SELECT count(*) FROM notes WHERE book_uuid = ?", "linux-book-uuid"), &linuxNoteCount) + + assert.Equalf(t, bookCount, 2, "book count mismatch") + assert.Equalf(t, noteCount, 3, "note count mismatch") + assert.Equal(t, jsNoteCount, 2, "js book should have 2 notes") + assert.Equal(t, linuxNoteCount, 1, "linux book book should have 1 note") + + var b1, b2 database.Book + var n1, n2, n3 database.Note + database.MustScan(t, "getting b1", + db.QueryRow("SELECT label, dirty, deleted, usn FROM books WHERE uuid = ?", "js-book-uuid"), + &b1.Label, &b1.Dirty, &b1.Deleted, &b1.USN) + database.MustScan(t, "getting b2", + db.QueryRow("SELECT label, dirty, deleted, usn FROM books WHERE uuid = ?", "linux-book-uuid"), + &b2.Label, &b2.Dirty, &b2.Deleted, &b2.USN) + database.MustScan(t, "getting n1", + db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f"), + &n1.UUID, &n1.Body, &n1.AddedOn, &n1.Deleted, &n1.Dirty, &n1.USN) + database.MustScan(t, "getting n2", + db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "js-book-uuid", "43827b9a-c2b0-4c06-a290-97991c896653"), + &n2.UUID, &n2.Body, &n2.AddedOn, &n2.Deleted, &n2.Dirty, &n2.USN) + database.MustScan(t, "getting n3", + db.QueryRow("SELECT uuid, body, added_on, dirty, deleted, usn FROM notes WHERE book_uuid = ? AND uuid = ?", "linux-book-uuid", "3e065d55-6d47-42f2-a6bf-f5844130b2d2"), + &n3.UUID, &n3.Body, &n3.AddedOn, &n3.Deleted, &n3.Dirty, &n3.USN) + + assert.NotEqual(t, b1.Label, "js", "b1 label mismatch") + assert.Equal(t, b1.Dirty, true, "b1 Dirty mismatch") + assert.Equal(t, b1.Deleted, true, "b1 deleted mismatch") + assert.Equal(t, b1.USN, 111, "b1 usn mismatch") + + assert.Equal(t, b2.Label, "linux", "b2 label mismatch") + assert.Equal(t, b2.Dirty, false, "b2 Dirty mismatch") + assert.Equal(t, b2.Deleted, false, "b2 deleted mismatch") + assert.Equal(t, b2.USN, 122, "b2 usn mismatch") + + assert.Equal(t, n1.UUID, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", "n1 should have UUID") + assert.Equal(t, n1.Body, "", "n1 body mismatch") + assert.Equal(t, n1.Dirty, true, "n1 Dirty mismatch") + assert.Equal(t, n1.Deleted, true, "n1 deleted mismatch") + assert.Equal(t, n1.USN, 11, "n1 usn mismatch") + + assert.Equal(t, n2.UUID, "43827b9a-c2b0-4c06-a290-97991c896653", "n2 should have UUID") + assert.Equal(t, n2.Body, "", "n2 body mismatch") + assert.Equal(t, n2.Dirty, true, "n2 Dirty mismatch") + assert.Equal(t, n2.Deleted, true, "n2 deleted mismatch") + assert.Equal(t, n2.USN, 12, "n2 usn mismatch") + + assert.Equal(t, n3.UUID, "3e065d55-6d47-42f2-a6bf-f5844130b2d2", "n3 should have UUID") + assert.Equal(t, n3.Body, "n3 body", "n3 body mismatch") + assert.Equal(t, n3.Dirty, false, "n3 Dirty mismatch") + assert.Equal(t, n3.Deleted, false, "n3 deleted mismatch") + assert.Equal(t, n3.USN, 13, "n3 usn mismatch") + }) + } +} + +func TestDBPathFlag(t *testing.T) { + // Helper function to verify database contents + verifyDatabase := func(t *testing.T, dbPath, expectedBook, expectedNote string) *database.DB { + ok, err := utils.FileExists(dbPath) + if err != nil { + t.Fatal(errors.Wrapf(err, "checking if custom db exists at %s", dbPath)) + } + if !ok { + t.Errorf("custom database was not created at %s", dbPath) + } + + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrapf(err, "opening db at %s", dbPath)) + } + + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 1, fmt.Sprintf("%s book count mismatch", dbPath)) + assert.Equalf(t, noteCount, 1, fmt.Sprintf("%s note count mismatch", dbPath)) + + var book database.Book + database.MustScan(t, "getting book", db.QueryRow("SELECT label FROM books"), &book.Label) + assert.Equalf(t, book.Label, expectedBook, fmt.Sprintf("%s book label mismatch", dbPath)) + + var note database.Note + database.MustScan(t, "getting note", db.QueryRow("SELECT body FROM notes"), ¬e.Body) + assert.Equalf(t, note.Body, expectedNote, fmt.Sprintf("%s note body mismatch", dbPath)) + + return db + } + + // Setup - use two different custom database paths + testDir, customOpts := setupTestEnv(t) + customDBPath1 := fmt.Sprintf("%s/custom-test1.db", testDir) + customDBPath2 := fmt.Sprintf("%s/custom-test2.db", testDir) + + // Execute - add different notes to each database + testutils.RunDnoteCmd(t, customOpts, binaryName, "--dbPath", customDBPath1, "add", "db1-book", "-c", "content in db1") + testutils.RunDnoteCmd(t, customOpts, binaryName, "--dbPath", customDBPath2, "add", "db2-book", "-c", "content in db2") + + // Test both databases + db1 := verifyDatabase(t, customDBPath1, "db1-book", "content in db1") + defer db1.Close() + + db2 := verifyDatabase(t, customDBPath2, "db2-book", "content in db2") + defer db2.Close() + + // Verify that the databases are independent + var db1HasDB2Book int + db1.QueryRow("SELECT count(*) FROM books WHERE label = ?", "db2-book").Scan(&db1HasDB2Book) + assert.Equal(t, db1HasDB2Book, 0, "db1 should not have db2's book") + + var db2HasDB1Book int + db2.QueryRow("SELECT count(*) FROM books WHERE label = ?", "db1-book").Scan(&db2HasDB1Book) + assert.Equal(t, db2HasDB1Book, 0, "db2 should not have db1's book") +} + +func TestView(t *testing.T) { + t.Run("view note by rowid", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "1") + + assert.Equal(t, strings.Contains(output, "Booleans have toString()"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), true, "should show metadata") + }) + + t.Run("view note content only", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "1", "--content-only") + + assert.Equal(t, strings.Contains(output, "Booleans have toString()"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), false, "should not show metadata") + }) + + t.Run("list books", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup1(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view") + + assert.Equal(t, strings.Contains(output, "js"), true, "should list js book") + assert.Equal(t, strings.Contains(output, "linux"), true, "should list linux book") + }) + + t.Run("list notes in book", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup2(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "js") + + assert.Equal(t, strings.Contains(output, "n1 body"), true, "should list note 1") + assert.Equal(t, strings.Contains(output, "n2 body"), true, "should list note 2") + }) + + t.Run("view note by book name and rowid", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "js", "2") + + assert.Equal(t, strings.Contains(output, "Date object implements mathematical comparisons"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), true, "should show metadata") + }) +} diff --git a/cli/migrate/fixtures/legacy-2-pre-dnote.json b/pkg/cli/migrate/fixtures/legacy-2-pre-dnote.json similarity index 100% rename from cli/migrate/fixtures/legacy-2-pre-dnote.json rename to pkg/cli/migrate/fixtures/legacy-2-pre-dnote.json diff --git a/cli/migrate/fixtures/legacy-3-pre-dnote.json b/pkg/cli/migrate/fixtures/legacy-3-pre-dnote.json similarity index 100% rename from cli/migrate/fixtures/legacy-3-pre-dnote.json rename to pkg/cli/migrate/fixtures/legacy-3-pre-dnote.json diff --git a/cli/migrate/fixtures/legacy-4-pre-dnoterc.yaml b/pkg/cli/migrate/fixtures/legacy-4-pre-dnoterc.yaml similarity index 100% rename from cli/migrate/fixtures/legacy-4-pre-dnoterc.yaml rename to pkg/cli/migrate/fixtures/legacy-4-pre-dnoterc.yaml diff --git a/cli/migrate/fixtures/legacy-5-post-actions.json b/pkg/cli/migrate/fixtures/legacy-5-post-actions.json similarity index 100% rename from cli/migrate/fixtures/legacy-5-post-actions.json rename to pkg/cli/migrate/fixtures/legacy-5-post-actions.json diff --git a/cli/migrate/fixtures/legacy-5-pre-actions.json b/pkg/cli/migrate/fixtures/legacy-5-pre-actions.json similarity index 100% rename from cli/migrate/fixtures/legacy-5-pre-actions.json rename to pkg/cli/migrate/fixtures/legacy-5-pre-actions.json diff --git a/cli/migrate/fixtures/legacy-6-post-dnote.json b/pkg/cli/migrate/fixtures/legacy-6-post-dnote.json similarity index 100% rename from cli/migrate/fixtures/legacy-6-post-dnote.json rename to pkg/cli/migrate/fixtures/legacy-6-post-dnote.json diff --git a/cli/migrate/fixtures/legacy-6-pre-dnote.json b/pkg/cli/migrate/fixtures/legacy-6-pre-dnote.json similarity index 100% rename from cli/migrate/fixtures/legacy-6-pre-dnote.json rename to pkg/cli/migrate/fixtures/legacy-6-pre-dnote.json diff --git a/cli/migrate/fixtures/legacy-7-post-actions.json b/pkg/cli/migrate/fixtures/legacy-7-post-actions.json similarity index 100% rename from cli/migrate/fixtures/legacy-7-post-actions.json rename to pkg/cli/migrate/fixtures/legacy-7-post-actions.json diff --git a/cli/migrate/fixtures/legacy-7-pre-actions.json b/pkg/cli/migrate/fixtures/legacy-7-pre-actions.json similarity index 100% rename from cli/migrate/fixtures/legacy-7-pre-actions.json rename to pkg/cli/migrate/fixtures/legacy-7-pre-actions.json diff --git a/cli/migrate/fixtures/legacy-8-actions.json b/pkg/cli/migrate/fixtures/legacy-8-actions.json similarity index 100% rename from cli/migrate/fixtures/legacy-8-actions.json rename to pkg/cli/migrate/fixtures/legacy-8-actions.json diff --git a/cli/migrate/fixtures/legacy-8-dnote.json b/pkg/cli/migrate/fixtures/legacy-8-dnote.json similarity index 100% rename from cli/migrate/fixtures/legacy-8-dnote.json rename to pkg/cli/migrate/fixtures/legacy-8-dnote.json diff --git a/cli/migrate/fixtures/legacy-8-dnoterc.yaml b/pkg/cli/migrate/fixtures/legacy-8-dnoterc.yaml similarity index 100% rename from cli/migrate/fixtures/legacy-8-dnoterc.yaml rename to pkg/cli/migrate/fixtures/legacy-8-dnoterc.yaml diff --git a/cli/migrate/fixtures/legacy-8-schema.yaml b/pkg/cli/migrate/fixtures/legacy-8-schema.yaml similarity index 100% rename from cli/migrate/fixtures/legacy-8-schema.yaml rename to pkg/cli/migrate/fixtures/legacy-8-schema.yaml diff --git a/cli/migrate/fixtures/legacy-8-timestamps.yaml b/pkg/cli/migrate/fixtures/legacy-8-timestamps.yaml similarity index 100% rename from cli/migrate/fixtures/legacy-8-timestamps.yaml rename to pkg/cli/migrate/fixtures/legacy-8-timestamps.yaml diff --git a/cli/migrate/fixtures/local-1-pre-schema.sql b/pkg/cli/migrate/fixtures/local-1-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/local-1-pre-schema.sql rename to pkg/cli/migrate/fixtures/local-1-pre-schema.sql diff --git a/cli/testutils/fixtures/schema.sql b/pkg/cli/migrate/fixtures/local-10-pre-schema.sql similarity index 93% rename from cli/testutils/fixtures/schema.sql rename to pkg/cli/migrate/fixtures/local-10-pre-schema.sql index 6723608b..a9679e45 100644 --- a/cli/testutils/fixtures/schema.sql +++ b/pkg/cli/migrate/fixtures/local-10-pre-schema.sql @@ -10,14 +10,6 @@ CREATE TABLE system ); CREATE UNIQUE INDEX idx_books_label ON books(label); CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); -CREATE TABLE actions - ( - uuid text PRIMARY KEY, - schema integer NOT NULL, - type text NOT NULL, - data text NOT NULL, - timestamp integer NOT NULL - ); CREATE TABLE IF NOT EXISTS "notes" ( uuid text NOT NULL, @@ -30,8 +22,7 @@ CREATE TABLE IF NOT EXISTS "notes" usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false ); -CREATE VIRTUAL TABLE note_fts - USING fts5(content=notes, body, tokenize = "unicode61") +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") /* note_fts(body) */; CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; @@ -47,5 +38,13 @@ CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); END; +CREATE TABLE actions + ( + uuid text PRIMARY KEY, + schema integer NOT NULL, + type text NOT NULL, + data text NOT NULL, + timestamp integer NOT NULL + ); CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/pkg/cli/migrate/fixtures/local-11-pre-schema.sql b/pkg/cli/migrate/fixtures/local-11-pre-schema.sql new file mode 100644 index 00000000..a9679e45 --- /dev/null +++ b/pkg/cli/migrate/fixtures/local-11-pre-schema.sql @@ -0,0 +1,50 @@ +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE IF NOT EXISTS "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + public bool DEFAULT false, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") +/* note_fts(body) */; +CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; +CREATE TABLE IF NOT EXISTS 'note_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID; +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TABLE actions + ( + uuid text PRIMARY KEY, + schema integer NOT NULL, + type text NOT NULL, + data text NOT NULL, + timestamp integer NOT NULL + ); +CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); +CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/pkg/cli/migrate/fixtures/local-12-pre-schema.sql b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql new file mode 100644 index 00000000..5560af3d --- /dev/null +++ b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql @@ -0,0 +1,42 @@ +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE IF NOT EXISTS "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + public bool DEFAULT false, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") +/* note_fts(body) */; +CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; +CREATE TABLE IF NOT EXISTS 'note_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID; +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); +CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/pkg/cli/migrate/fixtures/local-14-pre-schema.sql b/pkg/cli/migrate/fixtures/local-14-pre-schema.sql new file mode 100644 index 00000000..5560af3d --- /dev/null +++ b/pkg/cli/migrate/fixtures/local-14-pre-schema.sql @@ -0,0 +1,42 @@ +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE IF NOT EXISTS "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + public bool DEFAULT false, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") +/* note_fts(body) */; +CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; +CREATE TABLE IF NOT EXISTS 'note_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID; +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); +CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/cli/migrate/fixtures/local-5-pre-schema.sql b/pkg/cli/migrate/fixtures/local-5-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/local-5-pre-schema.sql rename to pkg/cli/migrate/fixtures/local-5-pre-schema.sql diff --git a/cli/migrate/fixtures/local-7-pre-schema.sql b/pkg/cli/migrate/fixtures/local-7-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/local-7-pre-schema.sql rename to pkg/cli/migrate/fixtures/local-7-pre-schema.sql diff --git a/cli/migrate/fixtures/local-8-pre-schema.sql b/pkg/cli/migrate/fixtures/local-8-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/local-8-pre-schema.sql rename to pkg/cli/migrate/fixtures/local-8-pre-schema.sql diff --git a/cli/migrate/fixtures/local-9-pre-schema.sql b/pkg/cli/migrate/fixtures/local-9-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/local-9-pre-schema.sql rename to pkg/cli/migrate/fixtures/local-9-pre-schema.sql diff --git a/cli/migrate/fixtures/remote-1-pre-schema.sql b/pkg/cli/migrate/fixtures/remote-1-pre-schema.sql similarity index 100% rename from cli/migrate/fixtures/remote-1-pre-schema.sql rename to pkg/cli/migrate/fixtures/remote-1-pre-schema.sql diff --git a/cli/migrate/legacy.go b/pkg/cli/migrate/legacy.go similarity index 82% rename from cli/migrate/legacy.go rename to pkg/cli/migrate/legacy.go index ee79a07b..4399f7fb 100644 --- a/cli/migrate/legacy.go +++ b/pkg/cli/migrate/legacy.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package migrate provides migration logic for both sqlite and @@ -23,15 +20,14 @@ package migrate import ( "encoding/json" "fmt" - "io/ioutil" "os" "time" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" - "github.com/dnote/dnote/cli/utils" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/google/uuid" "github.com/pkg/errors" - "github.com/satori/go.uuid" "gopkg.in/yaml.v2" ) @@ -81,11 +77,25 @@ func makeSchema(complete bool) schema { return s } +func genUUID() (string, error) { + res, err := uuid.NewRandom() + if err != nil { + return "", errors.Wrap(err, "generating a random uuid") + } + + return res.String(), nil + +} + // Legacy performs migration on JSON-based dnote if necessary -func Legacy(ctx infra.DnoteCtx) error { +func Legacy(ctx context.DnoteCtx) error { // If schema does not exist, no need run a legacy migration schemaPath := getSchemaPath(ctx) - if ok := utils.FileExists(schemaPath); !ok { + ok, err := utils.FileExists(schemaPath) + if err != nil { + return errors.Wrap(err, "checking if schema exists") + } + if !ok { return nil } @@ -106,7 +116,7 @@ func Legacy(ctx infra.DnoteCtx) error { // performMigration backs up current .dnote data, performs migration, and // restores or cleans backups depending on if there is an error -func performMigration(ctx infra.DnoteCtx, migrationID int) error { +func performMigration(ctx context.DnoteCtx, migrationID int) error { // legacyMigrationV8 is the final migration of the legacy JSON Dnote migration // migrate to sqlite and return if migrationID == legacyMigrationV8 { @@ -162,9 +172,9 @@ func performMigration(ctx infra.DnoteCtx, migrationID int) error { } // backupDnoteDir backs up the dnote directory to a temporary backup directory -func backupDnoteDir(ctx infra.DnoteCtx) error { - srcPath := fmt.Sprintf("%s/.dnote", ctx.HomeDir) - tmpPath := fmt.Sprintf("%s/%s", ctx.HomeDir, backupDirName) +func backupDnoteDir(ctx context.DnoteCtx) error { + srcPath := fmt.Sprintf("%s/.dnote", ctx.Paths.Home) + tmpPath := fmt.Sprintf("%s/%s", ctx.Paths.Home, backupDirName) if err := utils.CopyDir(srcPath, tmpPath); err != nil { return errors.Wrap(err, "Failed to copy the .dnote directory") @@ -173,19 +183,19 @@ func backupDnoteDir(ctx infra.DnoteCtx) error { return nil } -func restoreBackup(ctx infra.DnoteCtx) error { +func restoreBackup(ctx context.DnoteCtx) error { var err error defer func() { if err != nil { log.Printf(`Failed to restore backup for a failed migration. Don't worry. Your data is still intact in the backup directory. - Get help on https://github.com/dnote/dnote/cli/issues`) + Get help on https://github.com/dnote/dnote/pkg/cli/issues`) } }() - srcPath := fmt.Sprintf("%s/.dnote", ctx.HomeDir) - backupPath := fmt.Sprintf("%s/%s", ctx.HomeDir, backupDirName) + srcPath := fmt.Sprintf("%s/.dnote", ctx.Paths.Home) + backupPath := fmt.Sprintf("%s/%s", ctx.Paths.Home, backupDirName) if err = os.RemoveAll(srcPath); err != nil { return errors.Wrapf(err, "Failed to clear current dnote data at %s", backupPath) @@ -198,8 +208,8 @@ func restoreBackup(ctx infra.DnoteCtx) error { return nil } -func clearBackup(ctx infra.DnoteCtx) error { - backupPath := fmt.Sprintf("%s/%s", ctx.HomeDir, backupDirName) +func clearBackup(ctx context.DnoteCtx) error { + backupPath := fmt.Sprintf("%s/%s", ctx.Paths.Home, backupDirName) if err := os.RemoveAll(backupPath); err != nil { return errors.Wrapf(err, "Failed to remove backup at %s", backupPath) @@ -209,16 +219,16 @@ func clearBackup(ctx infra.DnoteCtx) error { } // getSchemaPath returns the path to the file containing schema info -func getSchemaPath(ctx infra.DnoteCtx) string { - return fmt.Sprintf("%s/%s", ctx.DnoteDir, schemaFilename) +func getSchemaPath(ctx context.DnoteCtx) string { + return fmt.Sprintf("%s/%s", ctx.Paths.LegacyDnote, schemaFilename) } -func readSchema(ctx infra.DnoteCtx) (schema, error) { +func readSchema(ctx context.DnoteCtx) (schema, error) { var ret schema path := getSchemaPath(ctx) - b, err := ioutil.ReadFile(path) + b, err := os.ReadFile(path) if err != nil { return ret, errors.Wrap(err, "Failed to read schema file") } @@ -231,21 +241,21 @@ func readSchema(ctx infra.DnoteCtx) (schema, error) { return ret, nil } -func writeSchema(ctx infra.DnoteCtx, s schema) error { +func writeSchema(ctx context.DnoteCtx, s schema) error { path := getSchemaPath(ctx) d, err := yaml.Marshal(&s) if err != nil { return errors.Wrap(err, "Failed to marshal schema into yaml") } - if err := ioutil.WriteFile(path, d, 0644); err != nil { + if err := os.WriteFile(path, d, 0644); err != nil { return errors.Wrap(err, "Failed to write schema file") } return nil } -func getUnrunMigrations(ctx infra.DnoteCtx) ([]int, error) { +func getUnrunMigrations(ctx context.DnoteCtx) ([]int, error) { var ret []int schema, err := readSchema(ctx) @@ -265,7 +275,7 @@ func getUnrunMigrations(ctx infra.DnoteCtx) ([]int, error) { return ret, nil } -func updateSchemaVersion(ctx infra.DnoteCtx, mID int) error { +func updateSchemaVersion(ctx context.DnoteCtx, mID int) error { s, err := readSchema(ctx) if err != nil { return errors.Wrap(err, "Failed to read schema") @@ -470,9 +480,13 @@ var migrateToV8SystemKeyBookMark = "bookmark" /***** migrations **/ // migrateToV1 deletes YAML archive if exists -func migrateToV1(ctx infra.DnoteCtx) error { - yamlPath := fmt.Sprintf("%s/%s", ctx.HomeDir, ".dnote-yaml-archived") - if !utils.FileExists(yamlPath) { +func migrateToV1(ctx context.DnoteCtx) error { + yamlPath := fmt.Sprintf("%s/%s", ctx.Paths.Home, ".dnote-yaml-archived") + ok, err := utils.FileExists(yamlPath) + if err != nil { + return errors.Wrap(err, "checking if yaml file exists") + } + if !ok { return nil } @@ -483,10 +497,10 @@ func migrateToV1(ctx infra.DnoteCtx) error { return nil } -func migrateToV2(ctx infra.DnoteCtx) error { - notePath := fmt.Sprintf("%s/dnote", ctx.DnoteDir) +func migrateToV2(ctx context.DnoteCtx) error { + notePath := fmt.Sprintf("%s/dnote", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(notePath) + b, err := os.ReadFile(notePath) if err != nil { return errors.Wrap(err, "Failed to read the note file") } @@ -502,8 +516,13 @@ func migrateToV2(ctx infra.DnoteCtx) error { for bookName, book := range preDnote { var notes = make([]migrateToV2PostNote, 0, len(book)) for _, note := range book { + noteUUID, err := genUUID() + if err != nil { + return errors.Wrap(err, "generating uuid") + } + newNote := migrateToV2PostNote{ - UUID: uuid.NewV4().String(), + UUID: noteUUID, Content: note.Content, AddedOn: note.AddedOn, EditedOn: 0, @@ -525,7 +544,7 @@ func migrateToV2(ctx infra.DnoteCtx) error { return errors.Wrap(err, "Failed to marshal new dnote into JSON") } - err = ioutil.WriteFile(notePath, d, 0644) + err = os.WriteFile(notePath, d, 0644) if err != nil { return errors.Wrap(err, "Failed to write the new dnote into the file") } @@ -534,11 +553,11 @@ func migrateToV2(ctx infra.DnoteCtx) error { } // migrateToV3 generates actions for existing dnote -func migrateToV3(ctx infra.DnoteCtx) error { - notePath := fmt.Sprintf("%s/dnote", ctx.DnoteDir) - actionsPath := fmt.Sprintf("%s/actions", ctx.DnoteDir) +func migrateToV3(ctx context.DnoteCtx) error { + notePath := fmt.Sprintf("%s/dnote", ctx.Paths.LegacyDnote) + actionsPath := fmt.Sprintf("%s/actions", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(notePath) + b, err := os.ReadFile(notePath) if err != nil { return errors.Wrap(err, "Failed to read the note file") } @@ -592,7 +611,7 @@ func migrateToV3(ctx infra.DnoteCtx) error { return errors.Wrap(err, "Failed to marshal actions into JSON") } - err = ioutil.WriteFile(actionsPath, a, 0644) + err = os.WriteFile(actionsPath, a, 0644) if err != nil { return errors.Wrap(err, "Failed to write the actions into a file") } @@ -621,10 +640,10 @@ func getEditorCommand() string { } } -func migrateToV4(ctx infra.DnoteCtx) error { - configPath := fmt.Sprintf("%s/dnoterc", ctx.DnoteDir) +func migrateToV4(ctx context.DnoteCtx) error { + configPath := fmt.Sprintf("%s/dnoterc", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(configPath) + b, err := os.ReadFile(configPath) if err != nil { return errors.Wrap(err, "Failed to read the config file") } @@ -645,7 +664,7 @@ func migrateToV4(ctx infra.DnoteCtx) error { return errors.Wrap(err, "Failed to marshal config into JSON") } - err = ioutil.WriteFile(configPath, data, 0644) + err = os.WriteFile(configPath, data, 0644) if err != nil { return errors.Wrap(err, "Failed to write the config into a file") } @@ -654,10 +673,10 @@ func migrateToV4(ctx infra.DnoteCtx) error { } // migrateToV5 migrates actions -func migrateToV5(ctx infra.DnoteCtx) error { - actionsPath := fmt.Sprintf("%s/actions", ctx.DnoteDir) +func migrateToV5(ctx context.DnoteCtx) error { + actionsPath := fmt.Sprintf("%s/actions", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(actionsPath) + b, err := os.ReadFile(actionsPath) if err != nil { return errors.Wrap(err, "reading the actions file") } @@ -695,8 +714,13 @@ func migrateToV5(ctx infra.DnoteCtx) error { data = action.Data } + actionUUID, err := genUUID() + if err != nil { + return errors.Wrap(err, "generating UUID") + } + migrated := migrateToV5PostAction{ - UUID: uuid.NewV4().String(), + UUID: actionUUID, Schema: 1, Type: action.Type, Data: data, @@ -710,7 +734,7 @@ func migrateToV5(ctx infra.DnoteCtx) error { if err != nil { return errors.Wrap(err, "marshalling result into JSON") } - err = ioutil.WriteFile(actionsPath, a, 0644) + err = os.WriteFile(actionsPath, a, 0644) if err != nil { return errors.Wrap(err, "writing the result into a file") } @@ -719,10 +743,10 @@ func migrateToV5(ctx infra.DnoteCtx) error { } // migrateToV6 adds a 'public' field to notes -func migrateToV6(ctx infra.DnoteCtx) error { - notePath := fmt.Sprintf("%s/dnote", ctx.DnoteDir) +func migrateToV6(ctx context.DnoteCtx) error { + notePath := fmt.Sprintf("%s/dnote", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(notePath) + b, err := os.ReadFile(notePath) if err != nil { return errors.Wrap(err, "Failed to read the note file") } @@ -763,7 +787,7 @@ func migrateToV6(ctx infra.DnoteCtx) error { return errors.Wrap(err, "Failed to marshal new dnote into JSON") } - err = ioutil.WriteFile(notePath, d, 0644) + err = os.WriteFile(notePath, d, 0644) if err != nil { return errors.Wrap(err, "Failed to write the new dnote into the file") } @@ -773,11 +797,11 @@ func migrateToV6(ctx infra.DnoteCtx) error { // migrateToV7 migrates data of edit_note action to the proper version which is // EditNoteDataV2. Due to a bug, edit logged actions with schema version '2' -// but with a data of EditNoteDataV1. https://github.com/dnote/dnote/cli/issues/107 -func migrateToV7(ctx infra.DnoteCtx) error { - actionPath := fmt.Sprintf("%s/actions", ctx.DnoteDir) +// but with a data of EditNoteDataV1. https://github.com/dnote/dnote/pkg/cli/issues/107 +func migrateToV7(ctx context.DnoteCtx) error { + actionPath := fmt.Sprintf("%s/actions", ctx.Paths.LegacyDnote) - b, err := ioutil.ReadFile(actionPath) + b, err := os.ReadFile(actionPath) if err != nil { return errors.Wrap(err, "reading actions file") } @@ -829,7 +853,7 @@ func migrateToV7(ctx infra.DnoteCtx) error { return errors.Wrap(err, "marshalling new actions") } - err = ioutil.WriteFile(actionPath, d, 0644) + err = os.WriteFile(actionPath, d, 0644) if err != nil { return errors.Wrap(err, "writing new actions to a file") } @@ -838,15 +862,15 @@ func migrateToV7(ctx infra.DnoteCtx) error { } // migrateToV8 migrates dnote data to sqlite database -func migrateToV8(ctx infra.DnoteCtx) error { +func migrateToV8(ctx context.DnoteCtx) error { tx, err := ctx.DB.Begin() if err != nil { return errors.Wrap(err, "beginning a transaction") } // 1. Migrate the the dnote file - dnoteFilePath := fmt.Sprintf("%s/dnote", ctx.DnoteDir) - b, err := ioutil.ReadFile(dnoteFilePath) + dnoteFilePath := fmt.Sprintf("%s/dnote", ctx.Paths.LegacyDnote) + b, err := os.ReadFile(dnoteFilePath) if err != nil { return errors.Wrap(err, "reading the notes") } @@ -858,7 +882,13 @@ func migrateToV8(ctx infra.DnoteCtx) error { } for bookName, book := range dnote { - bookUUID := uuid.NewV4().String() + bookUUIDResult, err := uuid.NewRandom() + if err != nil { + return errors.Wrap(err, "generating uuid") + } + + bookUUID := bookUUIDResult.String() + _, err = tx.Exec(`INSERT INTO books (uuid, label) VALUES (?, ?)`, bookUUID, bookName) if err != nil { tx.Rollback() @@ -879,8 +909,8 @@ func migrateToV8(ctx infra.DnoteCtx) error { } // 2. Migrate the actions file - actionsPath := fmt.Sprintf("%s/actions", ctx.DnoteDir) - b, err = ioutil.ReadFile(actionsPath) + actionsPath := fmt.Sprintf("%s/actions", ctx.Paths.LegacyDnote) + b, err = os.ReadFile(actionsPath) if err != nil { return errors.Wrap(err, "reading the actions") } @@ -904,8 +934,8 @@ func migrateToV8(ctx infra.DnoteCtx) error { } // 3. Migrate the timestamps file - timestampsPath := fmt.Sprintf("%s/timestamps", ctx.DnoteDir) - b, err = ioutil.ReadFile(timestampsPath) + timestampsPath := fmt.Sprintf("%s/timestamps", ctx.Paths.LegacyDnote) + b, err = os.ReadFile(timestampsPath) if err != nil { return errors.Wrap(err, "reading the timestamps") } @@ -946,7 +976,7 @@ func migrateToV8(ctx infra.DnoteCtx) error { if err := os.RemoveAll(timestampsPath); err != nil { return errors.Wrap(err, "removing the timestamps file") } - schemaPath := fmt.Sprintf("%s/schema", ctx.DnoteDir) + schemaPath := fmt.Sprintf("%s/schema", ctx.Paths.LegacyDnote) if err := os.RemoveAll(schemaPath); err != nil { return errors.Wrap(err, "removing the schema file") } diff --git a/pkg/cli/migrate/legacy_test.go b/pkg/cli/migrate/legacy_test.go new file mode 100644 index 00000000..73d8b063 --- /dev/null +++ b/pkg/cli/migrate/legacy_test.go @@ -0,0 +1,656 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package migrate + +import ( + "encoding/json" + "fmt" + "os" + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" + "gopkg.in/yaml.v2" +) + +func setupEnv(t *testing.T, homeDir string) context.DnoteCtx { + dnoteDir := fmt.Sprintf("%s/.dnote", homeDir) + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "preparing dnote dir")) + } + + return context.DnoteCtx{ + Paths: context.Paths{ + Home: homeDir, + LegacyDnote: dnoteDir, + }, + } +} + +func teardownEnv(t *testing.T, ctx context.DnoteCtx) { + if err := os.RemoveAll(ctx.Paths.LegacyDnote); err != nil { + t.Fatal(errors.Wrap(err, "tearing down the dnote dir")) + } +} + +func TestMigrateToV1(t *testing.T) { + t.Run("yaml exists", func(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + yamlPath, err := filepath.Abs(filepath.Join(ctx.Paths.Home, ".dnote-yaml-archived")) + if err != nil { + panic(errors.Wrap(err, "Failed to get absolute YAML path").Error()) + } + os.WriteFile(yamlPath, []byte{}, 0644) + + // execute + if err := migrateToV1(ctx); err != nil { + t.Fatal(errors.Wrapf(err, "Failed to migrate").Error()) + } + + // test + ok, err := utils.FileExists(yamlPath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if yaml file exists")) + } + if ok { + t.Fatal("YAML archive file has not been deleted") + } + }) + + t.Run("yaml does not exist", func(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + yamlPath, err := filepath.Abs(filepath.Join(ctx.Paths.Home, ".dnote-yaml-archived")) + if err != nil { + panic(errors.Wrap(err, "Failed to get absolute YAML path").Error()) + } + + // execute + if err := migrateToV1(ctx); err != nil { + t.Fatal(errors.Wrapf(err, "Failed to migrate").Error()) + } + + // test + ok, err := utils.FileExists(yamlPath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if yaml file exists")) + } + if ok { + t.Fatal("YAML archive file must not exist") + } + }) +} + +func TestMigrateToV2(t *testing.T) { + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-2-pre-dnote.json", "dnote") + + // execute + if err := migrateToV2(ctx); err != nil { + t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) + } + + // test + b := testutils.ReadFile(ctx, "dnote") + + var postDnote migrateToV2PostDnote + if err := json.Unmarshal(b, &postDnote); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) + } + + for _, book := range postDnote { + assert.NotEqual(t, book.Name, "", "Book name was not populated") + + for _, note := range book.Notes { + if len(note.UUID) == 8 { + t.Errorf("Note UUID was not migrated. It has length of %d", len(note.UUID)) + } + + assert.NotEqual(t, note.AddedOn, int64(0), "AddedOn was not carried over") + assert.Equal(t, note.EditedOn, int64(0), "EditedOn was not created properly") + } + } +} + +func TestMigrateToV3(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-3-pre-dnote.json", "dnote") + + // execute + if err := migrateToV3(ctx); err != nil { + t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) + } + + // test + b := testutils.ReadFile(ctx, "dnote") + var postDnote migrateToV3Dnote + if err := json.Unmarshal(b, &postDnote); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) + } + + b = testutils.ReadFile(ctx, "actions") + var actions []migrateToV3Action + if err := json.Unmarshal(b, &actions); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the actions").Error()) + } + + assert.Equal(t, len(actions), 6, "actions length mismatch") + + for _, book := range postDnote { + for _, note := range book.Notes { + assert.NotEqual(t, note.AddedOn, int64(0), "AddedOn was not carried over") + } + } +} + +func TestMigrateToV4(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + defer os.Setenv("EDITOR", "") + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-4-pre-dnoterc.yaml", "dnoterc") + + // execute + os.Setenv("EDITOR", "vim") + if err := migrateToV4(ctx); err != nil { + t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) + } + + // test + b := testutils.ReadFile(ctx, "dnoterc") + var config migrateToV4PostConfig + if err := yaml.Unmarshal(b, &config); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) + } + + assert.Equal(t, config.APIKey, "Oev6e1082ORasdf9rjkfjkasdfjhgei", "api key mismatch") + assert.Equal(t, config.Editor, "vim", "editor mismatch") +} + +func TestMigrateToV5(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-5-pre-actions.json", "actions") + + // execute + if err := migrateToV5(ctx); err != nil { + t.Fatal(errors.Wrap(err, "migrating").Error()) + } + + // test + var oldActions []migrateToV5PreAction + testutils.ReadJSON("./fixtures/legacy-5-pre-actions.json", &oldActions) + + b := testutils.ReadFile(ctx, "actions") + var migratedActions []migrateToV5PostAction + if err := json.Unmarshal(b, &migratedActions); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling migrated actions").Error()) + } + + if len(oldActions) != len(migratedActions) { + t.Fatalf("There were %d actions but after migration there were %d", len(oldActions), len(migratedActions)) + } + + for idx := range migratedActions { + migrated := migratedActions[idx] + old := oldActions[idx] + + assert.NotEqual(t, migrated.UUID, "", fmt.Sprintf("uuid mismatch for migrated item with index %d", idx)) + assert.Equal(t, migrated.Schema, 1, fmt.Sprintf("schema mismatch for migrated item with index %d", idx)) + assert.Equal(t, migrated.Timestamp, old.Timestamp, fmt.Sprintf("timestamp mismatch for migrated item with index %d", idx)) + assert.Equal(t, migrated.Type, old.Type, fmt.Sprintf("timestamp mismatch for migrated item with index %d", idx)) + + switch migrated.Type { + case migrateToV5ActionAddNote: + var oldData, migratedData migrateToV5AddNoteData + if err := json.Unmarshal(old.Data, &oldData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) + } + if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) + } + + assert.Equal(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) + assert.Equal(t, oldData.Content, migratedData.Content, fmt.Sprintf("data content mismatch for item idx %d", idx)) + assert.Equal(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) + case migrateToV5ActionRemoveNote: + var oldData, migratedData migrateToV5RemoveNoteData + if err := json.Unmarshal(old.Data, &oldData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) + } + if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) + } + + assert.Equal(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) + assert.Equal(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) + case migrateToV5ActionAddBook: + var oldData, migratedData migrateToV5AddBookData + if err := json.Unmarshal(old.Data, &oldData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) + } + if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) + } + + assert.Equal(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) + case migrateToV5ActionRemoveBook: + var oldData, migratedData migrateToV5RemoveBookData + if err := json.Unmarshal(old.Data, &oldData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) + } + if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) + } + + assert.Equal(t, oldData.BookName, migratedData.BookName, fmt.Sprintf("data book_name mismatch for item idx %d", idx)) + case migrateToV5ActionEditNote: + var oldData migrateToV5PreEditNoteData + var migratedData migrateToV5PostEditNoteData + if err := json.Unmarshal(old.Data, &oldData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling old data").Error()) + } + if err := json.Unmarshal(migrated.Data, &migratedData); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling new data").Error()) + } + + assert.Equal(t, oldData.NoteUUID, migratedData.NoteUUID, fmt.Sprintf("data note_uuid mismatch for item idx %d", idx)) + assert.Equal(t, oldData.Content, migratedData.Content, fmt.Sprintf("data content mismatch for item idx %d", idx)) + assert.Equal(t, oldData.BookName, migratedData.FromBook, "book_name should have been renamed to from_book") + assert.Equal(t, migratedData.ToBook, "", "to_book should be empty") + } + } +} + +func TestMigrateToV6(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-6-pre-dnote.json", "dnote") + + // execute + if err := migrateToV6(ctx); err != nil { + t.Fatal(errors.Wrap(err, "Failed to migrate").Error()) + } + + // test + b := testutils.ReadFile(ctx, "dnote") + var got migrateToV6PostDnote + if err := json.Unmarshal(b, &got); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) + } + + b = utils.ReadFileAbs("./fixtures/legacy-6-post-dnote.json") + var expected migrateToV6PostDnote + if err := json.Unmarshal(b, &expected); err != nil { + t.Fatal(errors.Wrap(err, "Failed to unmarshal the result into Dnote").Error()) + } + + assert.DeepEqual(t, expected, got, "payload mismatch") +} + +func TestMigrateToV7(t *testing.T) { + // set up + ctx := setupEnv(t, "../tmp") + defer teardownEnv(t, ctx) + + testutils.CopyFixture(t, ctx, "./fixtures/legacy-7-pre-actions.json", "actions") + + // execute + if err := migrateToV7(ctx); err != nil { + t.Fatal(errors.Wrap(err, "migrating").Error()) + } + + // test + b := testutils.ReadFile(ctx, "actions") + var got []migrateToV7Action + if err := json.Unmarshal(b, &got); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling the result").Error()) + } + + b2 := utils.ReadFileAbs("./fixtures/legacy-7-post-actions.json") + var expected []migrateToV7Action + if err := json.Unmarshal(b, &expected); err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling the result into Dnote").Error()) + } + + assert.EqualJSON(t, string(b), string(b2), "Result does not match") +} + +func TestMigrateToV8(t *testing.T) { + tmpDir := t.TempDir() + dnoteDir := tmpDir + "/.dnote" + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "creating legacy dnote directory")) + } + + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + + ctx := context.DnoteCtx{ + Paths: context.Paths{ + Home: tmpDir, + LegacyDnote: dnoteDir, + }, + DB: db, + } + + // set up + testutils.CopyFixture(t, ctx, "./fixtures/legacy-8-actions.json", "actions") + testutils.CopyFixture(t, ctx, "./fixtures/legacy-8-dnote.json", "dnote") + testutils.CopyFixture(t, ctx, "./fixtures/legacy-8-dnoterc.yaml", "dnoterc") + testutils.CopyFixture(t, ctx, "./fixtures/legacy-8-schema.yaml", "schema") + testutils.CopyFixture(t, ctx, "./fixtures/legacy-8-timestamps.yaml", "timestamps") + + // execute + if err := migrateToV8(ctx); err != nil { + t.Fatal(errors.Wrap(err, "migrating").Error()) + } + + // test + + // 1. test if files are migrated + dnoteFilePath := fmt.Sprintf("%s/dnote", ctx.Paths.LegacyDnote) + dnotercPath := fmt.Sprintf("%s/dnoterc", ctx.Paths.LegacyDnote) + schemaFilePath := fmt.Sprintf("%s/schema", ctx.Paths.LegacyDnote) + timestampFilePath := fmt.Sprintf("%s/timestamps", ctx.Paths.LegacyDnote) + + ok, err := utils.FileExists(dnoteFilePath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if file exists")) + } + if ok { + t.Errorf("%s still exists", dnoteFilePath) + } + + ok, err = utils.FileExists(schemaFilePath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if file exists")) + } + if ok { + t.Errorf("%s still exists", schemaFilePath) + } + + ok, err = utils.FileExists(timestampFilePath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if file exists")) + } + if ok { + t.Errorf("%s still exists", timestampFilePath) + } + + ok, err = utils.FileExists(dnotercPath) + if err != nil { + t.Fatal(errors.Wrap(err, "checking if file exists")) + } + if !ok { + t.Errorf("%s still exists", dnotercPath) + } + + // 2. test if notes and books are migrated + + var bookCount, noteCount int + err = db.QueryRow("SELECT count(*) FROM books").Scan(&bookCount) + if err != nil { + panic(errors.Wrap(err, "counting books")) + } + err = db.QueryRow("SELECT count(*) FROM notes").Scan(¬eCount) + if err != nil { + panic(errors.Wrap(err, "counting notes")) + } + assert.Equal(t, bookCount, 2, "book count mismatch") + assert.Equal(t, noteCount, 3, "note count mismatch") + + type bookInfo struct { + label string + uuid string + } + type noteInfo struct { + id int + uuid string + bookUUID string + content string + addedOn int64 + editedOn int64 + public bool + } + + var b1, b2 bookInfo + var n1, n2, n3 noteInfo + err = db.QueryRow("SELECT label, uuid FROM books WHERE label = ?", "js").Scan(&b1.label, &b1.uuid) + if err != nil { + panic(errors.Wrap(err, "finding book 1")) + } + err = db.QueryRow("SELECT label, uuid FROM books WHERE label = ?", "css").Scan(&b2.label, &b2.uuid) + if err != nil { + panic(errors.Wrap(err, "finding book 2")) + } + err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "d69edb54-5b31-4cdd-a4a5-34f0a0bfa153").Scan(&n1.id, &n1.uuid, &n1.bookUUID, &n1.content, &n1.addedOn, &n1.editedOn, &n1.public) + if err != nil { + panic(errors.Wrap(err, "finding note 1")) + } + err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "35cbcab1-6a2a-4cc8-97e0-e73bbbd54626").Scan(&n2.id, &n2.uuid, &n2.bookUUID, &n2.content, &n2.addedOn, &n2.editedOn, &n2.public) + if err != nil { + panic(errors.Wrap(err, "finding note 2")) + } + err = db.QueryRow("SELECT id, uuid, book_uuid, content, added_on, edited_on, public FROM notes WHERE uuid = ?", "7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a").Scan(&n3.id, &n3.uuid, &n3.bookUUID, &n3.content, &n3.addedOn, &n3.editedOn, &n3.public) + if err != nil { + panic(errors.Wrap(err, "finding note 3")) + } + + assert.NotEqual(t, b1.uuid, "", "book 1 uuid should have been generated") + assert.Equal(t, b1.label, "js", "book 1 label mismatch") + assert.NotEqual(t, b2.uuid, "", "book 2 uuid should have been generated") + assert.Equal(t, b2.label, "css", "book 2 label mismatch") + + assert.Equal(t, n1.uuid, "d69edb54-5b31-4cdd-a4a5-34f0a0bfa153", "note 1 uuid mismatch") + assert.NotEqual(t, n1.id, 0, "note 1 id should have been generated") + assert.Equal(t, n1.bookUUID, b2.uuid, "note 1 book_uuid mismatch") + assert.Equal(t, n1.content, "css test 1", "note 1 content mismatch") + assert.Equal(t, n1.addedOn, int64(1536977237), "note 1 added_on mismatch") + assert.Equal(t, n1.editedOn, int64(1536977253), "note 1 edited_on mismatch") + assert.Equal(t, n1.public, false, "note 1 public mismatch") + + assert.Equal(t, n2.uuid, "35cbcab1-6a2a-4cc8-97e0-e73bbbd54626", "note 2 uuid mismatch") + assert.NotEqual(t, n2.id, 0, "note 2 id should have been generated") + assert.Equal(t, n2.bookUUID, b1.uuid, "note 2 book_uuid mismatch") + assert.Equal(t, n2.content, "js test 1", "note 2 content mismatch") + assert.Equal(t, n2.addedOn, int64(1536977229), "note 2 added_on mismatch") + assert.Equal(t, n2.editedOn, int64(0), "note 2 edited_on mismatch") + assert.Equal(t, n2.public, false, "note 2 public mismatch") + + assert.Equal(t, n3.uuid, "7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a", "note 3 uuid mismatch") + assert.NotEqual(t, n3.id, 0, "note 3 id should have been generated") + assert.Equal(t, n3.bookUUID, b1.uuid, "note 3 book_uuid mismatch") + assert.Equal(t, n3.content, "js test 2", "note 3 content mismatch") + assert.Equal(t, n3.addedOn, int64(1536977230), "note 3 added_on mismatch") + assert.Equal(t, n3.editedOn, int64(0), "note 3 edited_on mismatch") + assert.Equal(t, n3.public, false, "note 3 public mismatch") + + // 3. test if actions are migrated + var actionCount int + err = db.QueryRow("SELECT count(*) FROM actions").Scan(&actionCount) + if err != nil { + panic(errors.Wrap(err, "counting actions")) + } + + assert.Equal(t, actionCount, 11, "action count mismatch") + + type actionInfo struct { + uuid string + schema int + actionType string + data string + timestamp int + } + + var a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11 actionInfo + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "6145c1b7-f286-4d9f-b0f6-00d274baefc6").Scan(&a1.uuid, &a1.schema, &a1.actionType, &a1.data, &a1.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a1")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "c048a56b-179c-4f31-9995-81e9b32b7dd6").Scan(&a2.uuid, &a2.schema, &a2.actionType, &a2.data, &a2.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a2")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "f557ef48-c304-47dc-adfb-46b7306e701f").Scan(&a3.uuid, &a3.schema, &a3.actionType, &a3.data, &a3.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a3")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "8d79db34-343d-4331-ae5b-24743f17ca7f").Scan(&a4.uuid, &a4.schema, &a4.actionType, &a4.data, &a4.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a4")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "b9c1ed4a-e6b3-41f2-983b-593ec7b8b7a1").Scan(&a5.uuid, &a5.schema, &a5.actionType, &a5.data, &a5.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a5")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "06ed7ef0-f171-4bd7-ae8e-97b5d06a4c49").Scan(&a6.uuid, &a6.schema, &a6.actionType, &a6.data, &a6.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a6")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "7f173cef-1688-4177-a373-145fcd822b2f").Scan(&a7.uuid, &a7.schema, &a7.actionType, &a7.data, &a7.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a7")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "64352e08-aa7a-45f4-b760-b3f38b5e11fa").Scan(&a8.uuid, &a8.schema, &a8.actionType, &a8.data, &a8.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a8")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "82e20a12-bda8-45f7-ac42-b453b6daa5ec").Scan(&a9.uuid, &a9.schema, &a9.actionType, &a9.data, &a9.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a9")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "a29055f4-ace4-44fd-8800-3396edbccaef").Scan(&a10.uuid, &a10.schema, &a10.actionType, &a10.data, &a10.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a10")) + } + err = db.QueryRow("SELECT uuid, schema, type, data, timestamp FROM actions WHERE uuid = ?", "871a5562-1bd0-43c1-b550-5bbb727ac7c4").Scan(&a11.uuid, &a11.schema, &a11.actionType, &a11.data, &a11.timestamp) + if err != nil { + panic(errors.Wrap(err, "finding a11")) + } + + assert.Equal(t, a1.uuid, "6145c1b7-f286-4d9f-b0f6-00d274baefc6", "action 1 uuid mismatch") + assert.Equal(t, a1.schema, 1, "action 1 schema mismatch") + assert.Equal(t, a1.actionType, "add_book", "action 1 type mismatch") + assert.Equal(t, a1.data, `{"book_name":"js"}`, "action 1 data mismatch") + assert.Equal(t, a1.timestamp, 1536977229, "action 1 timestamp mismatch") + + assert.Equal(t, a2.uuid, "c048a56b-179c-4f31-9995-81e9b32b7dd6", "action 2 uuid mismatch") + assert.Equal(t, a2.schema, 2, "action 2 schema mismatch") + assert.Equal(t, a2.actionType, "add_note", "action 2 type mismatch") + assert.Equal(t, a2.data, `{"note_uuid":"35cbcab1-6a2a-4cc8-97e0-e73bbbd54626","book_name":"js","content":"js test 1","public":false}`, "action 2 data mismatch") + assert.Equal(t, a2.timestamp, 1536977229, "action 2 timestamp mismatch") + + assert.Equal(t, a3.uuid, "f557ef48-c304-47dc-adfb-46b7306e701f", "action 3 uuid mismatch") + assert.Equal(t, a3.schema, 2, "action 3 schema mismatch") + assert.Equal(t, a3.actionType, "add_note", "action 3 type mismatch") + assert.Equal(t, a3.data, `{"note_uuid":"7c1fcfb2-de8b-4350-88f0-fb3cbaf6630a","book_name":"js","content":"js test 2","public":false}`, "action 3 data mismatch") + assert.Equal(t, a3.timestamp, 1536977230, "action 3 timestamp mismatch") + + assert.Equal(t, a4.uuid, "8d79db34-343d-4331-ae5b-24743f17ca7f", "action 4 uuid mismatch") + assert.Equal(t, a4.schema, 2, "action 4 schema mismatch") + assert.Equal(t, a4.actionType, "add_note", "action 4 type mismatch") + assert.Equal(t, a4.data, `{"note_uuid":"b23a88ba-b291-4294-9795-86b394db5dcf","book_name":"js","content":"js test 3","public":false}`, "action 4 data mismatch") + assert.Equal(t, a4.timestamp, 1536977234, "action 4 timestamp mismatch") + + assert.Equal(t, a5.uuid, "b9c1ed4a-e6b3-41f2-983b-593ec7b8b7a1", "action 5 uuid mismatch") + assert.Equal(t, a5.schema, 1, "action 5 schema mismatch") + assert.Equal(t, a5.actionType, "add_book", "action 5 type mismatch") + assert.Equal(t, a5.data, `{"book_name":"css"}`, "action 5 data mismatch") + assert.Equal(t, a5.timestamp, 1536977237, "action 5 timestamp mismatch") + + assert.Equal(t, a6.uuid, "06ed7ef0-f171-4bd7-ae8e-97b5d06a4c49", "action 6 uuid mismatch") + assert.Equal(t, a6.schema, 2, "action 6 schema mismatch") + assert.Equal(t, a6.actionType, "add_note", "action 6 type mismatch") + assert.Equal(t, a6.data, `{"note_uuid":"d69edb54-5b31-4cdd-a4a5-34f0a0bfa153","book_name":"css","content":"js test 3","public":false}`, "action 6 data mismatch") + assert.Equal(t, a6.timestamp, 1536977237, "action 6 timestamp mismatch") + + assert.Equal(t, a7.uuid, "7f173cef-1688-4177-a373-145fcd822b2f", "action 7 uuid mismatch") + assert.Equal(t, a7.schema, 2, "action 7 schema mismatch") + assert.Equal(t, a7.actionType, "edit_note", "action 7 type mismatch") + assert.Equal(t, a7.data, `{"note_uuid":"d69edb54-5b31-4cdd-a4a5-34f0a0bfa153","from_book":"css","to_book":null,"content":"css test 1","public":null}`, "action 7 data mismatch") + assert.Equal(t, a7.timestamp, 1536977253, "action 7 timestamp mismatch") + + assert.Equal(t, a8.uuid, "64352e08-aa7a-45f4-b760-b3f38b5e11fa", "action 8 uuid mismatch") + assert.Equal(t, a8.schema, 1, "action 8 schema mismatch") + assert.Equal(t, a8.actionType, "add_book", "action 8 type mismatch") + assert.Equal(t, a8.data, `{"book_name":"sql"}`, "action 8 data mismatch") + assert.Equal(t, a8.timestamp, 1536977261, "action 8 timestamp mismatch") + + assert.Equal(t, a9.uuid, "82e20a12-bda8-45f7-ac42-b453b6daa5ec", "action 9 uuid mismatch") + assert.Equal(t, a9.schema, 2, "action 9 schema mismatch") + assert.Equal(t, a9.actionType, "add_note", "action 9 type mismatch") + assert.Equal(t, a9.data, `{"note_uuid":"2f47d390-685b-4b84-89ac-704c6fb8d3fb","book_name":"sql","content":"blah","public":false}`, "action 9 data mismatch") + assert.Equal(t, a9.timestamp, 1536977261, "action 9 timestamp mismatch") + + assert.Equal(t, a10.uuid, "a29055f4-ace4-44fd-8800-3396edbccaef", "action 10 uuid mismatch") + assert.Equal(t, a10.schema, 1, "action 10 schema mismatch") + assert.Equal(t, a10.actionType, "remove_book", "action 10 type mismatch") + assert.Equal(t, a10.data, `{"book_name":"sql"}`, "action 10 data mismatch") + assert.Equal(t, a10.timestamp, 1536977268, "action 10 timestamp mismatch") + + assert.Equal(t, a11.uuid, "871a5562-1bd0-43c1-b550-5bbb727ac7c4", "action 11 uuid mismatch") + assert.Equal(t, a11.schema, 1, "action 11 schema mismatch") + assert.Equal(t, a11.actionType, "remove_note", "action 11 type mismatch") + assert.Equal(t, a11.data, `{"note_uuid":"b23a88ba-b291-4294-9795-86b394db5dcf","book_name":"js"}`, "action 11 data mismatch") + assert.Equal(t, a11.timestamp, 1536977274, "action 11 timestamp mismatch") + + // 3. test if system is migrated + var systemCount int + err = db.QueryRow("SELECT count(*) FROM system").Scan(&systemCount) + if err != nil { + panic(errors.Wrap(err, "counting system")) + } + + assert.Equal(t, systemCount, 3, "action count mismatch") + + var lastUpgrade, lastAction, bookmark int + err = db.QueryRow("SELECT value FROM system WHERE key = ?", "last_upgrade").Scan(&lastUpgrade) + if err != nil { + panic(errors.Wrap(err, "finding last_upgrade")) + } + err = db.QueryRow("SELECT value FROM system WHERE key = ?", "last_action").Scan(&lastAction) + if err != nil { + panic(errors.Wrap(err, "finding last_action")) + } + err = db.QueryRow("SELECT value FROM system WHERE key = ?", "bookmark").Scan(&bookmark) + if err != nil { + panic(errors.Wrap(err, "finding bookmark")) + } + + assert.Equal(t, lastUpgrade, 1536977220, "last_upgrade mismatch") + assert.Equal(t, lastAction, 1536977274, "last_action mismatch") + assert.Equal(t, bookmark, 9, "bookmark mismatch") +} diff --git a/cli/migrate/migrate.go b/pkg/cli/migrate/migrate.go similarity index 66% rename from cli/migrate/migrate.go rename to pkg/cli/migrate/migrate.go index b604dedb..9b4b0f50 100644 --- a/cli/migrate/migrate.go +++ b/pkg/cli/migrate/migrate.go @@ -1,27 +1,26 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate import ( "database/sql" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" ) @@ -43,6 +42,11 @@ var LocalSequence = []migration{ lm7, lm8, lm9, + lm10, + lm11, + lm12, + lm13, + lm14, } // RemoteSequence is a list of remote migrations to be run @@ -50,7 +54,7 @@ var RemoteSequence = []migration{ rm1, } -func initSchema(ctx infra.DnoteCtx, schemaKey string) (int, error) { +func initSchema(ctx context.DnoteCtx, schemaKey string) (int, error) { // schemaVersion is the index of the latest run migration in the sequence schemaVersion := 0 @@ -65,17 +69,17 @@ func initSchema(ctx infra.DnoteCtx, schemaKey string) (int, error) { func getSchemaKey(mode int) (string, error) { if mode == LocalMode { - return infra.SystemSchema, nil + return consts.SystemSchema, nil } if mode == RemoteMode { - return infra.SystemRemoteSchema, nil + return consts.SystemRemoteSchema, nil } return "", errors.Errorf("unsupported migration type '%d'", mode) } -func getSchema(ctx infra.DnoteCtx, schemaKey string) (int, error) { +func getSchema(ctx context.DnoteCtx, schemaKey string) (int, error) { var ret int db := ctx.DB @@ -93,7 +97,7 @@ func getSchema(ctx infra.DnoteCtx, schemaKey string) (int, error) { return ret, nil } -func execute(ctx infra.DnoteCtx, m migration, schemaKey string) error { +func execute(ctx context.DnoteCtx, m migration, schemaKey string) error { log.Debug("running migration %s\n", m.name) tx, err := ctx.DB.Begin() @@ -126,7 +130,7 @@ func execute(ctx infra.DnoteCtx, m migration, schemaKey string) error { } // Run performs unrun migrations -func Run(ctx infra.DnoteCtx, migrations []migration, mode int) error { +func Run(ctx context.DnoteCtx, migrations []migration, mode int) error { schemaKey, err := getSchemaKey(mode) if err != nil { return errors.Wrap(err, "getting schema key") @@ -137,7 +141,7 @@ func Run(ctx infra.DnoteCtx, migrations []migration, mode int) error { return errors.Wrap(err, "getting the current schema") } - log.Debug("current schema: %s %d of %d\n", infra.SystemSchema, schema, len(migrations)) + log.Debug("%s: %d of %d\n", schemaKey, schema, len(migrations)) toRun := migrations[schema:] diff --git a/pkg/cli/migrate/migrate_test.go b/pkg/cli/migrate/migrate_test.go new file mode 100644 index 00000000..7b31a91e --- /dev/null +++ b/pkg/cli/migrate/migrate_test.go @@ -0,0 +1,1217 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package migrate + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "os" + "testing" + "time" + + "gopkg.in/yaml.v2" + + "github.com/dnote/actions" + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/pkg/errors" +) + +// initTestDBNoMigration initializes a test database with schema.sql but removes +// migration version data so tests can control the migration state themselves. +func initTestDBNoMigration(t *testing.T) *database.DB { + db := database.InitTestMemoryDBRaw(t, "") + // Remove migration versions from schema.sql so tests can set their own + database.MustExec(t, "clearing schema versions", db, "DELETE FROM system WHERE key IN (?, ?)", consts.SystemSchema, consts.SystemRemoteSchema) + return db +} + +func TestExecute_bump_schema(t *testing.T) { + testCases := []struct { + schemaKey string + }{ + { + schemaKey: consts.SystemSchema, + }, + { + schemaKey: consts.SystemRemoteSchema, + }, + } + + for _, tc := range testCases { + func() { + // set up + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) + + database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 8) + + m1 := migration{ + name: "noop", + run: func(ctx context.DnoteCtx, db *database.DB) error { + return nil + }, + } + m2 := migration{ + name: "noop", + run: func(ctx context.DnoteCtx, db *database.DB) error { + return nil + }, + } + + // execute + err := execute(ctx, m1, tc.schemaKey) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to execute")) + } + err = execute(ctx, m2, tc.schemaKey) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to execute")) + } + + // test + var schema int + database.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) + assert.Equal(t, schema, 10, "schema was not incremented properly") + }() + } +} + +func TestRun_nonfresh(t *testing.T) { + testCases := []struct { + mode int + schemaKey string + }{ + { + mode: LocalMode, + schemaKey: consts.SystemSchema, + }, + { + mode: RemoteMode, + schemaKey: consts.SystemRemoteSchema, + }, + } + + for _, tc := range testCases { + func() { + // set up + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) + database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 2) + database.MustExec(t, "creating a temporary table for testing", db, + "CREATE TABLE migrate_run_test ( name string )") + + sequence := []migration{ + { + name: "v1", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") + return nil + }, + }, + { + name: "v2", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") + return nil + }, + }, + { + name: "v3", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") + return nil + }, + }, + { + name: "v4", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v4 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v4") + return nil + }, + }, + } + + // execute + err := Run(ctx, sequence, tc.mode) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to run")) + } + + // test + var schema int + database.MustScan(t, fmt.Sprintf("getting schema for %s", tc.schemaKey), db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) + assert.Equal(t, schema, 4, fmt.Sprintf("schema was not updated for %s", tc.schemaKey)) + + var testRunCount int + database.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) + assert.Equal(t, testRunCount, 2, "test run count mismatch") + + var testRun1, testRun2 string + database.MustScan(t, "finding test run 1", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v3"), &testRun1) + database.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v4"), &testRun2) + }() + } +} + +func TestRun_fresh(t *testing.T) { + testCases := []struct { + mode int + schemaKey string + }{ + { + mode: LocalMode, + schemaKey: consts.SystemSchema, + }, + { + mode: RemoteMode, + schemaKey: consts.SystemRemoteSchema, + }, + } + + for _, tc := range testCases { + func() { + // set up + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) + + database.MustExec(t, "creating a temporary table for testing", db, + "CREATE TABLE migrate_run_test ( name string )") + + sequence := []migration{ + { + name: "v1", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") + return nil + }, + }, + { + name: "v2", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") + return nil + }, + }, + { + name: "v3", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") + return nil + }, + }, + } + + // execute + err := Run(ctx, sequence, tc.mode) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to run")) + } + + // test + var schema int + database.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) + assert.Equal(t, schema, 3, "schema was not updated") + + var testRunCount int + database.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) + assert.Equal(t, testRunCount, 3, "test run count mismatch") + + var testRun1, testRun2, testRun3 string + database.MustScan(t, "finding test run 1", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v1"), &testRun1) + database.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v2"), &testRun2) + database.MustScan(t, "finding test run 2", db.QueryRow("SELECT name FROM migrate_run_test WHERE name = ?", "v3"), &testRun3) + }() + } +} + +func TestRun_up_to_date(t *testing.T) { + testCases := []struct { + mode int + schemaKey string + }{ + { + mode: LocalMode, + schemaKey: consts.SystemSchema, + }, + { + mode: RemoteMode, + schemaKey: consts.SystemRemoteSchema, + }, + } + + for _, tc := range testCases { + func() { + // set up + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) + + database.MustExec(t, "creating a temporary table for testing", db, + "CREATE TABLE migrate_run_test ( name string )") + + database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 3) + + sequence := []migration{ + { + name: "v1", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v1 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v1") + return nil + }, + }, + { + name: "v2", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v2 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v2") + return nil + }, + }, + { + name: "v3", + run: func(ctx context.DnoteCtx, db *database.DB) error { + database.MustExec(t, "marking v3 completed", db, "INSERT INTO migrate_run_test (name) VALUES (?)", "v3") + return nil + }, + }, + } + + // execute + err := Run(ctx, sequence, tc.mode) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to run")) + } + + // test + var schema int + database.MustScan(t, "getting schema", db.QueryRow("SELECT value FROM system WHERE key = ?", tc.schemaKey), &schema) + assert.Equal(t, schema, 3, "schema was not updated") + + var testRunCount int + database.MustScan(t, "counting test runs", db.QueryRow("SELECT count(*) FROM migrate_run_test"), &testRunCount) + assert.Equal(t, testRunCount, 0, "test run count mismatch") + }() + } +} + +func TestLocalMigration1(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) + a1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 1, "add_book", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.EditNoteDataV1{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: "", Content: "note 1"}) + a2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 1, "edit_note", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.EditNoteDataV1{NoteUUID: "note-2-uuid", FromBook: "js", ToBook: "", Content: "note 2"}) + a3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 1, "edit_note", string(data), 1537829463) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm1.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var actionCount int + database.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) + assert.Equal(t, actionCount, 3, "action count mismatch") + + var a1, a2, a3 actions.Action + var a1DataRaw, a2DataRaw, a3DataRaw string + database.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), + &a1.Schema, &a1.Type, &a1DataRaw, &a1.Timestamp) + database.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), + &a2.Schema, &a2.Type, &a2DataRaw, &a2.Timestamp) + database.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), + &a3.Schema, &a3.Type, &a3DataRaw, &a3.Timestamp) + + var a1Data actions.AddBookDataV1 + var a2Data, a3Data actions.EditNoteDataV3 + testutils.MustUnmarshalJSON(t, []byte(a1DataRaw), &a1Data) + testutils.MustUnmarshalJSON(t, []byte(a2DataRaw), &a2Data) + testutils.MustUnmarshalJSON(t, []byte(a3DataRaw), &a3Data) + + assert.Equal(t, a1.Schema, 1, "a1 schema mismatch") + assert.Equal(t, a1.Type, "add_book", "a1 type mismatch") + assert.Equal(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") + assert.Equal(t, a1Data.BookName, "js", "a1 data book_name mismatch") + + assert.Equal(t, a2.Schema, 3, "a2 schema mismatch") + assert.Equal(t, a2.Type, "edit_note", "a2 type mismatch") + assert.Equal(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") + assert.Equal(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") + assert.Equal(t, a2Data.BookName, (*string)(nil), "a2 data book_name mismatch") + assert.Equal(t, *a2Data.Content, "note 1", "a2 data content mismatch") + assert.Equal(t, *a2Data.Public, false, "a2 data public mismatch") + + assert.Equal(t, a3.Schema, 3, "a3 schema mismatch") + assert.Equal(t, a3.Type, "edit_note", "a3 type mismatch") + assert.Equal(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") + assert.Equal(t, a3Data.NoteUUID, "note-2-uuid", "a3 data note_uuid mismatch") + assert.Equal(t, a3Data.BookName, (*string)(nil), "a3 data book_name mismatch") + assert.Equal(t, *a3Data.Content, "note 2", "a3 data content mismatch") + assert.Equal(t, *a3Data.Public, false, "a3 data public mismatch") +} + +func TestLocalMigration2(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + c1 := "note 1 - v1" + c2 := "note 1 - v2" + css := "css" + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") + + data := testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: "note-1-uuid", BookName: "js", Content: "note 1", Public: false}) + a1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 2, "add_note", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.EditNoteDataV2{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: nil, Content: &c1, Public: nil}) + a2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 2, "edit_note", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.EditNoteDataV2{NoteUUID: "note-1-uuid", FromBook: "js", ToBook: &css, Content: &c2, Public: nil}) + a3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 2, "edit_note", string(data), 1537829463) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm2.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var actionCount int + database.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) + assert.Equal(t, actionCount, 3, "action count mismatch") + + var a1, a2, a3 actions.Action + var a1DataRaw, a2DataRaw, a3DataRaw string + database.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), + &a1.Schema, &a1.Type, &a1DataRaw, &a1.Timestamp) + database.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), + &a2.Schema, &a2.Type, &a2DataRaw, &a2.Timestamp) + database.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), + &a3.Schema, &a3.Type, &a3DataRaw, &a3.Timestamp) + + var a1Data actions.AddNoteDataV2 + var a2Data, a3Data actions.EditNoteDataV3 + testutils.MustUnmarshalJSON(t, []byte(a1DataRaw), &a1Data) + testutils.MustUnmarshalJSON(t, []byte(a2DataRaw), &a2Data) + testutils.MustUnmarshalJSON(t, []byte(a3DataRaw), &a3Data) + + assert.Equal(t, a1.Schema, 2, "a1 schema mismatch") + assert.Equal(t, a1.Type, "add_note", "a1 type mismatch") + assert.Equal(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") + assert.Equal(t, a1Data.NoteUUID, "note-1-uuid", "a1 data note_uuid mismatch") + assert.Equal(t, a1Data.BookName, "js", "a1 data book_name mismatch") + assert.Equal(t, a1Data.Public, false, "a1 data public mismatch") + + assert.Equal(t, a2.Schema, 3, "a2 schema mismatch") + assert.Equal(t, a2.Type, "edit_note", "a2 type mismatch") + assert.Equal(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") + assert.Equal(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") + assert.Equal(t, a2Data.BookName, (*string)(nil), "a2 data book_name mismatch") + assert.Equal(t, *a2Data.Content, c1, "a2 data content mismatch") + assert.Equal(t, a2Data.Public, (*bool)(nil), "a2 data public mismatch") + + assert.Equal(t, a3.Schema, 3, "a3 schema mismatch") + assert.Equal(t, a3.Type, "edit_note", "a3 type mismatch") + assert.Equal(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") + assert.Equal(t, a3Data.NoteUUID, "note-1-uuid", "a3 data note_uuid mismatch") + assert.Equal(t, *a3Data.BookName, "css", "a3 data book_name mismatch") + assert.Equal(t, *a3Data.Content, c2, "a3 data content mismatch") + assert.Equal(t, a3Data.Public, (*bool)(nil), "a3 data public mismatch") +} + +func TestLocalMigration3(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + data := testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: "note-1-uuid", BookName: "js", Content: "note 1", Public: false}) + a1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 2, "add_note", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.RemoveNoteDataV1{NoteUUID: "note-1-uuid", BookName: "js"}) + a2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a2UUID, 1, "remove_note", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.RemoveNoteDataV1{NoteUUID: "note-2-uuid", BookName: "js"}) + a3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a3UUID, 1, "remove_note", string(data), 1537829463) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm3.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var actionCount int + database.MustScan(t, "counting actions", db.QueryRow("SELECT count(*) FROM actions"), &actionCount) + assert.Equal(t, actionCount, 3, "action count mismatch") + + var a1, a2, a3 actions.Action + var a1DataRaw, a2DataRaw, a3DataRaw string + database.MustScan(t, "getting action 1", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a1UUID), + &a1.Schema, &a1.Type, &a1DataRaw, &a1.Timestamp) + database.MustScan(t, "getting action 2", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a2UUID), + &a2.Schema, &a2.Type, &a2DataRaw, &a2.Timestamp) + database.MustScan(t, "getting action 3", db.QueryRow("SELECT schema, type, data, timestamp FROM actions WHERE uuid = ?", a3UUID), + &a3.Schema, &a3.Type, &a3DataRaw, &a3.Timestamp) + + var a1Data actions.AddNoteDataV2 + var a2Data, a3Data actions.RemoveNoteDataV2 + testutils.MustUnmarshalJSON(t, []byte(a1DataRaw), &a1Data) + testutils.MustUnmarshalJSON(t, []byte(a2DataRaw), &a2Data) + testutils.MustUnmarshalJSON(t, []byte(a3DataRaw), &a3Data) + + assert.Equal(t, a1.Schema, 2, "a1 schema mismatch") + assert.Equal(t, a1.Type, "add_note", "a1 type mismatch") + assert.Equal(t, a1.Timestamp, int64(1537829463), "a1 timestamp mismatch") + assert.Equal(t, a1Data.NoteUUID, "note-1-uuid", "a1 data note_uuid mismatch") + assert.Equal(t, a1Data.BookName, "js", "a1 data book_name mismatch") + assert.Equal(t, a1Data.Content, "note 1", "a1 data content mismatch") + assert.Equal(t, a1Data.Public, false, "a1 data public mismatch") + + assert.Equal(t, a2.Schema, 2, "a2 schema mismatch") + assert.Equal(t, a2.Type, "remove_note", "a2 type mismatch") + assert.Equal(t, a2.Timestamp, int64(1537829463), "a2 timestamp mismatch") + assert.Equal(t, a2Data.NoteUUID, "note-1-uuid", "a2 data note_uuid mismatch") + + assert.Equal(t, a3.Schema, 2, "a3 schema mismatch") + assert.Equal(t, a3.Type, "remove_note", "a3 type mismatch") + assert.Equal(t, a3.Timestamp, int64(1537829463), "a3 timestamp mismatch") + assert.Equal(t, a3Data.NoteUUID, "note-2-uuid", "a3 data note_uuid mismatch") +} + +func TestLocalMigration4(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n1UUID, b1UUID, "n1 content", time.Now().UnixNano()) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm4.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var n1Dirty, b1Dirty bool + var n1Deleted, b1Deleted bool + var n1USN, b1USN int + database.MustScan(t, "scanning the newly added dirty flag of n1", db.QueryRow("SELECT dirty, deleted, usn FROM notes WHERE uuid = ?", n1UUID), &n1Dirty, &n1Deleted, &n1USN) + database.MustScan(t, "scanning the newly added dirty flag of b1", db.QueryRow("SELECT dirty, deleted, usn FROM books WHERE uuid = ?", b1UUID), &b1Dirty, &b1Deleted, &b1USN) + + assert.Equal(t, n1Dirty, false, "n1 dirty flag should be false by default") + assert.Equal(t, b1Dirty, false, "b1 dirty flag should be false by default") + + assert.Equal(t, n1Deleted, false, "n1 deleted flag should be false by default") + assert.Equal(t, b1Deleted, false, "b1 deleted flag should be false by default") + + assert.Equal(t, n1USN, 0, "n1 usn flag should be 0 by default") + assert.Equal(t, b1USN, 0, "b1 usn flag should be 0 by default") +} + +func TestLocalMigration5(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") + b2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting js book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "js") + + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n1UUID, b1UUID, "n1 content", time.Now().UnixNano()) + n2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n2UUID, b1UUID, "n2 content", time.Now().UnixNano()) + n3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting css note", db, "INSERT INTO notes (uuid, book_uuid, content, added_on) VALUES (?, ?, ?, ?)", n3UUID, b1UUID, "n3 content", time.Now().UnixNano()) + + data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) + database.MustExec(t, "inserting a1", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a1-uuid", 1, "add_book", string(data), 1537829463) + + data = testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: n1UUID, BookName: "css", Content: "n1 content", Public: false}) + database.MustExec(t, "inserting a2", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a2-uuid", 1, "add_note", string(data), 1537829463) + + updatedContent := "updated content" + data = testutils.MustMarshalJSON(t, actions.EditNoteDataV3{NoteUUID: n2UUID, BookName: (*string)(nil), Content: &updatedContent, Public: (*bool)(nil)}) + database.MustExec(t, "inserting a3", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", "a3-uuid", 1, "edit_note", string(data), 1537829463) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm5.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var b1Dirty, b2Dirty, n1Dirty, n2Dirty, n3Dirty bool + database.MustScan(t, "scanning the newly added dirty flag of b1", db.QueryRow("SELECT dirty FROM books WHERE uuid = ?", b1UUID), &b1Dirty) + database.MustScan(t, "scanning the newly added dirty flag of b2", db.QueryRow("SELECT dirty FROM books WHERE uuid = ?", b2UUID), &b2Dirty) + database.MustScan(t, "scanning the newly added dirty flag of n1", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n1UUID), &n1Dirty) + database.MustScan(t, "scanning the newly added dirty flag of n2", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n2UUID), &n2Dirty) + database.MustScan(t, "scanning the newly added dirty flag of n3", db.QueryRow("SELECT dirty FROM notes WHERE uuid = ?", n3UUID), &n3Dirty) + + assert.Equal(t, b1Dirty, false, "b1 dirty flag should be false by default") + assert.Equal(t, b2Dirty, true, "b2 dirty flag should be false by default") + assert.Equal(t, n1Dirty, true, "n1 dirty flag should be false by default") + assert.Equal(t, n2Dirty, true, "n2 dirty flag should be false by default") + assert.Equal(t, n3Dirty, false, "n3 dirty flag should be false by default") +} + +func TestLocalMigration6(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) + a1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting action", db, + "INSERT INTO actions (uuid, schema, type, data, timestamp) VALUES (?, ?, ?, ?, ?)", a1UUID, 1, "add_book", string(data), 1537829463) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm5.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var count int + err = db.QueryRow("SELECT name FROM sqlite_master WHERE type='table' AND name = ?;", "actions").Scan(&count) + assert.Equal(t, count, 0, "actions table should have been deleted") +} + +func TestLocalMigration7_trash(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting trash book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "trash") + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm7.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var b1Label string + var b1Dirty bool + database.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) + assert.Equal(t, b1Label, "trash (2)", "b1 label was not migrated") + assert.Equal(t, b1Dirty, true, "b1 was not marked dirty") +} + +func TestLocalMigration7_conflicts(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm7.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var b1Label string + var b1Dirty bool + database.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) + assert.Equal(t, b1Label, "conflicts (2)", "b1 label was not migrated") + assert.Equal(t, b1Dirty, true, "b1 was not marked dirty") +} + +func TestLocalMigration7_conflicts_dup(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") + b2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "conflicts (2)") + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm7.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var b1Label, b2Label string + var b1Dirty, b2Dirty bool + database.MustScan(t, "scanning b1 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) + database.MustScan(t, "scanning b2 label", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b2UUID), &b2Label, &b2Dirty) + assert.Equal(t, b1Label, "conflicts (3)", "b1 label was not migrated") + assert.Equal(t, b2Label, "conflicts (2)", "b1 label was not migrated") + assert.Equal(t, b1Dirty, true, "b1 was not marked dirty") + assert.Equal(t, b2Dirty, false, "b2 should not have been marked dirty") +} + +func TestLocalMigration8(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-8-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") + + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting n1", db, `INSERT INTO notes + (id, uuid, book_uuid, content, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 1, n1UUID, b1UUID, "n1 Body", 1, 2, true, true, 20, false) + n2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting n2", db, `INSERT INTO notes + (id, uuid, book_uuid, content, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 2, n2UUID, b1UUID, "", 3, 4, false, true, 21, true) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm8.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var n1BookUUID, n1Body string + var n1AddedOn, n1EditedOn int64 + var n1USN int + var n1Public, n1Dirty, n1Deleted bool + database.MustScan(t, "scanning n1", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n1UUID), &n1BookUUID, &n1Body, &n1AddedOn, &n1EditedOn, &n1USN, &n1Public, &n1Dirty, &n1Deleted) + + var n2BookUUID, n2Body string + var n2AddedOn, n2EditedOn int64 + var n2USN int + var n2Public, n2Dirty, n2Deleted bool + database.MustScan(t, "scanning n2", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n2UUID), &n2BookUUID, &n2Body, &n2AddedOn, &n2EditedOn, &n2USN, &n2Public, &n2Dirty, &n2Deleted) + + assert.Equal(t, n1BookUUID, b1UUID, "n1 BookUUID mismatch") + assert.Equal(t, n1Body, "n1 Body", "n1 Body mismatch") + assert.Equal(t, n1AddedOn, int64(1), "n1 AddedOn mismatch") + assert.Equal(t, n1EditedOn, int64(2), "n1 EditedOn mismatch") + assert.Equal(t, n1USN, 20, "n1 USN mismatch") + assert.Equal(t, n1Public, true, "n1 Public mismatch") + assert.Equal(t, n1Dirty, true, "n1 Dirty mismatch") + assert.Equal(t, n1Deleted, false, "n1 Deleted mismatch") + + assert.Equal(t, n2BookUUID, b1UUID, "n2 BookUUID mismatch") + assert.Equal(t, n2Body, "", "n2 Body mismatch") + assert.Equal(t, n2AddedOn, int64(3), "n2 AddedOn mismatch") + assert.Equal(t, n2EditedOn, int64(4), "n2 EditedOn mismatch") + assert.Equal(t, n2USN, 21, "n2 USN mismatch") + assert.Equal(t, n2Public, false, "n2 Public mismatch") + assert.Equal(t, n2Dirty, true, "n2 Dirty mismatch") + assert.Equal(t, n2Deleted, true, "n2 Deleted mismatch") +} + +func TestLocalMigration9(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-9-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") + + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting n1", db, `INSERT INTO notes + (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n1UUID, b1UUID, "n1 Body", 1, 2, true, true, 20, false) + n2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting n2", db, `INSERT INTO notes + (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n2UUID, b1UUID, "n2 Body", 3, 4, false, true, 21, false) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm9.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + + // assert that note_fts was populated with correct values + var noteFtsCount int + database.MustScan(t, "counting note_fts", db.QueryRow("SELECT count(*) FROM note_fts;"), ¬eFtsCount) + assert.Equal(t, noteFtsCount, 2, "noteFtsCount mismatch") + + var resCount int + database.MustScan(t, "counting result", db.QueryRow("SELECT count(*) FROM note_fts WHERE note_fts MATCH ?", "n1"), &resCount) + assert.Equal(t, resCount, 1, "noteFtsCount mismatch") +} + +func TestLocalMigration10(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-10-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book ", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "123") + b2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "123 javascript") + b3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 3", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b3UUID, "foo") + b4UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 4", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b4UUID, "+123") + b5UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 5", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b5UUID, "0123") + b6UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 6", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b6UUID, "javascript 123") + b7UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 7", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b7UUID, "123 (1)") + b8UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 8", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b8UUID, "5") + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm10.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + + // assert that note_fts was populated with correct values + var b1Label, b2Label, b3Label, b4Label, b5Label, b6Label, b7Label, b8Label string + var b1Dirty, b2Dirty, b3Dirty, b4Dirty, b5Dirty, b6Dirty, b7Dirty, b8Dirty bool + + database.MustScan(t, "getting b1", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) + database.MustScan(t, "getting b2", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b2UUID), &b2Label, &b2Dirty) + database.MustScan(t, "getting b3", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b3UUID), &b3Label, &b3Dirty) + database.MustScan(t, "getting b4", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b4UUID), &b4Label, &b4Dirty) + database.MustScan(t, "getting b5", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b5UUID), &b5Label, &b5Dirty) + database.MustScan(t, "getting b6", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b6UUID), &b6Label, &b6Dirty) + database.MustScan(t, "getting b7", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b7UUID), &b7Label, &b7Dirty) + database.MustScan(t, "getting b8", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b8UUID), &b8Label, &b8Dirty) + + assert.Equal(t, b1Label, "123 (2)", "b1Label mismatch") + assert.Equal(t, b1Dirty, true, "b1Dirty mismatch") + assert.Equal(t, b2Label, "123 javascript", "b2Label mismatch") + assert.Equal(t, b2Dirty, false, "b2Dirty mismatch") + assert.Equal(t, b3Label, "foo", "b3Label mismatch") + assert.Equal(t, b3Dirty, false, "b3Dirty mismatch") + assert.Equal(t, b4Label, "+123", "b4Label mismatch") + assert.Equal(t, b4Dirty, false, "b4Dirty mismatch") + assert.Equal(t, b5Label, "0123 (1)", "b5Label mismatch") + assert.Equal(t, b5Dirty, true, "b5Dirty mismatch") + assert.Equal(t, b6Label, "javascript 123", "b6Label mismatch") + assert.Equal(t, b6Dirty, false, "b6Dirty mismatch") + assert.Equal(t, b7Label, "123 (1)", "b7Label mismatch") + assert.Equal(t, b7Dirty, false, "b7Dirty mismatch") + assert.Equal(t, b8Label, "5 (1)", "b8Label mismatch") + assert.Equal(t, b8Dirty, true, "b8Dirty mismatch") +} + +func TestLocalMigration11(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-11-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "foo") + b2UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "bar baz") + b3UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 3", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b3UUID, "quz qux") + b4UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 4", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b4UUID, "quz_qux") + b5UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 5", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b5UUID, "foo bar baz quz 123") + b6UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 6", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b6UUID, "foo_bar baz") + b7UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 7", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b7UUID, "cool ideas") + b8UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 8", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b8UUID, "cool_ideas") + b9UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book 9", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b9UUID, "cool_ideas_2") + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm11.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test + var bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + assert.Equal(t, bookCount, 9, "bookCount mismatch") + + // assert that note_fts was populated with correct values + var b1Label, b2Label, b3Label, b4Label, b5Label, b6Label, b7Label, b8Label, b9Label string + var b1Dirty, b2Dirty, b3Dirty, b4Dirty, b5Dirty, b6Dirty, b7Dirty, b8Dirty, b9Dirty bool + + database.MustScan(t, "getting b1", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b1UUID), &b1Label, &b1Dirty) + database.MustScan(t, "getting b2", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b2UUID), &b2Label, &b2Dirty) + database.MustScan(t, "getting b3", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b3UUID), &b3Label, &b3Dirty) + database.MustScan(t, "getting b4", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b4UUID), &b4Label, &b4Dirty) + database.MustScan(t, "getting b5", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b5UUID), &b5Label, &b5Dirty) + database.MustScan(t, "getting b6", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b6UUID), &b6Label, &b6Dirty) + database.MustScan(t, "getting b7", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b7UUID), &b7Label, &b7Dirty) + database.MustScan(t, "getting b8", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b8UUID), &b8Label, &b8Dirty) + database.MustScan(t, "getting b9", db.QueryRow("SELECT label, dirty FROM books WHERE uuid = ?", b9UUID), &b9Label, &b9Dirty) + + assert.Equal(t, b1Label, "foo", "b1Label mismatch") + assert.Equal(t, b1Dirty, false, "b1Dirty mismatch") + assert.Equal(t, b2Label, "bar_baz", "b2Label mismatch") + assert.Equal(t, b2Dirty, true, "b2Dirty mismatch") + assert.Equal(t, b3Label, "quz_qux_2", "b3Label mismatch") + assert.Equal(t, b3Dirty, true, "b3Dirty mismatch") + assert.Equal(t, b4Label, "quz_qux", "b4Label mismatch") + assert.Equal(t, b4Dirty, false, "b4Dirty mismatch") + assert.Equal(t, b5Label, "foo_bar_baz_quz_123", "b5Label mismatch") + assert.Equal(t, b5Dirty, true, "b5Dirty mismatch") + assert.Equal(t, b6Label, "foo_bar_baz", "b6Label mismatch") + assert.Equal(t, b6Dirty, true, "b6Dirty mismatch") + assert.Equal(t, b7Label, "cool_ideas_3", "b7Label mismatch") + assert.Equal(t, b7Dirty, true, "b7Dirty mismatch") + assert.Equal(t, b8Label, "cool_ideas", "b8Label mismatch") + assert.Equal(t, b8Dirty, false, "b8Dirty mismatch") + assert.Equal(t, b9Label, "cool_ideas_2", "b9Label mismatch") + assert.Equal(t, b9Dirty, false, "b9Dirty mismatch") +} + +func TestLocalMigration12(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + data := []byte("editor: vim") + path := fmt.Sprintf("%s/%s/dnoterc", ctx.Paths.Config, consts.DnoteDirName) + if err := os.WriteFile(path, data, 0644); err != nil { + t.Fatal(errors.Wrap(err, "Failed to write schema file")) + } + + // execute + err := lm12.run(ctx, nil) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to run")) + } + + // test + b, err := os.ReadFile(path) + if err != nil { + t.Fatal(errors.Wrap(err, "reading config")) + } + + type config struct { + APIEndpoint string `yaml:"apiEndpoint"` + } + + var cf config + err = yaml.Unmarshal(b, &cf) + if err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling config")) + } + + assert.NotEqual(t, cf.APIEndpoint, "", "apiEndpoint was not populated") +} + +func TestLocalMigration13(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + data := []byte("editor: vim\napiEndpoint: https://test.com/api") + + path := fmt.Sprintf("%s/%s/dnoterc", ctx.Paths.Config, consts.DnoteDirName) + if err := os.WriteFile(path, data, 0644); err != nil { + t.Fatal(errors.Wrap(err, "Failed to write schema file")) + } + + // execute + err := lm13.run(ctx, nil) + if err != nil { + t.Fatal(errors.Wrap(err, "failed to run")) + } + + // test + b, err := os.ReadFile(path) + if err != nil { + t.Fatal(errors.Wrap(err, "reading config")) + } + + type config struct { + Editor string `yaml:"editor"` + ApiEndpoint string `yaml:"apiEndpoint"` + EnableUpgradeCheck bool `yaml:"enableUpgradeCheck"` + } + + var cf config + err = yaml.Unmarshal(b, &cf) + if err != nil { + t.Fatal(errors.Wrap(err, "unmarshalling config")) + } + + assert.Equal(t, cf.Editor, "vim", "editor mismatch") + assert.Equal(t, cf.ApiEndpoint, "https://test.com/api", "apiEndpoint mismatch") + assert.Equal(t, cf.EnableUpgradeCheck, true, "enableUpgradeCheck mismatch") +} + +func TestLocalMigration14(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-14-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") + + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting note", db, `INSERT INTO notes + (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n1UUID, b1UUID, "test note", 1, 2, true, false, 0, false) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm14.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test - verify public column was dropped by checking column names + rows, err := db.Query("SELECT name FROM pragma_table_info('notes')") + if err != nil { + t.Fatal(errors.Wrap(err, "getting table info")) + } + defer rows.Close() + + for rows.Next() { + var name string + err := rows.Scan(&name) + if err != nil { + t.Fatal(errors.Wrap(err, "scanning column name")) + } + + if name == "public" { + t.Fatal("public column still exists after migration") + } + } +} + +func TestRemoteMigration1(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/remote-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + testutils.Login(t, &ctx) + + JSBookUUID := "existing-js-book-uuid" + CSSBookUUID := "existing-css-book-uuid" + linuxBookUUID := "existing-linux-book-uuid" + newJSBookUUID := "new-js-book-uuid" + newCSSBookUUID := "new-css-book-uuid" + + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.URL.String() == "/v3/books" { + res := []struct { + UUID string `json:"uuid"` + Label string `json:"label"` + }{ + { + UUID: newJSBookUUID, + Label: "js", + }, + { + UUID: newCSSBookUUID, + Label: "css", + }, + // book that only exists on the server. client must ignore. + { + UUID: "golang-book-uuid", + Label: "golang", + }, + } + + w.Header().Set("Content-Type", "application/json") + if err := json.NewEncoder(w).Encode(res); err != nil { + t.Fatal(errors.Wrap(err, "encoding response")) + } + } + })) + defer server.Close() + + ctx.APIEndpoint = server.URL + + database.MustExec(t, "inserting js book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", JSBookUUID, "js") + database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", CSSBookUUID, "css") + database.MustExec(t, "inserting linux book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", linuxBookUUID, "linux") + database.MustExec(t, "inserting sessionKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, "someSessionKey") + database.MustExec(t, "inserting sessionKeyExpiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, time.Now().Add(24*time.Hour).Unix()) + + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = rm1.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // test + var postJSBookUUID, postCSSBookUUID, postLinuxBookUUID string + database.MustScan(t, "getting js book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "js"), &postJSBookUUID) + database.MustScan(t, "getting css book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "css"), &postCSSBookUUID) + database.MustScan(t, "getting linux book uuid", db.QueryRow("SELECT uuid FROM books WHERE label = ?", "linux"), &postLinuxBookUUID) + + assert.Equal(t, postJSBookUUID, newJSBookUUID, "js book uuid was not updated correctly") + assert.Equal(t, postCSSBookUUID, newCSSBookUUID, "css book uuid was not updated correctly") + assert.Equal(t, postLinuxBookUUID, linuxBookUUID, "linux book uuid changed") +} diff --git a/cli/migrate/migrations.go b/pkg/cli/migrate/migrations.go similarity index 67% rename from cli/migrate/migrations.go rename to pkg/cli/migrate/migrations.go index e624e2a4..197a2b03 100644 --- a/cli/migrate/migrations.go +++ b/pkg/cli/migrate/migrations.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote CLI. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote CLI is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote CLI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote CLI. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate @@ -22,22 +19,26 @@ import ( "database/sql" "encoding/json" "fmt" + "regexp" + "strings" "github.com/dnote/actions" - "github.com/dnote/dnote/cli/client" - "github.com/dnote/dnote/cli/infra" - "github.com/dnote/dnote/cli/log" + "github.com/dnote/dnote/pkg/cli/client" + "github.com/dnote/dnote/pkg/cli/config" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" ) type migration struct { name string - run func(ctx infra.DnoteCtx, tx *infra.DB) error + run func(ctx context.DnoteCtx, tx *database.DB) error } var lm1 = migration{ name: "upgrade-edit-note-from-v1-to-v3", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { rows, err := tx.Query("SELECT uuid, data FROM actions WHERE type = ? AND schema = ?", "edit_note", 1) if err != nil { return errors.Wrap(err, "querying rows") @@ -85,7 +86,7 @@ var lm1 = migration{ var lm2 = migration{ name: "upgrade-edit-note-from-v2-to-v3", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { rows, err := tx.Query("SELECT uuid, data FROM actions WHERE type = ? AND schema = ?", "edit_note", 2) if err != nil { return errors.Wrap(err, "querying rows") @@ -130,7 +131,7 @@ var lm2 = migration{ var lm3 = migration{ name: "upgrade-remove-note-from-v1-to-v2", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { rows, err := tx.Query("SELECT uuid, data FROM actions WHERE type = ? AND schema = ?", "remove_note", 1) if err != nil { return errors.Wrap(err, "querying rows") @@ -172,7 +173,7 @@ var lm3 = migration{ var lm4 = migration{ name: "add-dirty-usn-deleted-to-notes-and-books", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { _, err := tx.Exec("ALTER TABLE books ADD COLUMN dirty bool DEFAULT false") if err != nil { return errors.Wrap(err, "adding dirty column to books") @@ -209,7 +210,7 @@ var lm4 = migration{ var lm5 = migration{ name: "mark-action-targets-dirty", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { rows, err := tx.Query("SELECT uuid, data, type FROM actions") if err != nil { return errors.Wrap(err, "querying rows") @@ -271,7 +272,7 @@ var lm5 = migration{ var lm6 = migration{ name: "drop-actions", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { _, err := tx.Exec("DROP TABLE actions;") if err != nil { return errors.Wrap(err, "dropping the actions table") @@ -283,7 +284,7 @@ var lm6 = migration{ var lm7 = migration{ name: "resolve-conflicts-with-reserved-book-names", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { migrateBook := func(name string) error { var uuid string @@ -330,7 +331,7 @@ var lm7 = migration{ var lm8 = migration{ name: "drop-note-id-and-rename-content-to-body", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { _, err := tx.Exec(`CREATE TABLE notes_tmp ( uuid text NOT NULL, @@ -369,7 +370,7 @@ var lm8 = migration{ var lm9 = migration{ name: "create-fts-index", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { _, err := tx.Exec(`CREATE VIRTUAL TABLE IF NOT EXISTS note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'");`) if err != nil { return errors.Wrap(err, "creating note_fts") @@ -403,9 +404,186 @@ var lm9 = migration{ }, } +var lm10 = migration{ + name: "rename-number-only-book", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + migrateBook := func(label string) error { + var uuid string + + err := tx.QueryRow("SELECT uuid FROM books WHERE label = ?", label).Scan(&uuid) + if err != nil { + return errors.Wrap(err, "finding uuid") + } + + for i := 1; ; i++ { + candidate := fmt.Sprintf("%s (%d)", label, i) + + var count int + err := tx.QueryRow("SELECT count(*) FROM books WHERE label = ?", candidate).Scan(&count) + if err != nil { + return errors.Wrap(err, "counting candidate") + } + + if count == 0 { + _, err := tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE uuid = ?", candidate, true, uuid) + if err != nil { + return errors.Wrapf(err, "updating book '%s'", label) + } + + break + } + } + + return nil + } + + rows, err := tx.Query("SELECT label FROM books") + defer rows.Close() + if err != nil { + return errors.Wrap(err, "getting labels") + } + + var regexNumber = regexp.MustCompile(`^\d+$`) + + for rows.Next() { + var label string + err := rows.Scan(&label) + if err != nil { + return errors.Wrap(err, "scannign row") + } + + if regexNumber.MatchString(label) { + err = migrateBook(label) + if err != nil { + return errors.Wrapf(err, "migrating book %s", label) + } + } + } + + return nil + }, +} + +var lm11 = migration{ + name: "rename-book-labels-with-space", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + processLabel := func(label string) (string, error) { + sanitized := strings.Replace(label, " ", "_", -1) + + var cnt int + err := tx.QueryRow("SELECT count(*) FROM books WHERE label = ?", sanitized).Scan(&cnt) + if err != nil { + return "", errors.Wrap(err, "counting ret") + } + if cnt == 0 { + return sanitized, nil + } + + // if there is a collision, resolve by appending number + var ret string + for i := 2; ; i++ { + ret = fmt.Sprintf("%s_%d", sanitized, i) + + var count int + err := tx.QueryRow("SELECT count(*) FROM books WHERE label = ?", ret).Scan(&count) + if err != nil { + return "", errors.Wrap(err, "counting ret") + } + + if count == 0 { + break + } + } + + return ret, nil + } + + rows, err := tx.Query("SELECT uuid, label FROM books") + defer rows.Close() + if err != nil { + return errors.Wrap(err, "getting labels") + } + + for rows.Next() { + var uuid, label string + err := rows.Scan(&uuid, &label) + if err != nil { + return errors.Wrap(err, "scanning row") + } + + if strings.Contains(label, " ") { + processed, err := processLabel(label) + if err != nil { + return errors.Wrapf(err, "resolving book name for %s", label) + } + + _, err = tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE uuid = ?", processed, true, uuid) + if err != nil { + return errors.Wrapf(err, "updating book '%s'", label) + } + } + } + + return nil + }, +} + +var lm12 = migration{ + name: "add apiEndpoint to the configuration file", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + cf, err := config.Read(ctx) + if err != nil { + return errors.Wrap(err, "reading config") + } + + // Only set if not already configured + if cf.APIEndpoint == "" { + cf.APIEndpoint = "https://api.getdnote.com" + } + + err = config.Write(ctx, cf) + if err != nil { + return errors.Wrap(err, "writing config") + } + + return nil + }, +} + +var lm13 = migration{ + name: "add enableUpgradeCheck to the configuration file", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + cf, err := config.Read(ctx) + if err != nil { + return errors.Wrap(err, "reading config") + } + + cf.EnableUpgradeCheck = true + + err = config.Write(ctx, cf) + if err != nil { + return errors.Wrap(err, "writing config") + } + + return nil + }, +} + +var lm14 = migration{ + name: "drop-public-from-notes", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + _, err := tx.Exec(`ALTER TABLE notes DROP COLUMN public;`) + if err != nil { + return errors.Wrap(err, "dropping public column from notes") + } + + return nil + }, +} + var rm1 = migration{ name: "sync-book-uuids-from-server", - run: func(ctx infra.DnoteCtx, tx *infra.DB) error { + run: func(ctx context.DnoteCtx, tx *database.DB) error { sessionKey := ctx.SessionKey if sessionKey == "" { return errors.New("not logged in") diff --git a/pkg/cli/output/output.go b/pkg/cli/output/output.go new file mode 100644 index 00000000..d272ba88 --- /dev/null +++ b/pkg/cli/output/output.go @@ -0,0 +1,53 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package output provides functions to print informations on the terminal +// in a consistent manner +package output + +import ( + "fmt" + "io" + "time" + + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/log" +) + +// NoteInfo prints a note information +func NoteInfo(w io.Writer, info database.NoteInfo) { + log.Infof("book name: %s\n", info.BookLabel) + log.Infof("created at: %s\n", time.Unix(0, info.AddedOn).Format("Jan 2, 2006 3:04pm (MST)")) + if info.EditedOn != 0 { + log.Infof("updated at: %s\n", time.Unix(0, info.EditedOn).Format("Jan 2, 2006 3:04pm (MST)")) + } + log.Infof("note id: %d\n", info.RowID) + log.Infof("note uuid: %s\n", info.UUID) + + fmt.Fprintf(w, "\n------------------------content------------------------\n") + fmt.Fprintf(w, "%s", info.Content) + fmt.Fprintf(w, "\n-------------------------------------------------------\n") +} + +func NoteContent(w io.Writer, info database.NoteInfo) { + fmt.Fprintf(w, "%s", info.Content) +} + +// BookInfo prints a note information +func BookInfo(info database.BookInfo) { + log.Infof("book name: %s\n", info.Name) + log.Infof("book id: %d\n", info.RowID) + log.Infof("book uuid: %s\n", info.UUID) +} diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go new file mode 100644 index 00000000..db3282d7 --- /dev/null +++ b/pkg/cli/testutils/main.go @@ -0,0 +1,310 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package testutils provides utilities used in tests +package testutils + +import ( + "bytes" + "encoding/json" + "io" + "os" + "os/exec" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +// Prompts for user input +const ( + PromptRemoveNote = "remove this note?" + PromptDeleteBook = "delete book" + PromptEmptyServer = "The server is empty but you have local data" +) + +// Timeout for waiting for prompts in tests +const promptTimeout = 10 * time.Second + +// LoginDB sets up login credentials in the database for tests +func LoginDB(t *testing.T, db *database.DB) { + database.MustExec(t, "inserting sessionKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, "someSessionKey") + database.MustExec(t, "inserting sessionKeyExpiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, time.Now().Add(24*time.Hour).Unix()) +} + +// Login simulates a logged in user by inserting credentials in the local database +func Login(t *testing.T, ctx *context.DnoteCtx) { + LoginDB(t, ctx.DB) + + ctx.SessionKey = "someSessionKey" + ctx.SessionKeyExpiry = time.Now().Add(24 * time.Hour).Unix() +} + +// RemoveDir cleans up the test env represented by the given context +func RemoveDir(t *testing.T, dir string) { + if err := os.RemoveAll(dir); err != nil { + t.Fatal(errors.Wrap(err, "removing the directory")) + } +} + +// CopyFixture writes the content of the given fixture to the filename inside the dnote dir +func CopyFixture(t *testing.T, ctx context.DnoteCtx, fixturePath string, filename string) { + fp, err := filepath.Abs(fixturePath) + if err != nil { + t.Fatal(errors.Wrap(err, "getting the absolute path for fixture")) + } + + dp, err := filepath.Abs(filepath.Join(ctx.Paths.LegacyDnote, filename)) + if err != nil { + t.Fatal(errors.Wrap(err, "getting the absolute path dnote dir")) + } + + err = utils.CopyFile(fp, dp) + if err != nil { + t.Fatal(errors.Wrap(err, "copying the file")) + } +} + +// WriteFile writes a file with the given content and filename inside the dnote dir +func WriteFile(ctx context.DnoteCtx, content []byte, filename string) { + dp, err := filepath.Abs(filepath.Join(ctx.Paths.LegacyDnote, filename)) + if err != nil { + panic(err) + } + + if err := os.WriteFile(dp, content, 0644); err != nil { + panic(err) + } +} + +// ReadFile reads the content of the file with the given name in dnote dir +func ReadFile(ctx context.DnoteCtx, filename string) []byte { + path := filepath.Join(ctx.Paths.LegacyDnote, filename) + + b, err := os.ReadFile(path) + if err != nil { + panic(err) + } + + return b +} + +// ReadJSON reads JSON fixture to the struct at the destination address +func ReadJSON(path string, destination interface{}) { + var dat []byte + dat, err := os.ReadFile(path) + if err != nil { + panic(errors.Wrap(err, "Failed to load fixture payload")) + } + if err := json.Unmarshal(dat, destination); err != nil { + panic(errors.Wrap(err, "Failed to get event")) + } +} + +// NewDnoteCmd returns a new Dnote command and a pointer to stderr +func NewDnoteCmd(opts RunDnoteCmdOptions, binaryName string, arg ...string) (*exec.Cmd, *bytes.Buffer, *bytes.Buffer, error) { + var stderr, stdout bytes.Buffer + + binaryPath, err := filepath.Abs(binaryName) + if err != nil { + return &exec.Cmd{}, &stderr, &stdout, errors.Wrap(err, "getting the absolute path to the test binary") + } + + cmd := exec.Command(binaryPath, arg...) + cmd.Stderr = &stderr + cmd.Stdout = &stdout + + cmd.Env = opts.Env + + return cmd, &stderr, &stdout, nil +} + +// RunDnoteCmdOptions is an option for RunDnoteCmd +type RunDnoteCmdOptions struct { + Env []string +} + +// RunDnoteCmd runs a dnote command +func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg ...string) string { + t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) + + cmd, stderr, stdout, err := NewDnoteCmd(opts, binaryName, arg...) + if err != nil { + t.Logf("\n%s", stdout) + t.Fatal(errors.Wrap(err, "getting command").Error()) + } + + cmd.Env = append(cmd.Env, "DNOTE_DEBUG=1") + + if err := cmd.Run(); err != nil { + t.Logf("\n%s", stdout) + t.Fatal(errors.Wrapf(err, "running command %s", stderr.String())) + } + + // Print stdout if and only if test fails later + t.Logf("\n%s", stdout) + + return stdout.String() +} + +// WaitDnoteCmd runs a dnote command and passes stdout to the callback. +func WaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.Reader, io.WriteCloser) error, binaryName string, arg ...string) (string, error) { + t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) + + binaryPath, err := filepath.Abs(binaryName) + if err != nil { + return "", errors.Wrap(err, "getting absolute path to test binary") + } + + cmd := exec.Command(binaryPath, arg...) + cmd.Env = opts.Env + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + stdout, err := cmd.StdoutPipe() + if err != nil { + return "", errors.Wrap(err, "getting stdout pipe") + } + + stdin, err := cmd.StdinPipe() + if err != nil { + return "", errors.Wrap(err, "getting stdin") + } + defer stdin.Close() + + if err = cmd.Start(); err != nil { + return "", errors.Wrap(err, "starting command") + } + + var output bytes.Buffer + tee := io.TeeReader(stdout, &output) + + err = runFunc(tee, stdin) + if err != nil { + t.Logf("\n%s", output.String()) + return output.String(), errors.Wrap(err, "running callback") + } + + io.Copy(&output, stdout) + + if err := cmd.Wait(); err != nil { + t.Logf("\n%s", output.String()) + return output.String(), errors.Wrapf(err, "command failed: %s", stderr.String()) + } + + t.Logf("\n%s", output.String()) + return output.String(), nil +} + +func MustWaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.Reader, io.WriteCloser) error, binaryName string, arg ...string) string { + output, err := WaitDnoteCmd(t, opts, runFunc, binaryName, arg...) + if err != nil { + t.Fatal(err) + } + + return output +} + +// MustWaitForPrompt waits for an expected prompt with a default timeout. +// Fails the test if the prompt is not found or an error occurs. +func MustWaitForPrompt(t *testing.T, stdout io.Reader, expectedPrompt string) { + if err := assert.WaitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { + t.Fatal(err) + } +} + +// ConfirmRemoveNote waits for prompt for removing a note and confirms. +func ConfirmRemoveNote(stdout io.Reader, stdin io.WriteCloser) error { + return assert.RespondToPrompt(stdout, stdin, PromptRemoveNote, "y\n", promptTimeout) +} + +// ConfirmRemoveBook waits for prompt for deleting a book confirms. +func ConfirmRemoveBook(stdout io.Reader, stdin io.WriteCloser) error { + return assert.RespondToPrompt(stdout, stdin, PromptDeleteBook, "y\n", promptTimeout) +} + +// UserConfirmEmptyServerSync waits for an empty server prompt and confirms. +func UserConfirmEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { + return assert.RespondToPrompt(stdout, stdin, PromptEmptyServer, "y\n", promptTimeout) +} + +// UserCancelEmptyServerSync waits for an empty server prompt and cancels. +func UserCancelEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { + return assert.RespondToPrompt(stdout, stdin, PromptEmptyServer, "n\n", promptTimeout) +} + +// UserContent simulates content from the user by writing to stdin. +// This is used for piped input where no prompt is shown. +func UserContent(stdout io.Reader, stdin io.WriteCloser) error { + longText := `Lorem ipsum dolor sit amet, consectetur adipiscing elit, + sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.` + + if _, err := io.WriteString(stdin, longText); err != nil { + return errors.Wrap(err, "creating note from stdin") + } + + // stdin needs to close so stdin reader knows to stop reading + // otherwise test case would wait until test timeout + stdin.Close() + + return nil +} + +// MustMarshalJSON marshalls the given interface into JSON. +// If there is any error, it fails the test. +func MustMarshalJSON(t *testing.T, v interface{}) []byte { + b, err := json.Marshal(v) + if err != nil { + t.Fatalf("%s: marshalling data: %s", t.Name(), err.Error()) + } + + return b +} + +// MustUnmarshalJSON marshalls the given interface into JSON. +// If there is any error, it fails the test. +func MustUnmarshalJSON(t *testing.T, data []byte, v interface{}) { + err := json.Unmarshal(data, v) + if err != nil { + t.Fatalf("%s: unmarshalling data: %s", t.Name(), err.Error()) + } +} + +// MustGenerateUUID generates the uuid. If error occurs, it fails the test. +func MustGenerateUUID(t *testing.T) string { + ret, err := utils.GenerateUUID() + if err != nil { + t.Fatal(errors.Wrap(err, "generating uuid").Error()) + } + + return ret +} + +func MustOpenDatabase(t *testing.T, dbPath string) *database.DB { + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database")) + } + + return db +} diff --git a/pkg/cli/testutils/setup.go b/pkg/cli/testutils/setup.go new file mode 100644 index 00000000..d88afd2d --- /dev/null +++ b/pkg/cli/testutils/setup.go @@ -0,0 +1,77 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package testutils + +import ( + "testing" + + "github.com/dnote/dnote/pkg/cli/database" +) + +// Setup1 sets up a dnote env #1 +func Setup1(t *testing.T, db *database.DB) { + b1UUID := "js-book-uuid" + b2UUID := "linux-book-uuid" + + database.MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "js") + database.MustExec(t, "setting up book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "linux") + + database.MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943) +} + +// Setup2 sets up a dnote env #2 +func Setup2(t *testing.T, db *database.DB) { + b1UUID := "js-book-uuid" + b2UUID := "linux-book-uuid" + + database.MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b1UUID, "js", 111) + database.MustExec(t, "setting up book 2", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b2UUID, "linux", 122) + + database.MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", b1UUID, "n1 body", 1515199951, 11) + database.MustExec(t, "setting up note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "n2 body", 1515199943, 12) + database.MustExec(t, "setting up note 3", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "3e065d55-6d47-42f2-a6bf-f5844130b2d2", b2UUID, "n3 body", 1515199961, 13) +} + +// Setup3 sets up a dnote env #3 +func Setup3(t *testing.T, db *database.DB) { + b1UUID := "js-book-uuid" + + database.MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "js") + + database.MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943) +} + +// Setup4 sets up a dnote env #4 +func Setup4(t *testing.T, db *database.DB) { + b1UUID := "js-book-uuid" + + database.MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b1UUID, "js", 111) + + database.MustExec(t, "setting up note 1", db, "INSERT INTO notes (rowid, uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?, ?)", 1, "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "Booleans have toString()", 1515199943, 11) + database.MustExec(t, "setting up note 2", db, "INSERT INTO notes (rowid, uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?, ?)", 2, "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", b1UUID, "Date object implements mathematical comparisons", 1515199951, 12) +} + +// Setup5 sets up a dnote env #2 +func Setup5(t *testing.T, db *database.DB) { + b1UUID := "js-book-uuid" + b2UUID := "linux-book-uuid" + + database.MustExec(t, "setting up book 1", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b1UUID, "js", 111) + database.MustExec(t, "setting up book 2", db, "INSERT INTO books (uuid, label, usn) VALUES (?, ?, ?)", b2UUID, "linux", 122) + + database.MustExec(t, "setting up note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "f0d0fbb7-31ff-45ae-9f0f-4e429c0c797f", b1UUID, "n1 body", 1515199951, 11) + database.MustExec(t, "setting up note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, usn) VALUES (?, ?, ?, ?, ?)", "43827b9a-c2b0-4c06-a290-97991c896653", b1UUID, "n2 body", 1515199943, 12) +} diff --git a/pkg/cli/ui/editor.go b/pkg/cli/ui/editor.go new file mode 100644 index 00000000..a6c165f4 --- /dev/null +++ b/pkg/cli/ui/editor.go @@ -0,0 +1,134 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package ui provides the user interface for the program +package ui + +import ( + "fmt" + "os" + "os/exec" + "strings" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +// GetTmpContentPath returns the path to the temporary file containing +// content being added or edited +func GetTmpContentPath(ctx context.DnoteCtx) (string, error) { + for i := 0; ; i++ { + filename := fmt.Sprintf("%s_%d.%s", consts.TmpContentFileBase, i, consts.TmpContentFileExt) + candidate := fmt.Sprintf("%s/%s", ctx.Paths.Cache, filename) + + ok, err := utils.FileExists(candidate) + if err != nil { + return "", errors.Wrapf(err, "checking if file exists at %s", candidate) + } + if !ok { + return candidate, nil + } + } +} + +// getEditorCommand returns the system's editor command with appropriate flags, +// if necessary, to make the command wait until editor is close to exit. +func getEditorCommand() string { + editor := os.Getenv("EDITOR") + + var ret string + + switch editor { + case "atom": + ret = "atom -w" + case "subl": + ret = "subl -n -w" + case "mate": + ret = "mate -w" + case "vim": + ret = "vim" + case "nano": + ret = "nano" + case "emacs": + ret = "emacs" + case "nvim": + ret = "nvim" + default: + ret = "vi" + } + + return ret +} + +func newEditorCmd(ctx context.DnoteCtx, fpath string) (*exec.Cmd, error) { + args := strings.Fields(ctx.Editor) + args = append(args, fpath) + + return exec.Command(args[0], args[1:]...), nil +} + +// GetEditorInput gets the user input by launching a text editor and waiting for +// it to exit +func GetEditorInput(ctx context.DnoteCtx, fpath string) (string, error) { + ok, err := utils.FileExists(fpath) + if err != nil { + return "", errors.Wrapf(err, "checking if the file exists at %s", fpath) + } + if !ok { + f, err := os.Create(fpath) + if err != nil { + return "", errors.Wrap(err, "creating a temporary content file") + } + err = f.Close() + if err != nil { + return "", errors.Wrap(err, "closing the temporary content file") + } + } + + cmd, err := newEditorCmd(ctx, fpath) + if err != nil { + return "", errors.Wrap(err, "creating an editor command") + } + + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + + err = cmd.Start() + if err != nil { + return "", errors.Wrapf(err, "launching an editor") + } + + err = cmd.Wait() + if err != nil { + return "", errors.Wrap(err, "waiting for the editor") + } + + b, err := os.ReadFile(fpath) + if err != nil { + return "", errors.Wrap(err, "reading the temporary content file") + } + + err = os.Remove(fpath) + if err != nil { + return "", errors.Wrap(err, "removing the temporary content file") + } + + raw := string(b) + + return raw, nil +} diff --git a/pkg/cli/ui/editor_test.go b/pkg/cli/ui/editor_test.go new file mode 100644 index 00000000..54538c49 --- /dev/null +++ b/pkg/cli/ui/editor_test.go @@ -0,0 +1,84 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ui + +import ( + "fmt" + "os" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/pkg/errors" +) + +func TestGetTmpContentPath(t *testing.T) { + t.Run("no collision", func(t *testing.T) { + ctx := context.InitTestCtx(t) + + res, err := GetTmpContentPath(ctx) + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + expected := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") + assert.Equal(t, res, expected, "filename did not match") + }) + + t.Run("one existing session", func(t *testing.T) { + // set up + ctx := context.InitTestCtx(t) + + p := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") + if _, err := os.Create(p); err != nil { + t.Fatal(errors.Wrap(err, "preparing the conflicting file")) + } + + // execute + res, err := GetTmpContentPath(ctx) + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + // test + expected := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_1.md") + assert.Equal(t, res, expected, "filename did not match") + }) + + t.Run("two existing sessions", func(t *testing.T) { + // set up + ctx := context.InitTestCtx(t) + + p1 := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") + if _, err := os.Create(p1); err != nil { + t.Fatal(errors.Wrap(err, "preparing the conflicting file")) + } + p2 := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_1.md") + if _, err := os.Create(p2); err != nil { + t.Fatal(errors.Wrap(err, "preparing the conflicting file")) + } + + // execute + res, err := GetTmpContentPath(ctx) + if err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + // test + expected := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_2.md") + assert.Equal(t, res, expected, "filename did not match") + }) +} diff --git a/pkg/cli/ui/terminal.go b/pkg/cli/ui/terminal.go new file mode 100644 index 00000000..6a255766 --- /dev/null +++ b/pkg/cli/ui/terminal.go @@ -0,0 +1,101 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ui + +import ( + "bufio" + "fmt" + "os" + "strings" + "syscall" + + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/prompt" + "github.com/pkg/errors" + "golang.org/x/crypto/ssh/terminal" +) + +func readInput() (string, error) { + reader := bufio.NewReader(os.Stdin) + input, err := reader.ReadString('\n') + if err != nil { + return "", errors.Wrap(err, "reading stdin") + } + + return strings.Trim(input, "\r\n"), nil +} + +// PromptInput prompts the user input and saves the result to the destination +func PromptInput(message string, dest *string) error { + log.Askf(message, false) + + input, err := readInput() + if err != nil { + return errors.Wrap(err, "getting user input") + } + + *dest = input + + return nil +} + +// PromptPassword prompts the user input a password and saves the result to the destination. +// The input is masked, meaning it is not echoed on the terminal. +func PromptPassword(message string, dest *string) error { + log.Askf(message, true) + + password, err := terminal.ReadPassword(int(syscall.Stdin)) + if err != nil { + return errors.Wrap(err, "getting user input") + } + + fmt.Println("") + + *dest = string(password) + + return nil +} + +// Confirm prompts for user input to confirm a choice +func Confirm(question string, optimistic bool) (bool, error) { + message := prompt.FormatQuestion(question, optimistic) + + // Use log.Askf for colored prompt in CLI + log.Askf(message, false) + + confirmed, err := prompt.ReadYesNo(os.Stdin, optimistic) + if err != nil { + return false, errors.Wrap(err, "Failed to get user input") + } + + return confirmed, nil +} + +// Grab text from stdin content +func ReadStdInput() (string, error) { + var lines []string + + s := bufio.NewScanner(os.Stdin) + for s.Scan() { + lines = append(lines, s.Text()) + } + err := s.Err() + if err != nil { + return "", errors.Wrap(err, "reading pipe") + } + + return strings.Join(lines, "\n"), nil +} diff --git a/pkg/cli/upgrade/upgrade.go b/pkg/cli/upgrade/upgrade.go new file mode 100644 index 00000000..7c24a86d --- /dev/null +++ b/pkg/cli/upgrade/upgrade.go @@ -0,0 +1,145 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package upgrade + +import ( + stdCtx "context" + "fmt" + "strings" + "time" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/cli/ui" + "github.com/google/go-github/github" + "github.com/pkg/errors" +) + +// upgradeInterval is 8 weeks +var upgradeInterval int64 = 86400 * 7 * 8 + +// shouldCheckUpdate checks if update should be checked +func shouldCheckUpdate(ctx context.DnoteCtx) (bool, error) { + db := ctx.DB + + var lastUpgrade int64 + err := db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastUpgrade).Scan(&lastUpgrade) + if err != nil { + return false, errors.Wrap(err, "getting last_udpate") + } + + now := time.Now().Unix() + + return now-lastUpgrade > upgradeInterval, nil +} + +func touchLastUpgrade(ctx context.DnoteCtx) error { + db := ctx.DB + + now := time.Now().Unix() + _, err := db.Exec("UPDATE system SET value = ? WHERE key = ?", now, consts.SystemLastUpgrade) + if err != nil { + return errors.Wrap(err, "updating last_upgrade") + } + + return nil +} + +func fetchLatestStableTag(gh *github.Client, page int) (string, error) { + params := github.ListOptions{ + Page: page, + } + releases, resp, err := gh.Repositories.ListReleases(stdCtx.Background(), "dnote", "dnote", ¶ms) + if err != nil { + return "", errors.Wrapf(err, "fetching releases page %d", page) + } + + for _, release := range releases { + tag := release.GetTagName() + isStable := !release.GetPrerelease() + + if strings.HasPrefix(tag, "cli-") && isStable { + return tag, nil + } + } + + if page == resp.LastPage { + return "", errors.New("No CLI release was found") + } + + return fetchLatestStableTag(gh, page+1) +} + +func checkVersion(ctx context.DnoteCtx) error { + log.Infof("current version is %s\n", ctx.Version) + + // Fetch the latest version + gh := github.NewClient(nil) + latestTag, err := fetchLatestStableTag(gh, 1) + if err != nil { + return errors.Wrap(err, "fetching the latest stable release") + } + + // releases are tagged in a form of cli-v1.0.0 + latestVersion := latestTag[5:] + log.Infof("latest version is %s\n", latestVersion) + + if latestVersion == ctx.Version { + log.Success("you are up-to-date\n\n") + } else { + log.Infof("to upgrade, see https://github.com/dnote/dnote\n") + } + + return nil +} + +// Check triggers update if needed +func Check(ctx context.DnoteCtx) error { + // If upgrade check is not enabled, do not proceed further + if !ctx.EnableUpgradeCheck { + return nil + } + + shouldCheck, err := shouldCheckUpdate(ctx) + if err != nil { + return errors.Wrap(err, "checking if dnote should check update") + } + if !shouldCheck { + return nil + } + + err = touchLastUpgrade(ctx) + if err != nil { + return errors.Wrap(err, "updating the last upgrade timestamp") + } + + fmt.Printf("\n") + willCheck, err := ui.Confirm("check for upgrade?", true) + if err != nil { + return errors.Wrap(err, "getting user confirmation") + } + if !willCheck { + return nil + } + + err = checkVersion(ctx) + if err != nil { + return errors.Wrap(err, "checking version") + } + + return nil +} diff --git a/pkg/cli/upgrade/upgrade_test.go b/pkg/cli/upgrade/upgrade_test.go new file mode 100644 index 00000000..917e6754 --- /dev/null +++ b/pkg/cli/upgrade/upgrade_test.go @@ -0,0 +1,172 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package upgrade + +import ( + "encoding/json" + "fmt" + "net/http" + "net/http/httptest" + "net/url" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/google/go-github/github" + "github.com/pkg/errors" +) + +func setupGithubClient(t *testing.T) (*github.Client, *http.ServeMux) { + mux := http.NewServeMux() + server := httptest.NewServer(mux) + + url, err := url.Parse(server.URL + "/") + if err != nil { + t.Fatal(errors.Wrap(err, "parsing mock server url")) + } + + client := github.NewClient(nil) + client.BaseURL = url + client.UploadURL = url + + return client, mux +} + +func TestFetchLatestStableTag(t *testing.T) { + tagCLI0_1_0 := "cli-v0.1.0" + tagCLI0_1_1 := "cli-v0.1.1" + tagCLI0_1_2Beta := "cli-v0.1.2-beta" + tagCLI0_1_3 := "cli-v0.1.3" + tagServer0_1_0 := "server-v0.1.0" + + prereleaseTrue := true + + testCases := []struct { + releases []*github.RepositoryRelease + expected string + }{ + { + releases: []*github.RepositoryRelease{{TagName: &tagCLI0_1_0}}, + expected: tagCLI0_1_0, + }, + { + releases: []*github.RepositoryRelease{ + {TagName: &tagCLI0_1_1}, + {TagName: &tagServer0_1_0}, + {TagName: &tagCLI0_1_0}, + }, + expected: tagCLI0_1_1, + }, + { + releases: []*github.RepositoryRelease{ + {TagName: &tagServer0_1_0}, + {TagName: &tagCLI0_1_1}, + {TagName: &tagCLI0_1_0}, + }, + expected: tagCLI0_1_1, + }, + { + releases: []*github.RepositoryRelease{ + {TagName: &tagCLI0_1_2Beta, Prerelease: &prereleaseTrue}, + {TagName: &tagServer0_1_0}, + {TagName: &tagCLI0_1_1}, + {TagName: &tagCLI0_1_0}, + }, + expected: tagCLI0_1_1, + }, + { + releases: []*github.RepositoryRelease{ + {TagName: &tagCLI0_1_3}, + {TagName: &tagCLI0_1_2Beta, Prerelease: &prereleaseTrue}, + {TagName: &tagCLI0_1_1}, + {TagName: &tagCLI0_1_0}, + }, + expected: tagCLI0_1_3, + }, + } + + for idx, tc := range testCases { + t.Run(fmt.Sprintf("case %d", idx), func(t *testing.T) { + // setup + gh, mux := setupGithubClient(t) + mux.HandleFunc("/repos/dnote/dnote/releases", func(w http.ResponseWriter, r *http.Request) { + if err := json.NewEncoder(w).Encode(tc.releases); err != nil { + t.Fatal(errors.Wrap(err, "responding with mock releases")) + } + }) + + // execute + got, err := fetchLatestStableTag(gh, 0) + if err != nil { + t.Fatal(errors.Wrap(err, "performing")) + } + + // test + assert.Equal(t, got, tc.expected, "result mismatch") + }) + } +} + +func TestFetchLatestStableTag_paginated(t *testing.T) { + tagServer0_1_0 := "server-v0.1.0" + tagCLI0_1_2Beta := "cli-v0.1.2-beta" + tagCLI0_1_1 := "cli-v0.1.1" + prereleaseTrue := true + + // set up + gh, mux := setupGithubClient(t) + path := "/repos/dnote/dnote/releases" + mux.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) { + page := r.FormValue("page") + + releasesPage1 := []*github.RepositoryRelease{ + {TagName: &tagServer0_1_0}, + } + releasesPage2 := []*github.RepositoryRelease{ + {TagName: &tagCLI0_1_2Beta, Prerelease: &prereleaseTrue}, + {TagName: &tagCLI0_1_1}, + } + + baseURL := gh.BaseURL.String() + + switch page { + case "", "1": + linkHeader := fmt.Sprintf("<%s%s?page=2>; rel=\"next\" <%s%s?page=2>; rel=\"last\"", baseURL, path, baseURL, path) + w.Header().Set("Link", linkHeader) + + if err := json.NewEncoder(w).Encode(releasesPage1); err != nil { + t.Fatal(errors.Wrap(err, "responding with mock releases")) + } + case "2": + linkHeader := fmt.Sprintf("<%s%s?page=1>; rel=\"prev\" <%s%s?page=1>; rel=\"first\"", baseURL, path, baseURL, path) + w.Header().Set("Link", linkHeader) + + if err := json.NewEncoder(w).Encode(releasesPage2); err != nil { + t.Fatal(errors.Wrap(err, "responding with mock releases")) + } + default: + t.Fatal("Should have stopped walking") + } + }) + + // execute + got, err := fetchLatestStableTag(gh, 0) + if err != nil { + t.Fatal(errors.Wrap(err, "performing")) + } + + // test + assert.Equal(t, got, tagCLI0_1_1, "result mismatch") +} diff --git a/pkg/cli/utils/diff/diff.go b/pkg/cli/utils/diff/diff.go new file mode 100644 index 00000000..ff7e3384 --- /dev/null +++ b/pkg/cli/utils/diff/diff.go @@ -0,0 +1,45 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package diff provides line-by-line diff feature by wrapping +// a package github.com/sergi/go-diff/diffmatchpatch +package diff + +import ( + "time" + + "github.com/sergi/go-diff/diffmatchpatch" +) + +const ( + // DiffEqual represents an equal diff + DiffEqual = diffmatchpatch.DiffEqual + // DiffInsert represents an insert diff + DiffInsert = diffmatchpatch.DiffInsert + // DiffDelete represents a delete diff + DiffDelete = diffmatchpatch.DiffDelete +) + +// Do computes line-by-line diff between two strings +func Do(s1, s2 string) (diffs []diffmatchpatch.Diff) { + dmp := diffmatchpatch.New() + dmp.DiffTimeout = time.Hour + + s1Chars, s2Chars, arr := dmp.DiffLinesToRunes(s1, s2) + diffs = dmp.DiffMainRunes(s1Chars, s2Chars, false) + diffs = dmp.DiffCharsToLines(diffs, arr) + + return diffs +} diff --git a/pkg/cli/utils/diff/diff_test.go b/pkg/cli/utils/diff/diff_test.go new file mode 100644 index 00000000..f777f26c --- /dev/null +++ b/pkg/cli/utils/diff/diff_test.go @@ -0,0 +1,146 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package diff + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/sergi/go-diff/diffmatchpatch" +) + +func TestDo(t *testing.T) { + testCases := []struct { + s1 string + s2 string + expected []diffmatchpatch.Diff + }{ + { + s1: "", + s2: "", + expected: []diffmatchpatch.Diff{}, + }, + { + s1: "", + s2: "foo", + expected: []diffmatchpatch.Diff{ + { + Type: diffmatchpatch.DiffInsert, + Text: "foo", + }, + }, + }, + { + s1: "foo", + s2: "", + expected: []diffmatchpatch.Diff{ + { + Type: DiffDelete, + Text: "foo", + }, + }, + }, + { + s1: "foo", + s2: "bar", + expected: []diffmatchpatch.Diff{ + { + Type: DiffDelete, + Text: "foo", + }, + { + Type: DiffInsert, + Text: "bar", + }, + }, + }, + { + s1: "foo\nbar\nbaz", + s2: "foo\nbar\nquz", + expected: []diffmatchpatch.Diff{ + { + Type: DiffEqual, + Text: "foo\nbar\n", + }, + { + Type: DiffDelete, + Text: "baz", + }, + { + Type: DiffInsert, + Text: "quz", + }, + }, + }, + { + s1: "fuz\nbar\nbaz\nquz", + s2: "foo\nbar\nbaz\nqux", + expected: []diffmatchpatch.Diff{ + { + Type: DiffDelete, + Text: "fuz\n", + }, + { + Type: DiffInsert, + Text: "foo\n", + }, + { + Type: DiffEqual, + Text: "bar\nbaz\n", + }, + { + Type: DiffDelete, + Text: "quz", + }, + { + Type: DiffInsert, + Text: "qux", + }, + }, + }, + { + s1: "foo bar\nhello dnote\nbaz quz", + s2: "foo bar\nhello foo\nbaz quz", + expected: []diffmatchpatch.Diff{ + { + Type: DiffEqual, + Text: "foo bar\n", + }, + { + Type: DiffDelete, + Text: "hello dnote\n", + }, + { + Type: DiffInsert, + Text: "hello foo\n", + }, + { + Type: DiffEqual, + Text: "baz quz", + }, + }, + }, + } + + for idx, tc := range testCases { + result := Do(tc.s1, tc.s2) + + t.Run(fmt.Sprintf("test case %d", idx), func(t *testing.T) { + assert.DeepEqual(t, result, tc.expected, "result mismatch") + }) + } +} diff --git a/pkg/cli/utils/files.go b/pkg/cli/utils/files.go new file mode 100644 index 00000000..60f57de6 --- /dev/null +++ b/pkg/cli/utils/files.go @@ -0,0 +1,156 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package utils + +import ( + "io" + "os" + "path/filepath" + + "github.com/pkg/errors" +) + +// ReadFileAbs reads the content of the file with the given file path by resolving +// it as an absolute path +func ReadFileAbs(relpath string) []byte { + fp, err := filepath.Abs(relpath) + if err != nil { + panic(err) + } + + b, err := os.ReadFile(fp) + if err != nil { + panic(err) + } + + return b +} + +// FileExists checks if the file exists at the given path +func FileExists(filepath string) (bool, error) { + _, err := os.Stat(filepath) + if err == nil { + return true, nil + } + if os.IsNotExist(err) { + return false, nil + } + + return false, errors.Wrap(err, "getting file info") +} + +// EnsureDir creates a directory if it doesn't exist. +// Returns nil if the directory already exists or was successfully created. +func EnsureDir(path string) error { + ok, err := FileExists(path) + if err != nil { + return errors.Wrapf(err, "checking if dir exists at %s", path) + } + if ok { + return nil + } + + if err := os.MkdirAll(path, 0755); err != nil { + return errors.Wrapf(err, "creating directory at %s", path) + } + + return nil +} + +// CopyDir copies a directory from src to dest, recursively copying nested +// directories +func CopyDir(src, dest string) error { + srcPath := filepath.Clean(src) + destPath := filepath.Clean(dest) + + fi, err := os.Stat(srcPath) + if err != nil { + return errors.Wrap(err, "getting the file info for the input") + } + if !fi.IsDir() { + return errors.New("source is not a directory") + } + + _, err = os.Stat(dest) + if err != nil && !os.IsNotExist(err) { + return errors.Wrap(err, "looking up the destination") + } + + err = os.MkdirAll(dest, fi.Mode()) + if err != nil { + return errors.Wrap(err, "creating destination") + } + + entries, err := os.ReadDir(src) + if err != nil { + return errors.Wrap(err, "reading the directory listing for the input") + } + + for _, entry := range entries { + srcEntryPath := filepath.Join(srcPath, entry.Name()) + destEntryPath := filepath.Join(destPath, entry.Name()) + + if entry.IsDir() { + if err = CopyDir(srcEntryPath, destEntryPath); err != nil { + return errors.Wrapf(err, "copying %s", entry.Name()) + } + } else { + if err = CopyFile(srcEntryPath, destEntryPath); err != nil { + return errors.Wrapf(err, "copying %s", entry.Name()) + } + } + } + + return nil +} + +// CopyFile copies a file from the src to dest +func CopyFile(src, dest string) error { + in, err := os.Open(src) + if err != nil { + return errors.Wrap(err, "opening the input file") + } + defer in.Close() + + out, err := os.Create(dest) + if err != nil { + return errors.Wrap(err, "creating the output file") + } + + if _, err = io.Copy(out, in); err != nil { + return errors.Wrap(err, "copying the file content") + } + + if err = out.Sync(); err != nil { + return errors.Wrap(err, "flushing the output file to disk") + } + + fi, err := os.Stat(src) + if err != nil { + return errors.Wrap(err, "getting the file info for the input file") + } + + if err = os.Chmod(dest, fi.Mode()); err != nil { + return errors.Wrap(err, "copying permission to the output file") + } + + // Close the output file + if err = out.Close(); err != nil { + return errors.Wrap(err, "closing the output file") + } + + return nil +} diff --git a/pkg/cli/utils/files_test.go b/pkg/cli/utils/files_test.go new file mode 100644 index 00000000..7f26e19c --- /dev/null +++ b/pkg/cli/utils/files_test.go @@ -0,0 +1,42 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package utils + +import ( + "os" + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestEnsureDir(t *testing.T) { + tmpDir := t.TempDir() + testPath := filepath.Join(tmpDir, "test", "nested", "dir") + + // Create directory + err := EnsureDir(testPath) + assert.Equal(t, err, nil, "EnsureDir should succeed") + + // Verify it exists + info, err := os.Stat(testPath) + assert.Equal(t, err, nil, "directory should exist") + assert.Equal(t, info.IsDir(), true, "should be a directory") + + // Call again on existing directory - should not error + err = EnsureDir(testPath) + assert.Equal(t, err, nil, "EnsureDir should succeed on existing directory") +} diff --git a/pkg/cli/utils/utils.go b/pkg/cli/utils/utils.go new file mode 100644 index 00000000..417963ce --- /dev/null +++ b/pkg/cli/utils/utils.go @@ -0,0 +1,45 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package utils + +import ( + "regexp" + + "github.com/google/uuid" + "github.com/pkg/errors" +) + +// GenerateUUID returns a uuid v4 in string +func GenerateUUID() (string, error) { + u, err := uuid.NewRandom() + if err != nil { + return "", errors.Wrap(err, "generating uuid") + } + + return u.String(), nil +} + +// regexNumber is a regex that matches a string that looks like an integer +var regexNumber = regexp.MustCompile(`^\d+$`) + +// IsNumber checks if the given string is in the form of a number +func IsNumber(s string) bool { + if s == "" { + return false + } + + return regexNumber.MatchString(s) +} diff --git a/pkg/cli/validate/book_test.go b/pkg/cli/validate/book_test.go new file mode 100644 index 00000000..97a384fc --- /dev/null +++ b/pkg/cli/validate/book_test.go @@ -0,0 +1,157 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package validate + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestValidateBookName(t *testing.T) { + testCases := []struct { + input string + expected error + }{ + { + input: "javascript", + expected: nil, + }, + { + input: "node.js", + expected: nil, + }, + { + input: "", + expected: ErrBookNameEmpty, + }, + { + input: "foo bar", + expected: ErrBookNameHasSpace, + }, + { + input: "123", + expected: ErrBookNameNumeric, + }, + { + input: "+123", + expected: nil, + }, + { + input: "-123", + expected: nil, + }, + { + input: "+javascript", + expected: nil, + }, + { + input: "0", + expected: ErrBookNameNumeric, + }, + { + input: "0333", + expected: ErrBookNameNumeric, + }, + { + input: " javascript", + expected: ErrBookNameHasSpace, + }, + { + input: "java script", + expected: ErrBookNameHasSpace, + }, + { + input: "javascript (1)", + expected: ErrBookNameHasSpace, + }, + { + input: "javascript ", + expected: ErrBookNameHasSpace, + }, + { + input: "javascript (1) (2) (3)", + expected: ErrBookNameHasSpace, + }, + + // multiline + { + input: "\n", + expected: ErrBookNameMultiline, + }, + { + input: "\n\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\nbar\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\nbar\nbaz", + expected: ErrBookNameMultiline, + }, + { + input: "\r\n", + expected: ErrBookNameMultiline, + }, + { + input: "\r\n\r\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\r\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\r\nbar\r\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\r\nbar\r\nbaz", + expected: ErrBookNameMultiline, + }, + { + input: "\n\r\n", + expected: ErrBookNameMultiline, + }, + { + input: "foo\nbar\r\n", + expected: ErrBookNameMultiline, + }, + + // reserved book names + { + input: "trash", + expected: ErrBookNameReserved, + }, + { + input: "conflicts", + expected: ErrBookNameReserved, + }, + } + + for _, tc := range testCases { + actual := BookName(tc.input) + + assert.Equal(t, actual, tc.expected, fmt.Sprintf("result does not match for the input '%s'", tc.input)) + } +} diff --git a/pkg/cli/validate/books.go b/pkg/cli/validate/books.go new file mode 100644 index 00000000..b0e4c0ed --- /dev/null +++ b/pkg/cli/validate/books.go @@ -0,0 +1,75 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package validate + +import ( + "strings" + + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +var reservedBookNames = []string{"trash", "conflicts"} + +// ErrBookNameReserved is an error incidating that the specified book name is reserved +var ErrBookNameReserved = errors.New("The book name is reserved") + +// ErrBookNameNumeric is an error for a book name that only contains numbers +var ErrBookNameNumeric = errors.New("The book name cannot contain only numbers") + +// ErrBookNameHasSpace is an error for a book name that has any space +var ErrBookNameHasSpace = errors.New("The book name cannot contain spaces") + +// ErrBookNameEmpty is an error for an empty book name +var ErrBookNameEmpty = errors.New("The book name is empty") + +// ErrBookNameMultiline is an error for a book name that has linebreaks +var ErrBookNameMultiline = errors.New("The book name contains multiple lines") + +func isReservedName(name string) bool { + for _, n := range reservedBookNames { + if name == n { + return true + } + } + + return false +} + +// BookName validates a book name +func BookName(name string) error { + if name == "" { + return ErrBookNameEmpty + } + + if isReservedName(name) { + return ErrBookNameReserved + } + + if utils.IsNumber(name) { + return ErrBookNameNumeric + } + + if strings.Contains(name, " ") { + return ErrBookNameHasSpace + } + + if strings.Contains(name, "\n") || strings.Contains(name, "\r\n") { + return ErrBookNameMultiline + } + + return nil +} diff --git a/server/api/clock/clock.go b/pkg/clock/clock.go similarity index 53% rename from server/api/clock/clock.go rename to pkg/clock/clock.go index a8dff8a6..061bb1a3 100644 --- a/server/api/clock/clock.go +++ b/pkg/clock/clock.go @@ -1,33 +1,28 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package clock provides an abstract layer over the standard time package package clock import ( + "sync" "time" ) -//TODO: use mutex to avoid race - // Clock is an interface to the standard library time. -// It is used to implement a real or a mock clock. The latter is -// used in tests. +// It is used to implement a real or a mock clock. The latter is used in tests. type Clock interface { Now() time.Time } @@ -40,16 +35,21 @@ func (c *clock) Now() time.Time { // Mock is a mock instance of clock type Mock struct { + mu sync.RWMutex currentTime time.Time } // SetNow sets the current time for the mock clock func (c *Mock) SetNow(t time.Time) { + c.mu.Lock() + defer c.mu.Unlock() c.currentTime = t } // Now returns the current time func (c *Mock) Now() time.Time { + c.mu.RLock() + defer c.mu.RUnlock() return c.currentTime } diff --git a/pkg/dirs/dirs.go b/pkg/dirs/dirs.go new file mode 100644 index 00000000..3eb57a7f --- /dev/null +++ b/pkg/dirs/dirs.go @@ -0,0 +1,64 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package dirs provides base directory definitions for the system +package dirs + +import ( + "os" + "os/user" + + "github.com/pkg/errors" +) + +var ( + // Home is the home directory of the user + Home string + // ConfigHome is the full path to the directory in which user-specific + // configurations should be written. + ConfigHome string + // DataHome is the full path to the directory in which user-specific data + // files should be written. + DataHome string + // CacheHome is the full path to the directory in which user-specific + // non-essential cached data should be writte + CacheHome string +) + +func init() { + Reload() +} + +// Reload reloads the directory definitions +func Reload() { + initDirs() +} + +func getHomeDir() string { + usr, err := user.Current() + if err != nil { + panic(errors.Wrap(err, "getting home dir")) + } + + return usr.HomeDir +} + +func readPath(envName, defaultPath string) string { + if dir := os.Getenv(envName); dir != "" { + return dir + } + + return defaultPath +} diff --git a/pkg/dirs/dirs_test.go b/pkg/dirs/dirs_test.go new file mode 100644 index 00000000..0c1ecb1f --- /dev/null +++ b/pkg/dirs/dirs_test.go @@ -0,0 +1,39 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package dirs + +import ( + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +type envTestCase struct { + envKey string + envVal string + got *string + expected string +} + +func testCustomDirs(t *testing.T, testCases []envTestCase) { + for _, tc := range testCases { + t.Setenv(tc.envKey, tc.envVal) + + Reload() + + assert.Equal(t, *tc.got, tc.expected, "result mismatch") + } +} diff --git a/pkg/dirs/dirs_unix.go b/pkg/dirs/dirs_unix.go new file mode 100644 index 00000000..6c7696c6 --- /dev/null +++ b/pkg/dirs/dirs_unix.go @@ -0,0 +1,49 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//go:build linux || darwin || freebsd + + +package dirs + +import ( + "path/filepath" +) + +// The environment variable names for the XDG base directory specification +var ( + envConfigHome = "XDG_CONFIG_HOME" + envDataHome = "XDG_DATA_HOME" + envCacheHome = "XDG_CACHE_HOME" +) + +func initDirs() { + Home = getHomeDir() + ConfigHome = readPath(envConfigHome, getConfigHome(Home)) + DataHome = readPath(envDataHome, getDataHome(Home)) + CacheHome = readPath(envCacheHome, getCacheHome(Home)) +} + +func getConfigHome(homeDir string) string { + return filepath.Join(homeDir, ".config") +} + +func getDataHome(homeDir string) string { + return filepath.Join(homeDir, ".local/share") +} + +func getCacheHome(homeDir string) string { + return filepath.Join(homeDir, ".cache") +} diff --git a/pkg/dirs/dirs_unix_test.go b/pkg/dirs/dirs_unix_test.go new file mode 100644 index 00000000..9ea5805a --- /dev/null +++ b/pkg/dirs/dirs_unix_test.go @@ -0,0 +1,82 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//go:build linux || darwin || freebsd + + +package dirs + +import ( + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestDirs(t *testing.T) { + home := Home + assert.NotEqual(t, home, "", "home is empty") + + configHome := filepath.Join(home, ".config") + dataHome := filepath.Join(home, ".local", "share") + cacheHome := filepath.Join(home, ".cache") + + testCases := []struct { + got string + expected string + }{ + { + got: ConfigHome, + expected: configHome, + }, + { + got: DataHome, + expected: dataHome, + }, + { + got: CacheHome, + expected: cacheHome, + }, + } + + for _, tc := range testCases { + assert.Equal(t, tc.got, tc.expected, "result mismatch") + } +} + +func TestCustomDirs(t *testing.T) { + testCases := []envTestCase{ + { + envKey: "XDG_CONFIG_HOME", + envVal: "~/custom/config", + got: &ConfigHome, + expected: "~/custom/config", + }, + { + envKey: "XDG_DATA_HOME", + envVal: "~/custom/data", + got: &DataHome, + expected: "~/custom/data", + }, + { + envKey: "XDG_CACHE_HOME", + envVal: "~/custom/cache", + got: &CacheHome, + expected: "~/custom/cache", + }, + } + + testCustomDirs(t, testCases) +} diff --git a/pkg/dirs/dirs_windows.go b/pkg/dirs/dirs_windows.go new file mode 100644 index 00000000..7159ae8d --- /dev/null +++ b/pkg/dirs/dirs_windows.go @@ -0,0 +1,30 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//go:build windows + + +package dirs + +import ( + "path/filepath" +) + +func initDirs() { + Home = getHomeDir() + ConfigHome = filepath.Join(Home, ".dnote") + DataHome = filepath.Join(Home, ".dnote") + CacheHome = filepath.Join(Home, ".dnote") +} diff --git a/pkg/dirs/dirs_windows_test.go b/pkg/dirs/dirs_windows_test.go new file mode 100644 index 00000000..101071f5 --- /dev/null +++ b/pkg/dirs/dirs_windows_test.go @@ -0,0 +1,57 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +//go:build windows + + +package dirs + +import ( + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestDirs(t *testing.T) { + home := Home + assert.NotEqual(t, home, "", "home is empty") + + configHome := filepath.Join(home, ".dnote") + dataHome := filepath.Join(home, ".dnote") + cacheHome := filepath.Join(home, ".dnote") + + testCases := []struct { + got string + expected string + }{ + { + got: ConfigHome, + expected: configHome, + }, + { + got: DataHome, + expected: dataHome, + }, + { + got: CacheHome, + expected: cacheHome, + }, + } + + for _, tc := range testCases { + assert.Equal(t, tc.got, tc.expected, "result mismatch") + } +} diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go new file mode 100644 index 00000000..e8ca3da6 --- /dev/null +++ b/pkg/e2e/server_test.go @@ -0,0 +1,353 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import ( + "bytes" + "fmt" + "net/http" + "os" + "os/exec" + "strings" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "gorm.io/driver/sqlite" + "gorm.io/gorm" +) + +var testServerBinary string + +func init() { + // Build server binary in temp directory + tmpDir := os.TempDir() + testServerBinary = fmt.Sprintf("%s/dnote-test-server", tmpDir) + buildCmd := exec.Command("go", "build", "-tags", "fts5", "-o", testServerBinary, "../server") + if out, err := buildCmd.CombinedOutput(); err != nil { + panic(fmt.Sprintf("failed to build server: %v\n%s", err, out)) + } +} + +func TestServerStart(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + port := "13456" // Use different port to avoid conflicts with main test server + + // Start server in background + cmd := exec.Command(testServerBinary, "start", "--port", port) + cmd.Env = append(os.Environ(), + "DBPath="+tmpDB, + ) + + if err := cmd.Start(); err != nil { + t.Fatalf("failed to start server: %v", err) + } + + // Ensure cleanup + cleanup := func() { + if cmd.Process != nil { + cmd.Process.Kill() + cmd.Wait() // Wait for process to fully exit + } + } + defer cleanup() + + // Wait for server to start and migrations to run + time.Sleep(3 * time.Second) + + // Verify server responds to health check + resp, err := http.Get(fmt.Sprintf("http://localhost:%s/health", port)) + if err != nil { + t.Fatalf("failed to reach server health endpoint: %v", err) + } + defer resp.Body.Close() + + assert.Equal(t, resp.StatusCode, 200, "health endpoint should return 200") + + // Kill server before checking database to avoid locks + cleanup() + + // Verify database file was created + if _, err := os.Stat(tmpDB); os.IsNotExist(err) { + t.Fatalf("database file was not created at %s", tmpDB) + } + + // Verify migrations ran by checking database + db, err := gorm.Open(sqlite.Open(tmpDB), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open test database: %v", err) + } + + // Verify migrations ran + var count int64 + if err := db.Raw("SELECT COUNT(*) FROM schema_migrations").Scan(&count).Error; err != nil { + t.Fatalf("schema_migrations table not found: %v", err) + } + if count == 0 { + t.Fatal("no migrations were run") + } + + // Verify FTS table exists and is functional + if err := db.Exec("SELECT * FROM notes_fts LIMIT 1").Error; err != nil { + t.Fatalf("notes_fts table not found or not functional: %v", err) + } +} + +func TestServerVersion(t *testing.T) { + cmd := exec.Command("go", "run", "-tags", "fts5", "../server", "version") + output, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("version command failed: %v", err) + } + + outputStr := string(output) + if !strings.Contains(outputStr, "dnote-server-") { + t.Errorf("expected version output to contain 'dnote-server-', got: %s", outputStr) + } +} + +func TestServerRootCommand(t *testing.T) { + cmd := exec.Command(testServerBinary) + output, err := cmd.CombinedOutput() + if err != nil { + t.Fatalf("server command failed: %v", err) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "Dnote server - a simple command line notebook"), true, "output should contain description") + assert.Equal(t, strings.Contains(outputStr, "start: Start the server"), true, "output should contain start command") + assert.Equal(t, strings.Contains(outputStr, "version: Print the version"), true, "output should contain version command") +} + +func TestServerStartHelp(t *testing.T) { + cmd := exec.Command(testServerBinary, "start", "--help") + output, _ := cmd.CombinedOutput() + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should contain usage") + assert.Equal(t, strings.Contains(outputStr, "--port"), true, "output should contain port flag") + assert.Equal(t, strings.Contains(outputStr, "--baseUrl"), true, "output should contain baseUrl flag") + assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "output should contain dbPath flag") + assert.Equal(t, strings.Contains(outputStr, "--disableRegistration"), true, "output should contain disableRegistration flag") +} + +func TestServerStartInvalidConfig(t *testing.T) { + cmd := exec.Command(testServerBinary, "start") + // Set invalid BaseURL to trigger validation failure + cmd.Env = []string{"BaseURL=not-a-valid-url"} + + output, err := cmd.CombinedOutput() + + // Should exit with non-zero status + if err == nil { + t.Fatal("expected command to fail with invalid config") + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "Error:"), true, "output should contain error message") + assert.Equal(t, strings.Contains(outputStr, "Invalid BaseURL"), true, "output should mention invalid BaseURL") + assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should show usage") + assert.Equal(t, strings.Contains(outputStr, "--baseUrl"), true, "output should show flags") +} + +func TestServerUnknownCommand(t *testing.T) { + cmd := exec.Command(testServerBinary, "unknown") + output, err := cmd.CombinedOutput() + + // Should exit with non-zero status + if err == nil { + t.Fatal("expected command to fail with unknown command") + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "Unknown command"), true, "output should contain unknown command message") + assert.Equal(t, strings.Contains(outputStr, "Dnote server - a simple command line notebook"), true, "output should show help") +} + +func TestServerUserCreate(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + cmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "password123") + output, err := cmd.CombinedOutput() + + if err != nil { + t.Fatalf("user create failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "User created successfully"), true, "output should show success message") + assert.Equal(t, strings.Contains(outputStr, "test@example.com"), true, "output should show email") + + // Verify user exists in database + db, err := gorm.Open(sqlite.Open(tmpDB), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open database: %v", err) + } + defer func() { + sqlDB, _ := db.DB() + sqlDB.Close() + }() + + var count int64 + db.Table("users").Count(&count) + assert.Equal(t, count, int64(1), "should have created 1 user") +} + +func TestServerUserCreateShortPassword(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + cmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "short") + output, err := cmd.CombinedOutput() + + // Should fail with short password + if err == nil { + t.Fatal("expected command to fail with short password") + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "password should be longer than 8 characters"), true, "output should show password error") +} + +func TestServerUserResetPassword(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create user first + createCmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "oldpassword123") + if output, err := createCmd.CombinedOutput(); err != nil { + t.Fatalf("failed to create user: %v\nOutput: %s", err, output) + } + + // Reset password + resetCmd := exec.Command(testServerBinary, "user", "reset-password", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "newpassword123") + output, err := resetCmd.CombinedOutput() + + if err != nil { + t.Fatalf("reset-password failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "Password reset successfully"), true, "output should show success message") +} + +func TestServerUserRemove(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create user first + createCmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "password123") + if output, err := createCmd.CombinedOutput(); err != nil { + t.Fatalf("failed to create user: %v\nOutput: %s", err, output) + } + + // Remove user with confirmation + removeCmd := exec.Command(testServerBinary, "user", "remove", + "--dbPath", tmpDB, + "--email", "test@example.com") + + // Pipe "y" to stdin to confirm removal + stdin, err := removeCmd.StdinPipe() + if err != nil { + t.Fatalf("failed to create stdin pipe: %v", err) + } + + // Capture output + stdout, err := removeCmd.StdoutPipe() + if err != nil { + t.Fatalf("failed to create stdout pipe: %v", err) + } + + var stderr bytes.Buffer + removeCmd.Stderr = &stderr + + // Start command + if err := removeCmd.Start(); err != nil { + t.Fatalf("failed to start remove command: %v", err) + } + + // Wait for prompt and send "y" to confirm + if err := assert.RespondToPrompt(stdout, stdin, "Remove user test@example.com?", "y\n", 10*time.Second); err != nil { + t.Fatalf("failed to confirm removal: %v", err) + } + + // Wait for command to finish + if err := removeCmd.Wait(); err != nil { + t.Fatalf("user remove failed: %v\nStderr: %s", err, stderr.String()) + } + + // Verify user was removed + db, err := gorm.Open(sqlite.Open(tmpDB), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open database: %v", err) + } + defer func() { + sqlDB, _ := db.DB() + sqlDB.Close() + }() + + var count int64 + db.Table("users").Count(&count) + assert.Equal(t, count, int64(0), "should have 0 users after removal") +} + +func TestServerUserCreateHelp(t *testing.T) { + cmd := exec.Command(testServerBinary, "user", "create", "--help") + output, err := cmd.CombinedOutput() + + if err != nil { + t.Fatalf("help command failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + + // Verify help shows double-dash flags for consistency with CLI + assert.Equal(t, strings.Contains(outputStr, "--email"), true, "help should show --email (double dash)") + assert.Equal(t, strings.Contains(outputStr, "--password"), true, "help should show --password (double dash)") + assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "help should show --dbPath (double dash)") +} + +func TestServerUserList(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create two users + exec.Command(testServerBinary, "user", "create", "--dbPath", tmpDB, "--email", "alice@example.com", "--password", "password123").CombinedOutput() + exec.Command(testServerBinary, "user", "create", "--dbPath", tmpDB, "--email", "bob@example.com", "--password", "password123").CombinedOutput() + + // List users + listCmd := exec.Command(testServerBinary, "user", "list", "--dbPath", tmpDB) + output, err := listCmd.CombinedOutput() + + if err != nil { + t.Fatalf("user list failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "alice@example.com"), true, "output should have alice") + assert.Equal(t, strings.Contains(outputStr, "bob@example.com"), true, "output should have bob") +} diff --git a/pkg/e2e/sync/basic_test.go b/pkg/e2e/sync/basic_test.go new file mode 100644 index 00000000..d49b0cd9 --- /dev/null +++ b/pkg/e2e/sync/basic_test.go @@ -0,0 +1,3811 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "fmt" + "os" + "testing" + + "github.com/dnote/dnote/pkg/assert" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/server/database" + apitest "github.com/dnote/dnote/pkg/server/testutils" +) + +func TestSync_Empty(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + return map[string]string{} + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + // Test + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 0, + clientLastMaxUSN: 0, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 0, + serverUserMaxUSN: 0, + }) + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) +} + +func TestSync_oneway(t *testing.T) { + t.Run("cli to api only", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) { + apitest.MustExec(t, env.ServerDB.Model(&user).Update("max_usn", 0), "updating user max_usn") + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + } + + assert := func(t *testing.T, env testEnv, user database.User) { + cliDB := env.DB + + // test client + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 3, + clientBookCount: 2, + clientLastMaxUSN: 5, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 3, + serverBookCount: 2, + serverUserMaxUSN: 5, + }) + + var cliBookJS, cliBookCSS cliDatabase.Book + var cliNote1JS, cliNote2JS, cliNote1CSS cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book js", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote2JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNote2JS.UUID, &cliNote2JS.Body, &cliNote2JS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + + // assert on usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote2JS.USN, 0, "cliNote2JS USN mismatch") + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote2JS.Body, "js2", "cliNote2JS Body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote2JS.Deleted, false, "cliNote2JS Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + + // test server + var apiBookJS, apiBookCSS database.Book + var apiNote1JS, apiNote2JS, apiNote1CSS database.Note + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote1JS.UUID).First(&apiNote1JS), "getting js1 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote2JS.UUID).First(&apiNote2JS), "getting js2 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote1CSS.UUID).First(&apiNote1CSS), "getting css1 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Where("uuid = ?", cliBookJS.UUID).First(&apiBookJS), "getting js book") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Where("uuid = ?", cliBookCSS.UUID).First(&apiBookCSS), "getting css book") + + // assert usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote2JS usn mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS usn mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS usn mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS usn mismatch") + // client must have generated uuids + assert.NotEqual(t, apiNote1JS.UUID, "", "apiNote1JS UUID mismatch") + assert.NotEqual(t, apiNote2JS.UUID, "", "apiNote2JS UUID mismatch") + assert.NotEqual(t, apiNote1CSS.UUID, "", "apiNote1CSS UUID mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote2JS.Deleted, false, "apiNote2JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + // assert on body and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "js2", "apiNote2JS Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + } + + t.Run("stepSync", func(t *testing.T) { + + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + assert(t, env, user) + }) + + t.Run("fullSync", func(t *testing.T) { + + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + + assert(t, env, user) + }) + }) + + t.Run("cli to api with edit and delete", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) { + apiDB := env.ServerDB + apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css2") + + var nid, nid2 string + cliDB := env.DB + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js3"), &nid) + cliDatabase.MustScan(t, "getting id of note to delete", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "css2"), &nid2) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js3-edited") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "css", nid2) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css4") + } + + assert := func(t *testing.T, env testEnv, user database.User) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 6, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 6, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // test cli + var cliN1, cliN2, cliN3, cliN4, cliN5, cliN6 cliDatabase.Note + var cliB1, cliB2 cliDatabase.Book + cliDatabase.MustScan(t, "finding cliN1", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliN1.UUID, &cliN1.Body, &cliN1.USN) + cliDatabase.MustScan(t, "finding cliN2", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliN2.UUID, &cliN2.Body, &cliN2.USN) + cliDatabase.MustScan(t, "finding cliN3", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js3-edited"), &cliN3.UUID, &cliN3.Body, &cliN3.USN) + cliDatabase.MustScan(t, "finding cliN4", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliN4.UUID, &cliN4.Body, &cliN4.USN) + cliDatabase.MustScan(t, "finding cliN5", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css3"), &cliN5.UUID, &cliN5.Body, &cliN5.USN) + cliDatabase.MustScan(t, "finding cliN6", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css4"), &cliN6.UUID, &cliN6.Body, &cliN6.USN) + cliDatabase.MustScan(t, "finding cliB1", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliB1.UUID, &cliB1.Label, &cliB1.USN) + cliDatabase.MustScan(t, "finding cliB2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliB2.UUID, &cliB2.Label, &cliB2.USN) + + // assert on usn + assert.NotEqual(t, cliN1.USN, 0, "cliN1 USN mismatch") + assert.NotEqual(t, cliN2.USN, 0, "cliN2 USN mismatch") + assert.NotEqual(t, cliN3.USN, 0, "cliN3 USN mismatch") + assert.NotEqual(t, cliN4.USN, 0, "cliN4 USN mismatch") + assert.NotEqual(t, cliN5.USN, 0, "cliN5 USN mismatch") + assert.NotEqual(t, cliN6.USN, 0, "cliN6 USN mismatch") + assert.NotEqual(t, cliB1.USN, 0, "cliB1 USN mismatch") + assert.NotEqual(t, cliB2.USN, 0, "cliB2 USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliN1.Body, "js1", "cliN1 Body mismatch") + assert.Equal(t, cliN2.Body, "js2", "cliN2 Body mismatch") + assert.Equal(t, cliN3.Body, "js3-edited", "cliN3 Body mismatch") + assert.Equal(t, cliN4.Body, "css1", "cliN4 Body mismatch") + assert.Equal(t, cliN5.Body, "css3", "cliN5 Body mismatch") + assert.Equal(t, cliN6.Body, "css4", "cliN6 Body mismatch") + assert.Equal(t, cliB1.Label, "js", "cliB1 Label mismatch") + assert.Equal(t, cliB2.Label, "css", "cliB2 Label mismatch") + // assert on deleted + assert.Equal(t, cliN1.Deleted, false, "cliN1 Deleted mismatch") + assert.Equal(t, cliN2.Deleted, false, "cliN2 Deleted mismatch") + assert.Equal(t, cliN3.Deleted, false, "cliN3 Deleted mismatch") + assert.Equal(t, cliN4.Deleted, false, "cliN4 Deleted mismatch") + assert.Equal(t, cliN5.Deleted, false, "cliN5 Deleted mismatch") + assert.Equal(t, cliN6.Deleted, false, "cliN6 Deleted mismatch") + assert.Equal(t, cliB1.Deleted, false, "cliB1 Deleted mismatch") + assert.Equal(t, cliB2.Deleted, false, "cliB2 Deleted mismatch") + + // test api + var apiN1, apiN2, apiN3, apiN4, apiN5, apiN6 database.Note + var apiB1, apiB2 database.Book + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN1.UUID).First(&apiN1), "finding apiN1") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN2.UUID).First(&apiN2), "finding apiN2") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN3.UUID).First(&apiN3), "finding apiN3") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN4.UUID).First(&apiN4), "finding apiN4") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN5.UUID).First(&apiN5), "finding apiN5") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliN6.UUID).First(&apiN6), "finding apiN6") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliB1.UUID).First(&apiB1), "finding apiB1") + apitest.MustExec(t, apiDB.Where("uuid = ?", cliB2.UUID).First(&apiB2), "finding apiB2") + + // assert on usn + assert.NotEqual(t, apiN1.USN, 0, "apiN1 usn mismatch") + assert.NotEqual(t, apiN2.USN, 0, "apiN2 usn mismatch") + assert.NotEqual(t, apiN3.USN, 0, "apiN3 usn mismatch") + assert.NotEqual(t, apiN4.USN, 0, "apiN4 usn mismatch") + assert.NotEqual(t, apiN5.USN, 0, "apiN5 usn mismatch") + assert.NotEqual(t, apiN6.USN, 0, "apiN6 usn mismatch") + assert.NotEqual(t, apiB1.USN, 0, "apiB1 usn mismatch") + assert.NotEqual(t, apiB2.USN, 0, "apiB2 usn mismatch") + // client must have generated uuids + assert.NotEqual(t, apiN1.UUID, "", "apiN1 UUID mismatch") + assert.NotEqual(t, apiN2.UUID, "", "apiN2 UUID mismatch") + assert.NotEqual(t, apiN3.UUID, "", "apiN3 UUID mismatch") + assert.NotEqual(t, apiN4.UUID, "", "apiN4 UUID mismatch") + assert.NotEqual(t, apiN5.UUID, "", "apiN5 UUID mismatch") + assert.NotEqual(t, apiN6.UUID, "", "apiN6 UUID mismatch") + assert.NotEqual(t, apiB1.UUID, "", "apiB1 UUID mismatch") + assert.NotEqual(t, apiB2.UUID, "", "apiB2 UUID mismatch") + // assert on deleted + assert.Equal(t, apiN1.Deleted, false, "apiN1 Deleted mismatch") + assert.Equal(t, apiN2.Deleted, false, "apiN2 Deleted mismatch") + assert.Equal(t, apiN3.Deleted, false, "apiN3 Deleted mismatch") + assert.Equal(t, apiN4.Deleted, false, "apiN4 Deleted mismatch") + assert.Equal(t, apiN5.Deleted, false, "apiN5 Deleted mismatch") + assert.Equal(t, apiN6.Deleted, false, "apiN6 Deleted mismatch") + assert.Equal(t, apiB1.Deleted, false, "apiB1 Deleted mismatch") + assert.Equal(t, apiB2.Deleted, false, "apiB2 Deleted mismatch") + // assert on body and labels + assert.Equal(t, apiN1.Body, "js1", "apiN1 Body mismatch") + assert.Equal(t, apiN2.Body, "js2", "apiN2 Body mismatch") + assert.Equal(t, apiN3.Body, "js3-edited", "apiN3 Body mismatch") + assert.Equal(t, apiN4.Body, "css1", "apiN4 Body mismatch") + assert.Equal(t, apiN5.Body, "css3", "apiN5 Body mismatch") + assert.Equal(t, apiN6.Body, "css4", "apiN6 Body mismatch") + assert.Equal(t, apiB1.Label, "js", "apiB1 Label mismatch") + assert.Equal(t, apiB2.Label, "css", "apiB2 Label mismatch") + } + + t.Run("stepSync", func(t *testing.T) { + + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + assert(t, env, user) + }) + + t.Run("fullSync", func(t *testing.T) { + + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + + assert(t, env, user) + }) + }) + + t.Run("api to cli", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + apiDB := env.ServerDB + + apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") + + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + jsNote2UUID := apiCreateNote(t, env, user, jsBookUUID, "js2", "adding js note 2") + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding linux book") + linuxNote1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux1", "adding linux note 1") + apiPatchNote(t, env, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + cssNote3UUID := apiCreateNote(t, env, user, cssBookUUID, "css3", "adding css note 3") + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding bash book") + bashNote1UUID := apiCreateNote(t, env, user, bashBookUUID, "bash1", "adding bash note 1") + + // delete the linux book and its two notes + apiDeleteBook(t, env, user, linuxBookUUID, "deleting linux book") + + apiPatchNote(t, env, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") + bashNote2UUID := apiCreateNote(t, env, user, bashBookUUID, "bash2", "adding bash note 2") + linuxBook2UUID := apiCreateBook(t, env, user, "linux", "adding new linux book") + linux2Note1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux-new-1", "adding linux note 1") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "jsNote2UUID": jsNote2UUID, + "cssBookUUID": cssBookUUID, + "cssNote1UUID": cssNote1UUID, + "cssNote2UUID": cssNote2UUID, + "cssNote3UUID": cssNote3UUID, + "linuxBookUUID": linuxBookUUID, + "linuxNote1UUID": linuxNote1UUID, + "bashBookUUID": bashBookUUID, + "bashNote1UUID": bashNote1UUID, + "bashNote2UUID": bashNote2UUID, + "linuxBook2UUID": linuxBook2UUID, + "linux2Note1UUID": linux2Note1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 6, + clientBookCount: 3, + clientLastMaxUSN: 21, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 9, + serverBookCount: 5, + serverUserMaxUSN: 21, + }) + + // test server + var apiNote1JS, apiNote2JS, apiNote1CSS, apiNote2CSS, apiNote3CSS, apiNote1Bash, apiNote2Bash, apiNote1Linux, apiNote2Linux, apiNote1LinuxDup database.Note + var apiBookJS, apiBookCSS, apiBookBash, apiBookLinux, apiBookLinuxDup database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding api js note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote2UUID"]).First(&apiNote2JS), "finding api js note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote1UUID"]).First(&apiNote1CSS), "finding api css note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote2UUID"]).First(&apiNote2CSS), "finding api css note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote3UUID"]).First(&apiNote3CSS), "finding api css note 3") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxNote1UUID"]).First(&apiNote1Linux), "finding api linux note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote2UUID"]).First(&apiNote2Linux), "finding api linux note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashNote1UUID"]).First(&apiNote1Bash), "finding api bash note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashNote2UUID"]).First(&apiNote2Bash), "finding api bash note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linux2Note1UUID"]).First(&apiNote1LinuxDup), "finding api linux 2 note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding api js book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding api css book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashBookUUID"]).First(&apiBookBash), "finding api bash book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxBookUUID"]).First(&apiBookLinux), "finding api linux book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxBook2UUID"]).First(&apiBookLinuxDup), "finding api linux book 2") + + // assert on server Label + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote2JS USN mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS USN mismatch") + assert.NotEqual(t, apiNote2CSS.USN, 0, "apiNote2CSS USN mismatch") + assert.NotEqual(t, apiNote3CSS.USN, 0, "apiNote3CSS USN mismatch") + assert.NotEqual(t, apiNote1Linux.USN, 0, "apiNote1Linux USN mismatch") + assert.NotEqual(t, apiNote2Linux.USN, 0, "apiNote2Linux USN mismatch") + assert.NotEqual(t, apiNote1Bash.USN, 0, "apiNote1Bash USN mismatch") + assert.NotEqual(t, apiNote2Bash.USN, 0, "apiNote2Bash USN mismatch") + assert.NotEqual(t, apiNote1LinuxDup.USN, 0, "apiNote1LinuxDup USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apibookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apibookCSS USN mismatch") + assert.NotEqual(t, apiBookBash.USN, 0, "apibookBash USN mismatch") + assert.NotEqual(t, apiBookLinux.USN, 0, "apibookLinux USN mismatch") + assert.NotEqual(t, apiBookLinuxDup.USN, 0, "apiBookLinuxDup USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "", "apiNote2JS Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiNote2CSS.Body, "css2-edited", "apiNote2CSS Body mismatch") + assert.Equal(t, apiNote3CSS.Body, "css3", "apiNote3CSS Body mismatch") + assert.Equal(t, apiNote1Linux.Body, "", "apiNote1Linux Body mismatch") + assert.Equal(t, apiNote2Linux.Body, "", "apiNote2Linux Body mismatch") + assert.Equal(t, apiNote1Bash.Body, "bash1", "apiNote1Bash Body mismatch") + assert.Equal(t, apiNote2Bash.Body, "bash2", "apiNote2Bash Body mismatch") + assert.Equal(t, apiNote1LinuxDup.Body, "linux-new-1", "apiNote1LinuxDup Body mismatch") + assert.Equal(t, apiBookJS.Label, "", "apibookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apibookCSS Label mismatch") + assert.Equal(t, apiBookBash.Label, "bash", "apibookBash Label mismatch") + assert.Equal(t, apiBookLinux.Label, "", "apibookLinux Label mismatch") + assert.Equal(t, apiBookLinuxDup.Label, "linux", "apiBookLinuxDup Label mismatch") + // assert on uuids + assert.NotEqual(t, apiNote1JS.UUID, "", "apiNote1JS UUID mismatch") + assert.NotEqual(t, apiNote2JS.UUID, "", "apiNote2JS UUID mismatch") + assert.NotEqual(t, apiNote1CSS.UUID, "", "apiNote1CSS UUID mismatch") + assert.NotEqual(t, apiNote2CSS.UUID, "", "apiNote2CSS UUID mismatch") + assert.NotEqual(t, apiNote3CSS.UUID, "", "apiNote3CSS UUID mismatch") + assert.NotEqual(t, apiNote1Linux.UUID, "", "apiNote1Linux UUID mismatch") + assert.NotEqual(t, apiNote2Linux.UUID, "", "apiNote2Linux UUID mismatch") + assert.NotEqual(t, apiNote1Bash.UUID, "", "apiNote1Bash UUID mismatch") + assert.NotEqual(t, apiNote2Bash.UUID, "", "apiNote2Bash UUID mismatch") + assert.NotEqual(t, apiNote2Bash.UUID, "", "apiNote2Bash UUID mismatch") + assert.NotEqual(t, apiBookJS.UUID, "", "apibookJS UUID mismatch") + assert.NotEqual(t, apiBookCSS.UUID, "", "apibookCSS UUID mismatch") + assert.NotEqual(t, apiBookBash.UUID, "", "apibookBash UUID mismatch") + assert.NotEqual(t, apiBookLinux.UUID, "", "apibookLinux UUID mismatch") + assert.NotEqual(t, apiBookLinuxDup.UUID, "", "apiBookLinuxDup UUID mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote2JS.Deleted, true, "apiNote2JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiNote2CSS.Deleted, false, "apiNote2CSS Deleted mismatch") + assert.Equal(t, apiNote3CSS.Deleted, false, "apiNote3CSS Deleted mismatch") + assert.Equal(t, apiNote1Linux.Deleted, true, "apiNote1Linux Deleted mismatch") + assert.Equal(t, apiNote2Linux.Deleted, true, "apiNote2Linux Deleted mismatch") + assert.Equal(t, apiNote1Bash.Deleted, false, "apiNote1Bash Deleted mismatch") + assert.Equal(t, apiNote2Bash.Deleted, false, "apiNote2Bash Deleted mismatch") + assert.Equal(t, apiNote2Bash.Deleted, false, "apiNote2Bash Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, true, "apibookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apibookCSS Deleted mismatch") + assert.Equal(t, apiBookBash.Deleted, false, "apibookBash Deleted mismatch") + assert.Equal(t, apiBookLinux.Deleted, true, "apibookLinux Deleted mismatch") + assert.Equal(t, apiBookLinuxDup.Deleted, false, "apiBookLinuxDup Deleted mismatch") + + // test client + var cliBookCSS, cliBookBash, cliBookLinux cliDatabase.Book + var cliNote1CSS, cliNote2CSS, cliNote3CSS, cliNote1Bash, cliNote2Bash, cliNote1Linux cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT label FROM books WHERE uuid = ?", ids["cssBookUUID"]), &cliBookCSS.Label) + cliDatabase.MustScan(t, "finding cli book bash", cliDB.QueryRow("SELECT label FROM books WHERE uuid = ?", ids["bashBookUUID"]), &cliBookBash.Label) + cliDatabase.MustScan(t, "finding cli book linux2", cliDB.QueryRow("SELECT label FROM books WHERE uuid = ?", ids["linuxBook2UUID"]), &cliBookLinux.Label) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote1CSS.UUID), &cliNote1CSS.Body, &cliNote1CSS.USN) + cliDatabase.MustScan(t, "finding cliNote2CSS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote2CSS.UUID), &cliNote2CSS.Body, &cliNote2CSS.USN) + cliDatabase.MustScan(t, "finding cliNote3CSS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote3CSS.UUID), &cliNote3CSS.Body, &cliNote3CSS.USN) + cliDatabase.MustScan(t, "finding cliNote1Bash", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote1Bash.UUID), &cliNote1Bash.Body, &cliNote1Bash.USN) + cliDatabase.MustScan(t, "finding cliNote2Bash", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote2Bash.UUID), &cliNote2Bash.Body, &cliNote2Bash.USN) + cliDatabase.MustScan(t, "finding cliNote2Bash", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", apiNote1LinuxDup.UUID), &cliNote1Linux.Body, &cliNote1Linux.USN) + + // assert on usn + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS usn mismatch") + assert.NotEqual(t, cliNote2CSS.USN, 0, "cliNote2CSS usn mismatch") + assert.NotEqual(t, cliNote3CSS.USN, 0, "cliNote3CSS usn mismatch") + assert.NotEqual(t, cliNote1Bash.USN, 0, "cliNote1Bash usn mismatch") + assert.NotEqual(t, cliNote2Bash.USN, 0, "cliNote2Bash usn mismatch") + assert.NotEqual(t, cliNote1Linux.USN, 0, "cliNote1Linux usn mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote2CSS.Body, "css2-edited", "cliNote2CSS Body mismatch") + assert.Equal(t, cliNote3CSS.Body, "css3", "cliNote3CSS Body mismatch") + assert.Equal(t, cliNote1Bash.Body, "bash1", "cliNote1Bash Body mismatch") + assert.Equal(t, cliNote2Bash.Body, "bash2", "cliNote2Bash Body mismatch") + assert.Equal(t, cliNote1Linux.Body, "linux-new-1", "cliNote1Linux Body mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookBash.Label, "bash", "cliBookBash Label mismatch") + assert.Equal(t, cliBookLinux.Label, "linux", "cliBookLinux Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliNote2CSS.Deleted, false, "cliNote2CSS Deleted mismatch") + assert.Equal(t, cliNote3CSS.Deleted, false, "cliNote3CSS Deleted mismatch") + assert.Equal(t, cliNote1Bash.Deleted, false, "cliNote1Bash Deleted mismatch") + assert.Equal(t, cliNote2Bash.Deleted, false, "cliNote2Bash Deleted mismatch") + assert.Equal(t, cliNote1Linux.Deleted, false, "cliNote1Linux Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookBash.Deleted, false, "cliBookBash Deleted mismatch") + assert.Equal(t, cliBookLinux.Deleted, false, "cliBookLinux Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) +} + +func TestSync_twoway(t *testing.T) { + t.Run("once", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + jsNote2UUID := apiCreateNote(t, env, user, jsBookUUID, "js2", "adding js note 2") + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding linux book") + linuxNote1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux1", "adding linux note 1") + apiPatchNote(t, env, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + cssNote3UUID := apiCreateNote(t, env, user, cssBookUUID, "css3", "adding css note 3") + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding bash book") + bashNote1UUID := apiCreateNote(t, env, user, bashBookUUID, "bash1", "adding bash note 1") + apiDeleteBook(t, env, user, linuxBookUUID, "deleting linux book") + apiPatchNote(t, env, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") + bashNote2UUID := apiCreateNote(t, env, user, bashBookUUID, "bash2", "adding bash note 2") + linuxBook2UUID := apiCreateBook(t, env, user, "linux", "adding new linux book") + linux2Note1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux-new-1", "adding linux note 1") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js4") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "math", "-c", "math1") + + var nid string + cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js3"), &nid) + + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "algorithms") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css4") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "jsNote2UUID": jsNote2UUID, + "cssBookUUID": cssBookUUID, + "cssNote1UUID": cssNote1UUID, + "cssNote2UUID": cssNote2UUID, + "cssNote3UUID": cssNote3UUID, + "linuxBookUUID": linuxBookUUID, + "linuxNote1UUID": linuxNote1UUID, + "bashBookUUID": bashBookUUID, + "bashNote1UUID": bashNote1UUID, + "bashNote2UUID": bashNote2UUID, + "linuxBook2UUID": linuxBook2UUID, + "linux2Note1UUID": linux2Note1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 9, + clientBookCount: 6, + clientLastMaxUSN: 27, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 12, + serverBookCount: 8, + serverUserMaxUSN: 27, + }) + + // test client + var cliNote1CSS, cliNote2CSS, cliNote3CSS, cliNote1CSS2, cliNote1Bash, cliNote2Bash, cliNote1Linux, cliNote1Math, cliNote1JS cliDatabase.Note + var cliBookCSS, cliBookCSS2, cliBookBash, cliBookLinux, cliBookMath, cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + cliDatabase.MustScan(t, "finding cliNote2CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css2-edited"), &cliNote2CSS.UUID, &cliNote2CSS.Body, &cliNote2CSS.USN) + cliDatabase.MustScan(t, "finding cliNote3CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css3"), &cliNote3CSS.UUID, &cliNote3CSS.Body, &cliNote3CSS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS2", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css4"), &cliNote1CSS2.UUID, &cliNote1CSS2.Body, &cliNote1CSS2.USN) + cliDatabase.MustScan(t, "finding cliNote1Bash", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "bash1"), &cliNote1Bash.UUID, &cliNote1Bash.Body, &cliNote1Bash.USN) + cliDatabase.MustScan(t, "finding cliNote2Bash", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "bash2"), &cliNote2Bash.UUID, &cliNote2Bash.Body, &cliNote2Bash.USN) + cliDatabase.MustScan(t, "finding cliNote1Linux", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "linux-new-1"), &cliNote1Linux.UUID, &cliNote1Linux.Body, &cliNote1Linux.USN) + cliDatabase.MustScan(t, "finding cliNote1Math", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "math1"), &cliNote1Math.UUID, &cliNote1Math.Body, &cliNote1Math.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js4"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + cliDatabase.MustScan(t, "finding cliBookBash", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "bash"), &cliBookBash.UUID, &cliBookBash.Label, &cliBookBash.USN) + cliDatabase.MustScan(t, "finding cliBookLinux", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "linux"), &cliBookLinux.UUID, &cliBookLinux.Label, &cliBookLinux.USN) + cliDatabase.MustScan(t, "finding cliBookMath", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "math"), &cliBookMath.UUID, &cliBookMath.Label, &cliBookMath.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + assert.NotEqual(t, cliNote2CSS.USN, 0, "cliNote2CSS USN mismatch") + assert.NotEqual(t, cliNote3CSS.USN, 0, "cliNote3CSS USN mismatch") + assert.NotEqual(t, cliNote1CSS2.USN, 0, "cliNote1CSS2 USN mismatch") + assert.NotEqual(t, cliNote1Bash.USN, 0, "cliNote1Bash USN mismatch") + assert.NotEqual(t, cliNote2Bash.USN, 0, "cliNote2Bash USN mismatch") + assert.NotEqual(t, cliNote1Linux.USN, 0, "cliNote1Linux USN mismatch") + assert.NotEqual(t, cliNote1Math.USN, 0, "cliNote1Math USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliBookCSS2.USN, 0, "cliBookCSS2 USN mismatch") + assert.NotEqual(t, cliBookBash.USN, 0, "cliBookBash USN mismatch") + assert.NotEqual(t, cliBookMath.USN, 0, "cliBookMath USN mismatch") + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote2CSS.Body, "css2-edited", "cliNote2CSS Body mismatch") + assert.Equal(t, cliNote3CSS.Body, "css3", "cliNote3CSS Body mismatch") + assert.Equal(t, cliNote1CSS2.Body, "css4", "cliNote1CSS2 Body mismatch") + assert.Equal(t, cliNote1Bash.Body, "bash1", "cliNote1Bash Body mismatch") + assert.Equal(t, cliNote2Bash.Body, "bash2", "cliNote2Bash Body mismatch") + assert.Equal(t, cliNote1Linux.Body, "linux-new-1", "cliNote1Linux Body mismatch") + assert.Equal(t, cliNote1Math.Body, "math1", "cliNote1Math Body mismatch") + assert.Equal(t, cliNote1JS.Body, "js4", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookCSS2.Label, "css_2", "cliBookCSS2 Label mismatch") + assert.Equal(t, cliBookBash.Label, "bash", "cliBookBash Label mismatch") + assert.Equal(t, cliBookMath.Label, "math", "cliBookMath Label mismatch") + assert.Equal(t, cliBookLinux.Label, "linux", "cliBookLinux Label mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliNote2CSS.Deleted, false, "cliNote2CSS Deleted mismatch") + assert.Equal(t, cliNote3CSS.Deleted, false, "cliNote3CSS Deleted mismatch") + assert.Equal(t, cliNote1CSS2.Deleted, false, "cliNote1CSS2 Deleted mismatch") + assert.Equal(t, cliNote1Bash.Deleted, false, "cliNote1Bash Deleted mismatch") + assert.Equal(t, cliNote2Bash.Deleted, false, "cliNote2Bash Deleted mismatch") + assert.Equal(t, cliNote1Linux.Deleted, false, "cliNote1Linux Deleted mismatch") + assert.Equal(t, cliNote1Math.Deleted, false, "cliNote1Math Deleted mismatch") + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookCSS2.Deleted, false, "cliBookCSS2 Deleted mismatch") + assert.Equal(t, cliBookBash.Deleted, false, "cliBookBash Deleted mismatch") + assert.Equal(t, cliBookMath.Deleted, false, "cliBookMath Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + + // test server + var apiNote1JS, apiNote1CSS, apiNote2CSS, apiNote3CSS, apiNote1Linux, apiNote2Linux, apiNote1Bash, apiNote2Bash, apiNote1LinuxDup, apiNote1CSS2, apiNote1Math, apiNote1JS2 database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding api js note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote1UUID"]).First(&apiNote1CSS), "finding api css note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote2UUID"]).First(&apiNote2CSS), "finding api css note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote3UUID"]).First(&apiNote3CSS), "finding api css note 3") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxNote1UUID"]).First(&apiNote1Linux), "finding api linux note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote2UUID"]).First(&apiNote2Linux), "finding api linux note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashNote1UUID"]).First(&apiNote1Bash), "finding api bash note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashNote2UUID"]).First(&apiNote2Bash), "finding api bash note 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linux2Note1UUID"]).First(&apiNote1LinuxDup), "finding api linux 2 note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS2.UUID).First(&apiNote1CSS2), "finding apiNote1CSS2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1Math.UUID).First(&apiNote1Math), "finding apiNote1Math") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1JS.UUID).First(&apiNote1JS2), "finding apiNote1JS2") + var apiBookJS, apiBookCSS, apiBookLinux, apiBookBash, apiBookLinuxDup, apiBookCSS2, apiBookMath, apiBookJS2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding api js book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding api css book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashBookUUID"]).First(&apiBookBash), "finding api bash book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxBookUUID"]).First(&apiBookLinux), "finding api linux book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxBook2UUID"]).First(&apiBookLinuxDup), "finding api linux book 2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS2.UUID).First(&apiBookCSS2), "finding apiBookCSS2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookMath.UUID).First(&apiBookMath), "finding apiBookMath") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookJS.UUID).First(&apiBookJS2), "finding apiBookJS2") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS usn mismatch") + assert.NotEqual(t, apiNote2CSS.USN, 0, "apiNote2CSS usn mismatch") + assert.NotEqual(t, apiNote3CSS.USN, 0, "apiNote3CSS usn mismatch") + assert.NotEqual(t, apiNote1Linux.USN, 0, "apiNote1Linux usn mismatch") + assert.NotEqual(t, apiNote2Linux.USN, 0, "apiNote2Linux usn mismatch") + assert.NotEqual(t, apiNote1Bash.USN, 0, "apiNote1Bash usn mismatch") + assert.NotEqual(t, apiNote2Bash.USN, 0, "apiNote2Bash usn mismatch") + assert.NotEqual(t, apiNote1LinuxDup.USN, 0, "apiNote1LinuxDup usn mismatch") + assert.NotEqual(t, apiNote1CSS2.USN, 0, "apiNoteCSS2 usn mismatch") + assert.NotEqual(t, apiNote1Math.USN, 0, "apiNote1Math usn mismatch") + assert.NotEqual(t, apiNote1JS2.USN, 0, "apiNote1JS2 usn mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS usn mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS usn mismatch") + assert.NotEqual(t, apiBookLinux.USN, 0, "apiBookLinux usn mismatch") + assert.NotEqual(t, apiBookBash.USN, 0, "apiBookBash usn mismatch") + assert.NotEqual(t, apiBookLinuxDup.USN, 0, "apiBookLinuxDup usn mismatch") + assert.NotEqual(t, apiBookCSS2.USN, 0, "apiBookCSS2 usn mismatch") + assert.NotEqual(t, apiBookMath.USN, 0, "apiBookMath usn mismatch") + assert.NotEqual(t, apiBookJS2.USN, 0, "apiBookJS2 usn mismatch") + // assert on note bodys + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiNote2CSS.Body, "css2-edited", "apiNote2CSS Body mismatch") + assert.Equal(t, apiNote3CSS.Body, "css3", "apiNote3CSS Body mismatch") + assert.Equal(t, apiNote1Linux.Body, "", "apiNote1Linux Body mismatch") + assert.Equal(t, apiNote2Linux.Body, "", "apiNote2Linux Body mismatch") + assert.Equal(t, apiNote1Bash.Body, "bash1", "apiNote1Bash Body mismatch") + assert.Equal(t, apiNote2Bash.Body, "bash2", "apiNote2Bash Body mismatch") + assert.Equal(t, apiNote1LinuxDup.Body, "linux-new-1", "apiNote1LinuxDup Body mismatch") + assert.Equal(t, apiNote1CSS2.Body, "css4", "apiNote1CSS2 Body mismatch") + assert.Equal(t, apiNote1Math.Body, "math1", "apiNote1Math Body mismatch") + assert.Equal(t, apiNote1JS2.Body, "js4", "apiNote1JS2 Body mismatch") + // client must have generated uuids + assert.NotEqual(t, apiNote1CSS2.UUID, "", "apiNote1CSS2 uuid mismatch") + assert.NotEqual(t, apiNote1Math.UUID, "", "apiNote1Math uuid mismatch") + assert.NotEqual(t, apiNote1JS2.UUID, "", "apiNote1JS2 uuid mismatch") + // assert on labels + assert.Equal(t, apiBookJS.Label, "", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookLinux.Label, "", "apiBookLinux Label mismatch") + assert.Equal(t, apiBookBash.Label, "bash", "apiBookBash Label mismatch") + assert.Equal(t, apiBookLinuxDup.Label, "linux", "apiBookLinuxDup Label mismatch") + assert.Equal(t, apiBookCSS2.Label, "css_2", "apiBookCSS2 Label mismatch") + assert.Equal(t, apiBookMath.Label, "math", "apiBookMath Label mismatch") + assert.Equal(t, apiBookJS2.Label, "js", "apiBookJS2 Label mismatch") + // assert on note deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiNote2CSS.Deleted, false, "apiNote2CSS Deleted mismatch") + assert.Equal(t, apiNote3CSS.Deleted, false, "apiNote3CSS Deleted mismatch") + assert.Equal(t, apiNote1Linux.Deleted, true, "apiNote1Linux Deleted mismatch") + assert.Equal(t, apiNote2Linux.Deleted, true, "apiNote2Linux Deleted mismatch") + assert.Equal(t, apiNote1Bash.Deleted, false, "apiNote1Bash Deleted mismatch") + assert.Equal(t, apiNote2Bash.Deleted, false, "apiNote2Bash Deleted mismatch") + assert.Equal(t, apiNote1LinuxDup.Deleted, false, "apiNote1LinuxDup Deleted mismatch") + assert.Equal(t, apiNote1CSS2.Deleted, false, "apiNote1CSS2 Deleted mismatch") + assert.Equal(t, apiNote1Math.Deleted, false, "apiNote1Math Deleted mismatch") + assert.Equal(t, apiNote1JS2.Deleted, false, "apiNote1JS2 Deleted mismatch") + // assert on book deleted + assert.Equal(t, apiBookJS.Deleted, true, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + assert.Equal(t, apiBookLinux.Deleted, true, "apiBookLinux Deleted mismatch") + assert.Equal(t, apiBookBash.Deleted, false, "apiBookBash Deleted mismatch") + assert.Equal(t, apiBookLinuxDup.Deleted, false, "apiBookLinuxDup Deleted mismatch") + assert.Equal(t, apiBookCSS2.Deleted, false, "apiBookCSS2 Deleted mismatch") + assert.Equal(t, apiBookMath.Deleted, false, "apiBookMath Deleted mismatch") + assert.Equal(t, apiBookJS2.Deleted, false, "apiBookJS2 Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("twice", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "math", "-c", "math1") + + var nid string + cliDB := env.DB + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "math1"), &nid) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "math", nid, "-c", "math1-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + scssBookUUID := apiCreateBook(t, env, user, "scss", "adding a scss book") + apiPatchNote(t, env, user, cssNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, scssBookUUID), "moving css note 1 to scss") + + var n1UUID string + cliDatabase.MustScan(t, "getting math1-edited note UUID", cliDB.QueryRow("SELECT uuid FROM notes WHERE body = ?", "math1-edited"), &n1UUID) + apiPatchNote(t, env, user, n1UUID, fmt.Sprintf(`{"content": "%s", "public": true}`, "math1-edited"), "editing math1 note") + + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + apiDeleteBook(t, env, user, cssBookUUID, "deleting css book") + + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding a bash book") + algorithmsBookUUID := apiCreateBook(t, env, user, "algorithms", "adding a algorithms book") + + // 4. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "cssBookUUID": cssBookUUID, + "scssBookUUID": scssBookUUID, + "cssNote1UUID": cssNote1UUID, + "cssNote2UUID": cssNote2UUID, + "bashBookUUID": bashBookUUID, + "algorithmsBookUUID": algorithmsBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + cliDB := env.DB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 5, + clientBookCount: 6, + clientLastMaxUSN: 17, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 6, + serverBookCount: 7, + serverUserMaxUSN: 17, + }) + + // test client + var cliNote1JS, cliNote2JS, cliNote1SCSS, cliNote1Math, cliNote1Alg2 cliDatabase.Note + var cliBookJS, cliBookSCSS, cliBookMath, cliBookBash, cliBookAlg, cliBookAlg2 cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote2JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js3"), &cliNote2JS.UUID, &cliNote2JS.Body, &cliNote2JS.USN) + cliDatabase.MustScan(t, "finding cliNote1SCSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1SCSS.UUID, &cliNote1SCSS.Body, &cliNote1SCSS.USN) + cliDatabase.MustScan(t, "finding cliNote1Math", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "math1-edited"), &cliNote1Math.UUID, &cliNote1Math.Body, &cliNote1Math.USN) + cliDatabase.MustScan(t, "finding cliNote1Alg2", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "algorithms1"), &cliNote1Alg2.UUID, &cliNote1Alg2.Body, &cliNote1Alg2.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookSCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "scss"), &cliBookSCSS.UUID, &cliBookSCSS.Label, &cliBookSCSS.USN) + cliDatabase.MustScan(t, "finding cliBookMath", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "math"), &cliBookMath.UUID, &cliBookMath.Label, &cliBookMath.USN) + cliDatabase.MustScan(t, "finding cliBookBash", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "bash"), &cliBookBash.UUID, &cliBookBash.Label, &cliBookBash.USN) + cliDatabase.MustScan(t, "finding cliBookAlg", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "algorithms"), &cliBookAlg.UUID, &cliBookAlg.Label, &cliBookAlg.USN) + cliDatabase.MustScan(t, "finding cliBookAlg2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "algorithms_2"), &cliBookAlg2.UUID, &cliBookAlg2.Label, &cliBookAlg2.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote2JS.USN, 0, "cliNote2JS USN mismatch") + assert.NotEqual(t, cliNote1SCSS.USN, 0, "cliNote1SCSS USN mismatch") + assert.NotEqual(t, cliNote1Math.USN, 0, "cliNote1Math USN mismatch") + assert.NotEqual(t, cliNote1Alg2.USN, 0, "cliNote1Alg2 USN mismatch") + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookSCSS.USN, 0, "cliBookSCSS USN mismatch") + assert.NotEqual(t, cliBookMath.USN, 0, "cliBookMath USN mismatch") + assert.NotEqual(t, cliBookBash.USN, 0, "cliBookBash USN mismatch") + assert.NotEqual(t, cliBookAlg.USN, 0, "cliBookAlg USN mismatch") + assert.NotEqual(t, cliBookAlg2.USN, 0, "cliBookAlg2 USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote2JS.Body, "js3", "cliNote2JS Body mismatch") + assert.Equal(t, cliNote1SCSS.Body, "css1", "cliNote1SCSS Body mismatch") + assert.Equal(t, cliNote1Math.Body, "math1-edited", "cliNote1Math Body mismatch") + assert.Equal(t, cliNote1Alg2.Body, "algorithms1", "cliNote1Alg2 Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookSCSS.Label, "scss", "cliBookSCSS Label mismatch") + assert.Equal(t, cliBookMath.Label, "math", "cliBookMath Label mismatch") + assert.Equal(t, cliBookBash.Label, "bash", "cliBookBash Label mismatch") + assert.Equal(t, cliBookAlg.Label, "algorithms", "cliBookAlg Label mismatch") + assert.Equal(t, cliBookAlg2.Label, "algorithms_2", "cliBookAlg2 Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote2JS.Deleted, false, "cliNote2JS Deleted mismatch") + assert.Equal(t, cliNote1SCSS.Deleted, false, "cliNote1SCSS Deleted mismatch") + assert.Equal(t, cliNote1Math.Deleted, false, "cliNote1Math Deleted mismatch") + assert.Equal(t, cliNote1Alg2.Deleted, false, "cliNote1Alg2 Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookSCSS.Deleted, false, "cliBookSCSS Deleted mismatch") + assert.Equal(t, cliBookMath.Deleted, false, "cliBookMath Deleted mismatch") + assert.Equal(t, cliBookBash.Deleted, false, "cliBookBash Deleted mismatch") + assert.Equal(t, cliBookAlg.Deleted, false, "cliBookAlg Deleted mismatch") + assert.Equal(t, cliBookAlg2.Deleted, false, "cliBookAlg2 Deleted mismatch") + + // test server + var apiNote1JS, apiNote2JS, apiNote1SCSS, apiNote2CSS, apiNote1Math, apiNote1Alg database.Note + var apiBookJS, apiBookCSS, apiBookSCSS, apiBookMath, apiBookBash, apiBookAlg, apiBookAlg2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote2UUID"]).First(&apiNote2CSS), "finding apiNote2CSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote2JS.UUID).First(&apiNote2JS), "finding apiNote2JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote1UUID"]).First(&apiNote1SCSS), "finding apiNote1SCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1Math.UUID).First(&apiNote1Math), "finding apiNote1Math") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1Alg2.UUID).First(&apiNote1Alg), "finding apiNote1Alg") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["bashBookUUID"]).First(&apiBookBash), "finding apiBookBash") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["scssBookUUID"]).First(&apiBookSCSS), "finding apiBookSCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["algorithmsBookUUID"]).First(&apiBookAlg), "finding apiBookAlg") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookAlg2.UUID).First(&apiBookAlg2), "finding apiBookAlg2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookMath.UUID).First(&apiBookMath), "finding apiBookMath") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote1SCSS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote2CSS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote1Math.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote1Alg.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBook1Alg usn mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS usn mismatch") + assert.NotEqual(t, apiBookSCSS.USN, 0, "apibookSCSS usn mismatch") + assert.NotEqual(t, apiBookMath.USN, 0, "apiBookMath usn mismatch") + assert.NotEqual(t, apiBookBash.USN, 0, "apiBookBash usn mismatch") + assert.NotEqual(t, apiBookAlg.USN, 0, "apiBookAlg usn mismatch") + assert.NotEqual(t, apiBookAlg2.USN, 0, "apiBookAlg2 usn mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "js3", "apiNote2JS Body mismatch") + assert.Equal(t, apiNote1SCSS.Body, "css1", "apiNote1SCSS Body mismatch") + assert.Equal(t, apiNote2CSS.Body, "", "apiNote2CSS Body mismatch") + assert.Equal(t, apiNote1Math.Body, "math1-edited", "apiNote1Math Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookSCSS.Label, "scss", "apiBookSCSS Label mismatch") + assert.Equal(t, apiBookMath.Label, "math", "apiBookMath Label mismatch") + assert.Equal(t, apiBookBash.Label, "bash", "apiBookBash Label mismatch") + assert.Equal(t, apiBookAlg.Label, "algorithms", "apiBookAlg Label mismatch") + assert.Equal(t, apiBookAlg2.Label, "algorithms_2", "apiBookAlg2 Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote2JS.Deleted, false, "apiNote2JS Deleted mismatch") + assert.Equal(t, apiNote1SCSS.Deleted, false, "apiNote1SCSS Deleted mismatch") + assert.Equal(t, apiNote2CSS.Deleted, true, "apiNote2CSS Deleted mismatch") + assert.Equal(t, apiNote1Math.Deleted, false, "apiNote1Math Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, true, "apiBookCSS Deleted mismatch") + assert.Equal(t, apiBookSCSS.Deleted, false, "apiBookSCSS Deleted mismatch") + assert.Equal(t, apiBookMath.Deleted, false, "apiBookMath Deleted mismatch") + assert.Equal(t, apiBookBash.Deleted, false, "apiBookBash Deleted mismatch") + assert.Equal(t, apiBookAlg.Deleted, false, "apiBookAlg Deleted mismatch") + assert.Equal(t, apiBookAlg2.Deleted, false, "apiBookAlg2 Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("three times", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + goBookUUID := apiCreateBook(t, env, user, "go", "adding a go book") + goNote1UUID := apiCreateNote(t, env, user, goBookUUID, "go1", "adding go note 1") + + // 4. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "html", "-c", "html1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "goBookUUID": goBookUUID, + "goNote1UUID": goNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // test client + var cliNote1JS, cliNote1CSS, cliNote1Go, cliNote1HTML cliDatabase.Note + var cliBookJS, cliBookCSS, cliBookGo, cliBookHTML cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + cliDatabase.MustScan(t, "finding cliNote1Go", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "go1"), &cliNote1Go.UUID, &cliNote1Go.Body, &cliNote1Go.USN) + cliDatabase.MustScan(t, "finding cliNote1HTML", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "html1"), &cliNote1HTML.UUID, &cliNote1HTML.Body, &cliNote1HTML.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliBookGo", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "go"), &cliBookGo.UUID, &cliBookGo.Label, &cliBookGo.USN) + cliDatabase.MustScan(t, "finding cliBookHTML", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "html"), &cliBookHTML.UUID, &cliBookHTML.Label, &cliBookHTML.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + assert.NotEqual(t, cliNote1Go.USN, 0, "cliNote1Go USN mismatch") + assert.NotEqual(t, cliNote1HTML.USN, 0, "cliNote1HTML USN mismatch") + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliBookGo.USN, 0, "cliBookGo USN mismatch") + assert.NotEqual(t, cliBookHTML.USN, 0, "cliBookHTML USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote1Go.Body, "go1", "cliNote1Go Body mismatch") + assert.Equal(t, cliNote1HTML.Body, "html1", "cliNote1HTML Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookGo.Label, "go", "cliBookGo Label mismatch") + assert.Equal(t, cliBookHTML.Label, "html", "cliBookHTML Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliNote1Go.Deleted, false, "cliNote1Go Deleted mismatch") + assert.Equal(t, cliNote1HTML.Deleted, false, "cliNote1HTML Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookGo.Deleted, false, "cliBookGo Deleted mismatch") + assert.Equal(t, cliBookHTML.Deleted, false, "cliBookHTML Deleted mismatch") + + // test server + var apiNote1JS, apiNote1CSS, apiNote1Go, apiNote1HTML database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["goNote1UUID"]).First(&apiNote1Go), "finding apiNote1Go") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS.UUID).First(&apiNote1CSS), "finding apiNote1CSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1HTML.UUID).First(&apiNote1HTML), "finding apiNote1HTML") + var apiBookJS, apiBookCSS, apiBookGo, apiBookHTML database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["goBookUUID"]).First(&apiBookGo), "finding apiBookGo") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS.UUID).First(&apiBookCSS), "finding apiBookCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookHTML.UUID).First(&apiBookHTML), "finding apiBookHTML") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS USN mismatch") + assert.NotEqual(t, apiNote1Go.USN, 0, "apiNote1Go USN mismatch") + assert.NotEqual(t, apiNote1HTML.USN, 0, "apiNote1HTM USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookGo.USN, 0, "apiBookGo USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + assert.NotEqual(t, apiBookHTML.USN, 0, "apiBookHTML USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiNote1Go.Body, "go1", "apiNote1Go Body mismatch") + assert.Equal(t, apiNote1HTML.Body, "html1", "apiNote1HTM Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookGo.Label, "go", "apiBookGo Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookHTML.Label, "html", "apiBookHTML Label mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) +} + +func TestSync(t *testing.T) { + t.Run("client adds a book and a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + + return map[string]string{} + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // test client + // assert on bodys and labels + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1JS.UUID).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookJS.UUID).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client deletes a book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 0, + clientLastMaxUSN: 5, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 5, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, true, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client deletes a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + var nid string + cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE label = ?", "js"), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client edits a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1-edited", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1-edited", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client edits a book by renaming it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test client + var cliBookJS cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, book_uuid, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookJS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js-edited", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js-edited", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server adds a book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 1, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 1, + serverUserMaxUSN: 1, + }) + + // test server + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + // assert on bodys and labels + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE label = ?", "js"), &cliBookJS.Label, &cliBookJS.USN) + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server edits a book by renaming it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-new-label"), "editing js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // test server + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiBookJS.Label, "js-new-label", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + // assert on bodys and labels + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + assert.Equal(t, cliBookJS.Label, "js-new-label", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server deletes a book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 0, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // test server + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiBookJS.Label, "", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiBookJS.Deleted, true, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server adds a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server edits a note body", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1-edited", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1-edited", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server moves a note to another book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "cssBookUUID": cssBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["cssBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["cssBookUUID"]), &cliBookCSS.Label, &cliBookCSS.USN) + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server deletes a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + // assert on bodys and labels + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server deletes the same book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + + // 4. on cli + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 0, + clientLastMaxUSN: 6, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 6, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, true, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server deletes the same note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + + // 4. on cli + var nid string + cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + cliDB := env.DB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server and client adds a note with same body", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 4. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test client + var cliNote1JS, cliNote2JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote2JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ? and uuid != ?", "js1", ids["jsNote1UUID"]), &cliNote2JS.UUID, &cliNote2JS.Body, &cliNote2JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote2JS.Body, "js1", "cliNote2JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote2JS.Deleted, false, "cliNote2JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + + // test server + var apiNote1JS, apiNote2JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote2JS.UUID).First(&apiNote2JS), "finding apiNote2JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote2JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "js1", "apiNote2JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server and client adds a book with same label", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test client + var cliNote1JS, cliNote1JS2 cliDatabase.Note + var cliBookJS, cliBookJS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS2", + cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ? AND uuid !=?", "js1", ids["jsNote1UUID"]), &cliNote1JS2.UUID, &cliNote1JS2.Body, &cliNote1JS2.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookJS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS2.Body, "js1", "cliNote1JS2 Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookJS2.Label, "js_2", "cliBookJS2 Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1JS2.Deleted, false, "cliNote1JS2 Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookJS2.Deleted, false, "cliBookJS2 Deleted mismatch") + + // test server + var apiNote1JS, apiNote1JS2 database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1JS2.UUID).First(&apiNote1JS2), "finding apiNote1JS2") + var apiBookJS, apiBookJS2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookJS2.UUID).First(&apiBookJS2), "finding apiBookJS2") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote1JS2.USN, 0, "apiNote1JS2 USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookJS2.USN, 0, "apiBookJS2 USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS2.Body, "js1", "apiNote1JS2 Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookJS2.Label, "js_2", "apiBookJS2 Label mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server and client adds two sets of books with same labels", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "cssBookUUID": cssBookUUID, + "cssNote1UUID": cssNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // test client + var cliNote1JS, cliNote1JS2, cliNote1CSS, cliNote1CSS2 cliDatabase.Note + var cliBookJS, cliBookJS2, cliBookCSS, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS2", + cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ? AND uuid != ?", "js1", ids["jsNote1UUID"]), &cliNote1JS2.UUID, &cliNote1JS2.Body, &cliNote1JS2.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE uuid = ?", ids["cssNote1UUID"]), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS2", + cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ? AND uuid != ?", "css1", ids["cssNote1UUID"]), &cliNote1CSS2.UUID, &cliNote1CSS2.Body, &cliNote1CSS2.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookJS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS2.Body, "js1", "cliNote1JS2 Body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote1CSS2.Body, "css1", "cliNote1CSS2 Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookJS2.Label, "js_2", "cliBookJS2 Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookCSS2.Label, "css_2", "cliBookCSS2 Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1JS2.Deleted, false, "cliNote1JS2 Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliNote1CSS2.Deleted, false, "cliNote1CSS2 Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookJS2.Deleted, false, "cliBookJS2 Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookCSS2.Deleted, false, "cliBookCSS2 Deleted mismatch") + + // test server + var apiNote1JS, apiNote1JS2, apiNote1CSS, apiNote1CSS2 database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1JS2.UUID).First(&apiNote1JS2), "finding apiNote1JS2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssNote1UUID"]).First(&apiNote1CSS), "finding apiNote1CSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS2.UUID).First(&apiNote1CSS2), "finding apiNote1CSS2") + var apiBookJS, apiBookJS2, apiBookCSS, apiBookCSS2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookJS2.UUID).First(&apiBookJS2), "finding apiBookJS2") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS2.UUID).First(&apiBookCSS2), "finding apiBookCSS2") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote1JS2.USN, 0, "apiNote1JS2 USN mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS USN mismatch") + assert.NotEqual(t, apiNote1CSS2.USN, 0, "apiNote1CSS2 USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookJS2.USN, 0, "apiBookJS2 USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + assert.NotEqual(t, apiBookCSS2.USN, 0, "apiBookCSS2 USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS2.Body, "js1", "apiNote1JS2 Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS2 Body mismatch") + assert.Equal(t, apiNote1CSS2.Body, "css1", "apiNote1CSS2 Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookJS2.Label, "js_2", "apiBookJS2 Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookCSS2.Label, "css_2", "apiBookCSS2 Label mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server and client adds notes to the same book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 4. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test client + var cliNote1JS, cliNote2JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote2JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNote2JS.UUID, &cliNote2JS.Body, &cliNote2JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote2JS.Body, "js2", "cliNote2JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote2JS.Deleted, false, "cliNote2JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + + // test server + var apiNote1JS, apiNote2JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote2JS.UUID).First(&apiNote2JS), "finding apiNote2JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote2JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "js2", "apiNote2JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server and client adds a book with the same label and notes in it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test client + var cliNote1JS, cliNote2JS cliDatabase.Note + var cliBookJS, cliBookJS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote2JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNote2JS.UUID, &cliNote2JS.Body, &cliNote2JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookJS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote2JS.Body, "js2", "cliNote2JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookJS2.Label, "js_2", "cliBookJS2 Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote2JS.Deleted, false, "cliNote2JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookJS2.Deleted, false, "cliBookJS2 Deleted mismatch") + + // test server + var apiNote1JS, apiNote2JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote2JS.UUID).First(&apiNote2JS), "finding apiNote2JS") + var apiBookJS, apiBookJS2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookJS2.UUID).First(&apiBookJS2), "finding apiBookJS2") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote2JS.USN, 0, "apiNote2JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookJS2.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote2JS.Body, "js2", "apiNote2JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookJS2.Label, "js_2", "apiBookJS2 USN mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server edits bodys of the same note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited-from-client") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited-from-server"), "editing js note 1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + resolvedBody := "<<<<<<< Local\njs1-edited-from-client\n=======\njs1-edited-from-server\n>>>>>>> Server\n" + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, resolvedBody, "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, resolvedBody, "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("clients deletes a note and server edits its body", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + var nid string + cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 3, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 3, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1-edited", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1-edited", "cliNote1JS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("clients deletes a note and server moves it to another book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + var nid string + cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + "cssBookUUID": cssBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["cssBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["cssBookUUID"]), &cliBookCSS.Label, &cliBookCSS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, ids["cssNote1UUID"], "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server deletes a note and client edits it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + + // 4. on cli + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1-edited", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, book_uuid, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1-edited", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, ids["jsBookUUID"], "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server deletes a book and client edits it by renaming it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + + // 4. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js-edited", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliBookJS.Label, "js-edited", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("server deletes a book and client edits a note in it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB + + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + + // 4. on cli + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 6, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 6, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1-edited", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliNote1JS cliDatabase.Note + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT body, book_uuid, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1-edited", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, ids["jsBookUUID"], "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client deletes a book and server edits it by renaming it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + + // 3. on server + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 1, + clientLastMaxUSN: 5, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 5, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js-edited", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + + // test client + var cliBookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.Label, &cliBookJS.USN) + + // test usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliBookJS.Label, "js-edited", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client deletes a book and server edits a note in it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") + + // 4. on cli + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 0, + clientBookCount: 0, + clientLastMaxUSN: 6, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 6, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["jsBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, true, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, true, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server edit a book by renaming it to a same name", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + + // 3. on server + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test client + var cliBookJS cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, book_uuid, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookJS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js-edited", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js-edited", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server edit a book by renaming it to different names", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited-client") + + // 3. on server + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited-server"), "editing js book") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + // In this case, server's change wins and overwrites that of client's + + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 4, + }) + + // test client + var cliBookJS cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE uuid = ?", ids["jsBookUUID"]), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, book_uuid, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookJS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js-edited-server", "cliBookJS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js-edited-server", "apiBookJS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client moves a note", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "cssBookUUID": cssBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["cssBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + + // test client + var cliBookJS, cliBookCSS cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book js", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, book_uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.BookUUID, &cliNote1JS.Body, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookCSS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + assert.Equal(t, cliBookCSS.Dirty, false, "cliBookCSS Dirty mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server each moves a note to a same book", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + + // 3. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "cssBookUUID": cssBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 2, + clientLastMaxUSN: 5, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 2, + serverUserMaxUSN: 5, + }) + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, ids["cssBookUUID"], "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + + // test client + var cliBookJS, cliBookCSS cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book js", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, book_uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.BookUUID, &cliNote1JS.Body, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookCSS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + assert.Equal(t, cliBookCSS.Dirty, false, "cliBookCSS Dirty mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client and server each moves a note to different books", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding a linux book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + + // 3. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "linux") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "cssBookUUID": cssBookUUID, + "jsNote1UUID": jsNote1UUID, + "linuxBookUUID": linuxBookUUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + expectedNote1JSBody := `<<<<<<< Local +Moved to the book linux +======= +Moved to the book css +>>>>>>> Server + +js1` + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 4, + clientLastMaxUSN: 7, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 4, + serverUserMaxUSN: 7, + }) + + // test client + var cliBookJS, cliBookCSS, cliBookLinux, cliBookConflicts cliDatabase.Book + var cliNote1JS cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book js", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliBookLinux", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "linux"), &cliBookLinux.UUID, &cliBookLinux.Label, &cliBookLinux.USN) + cliDatabase.MustScan(t, "finding cliBookConflicts", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "conflicts"), &cliBookConflicts.UUID, &cliBookConflicts.Label, &cliBookConflicts.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, book_uuid, body, usn FROM notes WHERE uuid = ?", ids["jsNote1UUID"]), &cliNote1JS.UUID, &cliNote1JS.BookUUID, &cliNote1JS.Body, &cliNote1JS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliBookLinux.USN, 0, "cliBookLinux USN mismatch") + assert.NotEqual(t, cliBookConflicts.USN, 0, "cliBookConflicts USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, expectedNote1JSBody, "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookConflicts.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookLinux.Label, "linux", "cliBookLinux Label mismatch") + assert.Equal(t, cliBookConflicts.Label, "conflicts", "cliBookConflicts Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookLinux.Deleted, false, "cliBookLinux Deleted mismatch") + assert.Equal(t, cliBookConflicts.Deleted, false, "cliBookConflicts Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + assert.Equal(t, cliBookCSS.Dirty, false, "cliBookCSS Dirty mismatch") + assert.Equal(t, cliBookLinux.Dirty, false, "cliBookLinux Dirty mismatch") + assert.Equal(t, cliBookConflicts.Dirty, false, "cliBookConflicts Dirty mismatch") + + // test server + var apiNote1JS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + var apiBookJS, apiBookCSS, apiBookLinux, apiBookConflicts database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["linuxBookUUID"]).First(&apiBookLinux), "finding apiBookLinux") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookConflicts.UUID).First(&apiBookConflicts), "finding apiBookConflicts") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + assert.NotEqual(t, apiBookConflicts.USN, 0, "apiBookConflicts USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, expectedNote1JSBody, "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, apiBookConflicts.UUID, "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookLinux.Label, "linux", "apiBookLinux Label mismatch") + assert.Equal(t, apiBookConflicts.Label, "conflicts", "apiBookConflicts Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + assert.Equal(t, apiBookLinux.Deleted, false, "apiBookLinux Deleted mismatch") + assert.Equal(t, apiBookConflicts.Deleted, false, "apiBookConflicts Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client adds a new book and moves a note into it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + cliDB := env.DB + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-b", "css") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 5, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 5, + }) + + // test client + var cliBookJS, cliBookCSS cliDatabase.Book + var cliNote1JS, cliNote1CSS cliDatabase.Note + cliDatabase.MustScan(t, "finding cli book js", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cli book css", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, book_uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.BookUUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, book_uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.BookUUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookCSS.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote1CSS.BookUUID, cliBookCSS.UUID, "cliNote1CSS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliNote1CSS.Dirty, false, "cliNote1CSS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + assert.Equal(t, cliBookCSS.Dirty, false, "cliBookCSS Dirty mismatch") + + // test server + var apiNote1JS, apiNote1CSS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS.UUID).First(&apiNote1CSS), "finding apiNote1CSS") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS.UUID).First(&apiBookCSS), "finding apiBookCSS") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, apiBookCSS.UUID, "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiNote1CSS.BookUUID, apiBookCSS.UUID, "apiNote1CSS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) + + t.Run("client adds a duplicate book and moves a note into it", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + // 1. on server + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + // 2. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // 3. on server + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + + // 3. on cli + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + var nid string + cliDatabase.MustScan(t, "getting id of note to edit", env.DB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", nid, "-b", "css") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "cssBookUUID": cssBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 3, + clientLastMaxUSN: 6, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 3, + serverUserMaxUSN: 6, + }) + + // test client + var cliBookJS, cliBookCSS, cliBookCSS2 cliDatabase.Book + var cliNote1JS, cliNote1CSS cliDatabase.Note + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS2", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, book_uuid, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.BookUUID, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, book_uuid, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.BookUUID, &cliNote1CSS.USN) + + // assert on usn + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + assert.NotEqual(t, cliBookCSS2.USN, 0, "cliBookCSS2 USN mismatch") + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1JS.BookUUID, cliBookCSS2.UUID, "cliNote1JS BookUUID mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliNote1CSS.BookUUID, cliBookCSS2.UUID, "cliNote1CSS BookUUID mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + assert.Equal(t, cliBookCSS2.Label, "css_2", "cliBookCSS2 Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + assert.Equal(t, cliBookCSS2.Deleted, false, "cliBookCSS2 Deleted mismatch") + // assert on dirty + assert.Equal(t, cliNote1JS.Dirty, false, "cliNote1JS Dirty mismatch") + assert.Equal(t, cliNote1CSS.Dirty, false, "cliNote1CSS Dirty mismatch") + assert.Equal(t, cliBookJS.Dirty, false, "cliBookJS Dirty mismatch") + assert.Equal(t, cliBookCSS.Dirty, false, "cliBookCSS Dirty mismatch") + assert.Equal(t, cliBookCSS2.Dirty, false, "cliBookCSS2 Dirty mismatch") + + // test server + var apiNote1JS, apiNote1CSS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding apiNote1JS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS.UUID).First(&apiNote1CSS), "finding apiNote1CSS") + var apiBookJS, apiBookCSS, apiBookCSS2 database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding apiBookJS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["cssBookUUID"]).First(&apiBookCSS), "finding apiBookCSS") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS2.UUID).First(&apiBookCSS2), "finding apiBookCSS2") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS USN mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS USN mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS USN mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS USN mismatch") + assert.NotEqual(t, apiBookCSS2.USN, 0, "apiBookCSS2 USN mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1JS.BookUUID, apiBookCSS2.UUID, "apiNote1JS BookUUID mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiNote1CSS.BookUUID, apiBookCSS2.UUID, "apiNote1CSS BookUUID mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + assert.Equal(t, apiBookCSS2.Label, "css_2", "apiBookCSS2 Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + assert.Equal(t, apiBookCSS2.Deleted, false, "apiBookCSS2 Deleted mismatch") + } + + testSyncCmd(t, false, setup, assert) + testSyncCmd(t, true, setup, assert) + }) +} + +func TestFullSync(t *testing.T) { + t.Run("consecutively with stepSync", func(t *testing.T) { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + return map[string]string{ + "jsBookUUID": jsBookUUID, + "jsNote1UUID": jsNote1UUID, + } + } + + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB + + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // test client + var cliNote1JS, cliNote1CSS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body, &cliNote1JS.USN) + cliDatabase.MustScan(t, "finding cliNote1CSS", cliDB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body, &cliNote1CSS.USN) + cliDatabase.MustScan(t, "finding cliBookJS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding cliBookCSS", cliDB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + + // test usn + assert.NotEqual(t, cliNote1JS.USN, 0, "cliNote1JS USN mismatch") + assert.NotEqual(t, cliNote1CSS.USN, 0, "cliNote1CSS USN mismatch") + assert.NotEqual(t, cliBookJS.USN, 0, "cliBookJS USN mismatch") + assert.NotEqual(t, cliBookCSS.USN, 0, "cliBookCSS USN mismatch") + // assert on bodys and labels + assert.Equal(t, cliNote1JS.Body, "js1", "cliNote1JS Body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "cliNote1CSS Body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "cliBookJS Label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "cliBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, cliNote1JS.Deleted, false, "cliNote1JS Deleted mismatch") + assert.Equal(t, cliNote1CSS.Deleted, false, "cliNote1CSS Deleted mismatch") + assert.Equal(t, cliBookJS.Deleted, false, "cliBookJS Deleted mismatch") + assert.Equal(t, cliBookCSS.Deleted, false, "cliBookCSS Deleted mismatch") + + // test server + var apiNote1JS, apiNote1CSS database.Note + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsNote1UUID"]).First(&apiNote1JS), "finding api js note 1") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliNote1CSS.UUID).First(&apiNote1CSS), "finding api css note 1") + var apiBookJS, apiBookCSS database.Book + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, ids["jsBookUUID"]).First(&apiBookJS), "finding api js book") + apitest.MustExec(t, apiDB.Where("user_id = ? AND uuid = ?", user.ID, cliBookCSS.UUID).First(&apiBookCSS), "finding api css book") + + // assert on usn + assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") + assert.NotEqual(t, apiNote1CSS.USN, 0, "apiNote1CSS usn mismatch") + assert.NotEqual(t, apiBookJS.USN, 0, "apiBookJS usn mismatch") + assert.NotEqual(t, apiBookCSS.USN, 0, "apiBookCSS usn mismatch") + // assert on bodys and labels + assert.Equal(t, apiNote1JS.Body, "js1", "apiNote1JS Body mismatch") + assert.Equal(t, apiNote1CSS.Body, "css1", "apiNote1CSS Body mismatch") + assert.Equal(t, apiBookJS.Label, "js", "apiBookJS Label mismatch") + assert.Equal(t, apiBookCSS.Label, "css", "apiBookCSS Label mismatch") + // assert on deleted + assert.Equal(t, apiNote1JS.Deleted, false, "apiNote1JS Deleted mismatch") + assert.Equal(t, apiNote1CSS.Deleted, false, "apiNote1CSS Deleted mismatch") + assert.Equal(t, apiBookJS.Deleted, false, "apiBookJS Deleted mismatch") + assert.Equal(t, apiBookCSS.Deleted, false, "apiBookCSS Deleted mismatch") + } + + t.Run("stepSync then fullSync", func(t *testing.T) { + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + assert(t, env, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + assert(t, env, user, ids) + }) + + t.Run("fullSync then stepSync", func(t *testing.T) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + assert(t, env, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + assert(t, env, user, ids) + }) + }) +} + +func TestSync_FreshClientConcurrent(t *testing.T) { + // Test the core issue: Fresh client (never synced, lastMaxUSN=0) syncing to a server + // that already has data uploaded by another client. + // + // Scenario: + // 1. Client A creates local notes (never synced, lastMaxUSN=0, lastSyncAt=0) + // 2. Client B uploads same book names to server first + // 3. Client A syncs + // + // Expected: Client A should pull server data first, detect duplicate book names, + // rename local books to avoid conflicts (js→js_2), then upload successfully. + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Client A: Create local data (never sync) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + // Client B: Upload same book names to server via API + jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") + apiCreateNote(t, env, user, jsBookUUID, "js2", "client B note") + apiCreateNote(t, env, user, cssBookUUID, "css2", "client B note") + + // Client A syncs - should handle the conflict gracefully + // Expected: pulls server data, renames local books to js_2/css_2, uploads successfully + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify: Should have 4 books and 4 notes on both client and server + // USN breakdown: 2 books + 2 notes from Client B (USN 1-4), then 2 books + 2 notes from Client A (USN 5-8) + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Verify server has all 4 books with correct names + var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + + assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") + assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") + assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") + assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") + + // Verify server has all 4 notes with correct content + var svrNoteJS1, svrNoteJS2, svrNoteCSS1, svrNoteCSS2 database.Note + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&svrNoteJS1), "finding server note 'js1'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js2").First(&svrNoteJS2), "finding server note 'js2'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&svrNoteCSS1), "finding server note 'css1'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css2").First(&svrNoteCSS2), "finding server note 'css2'") + + assert.Equal(t, svrNoteJS1.BookUUID, svrBookJS2.UUID, "note 'js1' should belong to book 'js_2' (Client A)") + assert.Equal(t, svrNoteJS2.BookUUID, svrBookJS.UUID, "note 'js2' should belong to book 'js' (Client B)") + assert.Equal(t, svrNoteCSS1.BookUUID, svrBookCSS2.UUID, "note 'css1' should belong to book 'css_2' (Client A)") + assert.Equal(t, svrNoteCSS2.BookUUID, svrBookCSS.UUID, "note 'css2' should belong to book 'css' (Client B)") + + // Verify client has all 4 books + var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // Verify client UUIDs match server + assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") + assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") + assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") + assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") + + // Verify all books have non-zero USN (synced successfully) + assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") + assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") + assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") + assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") + + // Verify client has all 4 notes + var cliNoteJS1, cliNoteJS2, cliNoteCSS1, cliNoteCSS2 cliDatabase.Note + cliDatabase.MustScan(t, "finding client note 'js1'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNoteJS1.UUID, &cliNoteJS1.Body, &cliNoteJS1.USN) + cliDatabase.MustScan(t, "finding client note 'js2'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNoteJS2.UUID, &cliNoteJS2.Body, &cliNoteJS2.USN) + cliDatabase.MustScan(t, "finding client note 'css1'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNoteCSS1.UUID, &cliNoteCSS1.Body, &cliNoteCSS1.USN) + cliDatabase.MustScan(t, "finding client note 'css2'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css2"), &cliNoteCSS2.UUID, &cliNoteCSS2.Body, &cliNoteCSS2.USN) + + // Verify client note UUIDs match server + assert.Equal(t, cliNoteJS1.UUID, svrNoteJS1.UUID, "client note 'js1' UUID should match server") + assert.Equal(t, cliNoteJS2.UUID, svrNoteJS2.UUID, "client note 'js2' UUID should match server") + assert.Equal(t, cliNoteCSS1.UUID, svrNoteCSS1.UUID, "client note 'css1' UUID should match server") + assert.Equal(t, cliNoteCSS2.UUID, svrNoteCSS2.UUID, "client note 'css2' UUID should match server") + + // Verify all notes have non-zero USN (synced successfully) + assert.NotEqual(t, cliNoteJS1.USN, 0, "client note 'js1' should have non-zero USN") + assert.NotEqual(t, cliNoteJS2.USN, 0, "client note 'js2' should have non-zero USN") + assert.NotEqual(t, cliNoteCSS1.USN, 0, "client note 'css1' should have non-zero USN") + assert.NotEqual(t, cliNoteCSS2.USN, 0, "client note 'css2' should have non-zero USN") +} + +// TestSync_ConvergeSameBookNames tests that two clients don't enter an infinite sync loop if they +// try to sync books with the same names. Books shouldn't get marked dirty when re-downloaded from server. +func TestSync_ConvergeSameBookNames(t *testing.T) { + env := setupTestEnv(t) + tmpDir := t.TempDir() + + // Setup two separate client databases + client1DB := fmt.Sprintf("%s/client1.db", tmpDir) + client2DB := fmt.Sprintf("%s/client2.db", tmpDir) + defer os.Remove(client1DB) + defer os.Remove(client2DB) + + // Set up sessions + user := setupUser(t, env) + db1 := testutils.MustOpenDatabase(t, client1DB) + db2 := testutils.MustOpenDatabase(t, client2DB) + defer db1.Close() + defer db2.Close() + + // Client 1: First sync to empty server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "testbook", "-c", "client1 note1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "anotherbook", "-c", "client1 note2") + login(t, db1, env.ServerDB, user) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + checkState(t, db1, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Client 2: Sync (downloads client 1's data, adds own notes) ===== + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "testbook", "-c", "client2 note1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "anotherbook", "-c", "client2 note2") + login(t, db2, env.ServerDB, user) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + // Verify state after client2 sync + checkState(t, db2, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Client 1: Sync again. It downloads client2's changes (2 extra notes). + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + + // Verify MaxUSN did not increase (client1 should only download, not upload) + // Client1 still has: 2 original books + 4 notes (2 own + 2 from client2) + checkState(t, db1, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Verify no infinite loop: alternate syncing + // Both clients should be able to sync without any changes (MaxUSN stays at 8) + for range 3 { + // Client 2 syncs + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + + // Verify client2 state unchanged + checkState(t, db2, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Client 1 syncs + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + + // Verify client1 state unchanged + checkState(t, db1, user, env.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + } +} diff --git a/pkg/e2e/sync/edge_cases_test.go b/pkg/e2e/sync/edge_cases_test.go new file mode 100644 index 00000000..f833cadc --- /dev/null +++ b/pkg/e2e/sync/edge_cases_test.go @@ -0,0 +1,163 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "io" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/google/uuid" + "github.com/pkg/errors" +) + +// TestSync_EmptyFragmentPreservesLastMaxUSN verifies that last_max_usn is not reset to 0 +// when sync receives an empty response from the server. +// +// Scenario: Client has orphaned note (references non-existent book). During sync: +// 1. Downloads data successfully (last_max_usn=3) +// 2. Upload fails (orphaned note -> 500 error, triggers retry stepSync) +// 3. Retry stepSync gets 0 fragments (already at latest USN) +// 4. last_max_usn should stay at 3, not reset to 0 +func TestSync_EmptyFragmentPreservesLastMaxUSN(t *testing.T) { + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + + // Create data on server (max_usn=3) + bookUUID := apiCreateBook(t, env, user, "javascript", "creating book via API") + apiCreateNote(t, env, user, bookUUID, "note1 content", "creating note1 via API") + apiCreateNote(t, env, user, bookUUID, "note2 content", "creating note2 via API") + + // Create orphaned note locally (will fail to upload) + orphanedNote := cliDatabase.Note{ + UUID: uuid.New().String(), + BookUUID: uuid.New().String(), // non-existent book + Body: "orphaned note content", + AddedOn: 1234567890, + EditedOn: 0, + USN: 0, + Deleted: false, + Dirty: true, + } + if err := orphanedNote.Insert(env.DB); err != nil { + t.Fatal(err) + } + + // Run sync (downloads data, upload fails, retry gets 0 fragments) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify last_max_usn is preserved at 3, not reset to 0 + var lastMaxUSN int + cliDatabase.MustScan(t, "finding system last_max_usn", + env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &lastMaxUSN) + + assert.Equal(t, lastMaxUSN, 3, "last_max_usn should be 3 after syncing") +} + +// TestSync_ConcurrentInitialSync reproduces the issue where two clients with identical +// local data syncing simultaneously to an empty server results in 500 errors. +// +// This demonstrates the race condition: +// - Client1 starts sync to empty server, gets empty server state +// - Client2 syncs. +// - Client1 tries to create same books → 409 "duplicate" +// - Client1 tries to create notes with wrong UUIDs → 500 "record not found" +// - stepSync recovers by renaming local books with _2 suffix +func TestSync_ConcurrentInitialSync(t *testing.T) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "javascript", "-c", "js note from client1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // Step 2: Switch to new empty server to simulate concurrent initial sync scenario + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Set up client2 with separate database + client2DB, client2DBPath := cliDatabase.InitTestFileDB(t) + login(t, client2DB, env.ServerDB, user) + client2DB.Close() // Close so CLI can access the database + + // Step 3: Client1 syncs to empty server, but during sync Client2 uploads same data + // This simulates the race condition deterministically + raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { + // Wait for empty server prompt to ensure Client1 has called GetSyncState + clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) + + // Now Client2 creates the same book and note via CLI (creating the race condition) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "add", "javascript", "-c", "js note from client2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync") + + // User confirms sync + if _, err := io.WriteString(stdin, "y\n"); err != nil { + return errors.Wrap(err, "confirming sync") + } + + return nil + } + + // Client1 continues sync - will hit 409 conflict, then 500 error, then recover + clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") + + // After sync: + // - Server has 2 books: "javascript" (from client2) and "javascript_2" (from client1 renamed) + // - Server has 2 notes + // - Both clients should converge to the same state + expectedState := systemState{ + clientNoteCount: 2, // both notes + clientBookCount: 2, // javascript and javascript_2 + clientLastMaxUSN: 4, // 2 books + 2 notes + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + } + checkState(t, env.DB, user, env.ServerDB, expectedState) + + // Client2 syncs again to download client1's data + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync") + client2DB = clitest.MustOpenDatabase(t, client2DBPath) + defer client2DB.Close() + + // Client2 should have converged to the same state as client1 + checkState(t, client2DB, user, env.ServerDB, expectedState) + + // Verify no orphaned notes on server + var orphanedCount int + if err := env.ServerDB.Raw(` + SELECT COUNT(*) FROM notes + WHERE book_uuid NOT IN (SELECT uuid FROM books) + `).Scan(&orphanedCount).Error; err != nil { + t.Fatal(err) + } + assert.Equal(t, orphanedCount, 0, "server should have no orphaned notes after sync") +} diff --git a/pkg/e2e/sync/empty_server_test.go b/pkg/e2e/sync/empty_server_test.go new file mode 100644 index 00000000..31756ed2 --- /dev/null +++ b/pkg/e2e/sync/empty_server_test.go @@ -0,0 +1,728 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "database/sql" + "fmt" + "io" + "os" + "strconv" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/server/database" + apitest "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" +) + +func TestSync_EmptyServer(t *testing.T) { + t.Run("sync to empty server after syncing to non-empty server", func(t *testing.T) { + // Test server data loss/wipe scenario (disaster recovery): + // Verify empty server detection works when the server loses all its data + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to a completely new empty server + switchToEmptyServer(t, &env) + + // Recreate user and session on new server + user = setupUserAndLogin(t, env) + + // Step 3: Sync again - should detect empty server and prompt user + // User confirms with "y" + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + + // Step 4: Verify data was uploaded to the empty server + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Verify the content is correct on both client and server + var cliNote1JS, cliNote1CSS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) + cliDatabase.MustScan(t, "finding cliNote1CSS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) + cliDatabase.MustScan(t, "finding cliBookJS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) + cliDatabase.MustScan(t, "finding cliBookCSS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) + + assert.Equal(t, cliNote1JS.Body, "js1", "js note body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "css note body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "js book label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "css book label mismatch") + + // Verify on server side + var serverNoteJS, serverNoteCSS database.Note + var serverBookJS, serverBookCSS database.Book + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&serverBookJS), "finding server book js") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") + + assert.Equal(t, serverNoteJS.Body, "js1", "server js note body mismatch") + assert.Equal(t, serverNoteCSS.Body, "css1", "server css note body mismatch") + assert.Equal(t, serverBookJS.Label, "js", "server js book label mismatch") + assert.Equal(t, serverBookCSS.Label, "css", "server css book label mismatch") + }) + + t.Run("user cancels empty server prompt", func(t *testing.T) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Step 3: Sync again but user cancels with "n" + output, err := clitest.WaitDnoteCmd(t, env.CmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") + if err == nil { + t.Fatal("Expected sync to fail when user cancels, but it succeeded") + } + + // Verify the prompt appeared + if !strings.Contains(output, clitest.PromptEmptyServer) { + t.Fatalf("Expected empty server warning in output, got: %s", output) + } + + // Step 4: Verify local state unchanged (transaction rolled back) + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 0, + serverUserMaxUSN: 0, + }) + + // Verify items still have original USN and dirty=false + var book cliDatabase.Book + var note cliDatabase.Note + cliDatabase.MustScan(t, "checking book state", env.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) + cliDatabase.MustScan(t, "checking note state", env.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) + + assert.NotEqual(t, book.USN, 0, "book USN should not be reset") + assert.NotEqual(t, note.USN, 0, "note USN should not be reset") + assert.Equal(t, book.Dirty, false, "book should not be marked dirty") + assert.Equal(t, note.Dirty, false, "note should not be marked dirty") + }) + + t.Run("all local data is marked deleted - should not upload", func(t *testing.T) { + // Test edge case: Server MaxUSN=0, local MaxUSN>0, but all items are deleted=true + // Should NOT prompt because there's nothing to upload + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Delete all local notes and books (mark as deleted) + cliDatabase.MustExec(t, "marking all books deleted", env.DB, "UPDATE books SET deleted = 1") + cliDatabase.MustExec(t, "marking all notes deleted", env.DB, "UPDATE notes SET deleted = 1") + + // Step 3: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) + // This should complete without user interaction + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify no data was uploaded (server still empty, but client still has deleted items) + // Check server is empty + var serverNoteCount, serverBookCount int64 + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Count(&serverBookCount), "counting server books") + assert.Equal(t, serverNoteCount, int64(0), "server should have no notes") + assert.Equal(t, serverBookCount, int64(0), "server should have no books") + + // Check client still has the deleted items locally + var clientNoteCount, clientBookCount int + cliDatabase.MustScan(t, "counting client notes", env.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", env.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) + assert.Equal(t, clientNoteCount, 2, "client should still have 2 deleted notes") + assert.Equal(t, clientBookCount, 2, "client should still have 2 deleted books") + + // Verify lastMaxUSN was reset to 0 + var lastMaxUSN int + cliDatabase.MustScan(t, "getting lastMaxUSN", env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + assert.Equal(t, lastMaxUSN, 0, "lastMaxUSN should be reset to 0") + }) + + t.Run("race condition - other client uploads first", func(t *testing.T) { + // This test exercises a race condition that can occur during sync: + // While Client A is waiting for user input, Client B uploads data to the server. + // + // The empty server scenario is the natural place to test this because + // an empty server detection triggers a prompt, at which point the test + // can make client B upload data. We trigger the race condition deterministically. + // + // Test flow: + // - Client A detects empty server and prompts user + // - While waiting for confirmation, Client B uploads the same data via API + // - Client A continues and handles the 409 conflict gracefully by: + // 1. Detecting the 409 error when trying to CREATE books that already exist + // 2. Running stepSync to pull the server's books (js, css) + // 3. mergeBook renames local conflicts (js→js_2, css→css_2) + // 4. Retrying sendChanges to upload the renamed books + // - Result: Both clients' data is preserved (4 books total) + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to establish lastMaxUSN > 0 + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to new empty server to simulate switching to empty server + switchToEmptyServer(t, &env) + + // Create user on new server and login + user = setupUserAndLogin(t, env) + + // Step 3: Trigger sync which will detect empty server and prompt user + // Inside the callback (before confirming), we simulate Client B uploading via API. + // We wait for the empty server prompt to ensure Client B uploads AFTER + // GetSyncState but BEFORE the sync decision, creating the race condition deterministically + raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { + // First, wait for the prompt to ensure Client A has obtained the sync state from the server. + clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) + + // Now Client B uploads the same data via API (after Client A got the sync state from the server + // but before its sync decision) + // This creates the race condition: Client A thinks server is empty, but Client B uploads data + jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") + apiCreateNote(t, env, user, jsBookUUID, "js1", "client B creating js note") + apiCreateNote(t, env, user, cssBookUUID, "css1", "client B creating css note") + + // Now user confirms + if _, err := io.WriteString(stdin, "y\n"); err != nil { + return errors.Wrap(err, "confirming sync") + } + + return nil + } + + // Step 4: Client A runs sync with race condition + // The 409 conflict is automatically handled: + // - When 409 is detected, isBehind flag is set + // - stepSync pulls Client B's data + // - mergeBook renames Client A's books to js_2, css_2 + // - Renamed books are uploaded + // - Both clients' data is preserved. + clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") + + // Verify final state - both clients' data preserved + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 4, // Both clients' notes + clientBookCount: 4, // js, css, js_2, css_2 + clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Verify server has both clients' books + var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + + assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") + assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") + assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") + assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") + + // Verify client has all books + var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // Verify client UUIDs match server + assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") + assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") + assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") + assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") + + // Verify all items have non-zero USN (synced successfully) + assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") + assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") + assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") + assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") + }) + + t.Run("sync to server A, then B, then back to A, then back to B", func(t *testing.T) { + // Test switching between two actual servers to verify: + // 1. Empty server detection works when switching to empty server + // 2. No false detection when switching back to non-empty servers + // 3. Both servers maintain independent state across multiple switches + + env := setupTestEnv(t) + + // Create Server A with its own database + serverA, serverDBA, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server A")) + } + defer serverA.Close() + + // Create Server B with its own database + serverB, serverDBB, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server B")) + } + defer serverB.Close() + + // Step 1: Set up user on Server A and sync + apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) + + userA := apitest.SetupUserData(serverDBA, "alice@example.com", "pass1234") + sessionA := apitest.SetupSession(serverDBA, userA) + cliDatabase.MustExec(t, "inserting session_key", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + + // Verify sync to Server A succeeded + checkState(t, env.DB, userA, serverDBA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to Server B (empty) and sync + apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) + + // Set up user on Server B + userB := apitest.SetupUserData(serverDBB, "alice@example.com", "pass1234") + sessionB := apitest.SetupSession(serverDBB, userB) + cliDatabase.MustExec(t, "updating session_key for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should detect empty server and prompt + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + + // Verify Server B now has data + checkState(t, env.DB, userB, serverDBB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 3: Switch back to Server A and sync + cliDatabase.MustExec(t, "updating session_key back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server A has MaxUSN > 0) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + + // Verify Server A still has its data + checkState(t, env.DB, userA, serverDBA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 4: Switch back to Server B and sync again + cliDatabase.MustExec(t, "updating session_key back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + + // Verify both servers maintain independent state + checkState(t, env.DB, userB, serverDBB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + }) + + t.Run("two clients with identical copied database sync to empty server", func(t *testing.T) { + // Suppose we have two clients and server becomes empty (migration). + // After the first client sync to empty server, the second client should trigger full sync. + // Without the full sync, client2 will do step sync asking for changes after its stale USN, + // get nothing from server, and potentially orphan notes during full sync. + + // Step 1: Create client1 with data and sync to ORIGINAL server + env1 := setupTestEnv(t) + user := setupUserAndLogin(t, env1) + + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + // Add more data to create a higher USN + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "go", "-c", "go1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "rust", "-c", "rust1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + // Verify initial sync succeeded (now with 4 notes, 4 books, USN=8) + checkState(t, env1.DB, user, env1.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Step 2: Create client2 by copying client1's database (simulating same DB on two devices) + env2 := setupTestEnv(t) + // Copy the database file from client1 to client2 + dbPath1 := env1.DB.Filepath + dbPath2 := env2.DB.Filepath + // Close both DBs before copying + env1.DB.Close() + env2.DB.Close() + + // Copy the database file + input, err := os.ReadFile(dbPath1) + if err != nil { + t.Fatal(errors.Wrap(err, "reading client1 database")) + } + if err := os.WriteFile(dbPath2, input, 0644); err != nil { + t.Fatal(errors.Wrap(err, "writing client2 database")) + } + + // Reopen databases + env1.DB, err = cliDatabase.Open(dbPath1) + if err != nil { + t.Fatal(errors.Wrap(err, "reopening client1 database")) + } + env2.DB, err = cliDatabase.Open(dbPath2) + if err != nil { + t.Fatal(errors.Wrap(err, "reopening client2 database")) + } + + // Verify client2 has identical data and USN=8 (stale) - same as client1 + // Note: at this point there's no server to compare against, we just check counts + var client2MaxUSN, client2NoteCount, client2BookCount int + cliDatabase.MustScan(t, "getting client2 maxUSN", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &client2MaxUSN) + cliDatabase.MustScan(t, "counting client2 notes", + env2.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 0"), + &client2NoteCount) + cliDatabase.MustScan(t, "counting client2 books", + env2.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 0"), + &client2BookCount) + + assert.Equal(t, client2MaxUSN, 8, "client2 should have same maxUSN=8 as client1") + assert.Equal(t, client2NoteCount, 4, "client2 should have 4 notes") + assert.Equal(t, client2BookCount, 4, "client2 should have 4 books") + + // Step 3: Switch client1 to new empty server + switchToEmptyServer(t, &env1) + + // Point client2 to the same new server + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + + // Update client2's API endpoint config to point to env1's server + apiEndpoint := fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Create same user on new server + user = setupUserAndLogin(t, env1) + + // Setup session for client2 (same user, same server) + login(t, env2.DB, env2.ServerDB, user) + + // Step 4: Client1 syncs ONLY FIRST 2 BOOKS to empty server (simulates partial upload) + // This creates the stale USN scenario: client2 has maxUSN=8, but server will only have maxUSN=4 + clitest.MustWaitDnoteCmd(t, env1.CmdOpts, clitest.UserConfirmEmptyServerSync, + cliBinaryName, "sync") + + // Delete the last 2 books from client1 to prevent them being on server + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "remove", "go", "-y") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "remove", "rust", "-y") + + // Sync deletions to server + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + + // Verify server has 2 active books/notes (go/rust deleted) + var serverNoteCount, serverBookCount int64 + apitest.MustExec(t, env1.ServerDB.Model(&database.Note{}).Where("deleted = ?", false).Count(&serverNoteCount), "counting active server notes") + apitest.MustExec(t, env1.ServerDB.Model(&database.Book{}).Where("deleted = ?", false).Count(&serverBookCount), "counting active server books") + assert.Equal(t, int(serverNoteCount), 2, "server should have 2 active notes (go/rust deleted)") + assert.Equal(t, int(serverBookCount), 2, "server should have 2 active books (go/rust deleted)") + + // Step 5: Client2 syncs + // CRITICAL: Client2 has lastMaxUSN=8 (from copied DB), but server's max_usn is now ~8 but only has 2 books + // Client2 will ask for changes after USN=8, get nothing, then try to upload its 4 books + // This should trigger the orphaned notes scenario or require full sync + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 6: Verify client2 has all data and NO orphaned notes + var orphanedCount int + cliDatabase.MustScan(t, "checking for orphaned notes", + env2.DB.QueryRow(` + SELECT COUNT(*) FROM notes + WHERE deleted = 0 + AND book_uuid NOT IN (SELECT uuid FROM books WHERE deleted = 0) + `), &orphanedCount) + + assert.Equal(t, orphanedCount, 0, "client2 should have no orphaned notes") + + // Verify client2 converged with server state + // Note: checkState counts ALL records (including deleted ones) + // During full sync, cleanLocalBooks/cleanLocalNotes DELETE local records not on server + // So client2 ends up with only the 2 active books/notes + // Server has 4 total (2 active + 2 deleted) + var client2LastMaxUSN, client2LastSyncAt int + var serverUserMaxUSN int + cliDatabase.MustScan(t, "getting client2 lastMaxUSN", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &client2LastMaxUSN) + var lastSyncAtStr string + cliDatabase.MustScan(t, "getting client2 lastSyncAt", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), + &lastSyncAtStr) + lastSyncAtInt, _ := strconv.ParseInt(lastSyncAtStr, 10, 64) + client2LastSyncAt = int(lastSyncAtInt) + + apitest.MustExec(t, env2.ServerDB.Table("users").Select("max_usn").Where("id = ?", user.ID).Scan(&serverUserMaxUSN), "getting server user max_usn") + + checkState(t, env2.DB, user, env2.ServerDB, systemState{ + clientNoteCount: 2, // Only active notes (deleted ones removed by cleanLocalNotes) + clientBookCount: 2, // Only active books (deleted ones removed by cleanLocalBooks) + clientLastMaxUSN: client2LastMaxUSN, + clientLastSyncAt: int64(client2LastSyncAt), + serverNoteCount: 4, // 2 active + 2 deleted + serverBookCount: 4, // 2 active + 2 deleted + serverUserMaxUSN: serverUserMaxUSN, + }) + + // Verify both clients have the expected books (css, js only - go/rust deleted) + var client1BookCSS, client1BookJS, client2BookCSS, client2BookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding client1 book 'css'", + env1.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "css"), + &client1BookCSS.UUID, &client1BookCSS.Label) + cliDatabase.MustScan(t, "finding client1 book 'js'", + env1.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "js"), + &client1BookJS.UUID, &client1BookJS.Label) + cliDatabase.MustScan(t, "finding client2 book 'css'", + env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "css"), + &client2BookCSS.UUID, &client2BookCSS.Label) + cliDatabase.MustScan(t, "finding client2 book 'js'", + env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "js"), + &client2BookJS.UUID, &client2BookJS.Label) + + assert.Equal(t, client1BookCSS.Label, "css", "client1 should have css book") + assert.Equal(t, client1BookJS.Label, "js", "client1 should have js book") + assert.Equal(t, client2BookCSS.Label, "css", "client2 should have css book") + assert.Equal(t, client2BookJS.Label, "js", "client2 should have js book") + + // Verify go and rust books are deleted/absent on both clients + var client2BookGo, client2BookRust cliDatabase.Book + errGo := env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "go").Scan(&client2BookGo.UUID, &client2BookGo.Label) + assert.Equal(t, errGo, sql.ErrNoRows, "client2 should not have non-deleted 'go' book") + errRust := env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "rust").Scan(&client2BookRust.UUID, &client2BookRust.Label) + assert.Equal(t, errRust, sql.ErrNoRows, "client2 should not have non-deleted 'rust' book") + }) + + t.Run("client with local data syncs after another client uploads to empty server - should not orphan notes", func(t *testing.T) { + // This test reproduces the scenario where: + // 1. Client1 has local data and syncs to original server + // 2. Client2 has DIFFERENT local data and syncs to SAME original server + // 3. Both clients switch to NEW empty server + // 4. Client1 uploads to the new empty server (sets FullSyncBefore) + // 5. Client2 syncs - should trigger full sync AND upload its local data + // WITHOUT orphaning notes due to cleanLocalBooks deleting them first + + // Step 1: Create client1 with local data on original server + env1 := setupTestEnv(t) + user := setupUserAndLogin(t, env1) + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "client1-book", "-c", "client1-note") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + + // Step 2: Create client2 with DIFFERENT local data on SAME original server + env2 := setupTestEnv(t) + // Point env2 to env1's server (the original server) + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + apiEndpoint := fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Login client2 to the same server + login(t, env2.DB, env2.ServerDB, user) + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "add", "client2-book", "-c", "client2-note") + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 3: Both clients switch to NEW empty server + switchToEmptyServer(t, &env1) + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + apiEndpoint = fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Create same user on new server + user = setupUserAndLogin(t, env1) + login(t, env2.DB, env2.ServerDB, user) + + // Step 4: Client1 uploads to empty server + clitest.MustWaitDnoteCmd(t, env1.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + + // Verify server has client1's data and FullSyncBefore is set + var serverUser database.User + apitest.MustExec(t, env1.ServerDB.Where("id = ?", user.ID).First(&serverUser), "getting server user state") + assert.Equal(t, serverUser.MaxUSN > 0, true, "server should have data after client1 upload") + assert.Equal(t, serverUser.FullSyncBefore > 0, true, "server should have FullSyncBefore set") + + // Step 5: Client2 syncs - should trigger full sync due to FullSyncBefore + // CRITICAL: Client2 has local data (client2-book, client2-note) that should be uploaded + // Without the fix, cleanLocalBooks will delete client2-book before upload, orphaning client2-note + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 6: Verify NO orphaned notes on client2 + var orphanedCount int + cliDatabase.MustScan(t, "checking for orphaned notes on client2", + env2.DB.QueryRow(` + SELECT COUNT(*) FROM notes + WHERE deleted = 0 + AND book_uuid NOT IN (SELECT uuid FROM books WHERE deleted = 0) + `), &orphanedCount) + + assert.Equal(t, orphanedCount, 0, "client2 should have no orphaned notes after sync") + + // Step 7: Verify client2's data was uploaded to server + var client2BookOnServer database.Book + err := env2.ServerDB.Where("label = ? AND deleted = ?", "client2-book", false).First(&client2BookOnServer).Error + assert.Equal(t, err, nil, "client2-book should exist on server") + + var client2NoteOnServer database.Note + err = env2.ServerDB.Where("body = ? AND deleted = ?", "client2-note", false).First(&client2NoteOnServer).Error + assert.Equal(t, err, nil, "client2-note should exist on server") + + // Step 8: Verify server has data from BOTH clients + // Note: Both clients had synced to original server, so they each have 2 books + 2 notes locally. + // When switching to new empty server, client1 uploads 2 books + 2 notes (USN 1-4). + // Client2 then does full sync, downloads client1's uploads, marks its local data as dirty, + // and uploads its version of the same 2 books + 2 notes with potentially different UUIDs. + // The exact count depends on UUID conflict resolution, but we verify both original books exist. + var serverBookCount, serverNoteCount int64 + apitest.MustExec(t, env2.ServerDB.Model(&database.Book{}).Where("deleted = ?", false).Count(&serverBookCount), "counting active server books") + apitest.MustExec(t, env2.ServerDB.Model(&database.Note{}).Where("deleted = ?", false).Count(&serverNoteCount), "counting active server notes") + + // The main assertion: both original client books should exist + var client1BookExists, client2BookExists bool + err = env2.ServerDB.Model(&database.Book{}).Where("label = ? AND deleted = ?", "client1-book", false).First(&database.Book{}).Error + client1BookExists = (err == nil) + err = env2.ServerDB.Model(&database.Book{}).Where("label = ? AND deleted = ?", "client2-book", false).First(&database.Book{}).Error + client2BookExists = (err == nil) + + assert.Equal(t, client1BookExists, true, "server should have client1-book") + assert.Equal(t, client2BookExists, true, "server should have client2-book") + assert.Equal(t, serverBookCount >= 2, true, "server should have at least 2 books") + assert.Equal(t, serverNoteCount >= 2, true, "server should have at least 2 notes") + }) +} diff --git a/pkg/e2e/sync/main_test.go b/pkg/e2e/sync/main_test.go new file mode 100644 index 00000000..188e3a99 --- /dev/null +++ b/pkg/e2e/sync/main_test.go @@ -0,0 +1,54 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "bytes" + "fmt" + "log" + "os" + "os/exec" + "testing" + "time" + + "github.com/pkg/errors" +) + +var cliBinaryName string +var serverTime = time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) + +var testDir = "./tmp/" + +func init() { + cliBinaryName = fmt.Sprintf("%s/test-cli", testDir) +} + +func TestMain(m *testing.M) { + // Build CLI binary without hardcoded API endpoint + // Each test will create its own server and config file + cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "github.com/dnote/dnote/pkg/cli") + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + if err := cmd.Run(); err != nil { + log.Print(errors.Wrap(err, "building a CLI binary").Error()) + log.Print(stderr.String()) + os.Exit(1) + } + + os.Exit(m.Run()) +} diff --git a/pkg/e2e/sync/testutils.go b/pkg/e2e/sync/testutils.go new file mode 100644 index 00000000..a5dfdf87 --- /dev/null +++ b/pkg/e2e/sync/testutils.go @@ -0,0 +1,295 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package sync + +import ( + "encoding/json" + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/app" + "github.com/dnote/dnote/pkg/server/controllers" + "github.com/dnote/dnote/pkg/server/database" + apitest "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" + "gorm.io/gorm" +) + +// testEnv holds the test environment for a single test +type testEnv struct { + DB *cliDatabase.DB + CmdOpts clitest.RunDnoteCmdOptions + Server *httptest.Server + ServerDB *gorm.DB + TmpDir string +} + +// setupTestEnv creates an isolated test environment with its own database and temp directory +func setupTestEnv(t *testing.T) testEnv { + tmpDir := t.TempDir() + + // Create .dnote directory + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "creating dnote directory")) + } + + // Create database at the expected path + dbPath := filepath.Join(dnoteDir, consts.DnoteDBFileName) + db := cliDatabase.InitTestFileDBRaw(t, dbPath) + + // Create server + server, serverDB := setupNewServer(t) + + // Create config file with this server's endpoint + apiEndpoint := fmt.Sprintf("%s/api", server.URL) + updateConfigAPIEndpoint(t, tmpDir, apiEndpoint) + + // Create command options with XDG paths pointing to temp dir + cmdOpts := clitest.RunDnoteCmdOptions{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDir), + fmt.Sprintf("XDG_DATA_HOME=%s", tmpDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDir), + }, + } + + return testEnv{ + DB: db, + CmdOpts: cmdOpts, + Server: server, + ServerDB: serverDB, + TmpDir: tmpDir, + } +} + +// setupTestServer creates a test server with its own database +func setupTestServer(t *testing.T, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { + db := apitest.InitMemoryDB(t) + + mockClock := clock.NewMock() + mockClock.SetNow(serverTime) + + a := app.NewTest() + a.Clock = mockClock + a.EmailBackend = &apitest.MockEmailbackendImplementation{} + a.DB = db + + server, err := controllers.NewServer(&a) + if err != nil { + return nil, nil, errors.Wrap(err, "initializing server") + } + + return server, db, nil +} + +// setupNewServer creates a new server and returns the server and database. +// This is useful when a test needs to switch to a new empty server. +func setupNewServer(t *testing.T) (*httptest.Server, *gorm.DB) { + server, serverDB, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up new test server")) + } + t.Cleanup(func() { server.Close() }) + + return server, serverDB +} + +// updateConfigAPIEndpoint updates the config file with the given API endpoint +func updateConfigAPIEndpoint(t *testing.T, tmpDir string, apiEndpoint string) { + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + configPath := filepath.Join(dnoteDir, consts.ConfigFilename) + configContent := fmt.Sprintf("apiEndpoint: %s\n", apiEndpoint) + if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil { + t.Fatal(errors.Wrap(err, "writing config file")) + } +} + +// switchToEmptyServer closes the current server and creates a new empty server, +// updating the config file to point to it. +func switchToEmptyServer(t *testing.T, env *testEnv) { + // Close old server + env.Server.Close() + + // Create new empty server + env.Server, env.ServerDB = setupNewServer(t) + + // Update config file to point to new server + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) + updateConfigAPIEndpoint(t, env.TmpDir, apiEndpoint) +} + +// setupUser creates a test user in the server database +func setupUser(t *testing.T, env testEnv) database.User { + user := apitest.SetupUserData(env.ServerDB, "alice@example.com", "pass1234") + + return user +} + +// setupUserAndLogin creates a test user and logs them in on the CLI +func setupUserAndLogin(t *testing.T, env testEnv) database.User { + user := setupUser(t, env) + login(t, env.DB, env.ServerDB, user) + + return user +} + +// login logs in the user in CLI +func login(t *testing.T, db *cliDatabase.DB, serverDB *gorm.DB, user database.User) { + session := apitest.SetupSession(serverDB, user) + + cliDatabase.MustExec(t, "inserting session_key", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) +} + +// apiCreateBook creates a book via the API and returns its UUID +func apiCreateBook(t *testing.T, env testEnv, user database.User, name, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) + + var resp controllers.CreateBookResp + if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { + t.Fatal(errors.Wrap(err, "decoding payload for adding book")) + return "" + } + + return resp.Book.UUID +} + +// apiPatchBook updates a book via the API +func apiPatchBook(t *testing.T, env testEnv, user database.User, uuid, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/books/%s", uuid), payload, message, user) +} + +// apiDeleteBook deletes a book via the API +func apiDeleteBook(t *testing.T, env testEnv, user database.User, uuid, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/books/%s", uuid), "", message, user) +} + +// apiCreateNote creates a note via the API and returns its UUID +func apiCreateNote(t *testing.T, env testEnv, user database.User, bookUUID, body, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/notes", fmt.Sprintf(`{"book_uuid": "%s", "content": "%s"}`, bookUUID, body), message, user) + + var resp controllers.CreateNoteResp + if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { + t.Fatal(errors.Wrap(err, "decoding payload for adding note")) + return "" + } + + return resp.Result.UUID +} + +// apiPatchNote updates a note via the API +func apiPatchNote(t *testing.T, env testEnv, user database.User, noteUUID, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/notes/%s", noteUUID), payload, message, user) +} + +// apiDeleteNote deletes a note via the API +func apiDeleteNote(t *testing.T, env testEnv, user database.User, noteUUID, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/notes/%s", noteUUID), "", message, user) +} + +// doHTTPReq performs an authenticated HTTP request and checks for errors +func doHTTPReq(t *testing.T, env testEnv, method, path, payload, message string, user database.User) *http.Response { + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) + endpoint := fmt.Sprintf("%s%s", apiEndpoint, path) + + req, err := http.NewRequest(method, endpoint, strings.NewReader(payload)) + if err != nil { + panic(errors.Wrap(err, "constructing http request")) + } + + res := apitest.HTTPAuthDo(t, env.ServerDB, req, user) + if res.StatusCode >= 400 { + bs, err := io.ReadAll(res.Body) + if err != nil { + panic(errors.Wrap(err, "parsing response body for error")) + } + + t.Errorf("%s. HTTP status %d. Message: %s", message, res.StatusCode, string(bs)) + } + + return res +} + +// setupFunc is a function that sets up test data and returns IDs for assertions +type setupFunc func(t *testing.T, env testEnv, user database.User) map[string]string + +// assertFunc is a function that asserts the expected state after sync +type assertFunc func(t *testing.T, env testEnv, user database.User, ids map[string]string) + +// testSyncCmd is a test helper that sets up a test environment, runs setup, syncs, and asserts +func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) + + if fullSync { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + } else { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + } + + assert(t, env, user, ids) +} + +// systemState represents the expected state of the sync system +type systemState struct { + clientNoteCount int + clientBookCount int + clientLastMaxUSN int + clientLastSyncAt int64 + serverNoteCount int64 + serverBookCount int64 + serverUserMaxUSN int +} + +// checkState compares the state of the client and the server with the given system state +func checkState(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { + var clientBookCount, clientNoteCount int + cliDatabase.MustScan(t, "counting client notes", clientDB.QueryRow("SELECT count(*) FROM notes"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", clientDB.QueryRow("SELECT count(*) FROM books"), &clientBookCount) + assert.Equal(t, clientNoteCount, expected.clientNoteCount, "client note count mismatch") + assert.Equal(t, clientBookCount, expected.clientBookCount, "client book count mismatch") + + var clientLastMaxUSN int + var clientLastSyncAt int64 + cliDatabase.MustScan(t, "finding system last_max_usn", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &clientLastMaxUSN) + cliDatabase.MustScan(t, "finding system last_sync_at", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &clientLastSyncAt) + assert.Equal(t, clientLastMaxUSN, expected.clientLastMaxUSN, "client last_max_usn mismatch") + assert.Equal(t, clientLastSyncAt, expected.clientLastSyncAt, "client last_sync_at mismatch") + + var serverBookCount, serverNoteCount int64 + apitest.MustExec(t, serverDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, serverDB.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") + assert.Equal(t, serverNoteCount, expected.serverNoteCount, "server note count mismatch") + assert.Equal(t, serverBookCount, expected.serverBookCount, "server book count mismatch") + var serverUser database.User + apitest.MustExec(t, serverDB.Where("id = ?", user.ID).First(&serverUser), "finding user") + assert.Equal(t, serverUser.MaxUSN, expected.serverUserMaxUSN, "user max_usn mismatch") +} diff --git a/pkg/prompt/prompt.go b/pkg/prompt/prompt.go new file mode 100644 index 00000000..262685e9 --- /dev/null +++ b/pkg/prompt/prompt.go @@ -0,0 +1,53 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +// Package prompt provides utilities for interactive yes/no prompts +package prompt + +import ( + "bufio" + "fmt" + "io" + "strings" +) + +// FormatQuestion formats a yes/no question with the appropriate choice indicator +func FormatQuestion(question string, optimistic bool) string { + choices := "(y/N)" + if optimistic { + choices = "(Y/n)" + } + return fmt.Sprintf("%s %s", question, choices) +} + +// ReadYesNo reads and parses a yes/no response from the given reader. +// Returns true if confirmed, respecting optimistic mode. +// In optimistic mode, empty input is treated as confirmation. +func ReadYesNo(r io.Reader, optimistic bool) (bool, error) { + reader := bufio.NewReader(r) + input, err := reader.ReadString('\n') + if err != nil { + return false, err + } + + input = strings.ToLower(strings.TrimSpace(input)) + confirmed := input == "y" + + if optimistic { + confirmed = confirmed || input == "" + } + + return confirmed, nil +} diff --git a/pkg/prompt/prompt_test.go b/pkg/prompt/prompt_test.go new file mode 100644 index 00000000..6d5eb597 --- /dev/null +++ b/pkg/prompt/prompt_test.go @@ -0,0 +1,145 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package prompt + +import ( + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestFormatQuestion(t *testing.T) { + testCases := []struct { + question string + optimistic bool + expected string + }{ + { + question: "Are you sure?", + optimistic: false, + expected: "Are you sure? (y/N)", + }, + { + question: "Continue?", + optimistic: true, + expected: "Continue? (Y/n)", + }, + } + + for _, tc := range testCases { + t.Run(tc.question, func(t *testing.T) { + result := FormatQuestion(tc.question, tc.optimistic) + assert.Equal(t, result, tc.expected, "formatted question mismatch") + }) + } +} + +func TestReadYesNo(t *testing.T) { + testCases := []struct { + name string + input string + optimistic bool + expected bool + }{ + { + name: "pessimistic with y", + input: "y\n", + optimistic: false, + expected: true, + }, + { + name: "pessimistic with Y (uppercase)", + input: "Y\n", + optimistic: false, + expected: true, + }, + { + name: "pessimistic with n", + input: "n\n", + optimistic: false, + expected: false, + }, + { + name: "pessimistic with empty", + input: "\n", + optimistic: false, + expected: false, + }, + { + name: "pessimistic with whitespace", + input: " \n", + optimistic: false, + expected: false, + }, + { + name: "optimistic with y", + input: "y\n", + optimistic: true, + expected: true, + }, + { + name: "optimistic with n", + input: "n\n", + optimistic: true, + expected: false, + }, + { + name: "optimistic with empty", + input: "\n", + optimistic: true, + expected: true, + }, + { + name: "optimistic with whitespace", + input: " \n", + optimistic: true, + expected: true, + }, + { + name: "invalid input defaults to no", + input: "maybe\n", + optimistic: false, + expected: false, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Create a reader with test input + reader := strings.NewReader(tc.input) + + // Test ReadYesNo + result, err := ReadYesNo(reader, tc.optimistic) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + + assert.Equal(t, result, tc.expected, "ReadYesNo result mismatch") + }) + } +} + +func TestReadYesNo_Error(t *testing.T) { + // Test error case with EOF (empty reader) + reader := strings.NewReader("") + + _, err := ReadYesNo(reader, false) + if err == nil { + t.Fatal("expected error when reading from empty reader") + } +} + diff --git a/server/.gitignore b/pkg/server/.gitignore similarity index 76% rename from server/.gitignore rename to pkg/server/.gitignore index 7de9e987..9835f3e3 100644 --- a/server/.gitignore +++ b/pkg/server/.gitignore @@ -5,3 +5,5 @@ tmp/ test-dnote /dist /build +server +/static diff --git a/pkg/server/README.md b/pkg/server/README.md new file mode 100644 index 00000000..bf8bb4fd --- /dev/null +++ b/pkg/server/README.md @@ -0,0 +1 @@ +This directory contains the Dnote server. It comprises of the web interface, the web API, and the background jobs. diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go new file mode 100644 index 00000000..cfaaf319 --- /dev/null +++ b/pkg/server/app/app.go @@ -0,0 +1,71 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/mailer" + "gorm.io/gorm" + "github.com/pkg/errors" +) + +var ( + // ErrEmptyDB is an error for missing database connection in the app configuration + ErrEmptyDB = errors.New("No database connection was provided") + // ErrEmptyClock is an error for missing clock in the app configuration + ErrEmptyClock = errors.New("No clock was provided") + // ErrEmptyBaseURL is an error for missing BaseURL content in the app configuration + ErrEmptyBaseURL = errors.New("No BaseURL was provided") + // ErrEmptyEmailBackend is an error for missing EmailBackend content in the app configuration + ErrEmptyEmailBackend = errors.New("No EmailBackend was provided") + // ErrEmptyHTTP500Page is an error for missing HTTP 500 page content + ErrEmptyHTTP500Page = errors.New("No HTTP 500 error page was set") +) + +// App is an application context +type App struct { + DB *gorm.DB + Clock clock.Clock + EmailBackend mailer.Backend + Files map[string][]byte + HTTP500Page []byte + BaseURL string + DisableRegistration bool + Port string + DBPath string + AssetBaseURL string +} + +// Validate validates the app configuration +func (a *App) Validate() error { + if a.BaseURL == "" { + return ErrEmptyBaseURL + } + if a.Clock == nil { + return ErrEmptyClock + } + if a.EmailBackend == nil { + return ErrEmptyEmailBackend + } + if a.DB == nil { + return ErrEmptyDB + } + if a.HTTP500Page == nil { + return ErrEmptyHTTP500Page + } + + return nil +} diff --git a/pkg/server/app/books.go b/pkg/server/app/books.go new file mode 100644 index 00000000..f222b816 --- /dev/null +++ b/pkg/server/app/books.go @@ -0,0 +1,105 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/helpers" + "gorm.io/gorm" + "github.com/pkg/errors" +) + +// CreateBook creates a book with the next usn and updates the user's max_usn +func (a *App) CreateBook(user database.User, name string) (database.Book, error) { + tx := a.DB.Begin() + + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + tx.Rollback() + return database.Book{}, errors.Wrap(err, "incrementing user max_usn") + } + + uuid, err := helpers.GenUUID() + if err != nil { + tx.Rollback() + return database.Book{}, err + } + + book := database.Book{ + UUID: uuid, + UserID: user.ID, + Label: name, + AddedOn: a.Clock.Now().UnixNano(), + USN: nextUSN, + } + if err := tx.Create(&book).Error; err != nil { + tx.Rollback() + return book, errors.Wrap(err, "inserting book") + } + + tx.Commit() + + return book, nil +} + +// DeleteBook marks a book deleted with the next usn and updates the user's max_usn +func (a *App) DeleteBook(tx *gorm.DB, user database.User, book database.Book) (database.Book, error) { + if user.ID != book.UserID { + return book, errors.New("Not allowed") + } + + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + return book, errors.Wrap(err, "incrementing user max_usn") + } + + if err := tx.Model(&book). + Updates(map[string]interface{}{ + "usn": nextUSN, + "deleted": true, + "label": "", + }).Error; err != nil { + return book, errors.Wrap(err, "deleting book") + } + + return book, nil +} + +// UpdateBook updaates the book, the usn and the user's max_usn +func (a *App) UpdateBook(tx *gorm.DB, user database.User, book database.Book, label *string) (database.Book, error) { + if user.ID != book.UserID { + return book, errors.New("Not allowed") + } + + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + return book, errors.Wrap(err, "incrementing user max_usn") + } + + if label != nil { + book.Label = *label + } + + book.USN = nextUSN + book.EditedOn = a.Clock.Now().UnixNano() + book.Deleted = false + + if err := tx.Save(&book).Error; err != nil { + return book, errors.Wrap(err, "updating the book") + } + + return book, nil +} diff --git a/server/api/operations/books_test.go b/pkg/server/app/books_test.go similarity index 51% rename from server/api/operations/books_test.go rename to pkg/server/app/books_test.go index 9887a98d..8953c613 100644 --- a/server/api/operations/books_test.go +++ b/pkg/server/app/books_test.go @@ -1,37 +1,31 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -package operations +package app import ( "fmt" "testing" - "github.com/dnote/dnote/server/api/clock" - "github.com/dnote/dnote/server/database" - "github.com/dnote/dnote/server/testutils" + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/testutils" "github.com/pkg/errors" ) -func init() { - testutils.InitTestDB() -} - func TestCreateBook(t *testing.T) { testCases := []struct { userUSN int @@ -57,23 +51,24 @@ func TestCreateBook(t *testing.T) { for idx, tc := range testCases { func() { - defer testutils.ClearData() - db := database.DBConn + db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData() + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData() + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - c := clock.NewMock() + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() - book, err := CreateBook(user, c, tc.label) + book, err := a.CreateBook(user, tc.label) if err != nil { t.Fatal(errors.Wrap(err, "creating book")) } - var bookCount int + var bookCount int64 var bookRecord database.Book var userRecord database.User @@ -87,16 +82,16 @@ func TestCreateBook(t *testing.T) { t.Fatal(errors.Wrap(err, "finding user")) } - testutils.AssertEqual(t, bookCount, 1, "book count mismatch") - testutils.AssertEqual(t, bookRecord.UserID, user.ID, "book user_id mismatch") - testutils.AssertEqual(t, bookRecord.Label, tc.label, "book label mismatch") - testutils.AssertEqual(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") + assert.Equal(t, bookCount, int64(1), "book count mismatch") + assert.Equal(t, bookRecord.UserID, user.ID, "book user_id mismatch") + assert.Equal(t, bookRecord.Label, tc.label, "book label mismatch") + assert.Equal(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") - testutils.AssertNotEqual(t, book.UUID, "", "book uuid should have been generated") - testutils.AssertEqual(t, book.UserID, user.ID, "returned book user_id mismatch") - testutils.AssertEqual(t, book.Label, tc.label, "returned book label mismatch") - testutils.AssertEqual(t, book.USN, tc.expectedUSN, "returned book usn mismatch") - testutils.AssertEqual(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") + assert.NotEqual(t, book.UUID, "", "book uuid should have been generated") + assert.Equal(t, book.UserID, user.ID, "returned book user_id mismatch") + assert.Equal(t, book.Label, tc.label, "returned book label mismatch") + assert.Equal(t, book.USN, tc.expectedUSN, "returned book usn mismatch") + assert.Equal(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") }() } } @@ -122,27 +117,28 @@ func TestDeleteBook(t *testing.T) { for idx, tc := range testCases { func() { - defer testutils.ClearData() - db := database.DBConn + db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData() + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData() + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) book := database.Book{UserID: user.ID, Label: "js", Deleted: false} testutils.MustExec(t, db.Save(&book), fmt.Sprintf("preparing book for test case %d", idx)) tx := db.Begin() - ret, err := DeleteBook(tx, user, book) + a := NewTest() + a.DB = db + ret, err := a.DeleteBook(tx, user, book) if err != nil { tx.Rollback() t.Fatal(errors.Wrap(err, "deleting book")) } tx.Commit() - var bookCount int + var bookCount int64 var bookRecord database.Book var userRecord database.User @@ -150,18 +146,18 @@ func TestDeleteBook(t *testing.T) { testutils.MustExec(t, db.First(&bookRecord), fmt.Sprintf("finding book for test case %d", idx)) testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), fmt.Sprintf("finding user for test case %d", idx)) - testutils.AssertEqual(t, bookCount, 1, "book count mismatch") - testutils.AssertEqual(t, bookRecord.UserID, user.ID, "book user_id mismatch") - testutils.AssertEqual(t, bookRecord.Label, "", "book label mismatch") - testutils.AssertEqual(t, bookRecord.Deleted, true, "book deleted flag mismatch") - testutils.AssertEqual(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") + assert.Equal(t, bookCount, int64(1), "book count mismatch") + assert.Equal(t, bookRecord.UserID, user.ID, "book user_id mismatch") + assert.Equal(t, bookRecord.Label, "", "book label mismatch") + assert.Equal(t, bookRecord.Deleted, true, "book deleted flag mismatch") + assert.Equal(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") - testutils.AssertEqual(t, ret.UserID, user.ID, "returned book user_id mismatch") - testutils.AssertEqual(t, ret.Label, "", "returned book label mismatch") - testutils.AssertEqual(t, ret.Deleted, true, "returned book deleted flag mismatch") - testutils.AssertEqual(t, ret.USN, tc.expectedUSN, "returned book label mismatch") + assert.Equal(t, ret.UserID, user.ID, "returned book user_id mismatch") + assert.Equal(t, ret.Label, "", "returned book label mismatch") + assert.Equal(t, ret.Deleted, true, "returned book deleted flag mismatch") + assert.Equal(t, ret.USN, tc.expectedUSN, "returned book label mismatch") - testutils.AssertEqual(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") + assert.Equal(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") }() } } @@ -200,23 +196,24 @@ func TestUpdateBook(t *testing.T) { for idx, tc := range testCases { func() { - defer testutils.ClearData() - db := database.DBConn + db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData() + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData() + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - c := clock.NewMock() - b := database.Book{UserID: user.ID, Deleted: false, Label: tc.expectedLabel} testutils.MustExec(t, db.Save(&b), fmt.Sprintf("preparing book for test case %d", idx)) - tx := db.Begin() + c := clock.NewMock() + a := NewTest() + a.DB = db + a.Clock = c - book, err := UpdateBook(tx, c, user, b, tc.payloadLabel) + tx := db.Begin() + book, err := a.UpdateBook(tx, user, b, tc.payloadLabel) if err != nil { tx.Rollback() t.Fatal(errors.Wrap(err, "updating book")) @@ -224,25 +221,25 @@ func TestUpdateBook(t *testing.T) { tx.Commit() - var bookCount int + var bookCount int64 var bookRecord database.Book var userRecord database.User testutils.MustExec(t, db.Model(&database.Book{}).Count(&bookCount), fmt.Sprintf("counting books for test case %d", idx)) testutils.MustExec(t, db.First(&bookRecord), fmt.Sprintf("finding book for test case %d", idx)) testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), fmt.Sprintf("finding user for test case %d", idx)) - testutils.AssertEqual(t, bookCount, 1, "book count mismatch") + assert.Equal(t, bookCount, int64(1), "book count mismatch") - testutils.AssertEqual(t, bookRecord.UserID, user.ID, "book user_id mismatch") - testutils.AssertEqual(t, bookRecord.Label, tc.expectedLabel, "book label mismatch") - testutils.AssertEqual(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") - testutils.AssertEqual(t, bookRecord.EditedOn, c.Now().UnixNano(), "book edited_on mismatch") - testutils.AssertEqual(t, book.UserID, user.ID, "returned book user_id mismatch") - testutils.AssertEqual(t, book.Label, tc.expectedLabel, "returned book label mismatch") - testutils.AssertEqual(t, book.USN, tc.expectedUSN, "returned book usn mismatch") - testutils.AssertEqual(t, book.EditedOn, c.Now().UnixNano(), "returned book edited_on mismatch") + assert.Equal(t, bookRecord.UserID, user.ID, "book user_id mismatch") + assert.Equal(t, bookRecord.Label, tc.expectedLabel, "book label mismatch") + assert.Equal(t, bookRecord.USN, tc.expectedUSN, "book label mismatch") + assert.Equal(t, bookRecord.EditedOn, c.Now().UnixNano(), "book edited_on mismatch") + assert.Equal(t, book.UserID, user.ID, "returned book user_id mismatch") + assert.Equal(t, book.Label, tc.expectedLabel, "returned book label mismatch") + assert.Equal(t, book.USN, tc.expectedUSN, "returned book usn mismatch") + assert.Equal(t, book.EditedOn, c.Now().UnixNano(), "returned book edited_on mismatch") - testutils.AssertEqual(t, userRecord.MaxUSN, tc.expectedUserUSN, "user max_usn mismatch") + assert.Equal(t, userRecord.MaxUSN, tc.expectedUserUSN, "user max_usn mismatch") }() } } diff --git a/pkg/server/app/doc.go b/pkg/server/app/doc.go new file mode 100644 index 00000000..2a3f3695 --- /dev/null +++ b/pkg/server/app/doc.go @@ -0,0 +1,19 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* +Package app implements application business logic +*/ +package app diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go new file mode 100644 index 00000000..fc86cda9 --- /dev/null +++ b/pkg/server/app/email.go @@ -0,0 +1,129 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "fmt" + "net/url" + "strings" + + "github.com/dnote/dnote/pkg/server/mailer" + "github.com/pkg/errors" +) + +var defaultSender = "admin@getdnote.com" + +// GetSenderEmail returns the sender email +func GetSenderEmail(baseURL, want string) (string, error) { + addr, err := getNoreplySender(baseURL) + if err != nil { + return "", errors.Wrap(err, "getting sender email address") + } + + return addr, nil +} + +func getDomainFromURL(rawURL string) (string, error) { + u, err := url.Parse(rawURL) + if err != nil { + return "", errors.Wrap(err, "parsing url") + } + + host := u.Hostname() + parts := strings.Split(host, ".") + if len(parts) < 2 { + return host, nil + } + domain := parts[len(parts)-2] + "." + parts[len(parts)-1] + + return domain, nil +} + +func getNoreplySender(baseURL string) (string, error) { + domain, err := getDomainFromURL(baseURL) + if err != nil { + return "", errors.Wrap(err, "parsing base url") + } + + addr := fmt.Sprintf("noreply@%s", domain) + return addr, nil +} + +// SendWelcomeEmail sends welcome email +func (a *App) SendWelcomeEmail(email string) error { + from, err := GetSenderEmail(a.BaseURL, defaultSender) + if err != nil { + return errors.Wrap(err, "getting the sender email") + } + + data := mailer.WelcomeTmplData{ + AccountEmail: email, + BaseURL: a.BaseURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeWelcome, from, []string{email}, data); err != nil { + return errors.Wrapf(err, "sending welcome email for %s", email) + } + + return nil +} + +// SendPasswordResetEmail sends password reset email +func (a *App) SendPasswordResetEmail(email, tokenValue string) error { + if email == "" { + return ErrEmailRequired + } + + from, err := GetSenderEmail(a.BaseURL, defaultSender) + if err != nil { + return errors.Wrap(err, "getting the sender email") + } + + data := mailer.EmailResetPasswordTmplData{ + AccountEmail: email, + Token: tokenValue, + BaseURL: a.BaseURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPassword, from, []string{email}, data); err != nil { + if errors.Cause(err) == mailer.ErrSMTPNotConfigured { + return ErrInvalidSMTPConfig + } + + return errors.Wrapf(err, "sending password reset email for %s", email) + } + + return nil +} + +// SendPasswordResetAlertEmail sends email that notifies users of a password change +func (a *App) SendPasswordResetAlertEmail(email string) error { + from, err := GetSenderEmail(a.BaseURL, defaultSender) + if err != nil { + return errors.Wrap(err, "getting the sender email") + } + + data := mailer.EmailResetPasswordAlertTmplData{ + AccountEmail: email, + BaseURL: a.BaseURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPasswordAlert, from, []string{email}, data); err != nil { + return errors.Wrapf(err, "sending password reset alert email for %s", email) + } + + return nil +} diff --git a/pkg/server/app/email_test.go b/pkg/server/app/email_test.go new file mode 100644 index 00000000..e0a73aef --- /dev/null +++ b/pkg/server/app/email_test.go @@ -0,0 +1,77 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/server/testutils" +) + +func TestSendWelcomeEmail(t *testing.T) { + emailBackend := testutils.MockEmailbackendImplementation{} + a := NewTest() + a.EmailBackend = &emailBackend + a.BaseURL = "http://example.com" + + if err := a.SendWelcomeEmail("alice@example.com"); err != nil { + t.Fatal(err, "failed to perform") + } + + assert.Equalf(t, len(emailBackend.Emails), 1, "email queue count mismatch") + assert.Equal(t, emailBackend.Emails[0].From, "noreply@example.com", "email sender mismatch") + assert.DeepEqual(t, emailBackend.Emails[0].To, []string{"alice@example.com"}, "email sender mismatch") + +} + +func TestSendPasswordResetEmail(t *testing.T) { + emailBackend := testutils.MockEmailbackendImplementation{} + a := NewTest() + a.EmailBackend = &emailBackend + a.BaseURL = "http://example.com" + + if err := a.SendPasswordResetEmail("alice@example.com", "mockTokenValue"); err != nil { + t.Fatal(err, "failed to perform") + } + + assert.Equalf(t, len(emailBackend.Emails), 1, "email queue count mismatch") + assert.Equal(t, emailBackend.Emails[0].From, "noreply@example.com", "email sender mismatch") + assert.DeepEqual(t, emailBackend.Emails[0].To, []string{"alice@example.com"}, "email sender mismatch") + +} + +func TestGetSenderEmail(t *testing.T) { + testCases := []struct { + baseURL string + expectedSender string + }{ + { + baseURL: "https://www.example.com", + expectedSender: "noreply@example.com", + }, + { + baseURL: "https://www.example2.com", + expectedSender: "alice@example2.com", + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("base url %s", tc.baseURL), func(t *testing.T) { + }) + } +} diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go new file mode 100644 index 00000000..67635b23 --- /dev/null +++ b/pkg/server/app/errors.go @@ -0,0 +1,82 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +type appError string + +func (e appError) Error() string { + return string(e) +} + +func (e appError) Public() string { + return string(e) +} + +var ( + // ErrNotFound an error that indicates that the given resource is not found + ErrNotFound appError = "not found" + // ErrLoginInvalid is an error for invalid login + ErrLoginInvalid appError = "Wrong email and password combination" + + // ErrDuplicateEmail is an error for duplicate email + ErrDuplicateEmail appError = "duplicate email" + // ErrEmailRequired is an error for missing email + ErrEmailRequired appError = "Please enter an email" + // ErrPasswordRequired is an error for missing email + ErrPasswordRequired appError = "Please enter a password" + // ErrPasswordTooShort is an error for short password + ErrPasswordTooShort appError = "password should be longer than 8 characters" + // ErrPasswordConfirmationMismatch is an error for password ans password confirmation not matching + ErrPasswordConfirmationMismatch appError = "password confirmation does not match password" + + // ErrLoginRequired is an error for not authenticated + ErrLoginRequired appError = "login required" + + // ErrBookUUIDRequired is an error for note missing book uuid + ErrBookUUIDRequired appError = "book uuid required" + // ErrBookNameRequired is an error for note missing book name + ErrBookNameRequired appError = "book name required" + // ErrDuplicateBook is an error for duplicate book + ErrDuplicateBook appError = "duplicate book exists" + + // ErrEmptyUpdate is an error for empty update params + ErrEmptyUpdate appError = "update is empty" + + // ErrInvalidUUID is an error for invalid uuid + ErrInvalidUUID appError = "invalid uuid" + + // ErrInvalidSMTPConfig is an error for invalid SMTP configuration + ErrInvalidSMTPConfig appError = "SMTP is not configured" + + // ErrInvalidToken is an error for invalid token + ErrInvalidToken appError = "invalid token" + // ErrMissingToken is an error for missing token + ErrMissingToken appError = "missing token" + // ErrExpiredToken is an error for missing token + ErrExpiredToken appError = "This token has expired." + + // ErrPasswordResetTokenExpired is an error for expired password reset token + ErrPasswordResetTokenExpired appError = "this link has been expired. Please request a new password reset link." + // ErrInvalidPasswordChangeInput is an error for changing password + ErrInvalidPasswordChangeInput appError = "Both current and new passwords are required to change the password." + + ErrInvalidPassword appError = "Invalid current password." + // ErrEmailTooLong is an error for email length exceeding the limit + ErrEmailTooLong appError = "Email is too long." + + // ErrUserHasExistingResources is an error for attempting to remove a user with existing notes or books + ErrUserHasExistingResources appError = "cannot remove user with existing notes or books" +) diff --git a/pkg/server/app/helpers.go b/pkg/server/app/helpers.go new file mode 100644 index 00000000..437ca9ae --- /dev/null +++ b/pkg/server/app/helpers.go @@ -0,0 +1,53 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "time" + + "github.com/dnote/dnote/pkg/server/database" + "github.com/pkg/errors" + "gorm.io/gorm" +) + +// incrementUserUSN increment the given user's max_usn by 1 +// and returns the new, incremented max_usn +func incrementUserUSN(tx *gorm.DB, userID int) (int, error) { + // First, get the current max_usn to detect transition from empty server + var user database.User + if err := tx.Select("max_usn, full_sync_before").Where("id = ?", userID).First(&user).Error; err != nil { + return 0, errors.Wrap(err, "getting current user state") + } + + // If transitioning from empty server (MaxUSN=0) to non-empty (MaxUSN=1), + // set full_sync_before to current timestamp to force all other clients to full sync + if user.MaxUSN == 0 && user.FullSyncBefore == 0 { + currentTime := time.Now().Unix() + if err := tx.Table("users").Where("id = ?", userID).Update("full_sync_before", currentTime).Error; err != nil { + return 0, errors.Wrap(err, "setting full_sync_before on empty server transition") + } + } + + if err := tx.Table("users").Where("id = ?", userID).Update("max_usn", gorm.Expr("max_usn + 1")).Error; err != nil { + return 0, errors.Wrap(err, "incrementing user max_usn") + } + + if err := tx.Select("max_usn").Where("id = ?", userID).First(&user).Error; err != nil { + return 0, errors.Wrap(err, "getting the updated user max_usn") + } + + return user.MaxUSN, nil +} diff --git a/pkg/server/app/helpers_test.go b/pkg/server/app/helpers_test.go new file mode 100644 index 00000000..93486ecd --- /dev/null +++ b/pkg/server/app/helpers_test.go @@ -0,0 +1,67 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "fmt" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" +) + +func TestIncremenetUserUSN(t *testing.T) { + testCases := []struct { + maxUSN int + expectedMaxUSN int + }{ + { + maxUSN: 1, + expectedMaxUSN: 2, + }, + { + maxUSN: 1988, + expectedMaxUSN: 1989, + }, + } + + // set up + for idx, tc := range testCases { + func() { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.maxUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) + + // execute + tx := db.Begin() + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + t.Fatal(errors.Wrap(err, "incrementing the user usn")) + } + tx.Commit() + + // test + var userRecord database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), fmt.Sprintf("finding user for test case %d", idx)) + + assert.Equal(t, userRecord.MaxUSN, tc.expectedMaxUSN, fmt.Sprintf("user max_usn mismatch for case %d", idx)) + assert.Equal(t, nextUSN, tc.expectedMaxUSN, fmt.Sprintf("next_usn mismatch for case %d", idx)) + }() + } +} diff --git a/pkg/server/app/notes.go b/pkg/server/app/notes.go new file mode 100644 index 00000000..4bdeaaf6 --- /dev/null +++ b/pkg/server/app/notes.go @@ -0,0 +1,291 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "errors" + "time" + + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/helpers" + pkgErrors "github.com/pkg/errors" + "gorm.io/gorm" +) + +// CreateNote creates a note with the next usn and updates the user's max_usn. +// It returns the created note. +func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn *int64, editedOn *int64, client string) (database.Note, error) { + tx := a.DB.Begin() + + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + tx.Rollback() + return database.Note{}, pkgErrors.Wrap(err, "incrementing user max_usn") + } + + var noteAddedOn int64 + if addedOn == nil { + noteAddedOn = a.Clock.Now().UnixNano() + } else { + noteAddedOn = *addedOn + } + + var noteEditedOn int64 + if editedOn == nil { + noteEditedOn = 0 + } else { + noteEditedOn = *editedOn + } + + uuid, err := helpers.GenUUID() + if err != nil { + tx.Rollback() + return database.Note{}, err + } + + note := database.Note{ + UUID: uuid, + BookUUID: bookUUID, + UserID: user.ID, + AddedOn: noteAddedOn, + EditedOn: noteEditedOn, + USN: nextUSN, + Body: content, + Client: client, + } + if err := tx.Create(¬e).Error; err != nil { + tx.Rollback() + return note, pkgErrors.Wrap(err, "inserting note") + } + + tx.Commit() + + return note, nil +} + +// UpdateNoteParams is the parameters for updating a note +type UpdateNoteParams struct { + BookUUID *string + Content *string +} + +// GetBookUUID gets the bookUUID from the UpdateNoteParams +func (r UpdateNoteParams) GetBookUUID() string { + if r.BookUUID == nil { + return "" + } + + return *r.BookUUID +} + +// GetContent gets the content from the UpdateNoteParams +func (r UpdateNoteParams) GetContent() string { + if r.Content == nil { + return "" + } + + return *r.Content +} + +// UpdateNote creates a note with the next usn and updates the user's max_usn +func (a *App) UpdateNote(tx *gorm.DB, user database.User, note database.Note, p *UpdateNoteParams) (database.Note, error) { + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + return note, pkgErrors.Wrap(err, "incrementing user max_usn") + } + + if p.BookUUID != nil { + note.BookUUID = p.GetBookUUID() + } + if p.Content != nil { + note.Body = p.GetContent() + } + + note.USN = nextUSN + note.EditedOn = a.Clock.Now().UnixNano() + note.Deleted = false + + if err := tx.Save(¬e).Error; err != nil { + return note, pkgErrors.Wrap(err, "editing note") + } + + return note, nil +} + +// DeleteNote marks a note deleted with the next usn and updates the user's max_usn +func (a *App) DeleteNote(tx *gorm.DB, user database.User, note database.Note) (database.Note, error) { + nextUSN, err := incrementUserUSN(tx, user.ID) + if err != nil { + return note, pkgErrors.Wrap(err, "incrementing user max_usn") + } + + if err := tx.Model(¬e). + Updates(map[string]interface{}{ + "usn": nextUSN, + "deleted": true, + "body": "", + }).Error; err != nil { + return note, pkgErrors.Wrap(err, "deleting note") + } + + return note, nil +} + +// GetUserNoteByUUID retrives a digest by the uuid for the given user +func (a *App) GetUserNoteByUUID(userID int, uuid string) (*database.Note, error) { + var ret database.Note + err := a.DB.Where("user_id = ? AND uuid = ?", userID, uuid).First(&ret).Error + + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, nil + } + if err != nil { + return nil, pkgErrors.Wrap(err, "finding digest") + } + + return &ret, nil +} + +// GetNotesParams is params for finding notes +type GetNotesParams struct { + Year int + Month int + Page int + Books []string + Search string + PerPage int +} + +type ftsParams struct { + HighlightAll bool +} + +func getFTSBodyExpression(params *ftsParams) string { + if params != nil && params.HighlightAll { + return "highlight(notes_fts, 0, '', '') AS body" + } + + return "snippet(notes_fts, 0, '', '', '...', 50) AS body" +} + +func selectFTSFields(conn *gorm.DB, params *ftsParams) *gorm.DB { + bodyExpr := getFTSBodyExpression(params) + + return conn.Select(` +notes.id, +notes.uuid, +notes.created_at, +notes.updated_at, +notes.book_uuid, +notes.user_id, +notes.added_on, +notes.edited_on, +notes.usn, +notes.deleted, +` + bodyExpr) +} + +func getNotesBaseQuery(db *gorm.DB, userID int, q GetNotesParams) *gorm.DB { + conn := db.Where( + "notes.user_id = ? AND notes.deleted = ?", + userID, false, + ) + + if q.Search != "" { + conn = selectFTSFields(conn, nil) + conn = conn.Joins("INNER JOIN notes_fts ON notes_fts.rowid = notes.id") + conn = conn.Where("notes_fts MATCH ?", q.Search) + } + + if len(q.Books) > 0 { + conn = conn.Joins("INNER JOIN books ON books.uuid = notes.book_uuid"). + Where("books.label in (?)", q.Books) + } + + if q.Year != 0 || q.Month != 0 { + dateLowerbound, dateUpperbound := getDateBounds(q.Year, q.Month) + conn = conn.Where("notes.added_on >= ? AND notes.added_on < ?", dateLowerbound, dateUpperbound) + } + + return conn +} + +func getDateBounds(year, month int) (int64, int64) { + var yearUpperbound, monthUpperbound int + + if month == 12 { + monthUpperbound = 1 + yearUpperbound = year + 1 + } else { + monthUpperbound = month + 1 + yearUpperbound = year + } + + lower := time.Date(year, time.Month(month), 1, 0, 0, 0, 0, time.UTC).UnixNano() + upper := time.Date(yearUpperbound, time.Month(monthUpperbound), 1, 0, 0, 0, 0, time.UTC).UnixNano() + + return lower, upper +} + +func orderGetNotes(conn *gorm.DB) *gorm.DB { + return conn.Order("notes.updated_at DESC, notes.id DESC") +} + +func paginate(conn *gorm.DB, page, perPage int) *gorm.DB { + // Paginate + if page > 0 { + offset := perPage * (page - 1) + conn = conn.Offset(offset) + } + + conn = conn.Limit(perPage) + + return conn +} + +// GetNotesResult is the result of getting notes +type GetNotesResult struct { + Notes []database.Note + Total int64 +} + +// GetNotes returns a list of matching notes +func (a *App) GetNotes(userID int, params GetNotesParams) (GetNotesResult, error) { + conn := getNotesBaseQuery(a.DB, userID, params) + + var total int64 + if err := conn.Model(database.Note{}).Count(&total).Error; err != nil { + return GetNotesResult{}, pkgErrors.Wrap(err, "counting total") + } + + notes := []database.Note{} + if total != 0 { + conn = orderGetNotes(conn) + conn = database.PreloadNote(conn) + conn = paginate(conn, params.Page, params.PerPage) + + if err := conn.Find(¬es).Error; err != nil { + return GetNotesResult{}, pkgErrors.Wrap(err, "finding notes") + } + } + + res := GetNotesResult{ + Notes: notes, + Total: total, + } + + return res, nil +} diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go new file mode 100644 index 00000000..a165312d --- /dev/null +++ b/pkg/server/app/notes_test.go @@ -0,0 +1,515 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "fmt" + "strings" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" +) + +func TestCreateNote(t *testing.T) { + serverTime := time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) + + ts1 := time.Date(2018, time.November, 12, 10, 11, 0, 0, time.UTC).UnixNano() + ts2 := time.Date(2018, time.November, 15, 0, 1, 10, 0, time.UTC).UnixNano() + + testCases := []struct { + userUSN int + addedOn *int64 + editedOn *int64 + expectedUSN int + expectedAddedOn int64 + expectedEditedOn int64 + }{ + { + userUSN: 8, + addedOn: nil, + editedOn: nil, + expectedUSN: 9, + expectedAddedOn: serverTime.UnixNano(), + expectedEditedOn: 0, + }, + { + userUSN: 102229, + addedOn: &ts1, + editedOn: nil, + expectedUSN: 102230, + expectedAddedOn: ts1, + expectedEditedOn: 0, + }, + { + userUSN: 8099, + addedOn: &ts1, + editedOn: &ts2, + expectedUSN: 8100, + expectedAddedOn: ts1, + expectedEditedOn: ts2, + }, + } + + for idx, tc := range testCases { + func() { + // Create a new clock for each test case to avoid race conditions in parallel tests + mockClock := clock.NewMock() + mockClock.SetNow(serverTime) + + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) + fmt.Println(user) + + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) + + b1 := database.Book{UserID: user.ID, Label: "js", Deleted: false} + testutils.MustExec(t, db.Save(&b1), fmt.Sprintf("preparing b1 for test case %d", idx)) + + a := NewTest() + a.DB = db + a.Clock = mockClock + + if _, err := a.CreateNote(user, b1.UUID, "note content", tc.addedOn, tc.editedOn, ""); err != nil { + t.Fatal(errors.Wrapf(err, "creating note for test case %d", idx)) + } + + var bookCount, noteCount int64 + var noteRecord database.Note + var userRecord database.User + + testutils.MustExec(t, db.Model(&database.Book{}).Count(&bookCount), fmt.Sprintf("counting book for test case %d", idx)) + testutils.MustExec(t, db.Model(&database.Note{}).Count(¬eCount), fmt.Sprintf("counting notes for test case %d", idx)) + testutils.MustExec(t, db.First(¬eRecord), fmt.Sprintf("finding note for test case %d", idx)) + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), fmt.Sprintf("finding user for test case %d", idx)) + + assert.Equal(t, bookCount, int64(1), "book count mismatch") + assert.Equal(t, noteCount, int64(1), "note count mismatch") + assert.NotEqual(t, noteRecord.UUID, "", "note UUID should have been generated") + assert.Equal(t, noteRecord.UserID, user.ID, "note UserID mismatch") + assert.Equal(t, noteRecord.Body, "note content", "note Body mismatch") + assert.Equal(t, noteRecord.Deleted, false, "note Deleted mismatch") + assert.Equal(t, noteRecord.USN, tc.expectedUSN, "note Label mismatch") + assert.Equal(t, noteRecord.AddedOn, tc.expectedAddedOn, "note AddedOn mismatch") + assert.Equal(t, noteRecord.EditedOn, tc.expectedEditedOn, "note EditedOn mismatch") + + assert.Equal(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") + + // Assert FTS table is updated + var ftsBody string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", noteRecord.ID).Scan(&ftsBody), fmt.Sprintf("querying notes_fts for test case %d", idx)) + assert.Equal(t, ftsBody, "note content", "FTS body mismatch") + var searchCount int64 + testutils.MustExec(t, db.Raw("SELECT COUNT(*) FROM notes_fts WHERE notes_fts MATCH ?", "content").Scan(&searchCount), "searching notes_fts") + assert.Equal(t, searchCount, int64(1), "Note should still be searchable") + }() + } +} + +func TestCreateNote_EmptyBody(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + // Create note with empty body + note, err := a.CreateNote(user, b1.UUID, "", nil, nil, "") + if err != nil { + t.Fatal(errors.Wrap(err, "creating note with empty body")) + } + + // Assert FTS entry exists with empty body + var ftsBody string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", note.ID).Scan(&ftsBody), "querying notes_fts for empty body note") + assert.Equal(t, ftsBody, "", "FTS body should be empty for note created with empty body") +} + +func TestUpdateNote(t *testing.T) { + testCases := []struct { + userUSN int + }{ + { + userUSN: 8, + }, + { + userUSN: 102229, + }, + { + userUSN: 8099, + }, + } + + for idx, tc := range testCases { + t.Run(fmt.Sprintf("test case %d", idx), func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), "preparing user max_usn for test case") + + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), "preparing user max_usn for test case") + + b1 := database.Book{UserID: user.ID, Label: "js", Deleted: false} + testutils.MustExec(t, db.Save(&b1), "preparing b1 for test case") + + note := database.Note{UserID: user.ID, Deleted: false, Body: "test content", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e), "preparing note for test case") + + // Assert FTS table has original content + var ftsBodyBefore string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", note.ID).Scan(&ftsBodyBefore), "querying notes_fts before update") + assert.Equal(t, ftsBodyBefore, "test content", "FTS body mismatch before update") + + c := clock.NewMock() + content := "updated test content" + + a := NewTest() + a.DB = db + a.Clock = c + + tx := db.Begin() + if _, err := a.UpdateNote(tx, user, note, &UpdateNoteParams{ + Content: &content, + }); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "updating note")) + } + tx.Commit() + + var bookCount, noteCount int64 + var noteRecord database.Note + var userRecord database.User + + testutils.MustExec(t, db.Model(&database.Book{}).Count(&bookCount), "counting book for test case") + testutils.MustExec(t, db.Model(&database.Note{}).Count(¬eCount), "counting notes for test case") + testutils.MustExec(t, db.First(¬eRecord), "finding note for test case") + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), "finding user for test case") + + expectedUSN := tc.userUSN + 1 + assert.Equal(t, bookCount, int64(1), "book count mismatch") + assert.Equal(t, noteCount, int64(1), "note count mismatch") + assert.Equal(t, noteRecord.UserID, user.ID, "note UserID mismatch") + assert.Equal(t, noteRecord.Body, content, "note Body mismatch") + assert.Equal(t, noteRecord.Deleted, false, "note Deleted mismatch") + assert.Equal(t, noteRecord.USN, expectedUSN, "note USN mismatch") + assert.Equal(t, userRecord.MaxUSN, expectedUSN, "user MaxUSN mismatch") + + // Assert FTS table is updated with new content + var ftsBodyAfter string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", noteRecord.ID).Scan(&ftsBodyAfter), "querying notes_fts after update") + assert.Equal(t, ftsBodyAfter, content, "FTS body mismatch after update") + var searchCount int64 + testutils.MustExec(t, db.Raw("SELECT COUNT(*) FROM notes_fts WHERE notes_fts MATCH ?", "updated").Scan(&searchCount), "searching notes_fts") + assert.Equal(t, searchCount, int64(1), "Note should still be searchable") + }) + } +} + +func TestUpdateNote_SameContent(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + note := database.Note{UserID: user.ID, Deleted: false, Body: "test content", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e), "preparing note") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + // Update note with same content + sameContent := "test content" + tx := db.Begin() + _, err := a.UpdateNote(tx, user, note, &UpdateNoteParams{ + Content: &sameContent, + }) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "updating note with same content")) + } + tx.Commit() + + // Assert FTS still has the same content + var ftsBody string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", note.ID).Scan(&ftsBody), "querying notes_fts after update") + assert.Equal(t, ftsBody, "test content", "FTS body should still be 'test content'") + + // Assert it's still searchable + var searchCount int64 + testutils.MustExec(t, db.Raw("SELECT COUNT(*) FROM notes_fts WHERE notes_fts MATCH ?", "test").Scan(&searchCount), "searching notes_fts") + assert.Equal(t, searchCount, int64(1), "Note should still be searchable") +} + +func TestDeleteNote(t *testing.T) { + testCases := []struct { + userUSN int + expectedUSN int + }{ + { + userUSN: 3, + expectedUSN: 4, + }, + { + userUSN: 9787, + expectedUSN: 9788, + }, + { + userUSN: 787, + expectedUSN: 788, + }, + } + + for idx, tc := range testCases { + func() { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) + + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) + + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), fmt.Sprintf("preparing b1 for test case %d", idx)) + + note := database.Note{UserID: user.ID, Deleted: false, Body: "test content", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e), fmt.Sprintf("preparing note for test case %d", idx)) + + // Assert FTS table has content before delete + var ftsCountBefore int64 + testutils.MustExec(t, db.Raw("SELECT COUNT(*) FROM notes_fts WHERE rowid = ?", note.ID).Scan(&ftsCountBefore), fmt.Sprintf("counting notes_fts before delete for test case %d", idx)) + assert.Equal(t, ftsCountBefore, int64(1), "FTS should have entry before delete") + + a := NewTest() + a.DB = db + + tx := db.Begin() + ret, err := a.DeleteNote(tx, user, note) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "deleting note")) + } + tx.Commit() + + var noteCount int64 + var noteRecord database.Note + var userRecord database.User + + testutils.MustExec(t, db.Model(&database.Note{}).Count(¬eCount), fmt.Sprintf("counting notes for test case %d", idx)) + testutils.MustExec(t, db.First(¬eRecord), fmt.Sprintf("finding note for test case %d", idx)) + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&userRecord), fmt.Sprintf("finding user for test case %d", idx)) + + assert.Equal(t, noteCount, int64(1), "note count mismatch") + + assert.Equal(t, noteRecord.UserID, user.ID, "note user_id mismatch") + assert.Equal(t, noteRecord.Body, "", "note content mismatch") + assert.Equal(t, noteRecord.Deleted, true, "note deleted flag mismatch") + assert.Equal(t, noteRecord.USN, tc.expectedUSN, "note label mismatch") + assert.Equal(t, userRecord.MaxUSN, tc.expectedUSN, "user max_usn mismatch") + + assert.Equal(t, ret.UserID, user.ID, "note user_id mismatch") + assert.Equal(t, ret.Body, "", "note content mismatch") + assert.Equal(t, ret.Deleted, true, "note deleted flag mismatch") + assert.Equal(t, ret.USN, tc.expectedUSN, "note label mismatch") + + // Assert FTS body is empty after delete (row still exists but content is cleared) + var ftsBody string + testutils.MustExec(t, db.Raw("SELECT body FROM notes_fts WHERE rowid = ?", noteRecord.ID).Scan(&ftsBody), fmt.Sprintf("querying notes_fts after delete for test case %d", idx)) + assert.Equal(t, ftsBody, "", "FTS body should be empty after delete") + }() + } +} + +func TestGetNotes_FTSSearch(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + // Create notes with different content + note1 := database.Note{UserID: user.ID, Deleted: false, Body: "foo bar baz bar", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e1), "preparing note1") + + note2 := database.Note{UserID: user.ID, Deleted: false, Body: "hello run foo", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e2), "preparing note2") + + note3 := database.Note{UserID: user.ID, Deleted: false, Body: "running quz succeeded", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e3), "preparing note3") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + // Search "baz" + result, err := a.GetNotes(user.ID, GetNotesParams{ + Search: "baz", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search")) + } + assert.Equal(t, result.Total, int64(1), "Should find 1 note with 'baz'") + assert.Equal(t, len(result.Notes), 1, "Should return 1 note") + for i, note := range result.Notes { + assert.Equal(t, strings.Contains(note.Body, "baz"), true, fmt.Sprintf("Note %d should contain highlighted dnote", i)) + } + + // Search for "running" - should return 1 note + result, err = a.GetNotes(user.ID, GetNotesParams{ + Search: "running", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search for review")) + } + assert.Equal(t, result.Total, int64(2), "Should find 2 note with 'running'") + assert.Equal(t, len(result.Notes), 2, "Should return 2 notes") + assert.Equal(t, result.Notes[0].Body, "running quz succeeded", "Should return the review note with highlighting") + assert.Equal(t, result.Notes[1].Body, "hello run foo", "Should return the review note with highlighting") + + // Search for non-existent term - should return 0 notes + result, err = a.GetNotes(user.ID, GetNotesParams{ + Search: "nonexistent", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search for nonexistent")) + } + + assert.Equal(t, result.Total, int64(0), "Should find 0 notes with 'nonexistent'") + assert.Equal(t, len(result.Notes), 0, "Should return 0 notes") +} + +func TestGetNotes_FTSSearch_Snippet(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + // Create a long note to test snippet truncation with "..." + // The snippet limit is 50 tokens, so we generate enough words to exceed it + longBody := strings.Repeat("filler ", 100) + "the important keyword appears here" + longNote := database.Note{UserID: user.ID, Deleted: false, Body: longBody, BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(&longNote), "preparing long note") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + // Search for "keyword" in long note - should return snippet with "..." + result, err := a.GetNotes(user.ID, GetNotesParams{ + Search: "keyword", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search for keyword")) + } + + assert.Equal(t, result.Total, int64(1), "Should find 1 note with 'keyword'") + assert.Equal(t, len(result.Notes), 1, "Should return 1 note") + // The snippet should contain "..." to indicate truncation and the highlighted keyword + assert.Equal(t, strings.Contains(result.Notes[0].Body, "..."), true, "Snippet should contain '...' for truncation") + assert.Equal(t, strings.Contains(result.Notes[0].Body, "keyword"), true, "Snippet should contain highlighted keyword") +} + +func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + // Create notes with short words + note1 := database.Note{UserID: user.ID, Deleted: false, Body: "a b c", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e1), "preparing note1") + + note2 := database.Note{UserID: user.ID, Deleted: false, Body: "d", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e2), "preparing note2") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + result, err := a.GetNotes(user.ID, GetNotesParams{ + Search: "a", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) + } + + assert.Equal(t, result.Total, int64(1), "Should find 1 note") + assert.Equal(t, len(result.Notes), 1, "Should return 1 note") + assert.Equal(t, strings.Contains(result.Notes[0].Body, "a"), true, "Should contain highlighted 'a'") +} + +func TestGetNotes_All(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "user@test.com", "password123") + b1 := database.Book{UserID: user.ID, Label: "testBook"} + testutils.MustExec(t, db.Save(&b1), "preparing book") + + note1 := database.Note{UserID: user.ID, Deleted: false, Body: "a b c", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e1), "preparing note1") + + note2 := database.Note{UserID: user.ID, Deleted: false, Body: "d", BookUUID: b1.UUID} + testutils.MustExec(t, db.Save(¬e2), "preparing note2") + + a := NewTest() + a.DB = db + a.Clock = clock.NewMock() + + result, err := a.GetNotes(user.ID, GetNotesParams{ + Search: "", + Page: 1, + PerPage: 30, + }) + if err != nil { + t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) + } + + assert.Equal(t, result.Total, int64(2), "Should not find all notes") + assert.Equal(t, len(result.Notes), 2, "Should not find all notes") + + for _, note := range result.Notes { + assert.Equal(t, strings.Contains(note.Body, ""), false, "There should be no keywords") + assert.Equal(t, strings.Contains(note.Body, ""), false, "There should be no keywords") + } + assert.Equal(t, result.Notes[0].Body, "d", "Full content should be returned") + assert.Equal(t, result.Notes[1].Body, "a b c", "Full content should be returned") +} diff --git a/pkg/server/app/sessions.go b/pkg/server/app/sessions.go new file mode 100644 index 00000000..6c230d76 --- /dev/null +++ b/pkg/server/app/sessions.go @@ -0,0 +1,65 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "time" + + "github.com/dnote/dnote/pkg/server/crypt" + "github.com/dnote/dnote/pkg/server/database" + "gorm.io/gorm" + "github.com/pkg/errors" +) + +// CreateSession returns a new session for the user of the given id +func (a *App) CreateSession(userID int) (database.Session, error) { + key, err := crypt.GetRandomStr(32) + if err != nil { + return database.Session{}, errors.Wrap(err, "generating key") + } + + session := database.Session{ + UserID: userID, + Key: key, + LastUsedAt: time.Now(), + ExpiresAt: time.Now().Add(24 * 100 * time.Hour), + } + + if err := a.DB.Save(&session).Error; err != nil { + return database.Session{}, errors.Wrap(err, "saving session") + } + + return session, nil +} + +// DeleteUserSessions deletes all existing sessions for the given user. It effectively +// invalidates all existing sessions. +func (a *App) DeleteUserSessions(db *gorm.DB, userID int) error { + if err := db.Where("user_id = ?", userID).Delete(&database.Session{}).Error; err != nil { + return errors.Wrap(err, "deleting sessions") + } + + return nil +} + +// DeleteSession deletes the session that match the given info +func (a *App) DeleteSession(sessionKey string) error { + if err := a.DB.Where("key = ?", sessionKey).Delete(&database.Session{}).Error; err != nil { + return errors.Wrap(err, "deleting the session") + } + + return nil +} diff --git a/pkg/server/app/testutils.go b/pkg/server/app/testutils.go new file mode 100644 index 00000000..248f4784 --- /dev/null +++ b/pkg/server/app/testutils.go @@ -0,0 +1,36 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/assets" + "github.com/dnote/dnote/pkg/server/testutils" +) + +// NewTest returns an app for a testing environment +func NewTest() App { + return App{ + Clock: clock.NewMock(), + EmailBackend: &testutils.MockEmailbackendImplementation{}, + HTTP500Page: assets.MustGetHTTP500ErrorPage(), + BaseURL: "http://127.0.0.0.1", + Port: "3000", + DisableRegistration: false, + DBPath: "", + AssetBaseURL: "", + } +} diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go new file mode 100644 index 00000000..9c167b69 --- /dev/null +++ b/pkg/server/app/users.go @@ -0,0 +1,214 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "errors" + + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/helpers" + "github.com/dnote/dnote/pkg/server/log" + pkgErrors "github.com/pkg/errors" + "golang.org/x/crypto/bcrypt" + "gorm.io/gorm" +) + +// validatePassword validates a password +func validatePassword(password string) error { + if len(password) < 8 { + return ErrPasswordTooShort + } + + return nil +} + +// TouchLastLoginAt updates the last login timestamp +func (a *App) TouchLastLoginAt(user database.User, tx *gorm.DB) error { + t := a.Clock.Now() + if err := tx.Model(&user).Update("last_login_at", &t).Error; err != nil { + return pkgErrors.Wrap(err, "updating last_login_at") + } + + return nil +} + +// CreateUser creates a user +func (a *App) CreateUser(email, password string, passwordConfirmation string) (database.User, error) { + if email == "" { + return database.User{}, ErrEmailRequired + } + + if err := validatePassword(password); err != nil { + return database.User{}, err + } + + if password != passwordConfirmation { + return database.User{}, ErrPasswordConfirmationMismatch + } + + tx := a.DB.Begin() + + var count int64 + if err := tx.Model(&database.User{}).Where("email = ?", email).Count(&count).Error; err != nil { + tx.Rollback() + return database.User{}, pkgErrors.Wrap(err, "counting user") + } + if count > 0 { + tx.Rollback() + return database.User{}, ErrDuplicateEmail + } + + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) + if err != nil { + tx.Rollback() + return database.User{}, pkgErrors.Wrap(err, "hashing password") + } + + uuid, err := helpers.GenUUID() + if err != nil { + tx.Rollback() + return database.User{}, pkgErrors.Wrap(err, "generating UUID") + } + + user := database.User{ + UUID: uuid, + Email: database.ToNullString(email), + Password: database.ToNullString(string(hashedPassword)), + } + if err = tx.Save(&user).Error; err != nil { + tx.Rollback() + return database.User{}, pkgErrors.Wrap(err, "saving user") + } + + if err := a.TouchLastLoginAt(user, tx); err != nil { + tx.Rollback() + return database.User{}, pkgErrors.Wrap(err, "updating last login") + } + + tx.Commit() + + return user, nil +} + +// GetUserByEmail finds a user by email +func (a *App) GetUserByEmail(email string) (*database.User, error) { + var user database.User + err := a.DB.Where("email = ?", email).First(&user).Error + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, ErrNotFound + } else if err != nil { + return nil, err + } + + return &user, nil +} + +// GetAllUsers retrieves all users from the database +func (a *App) GetAllUsers() ([]database.User, error) { + var users []database.User + err := a.DB.Find(&users).Error + if err != nil { + return nil, pkgErrors.Wrap(err, "finding users") + } + + return users, nil +} + +// Authenticate authenticates a user +func (a *App) Authenticate(email, password string) (*database.User, error) { + user, err := a.GetUserByEmail(email) + if err != nil { + return nil, err + } + + err = bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte(password)) + if err != nil { + return nil, ErrLoginInvalid + } + + return user, nil +} + +// UpdateUserPassword updates a user's password with validation +func UpdateUserPassword(db *gorm.DB, user *database.User, newPassword string) error { + // Validate password + if err := validatePassword(newPassword); err != nil { + return err + } + + // Hash the password + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(newPassword), bcrypt.DefaultCost) + if err != nil { + return pkgErrors.Wrap(err, "hashing password") + } + + // Update the password + if err := db.Model(&user).Update("password", string(hashedPassword)).Error; err != nil { + return pkgErrors.Wrap(err, "updating password") + } + + return nil +} + +// RemoveUser removes a user from the system +// Returns an error if the user has any notes or books +func (a *App) RemoveUser(email string) error { + // Find the user + user, err := a.GetUserByEmail(email) + if err != nil { + return err + } + + // Check if user has any notes + var noteCount int64 + if err := a.DB.Model(&database.Note{}).Where("user_id = ? AND deleted = ?", user.ID, false).Count(¬eCount).Error; err != nil { + return pkgErrors.Wrap(err, "counting notes") + } + if noteCount > 0 { + return ErrUserHasExistingResources + } + + // Check if user has any books + var bookCount int64 + if err := a.DB.Model(&database.Book{}).Where("user_id = ? AND deleted = ?", user.ID, false).Count(&bookCount).Error; err != nil { + return pkgErrors.Wrap(err, "counting books") + } + if bookCount > 0 { + return ErrUserHasExistingResources + } + + // Delete user + if err := a.DB.Delete(&user).Error; err != nil { + return pkgErrors.Wrap(err, "deleting user") + } + + return nil +} + +// SignIn signs in a user +func (a *App) SignIn(user *database.User) (*database.Session, error) { + err := a.TouchLastLoginAt(*user, a.DB) + if err != nil { + log.ErrorWrap(err, "touching login timestamp") + } + + session, err := a.CreateSession(user.ID) + if err != nil { + return nil, pkgErrors.Wrap(err, "creating session") + } + + return &session, nil +} diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go new file mode 100644 index 00000000..52183520 --- /dev/null +++ b/pkg/server/app/users_test.go @@ -0,0 +1,423 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package app + +import ( + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" + "golang.org/x/crypto/bcrypt" +) + +func TestValidatePassword(t *testing.T) { + testCases := []struct { + name string + password string + wantErr error + }{ + { + name: "valid password", + password: "password123", + wantErr: nil, + }, + { + name: "valid password exactly 8 chars", + password: "12345678", + wantErr: nil, + }, + { + name: "password too short", + password: "1234567", + wantErr: ErrPasswordTooShort, + }, + { + name: "empty password", + password: "", + wantErr: ErrPasswordTooShort, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + err := validatePassword(tc.password) + assert.Equal(t, err, tc.wantErr, "error mismatch") + }) + } +} + +func TestCreateUser_ProValue(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + if _, err := a.CreateUser("alice@example.com", "pass1234", "pass1234"); err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + var userCount int64 + var userRecord database.User + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") + testutils.MustExec(t, db.First(&userRecord), "finding user") + + assert.Equal(t, userCount, int64(1), "book count mismatch") + +} + +func TestGetUserByEmail(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + foundUser, err := a.GetUserByEmail("alice@example.com") + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, foundUser.Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, foundUser.ID, user.ID, "user ID mismatch") + }) + + t.Run("not found", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + user, err := a.GetUserByEmail("nonexistent@example.com") + + assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") + assert.Equal(t, user, (*database.User)(nil), "user should be nil") + }) +} + +func TestGetAllUsers(t *testing.T) { + t.Run("success with multiple users", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user1 := testutils.SetupUserData(db, "alice@example.com", "password123") + user2 := testutils.SetupUserData(db, "bob@example.com", "password123") + user3 := testutils.SetupUserData(db, "charlie@example.com", "password123") + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 3, "should return 3 users") + + // Verify all users are returned + emails := make(map[string]bool) + for _, user := range users { + emails[user.Email.String] = true + } + assert.Equal(t, emails["alice@example.com"], true, "alice should be in results") + assert.Equal(t, emails["bob@example.com"], true, "bob should be in results") + assert.Equal(t, emails["charlie@example.com"], true, "charlie should be in results") + + // Verify user details match + for _, user := range users { + if user.Email.String == "alice@example.com" { + assert.Equal(t, user.ID, user1.ID, "alice ID mismatch") + } else if user.Email.String == "bob@example.com" { + assert.Equal(t, user.ID, user2.ID, "bob ID mismatch") + } else if user.Email.String == "charlie@example.com" { + assert.Equal(t, user.ID, user3.ID, "charlie ID mismatch") + } + } + }) + + t.Run("empty database", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 0, "should return 0 users") + }) + + t.Run("single user", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 1, "should return 1 user") + assert.Equal(t, users[0].Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, users[0].ID, user.ID, "user ID mismatch") + }) +} + +func TestCreateUser(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + if _, err := a.CreateUser("alice@example.com", "pass1234", "pass1234"); err != nil { + t.Fatal(errors.Wrap(err, "executing")) + } + + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") + assert.Equal(t, userCount, int64(1), "user count mismatch") + + var userRecord database.User + testutils.MustExec(t, db.First(&userRecord), "finding user") + + assert.Equal(t, userRecord.Email.String, "alice@example.com", "user email mismatch") + + passwordErr := bcrypt.CompareHashAndPassword([]byte(userRecord.Password.String), []byte("pass1234")) + assert.Equal(t, passwordErr, nil, "Password mismatch") + }) + + t.Run("duplicate email", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + testutils.SetupUserData(db, "alice@example.com", "somepassword") + + a := NewTest() + a.DB = db + _, err := a.CreateUser("alice@example.com", "newpassword", "newpassword") + + assert.Equal(t, err, ErrDuplicateEmail, "error mismatch") + + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") + + assert.Equal(t, userCount, int64(1), "user count mismatch") + }) +} + +func TestUpdateUserPassword(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + + err := UpdateUserPassword(db, &user, "newpassword123") + + assert.Equal(t, err, nil, "should not error") + + // Verify password was updated in database + var updatedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") + + // Verify new password works + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("newpassword123")) + assert.Equal(t, passwordErr, nil, "New password should match") + + // Verify old password no longer works + oldPasswordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("oldpassword123")) + assert.NotEqual(t, oldPasswordErr, nil, "Old password should not match") + }) + + t.Run("password too short", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + + err := UpdateUserPassword(db, &user, "short") + + assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") + + // Verify password was NOT updated in database + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match") + }) + + t.Run("empty password", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + + err := UpdateUserPassword(db, &user, "") + + assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") + + // Verify password was NOT updated in database + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match") + }) + + t.Run("transaction rollback", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + + // Start a transaction and rollback to verify UpdateUserPassword respects transactions + tx := db.Begin() + err := UpdateUserPassword(tx, &user, "newpassword123") + assert.Equal(t, err, nil, "should not error") + tx.Rollback() + + // Verify password was NOT updated after rollback + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match after rollback") + }) + + t.Run("transaction commit", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + + // Start a transaction and commit to verify UpdateUserPassword respects transactions + tx := db.Begin() + err := UpdateUserPassword(tx, &user, "newpassword123") + assert.Equal(t, err, nil, "should not error") + tx.Commit() + + // Verify password was updated after commit + var updatedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") + + // Verify new password works + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("newpassword123")) + assert.Equal(t, passwordErr, nil, "New password should match after commit") + }) +} + +func TestRemoveUser(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + testutils.SetupUserData(db, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, nil, "should not error") + + // Verify user was deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(0), "user should be deleted") + }) + + t.Run("user not found", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + err := a.RemoveUser("nonexistent@example.com") + + assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") + }) + + t.Run("user has notes", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + note := database.Note{UserID: user.ID, BookUUID: book.UUID, Body: "test note", Deleted: false} + testutils.MustExec(t, db.Save(¬e), "creating note") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, ErrUserHasExistingResources, "should return ErrUserHasExistingResources") + + // Verify user was NOT deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(1), "user should not be deleted") + + }) + + t.Run("user has books", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, ErrUserHasExistingResources, "should return ErrUserHasExistingResources") + + // Verify user was NOT deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(1), "user should not be deleted") + + }) + + t.Run("user has deleted notes and books", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + note := database.Note{UserID: user.ID, BookUUID: book.UUID, Body: "test note", Deleted: false} + testutils.MustExec(t, db.Save(¬e), "creating note") + + // Soft delete the note and book + testutils.MustExec(t, db.Model(¬e).Update("deleted", true), "soft deleting note") + testutils.MustExec(t, db.Model(&book).Update("deleted", true), "soft deleting book") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, nil, "should not error when user only has deleted notes and books") + + // Verify user was deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(0), "user should be deleted") + + }) +} diff --git a/pkg/server/assets/.gitignore b/pkg/server/assets/.gitignore new file mode 100644 index 00000000..7ba54dae --- /dev/null +++ b/pkg/server/assets/.gitignore @@ -0,0 +1,7 @@ +# Ignore CSS and JS files in static directory because +# those files are built from the sources + +/static/*.css +/static/*.css.map +/static/*.js +/static/*.js.map diff --git a/pkg/server/assets/embed.go b/pkg/server/assets/embed.go new file mode 100644 index 00000000..e0272d95 --- /dev/null +++ b/pkg/server/assets/embed.go @@ -0,0 +1,46 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package assets + +import ( + "embed" + "github.com/pkg/errors" + "io/fs" +) + +//go:embed static +var staticFiles embed.FS + +// GetStaticFS returns a filesystem for static files, with +// all files situated in the root of the filesystem +func GetStaticFS() (fs.FS, error) { + subFs, err := fs.Sub(staticFiles, "static") + if err != nil { + return nil, errors.Wrap(err, "getting sub filesystem") + } + + return subFs, nil +} + +// MustGetHTTP500ErrorPage returns the content of HTML file for HTTP 500 error +func MustGetHTTP500ErrorPage() []byte { + ret, err := staticFiles.ReadFile("static/500.html") + if err != nil { + panic(errors.Wrap(err, "reading HTML file for 500 HTTP error")) + } + + return ret +} diff --git a/pkg/server/assets/js/build.sh b/pkg/server/assets/js/build.sh new file mode 100755 index 00000000..f00ddf3c --- /dev/null +++ b/pkg/server/assets/js/build.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash +# build.sh builds styles +set -ex + +dir=$(dirname "${BASH_SOURCE[0]}") +basePath="$dir/../../.." +serverDir="$dir/../.." +outputDir="$serverDir/assets/static" +inputDir="$dir/src" + +task="cp $inputDir/main.js $outputDir" + + +if [[ "$1" == "true" ]]; then +( + cd "$basePath/watcher" && \ + go run main.go \ + --task="$task" \ + --context="$inputDir" \ + "$inputDir" +) +else + eval "$task" +fi diff --git a/pkg/server/assets/js/src/main.js b/pkg/server/assets/js/src/main.js new file mode 100644 index 00000000..9e58d92a --- /dev/null +++ b/pkg/server/assets/js/src/main.js @@ -0,0 +1,74 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var getNextSibling = function (el, selector) { + var sibling = el.nextElementSibling; + + if (!selector) { + return sibling; + } + + while (sibling) { + if (sibling.matches(selector)) return sibling; + sibling = sibling.nextElementSibling; + } +}; + +var dropdownTriggerEls = document.getElementsByClassName('dropdown-trigger'); + +for (var i = 0; i < dropdownTriggerEls.length; i++) { + var dropdownTriggerEl = dropdownTriggerEls[i]; + + dropdownTriggerEl.addEventListener('click', function (e) { + var el = getNextSibling(e.target, '.dropdown-content'); + + el.classList.toggle('show'); + }); +} + +// Dropdown closer +window.onclick = function (e) { + // Close dropdown on click outside the dropdown content or trigger + function shouldClose(target) { + var dropdownContentEls = document.getElementsByClassName( + 'dropdown-content' + ); + + for (let i = 0; i < dropdownContentEls.length; ++i) { + var el = dropdownContentEls[i]; + if (el.contains(target)) { + return false; + } + } + for (let i = 0; i < dropdownTriggerEls.length; ++i) { + var el = dropdownTriggerEls[i]; + if (el.contains(target)) { + return false; + } + } + + return true; + } + + if (shouldClose(e.target)) { + var dropdowns = document.getElementsByClassName('dropdown-content'); + for (var i = 0; i < dropdowns.length; i++) { + var openDropdown = dropdowns[i]; + if (openDropdown.classList.contains('show')) { + openDropdown.classList.remove('show'); + } + } + } +}; diff --git a/pkg/server/assets/package-lock.json b/pkg/server/assets/package-lock.json new file mode 100644 index 00000000..7eb1c411 --- /dev/null +++ b/pkg/server/assets/package-lock.json @@ -0,0 +1,495 @@ +{ + "name": "assets", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "assets", + "version": "1.0.0", + "license": "Apache-2.0", + "devDependencies": { + "sass": "^1.50.1" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "optional": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "optional": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/immutable": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", + "dev": true, + "license": "MIT" + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "optional": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "optional": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "optional": true + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass": { + "version": "1.93.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz", + "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==", + "dev": true, + "dependencies": { + "chokidar": "^4.0.0", + "immutable": "^5.0.2", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" + } + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + } + } +} diff --git a/pkg/server/assets/package.json b/pkg/server/assets/package.json new file mode 100644 index 00000000..1561f6da --- /dev/null +++ b/pkg/server/assets/package.json @@ -0,0 +1,12 @@ +{ + "name": "assets", + "version": "1.0.0", + "description": "assets", + "main": "index.js", + "scripts": {}, + "author": "Dnote", + "license": "Apache-2.0", + "devDependencies": { + "sass": "^1.50.1" + } +} diff --git a/pkg/server/assets/static/500.html b/pkg/server/assets/static/500.html new file mode 100644 index 00000000..ccf85d20 --- /dev/null +++ b/pkg/server/assets/static/500.html @@ -0,0 +1,10 @@ + + + + + + + + 500 + + diff --git a/pkg/server/assets/static/android-icon-144x144.png b/pkg/server/assets/static/android-icon-144x144.png new file mode 100644 index 00000000..09b28d2f Binary files /dev/null and b/pkg/server/assets/static/android-icon-144x144.png differ diff --git a/pkg/server/assets/static/android-icon-192x192.png b/pkg/server/assets/static/android-icon-192x192.png new file mode 100644 index 00000000..48195236 Binary files /dev/null and b/pkg/server/assets/static/android-icon-192x192.png differ diff --git a/pkg/server/assets/static/android-icon-36x36.png b/pkg/server/assets/static/android-icon-36x36.png new file mode 100644 index 00000000..7c9f770f Binary files /dev/null and b/pkg/server/assets/static/android-icon-36x36.png differ diff --git a/pkg/server/assets/static/android-icon-48x48.png b/pkg/server/assets/static/android-icon-48x48.png new file mode 100644 index 00000000..d93d8cda Binary files /dev/null and b/pkg/server/assets/static/android-icon-48x48.png differ diff --git a/pkg/server/assets/static/android-icon-72x72.png b/pkg/server/assets/static/android-icon-72x72.png new file mode 100644 index 00000000..aa2e9876 Binary files /dev/null and b/pkg/server/assets/static/android-icon-72x72.png differ diff --git a/pkg/server/assets/static/android-icon-96x96.png b/pkg/server/assets/static/android-icon-96x96.png new file mode 100644 index 00000000..6d711b98 Binary files /dev/null and b/pkg/server/assets/static/android-icon-96x96.png differ diff --git a/pkg/server/assets/static/apple-icon-114x114.png b/pkg/server/assets/static/apple-icon-114x114.png new file mode 100644 index 00000000..e6b7fece Binary files /dev/null and b/pkg/server/assets/static/apple-icon-114x114.png differ diff --git a/pkg/server/assets/static/apple-icon-120x120.png b/pkg/server/assets/static/apple-icon-120x120.png new file mode 100644 index 00000000..871eb9d0 Binary files /dev/null and b/pkg/server/assets/static/apple-icon-120x120.png differ diff --git a/pkg/server/assets/static/apple-icon-144x144.png b/pkg/server/assets/static/apple-icon-144x144.png new file mode 100644 index 00000000..09b28d2f Binary files /dev/null and b/pkg/server/assets/static/apple-icon-144x144.png differ diff --git a/pkg/server/assets/static/apple-icon-152x152.png b/pkg/server/assets/static/apple-icon-152x152.png new file mode 100644 index 00000000..16a2dd70 Binary files /dev/null and b/pkg/server/assets/static/apple-icon-152x152.png differ diff --git a/pkg/server/assets/static/apple-icon-180x180.png b/pkg/server/assets/static/apple-icon-180x180.png new file mode 100644 index 00000000..77d31532 Binary files /dev/null and b/pkg/server/assets/static/apple-icon-180x180.png differ diff --git a/pkg/server/assets/static/apple-icon-57x57.png b/pkg/server/assets/static/apple-icon-57x57.png new file mode 100644 index 00000000..ca17d420 Binary files /dev/null and b/pkg/server/assets/static/apple-icon-57x57.png differ diff --git a/pkg/server/assets/static/apple-icon-60x60.png b/pkg/server/assets/static/apple-icon-60x60.png new file mode 100644 index 00000000..9dbf917e Binary files /dev/null and b/pkg/server/assets/static/apple-icon-60x60.png differ diff --git a/pkg/server/assets/static/apple-icon-72x72.png b/pkg/server/assets/static/apple-icon-72x72.png new file mode 100644 index 00000000..aa2e9876 Binary files /dev/null and b/pkg/server/assets/static/apple-icon-72x72.png differ diff --git a/pkg/server/assets/static/apple-icon-76x76.png b/pkg/server/assets/static/apple-icon-76x76.png new file mode 100644 index 00000000..5e4af4bc Binary files /dev/null and b/pkg/server/assets/static/apple-icon-76x76.png differ diff --git a/pkg/server/assets/static/apple-icon-precomposed.png b/pkg/server/assets/static/apple-icon-precomposed.png new file mode 100644 index 00000000..f3410b4e Binary files /dev/null and b/pkg/server/assets/static/apple-icon-precomposed.png differ diff --git a/pkg/server/assets/static/apple-icon.png b/pkg/server/assets/static/apple-icon.png new file mode 100644 index 00000000..f3410b4e Binary files /dev/null and b/pkg/server/assets/static/apple-icon.png differ diff --git a/web/static/browserconfig.xml b/pkg/server/assets/static/browserconfig.xml similarity index 100% rename from web/static/browserconfig.xml rename to pkg/server/assets/static/browserconfig.xml diff --git a/pkg/server/assets/static/favicon-16x16.png b/pkg/server/assets/static/favicon-16x16.png new file mode 100644 index 00000000..798fbd5c Binary files /dev/null and b/pkg/server/assets/static/favicon-16x16.png differ diff --git a/pkg/server/assets/static/favicon-32x32.png b/pkg/server/assets/static/favicon-32x32.png new file mode 100644 index 00000000..a1be50c4 Binary files /dev/null and b/pkg/server/assets/static/favicon-32x32.png differ diff --git a/pkg/server/assets/static/favicon-96x96.png b/pkg/server/assets/static/favicon-96x96.png new file mode 100644 index 00000000..6d711b98 Binary files /dev/null and b/pkg/server/assets/static/favicon-96x96.png differ diff --git a/pkg/server/assets/static/favicon.ico b/pkg/server/assets/static/favicon.ico new file mode 100644 index 00000000..c71572aa Binary files /dev/null and b/pkg/server/assets/static/favicon.ico differ diff --git a/pkg/server/assets/static/logo-512x512.png b/pkg/server/assets/static/logo-512x512.png new file mode 100644 index 00000000..141992ac Binary files /dev/null and b/pkg/server/assets/static/logo-512x512.png differ diff --git a/pkg/server/assets/static/manifest.json b/pkg/server/assets/static/manifest.json new file mode 100644 index 00000000..874b25a6 --- /dev/null +++ b/pkg/server/assets/static/manifest.json @@ -0,0 +1,52 @@ +{ + "name": "Dnote", + "short_name": "Dnote", + "icons": [ + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-144x144.png", + "sizes": "144x144", + "type": "image\/png", + "density": "3.0" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/android-icon-192x192.png", + "sizes": "192x192", + "type": "image\/png", + "density": "4.0" + }, + { + "src": "ASSET_BASE_PLACEHOLDER\/logo-512x512.png", + "sizes": "512x512", + "type": "image\/png", + "density": "4.0" + } + ], + "start_url": "/", + "display": "standalone", + "background_color": "#072a40", + "theme_color": "#ffffff" +} diff --git a/pkg/server/assets/static/ms-icon-144x144.png b/pkg/server/assets/static/ms-icon-144x144.png new file mode 100644 index 00000000..09b28d2f Binary files /dev/null and b/pkg/server/assets/static/ms-icon-144x144.png differ diff --git a/pkg/server/assets/static/ms-icon-150x150.png b/pkg/server/assets/static/ms-icon-150x150.png new file mode 100644 index 00000000..0fa43061 Binary files /dev/null and b/pkg/server/assets/static/ms-icon-150x150.png differ diff --git a/pkg/server/assets/static/ms-icon-310x310.png b/pkg/server/assets/static/ms-icon-310x310.png new file mode 100644 index 00000000..c8974c78 Binary files /dev/null and b/pkg/server/assets/static/ms-icon-310x310.png differ diff --git a/pkg/server/assets/static/ms-icon-70x70.png b/pkg/server/assets/static/ms-icon-70x70.png new file mode 100644 index 00000000..78fdbd5a Binary files /dev/null and b/pkg/server/assets/static/ms-icon-70x70.png differ diff --git a/web/static/404.html b/pkg/server/assets/static/offline.html similarity index 71% rename from web/static/404.html rename to pkg/server/assets/static/offline.html index 84fff815..0aadab72 100644 --- a/web/static/404.html +++ b/pkg/server/assets/static/offline.html @@ -5,10 +5,8 @@ Page Not Found | Dnote - - - - - - - - -
-
- You have requested to reset your password on Dnote. - - {{ template "header" }} - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- Hello. -
- Please click the link below to verify your email. This link will expire in 30 minutes. -
- - - - - - -
- - - - - - -
- Verify email -
-
-
- Alternatively you can manually go to the following URL: https://dnote.io/app/verify-email/{{ .Token }} -
- — Dnote -
-
- - - {{ template "footer" . }} - - - -
- 		 
- - diff --git a/server/mailer/templates/src/footer.html b/server/mailer/templates/src/footer.html deleted file mode 100644 index 535a46c7..00000000 --- a/server/mailer/templates/src/footer.html +++ /dev/null @@ -1,12 +0,0 @@ -{{ define "footer" }} -
- - - - -
- Dnote -
Level 2, 11 York St, Sydney NSW 2000 -
-
-{{ end }} diff --git a/server/mailer/templates/src/header.html b/server/mailer/templates/src/header.html deleted file mode 100644 index 0a8cf79e..00000000 --- a/server/mailer/templates/src/header.html +++ /dev/null @@ -1,31 +0,0 @@ -{{ define "header" }} - - - - - -
- - dnote-logo - -
-{{ end }} diff --git a/server/mailer/templates/src/reset_password.html b/server/mailer/templates/src/reset_password.html deleted file mode 100644 index 4510e04b..00000000 --- a/server/mailer/templates/src/reset_password.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - - {{ .Subject }} - - - - - - {{ template "header" }} - - - - - -
-
- - - You have requested to reset your password on Dnote. - - - - - - - - -
- - - - - - - - - - - - - - - - -
- You have requested to reset your password on Dnote. -
- Here is the link to reset your password. -
- - - - - - -
- - - - - - -
- Reset Password -
-
-
- -
- - - {{ template "footer" . }} - - - -
- 		 
- - diff --git a/server/mailer/templates/src/weekly_digest.html b/server/mailer/templates/src/weekly_digest.html deleted file mode 100644 index baa2d2db..00000000 --- a/server/mailer/templates/src/weekly_digest.html +++ /dev/null @@ -1,381 +0,0 @@ - - - - - - {{ .Subject }} - - - - - - - - - - -
-
- Here is your weekly Dnote digest. - - {{ template "header" }} - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - -
- This is your weekly Dnote digest, featuring {{ .ActiveNoteCount }} notes from {{ .ActiveBookCount }} books. -
- Please navigate to the link below to view the digest. -
- - - - - - -
- - - - - - -
- View digest -
-
- -
- — Dnote -
- Your data is safe and private. Dnote has zero knowledge about contents of your notes. Only you can decrypt them. -
- -
- - -
- - - - - - - - - - -
- Dnote -
Level 2, 11 York St, Sydney NSW 2000 -
- Change email frequency -
-
- - - -
- 		 
- - diff --git a/server/mailer/types.go b/server/mailer/types.go deleted file mode 100644 index 45975051..00000000 --- a/server/mailer/types.go +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package mailer - -// DigestTmplData is a template data for digest emails -type DigestTmplData struct { - Subject string - DigestUUID string - ActiveBookCount int - ActiveNoteCount int - EmailSessionToken string -} diff --git a/server/mailer/utils.go b/server/mailer/utils.go deleted file mode 100644 index 1fb91ab4..00000000 --- a/server/mailer/utils.go +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package mailer - -import ( - "crypto/rand" - "encoding/base64" - - "github.com/dnote/dnote/server/database" - "github.com/pkg/errors" -) - -func generateRandomToken(bits int) (string, error) { - b := make([]byte, bits) - - _, err := rand.Read(b) - if err != nil { - return "", errors.Wrap(err, "generating random bytes") - } - - return base64.URLEncoding.EncodeToString(b), nil -} - -// GetEmailPreferenceToken returns an unused email frequency token for the user -// by first looking up any existing record and creating one if none exists. -func GetEmailPreferenceToken(user database.User) (database.Token, error) { - db := database.DBConn - - var tok database.Token - conn := db. - Where("user_id = ? AND type =? AND used_at IS NULL", user.ID, database.TokenTypeEmailPreference). - First(&tok) - - tokenVal, err := generateRandomToken(16) - if err != nil { - return tok, errors.Wrap(err, "generating token value") - } - - if conn.RecordNotFound() { - tok = database.Token{ - UserID: user.ID, - Type: database.TokenTypeEmailPreference, - Value: tokenVal, - } - if err := db.Save(&tok).Error; err != nil { - return tok, errors.Wrap(err, "saving token") - } - - return tok, nil - } else if err := conn.Error; err != nil { - return tok, errors.Wrap(err, "finding token") - } - - return tok, nil -} diff --git a/server/testutils/main.go b/server/testutils/main.go deleted file mode 100644 index 211cadec..00000000 --- a/server/testutils/main.go +++ /dev/null @@ -1,363 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -// Package testutils provides utilities used in tests -package testutils - -import ( - "encoding/json" - "fmt" - "io/ioutil" - "net/http" - "net/http/httptest" - "reflect" - "strings" - "testing" - "time" - - "github.com/dnote/dnote/server/database" - "github.com/stripe/stripe-go" - - "github.com/jinzhu/gorm" - "github.com/pkg/errors" -) - -func checkEqual(a interface{}, b interface{}, message string) (bool, string) { - if a == b { - return true, "" - } - - var m string - if len(message) == 0 { - m = fmt.Sprintf("%v != %v", a, b) - } else { - m = message - } - errorMessage := fmt.Sprintf("%s. Actual: %+v. Expected: %+v.", m, a, b) - - return false, errorMessage -} - -// AssertEqual errors a test if the actual does not match the expected -func AssertEqual(t *testing.T, a interface{}, b interface{}, message string) { - ok, m := checkEqual(a, b, message) - if !ok { - t.Error(m) - } -} - -// AssertEqualf fails a test if the actual does not match the expected -func AssertEqualf(t *testing.T, a interface{}, b interface{}, message string) { - ok, m := checkEqual(a, b, message) - if !ok { - t.Fatal(m) - } -} - -// AssertNotEqual fails a test if the actual matches the expected -func AssertNotEqual(t *testing.T, a interface{}, b interface{}, message string) { - if a != b { - return - } - if len(message) == 0 { - message = fmt.Sprintf("%v != %v", a, b) - } - t.Errorf("%s. Expected %+v to not equal %+v.", message, a, b) -} - -// AssertDeepEqual fails a test if the actual does not deeply equal the expected -func AssertDeepEqual(t *testing.T, a interface{}, b interface{}, message string) { - if reflect.DeepEqual(a, b) { - return - } - - if len(message) == 0 { - message = fmt.Sprintf("%v != %v", a, b) - } - t.Errorf("%s.\nActual: %+v.\nExpected: %+v.", message, a, b) -} - -// AssertEqualJSON asserts that two JSON strings are equal -func AssertEqualJSON(t *testing.T, a, b, message string) { - var o1 interface{} - var o2 interface{} - - err := json.Unmarshal([]byte(a), &o1) - if err != nil { - panic(fmt.Errorf("Error mashalling string 1 :: %s", err.Error())) - } - err = json.Unmarshal([]byte(b), &o2) - if err != nil { - panic(fmt.Errorf("Error mashalling string 2 :: %s", err.Error())) - } - - if reflect.DeepEqual(o1, o2) { - return - } - - if len(message) == 0 { - message = fmt.Sprintf("%v != %v", a, b) - } - t.Errorf("%s.\nActual: %+v.\nExpected: %+v.", message, a, b) -} - -// ReadJSON reads JSON fixture to the struct at the destination address -func ReadJSON(path string, destination interface{}) { - var dat []byte - dat, err := ioutil.ReadFile(path) - if err != nil { - panic(errors.Wrap(err, "reading file")) - } - if err := json.Unmarshal(dat, destination); err != nil { - panic(errors.Wrap(err, "unmarshalling json")) - } -} - -// ReadFile reads file and returns the byte -func ReadFile(path string) []byte { - dat, err := ioutil.ReadFile(path) - if err != nil { - panic(errors.Wrap(err, "reading file")) - } - - return dat -} - -// InitTestDB establishes connection pool with the test database specified by -// the environment variable configuration and initalizes a new schema -func InitTestDB() { - database.InitDB() - database.InitSchema() -} - -// SetupUserData creates and returns a new user for testing purposes -func SetupUserData() database.User { - db := database.DBConn - - user := database.User{ - APIKey: "test-api-key", - Name: "user-name", - Cloud: true, - } - - if err := db.Save(&user).Error; err != nil { - panic(errors.Wrap(err, "Failed to prepare user")) - } - - return user -} - -// SetupAccountData creates and returns a new account for the user -func SetupAccountData(user database.User, email string) database.Account { - db := database.DBConn - - // email: alice@example.com - // password: pass1234 - // masterKey: WbUvagj9O6o1Z+4+7COjo7Uqm4MD2QE9EWFXne8+U+8= - // authKey: /XCYisXJ6/o+vf6NUEtmrdYzJYPz+T9oAUCtMpOjhzc= - account := database.Account{ - UserID: user.ID, - Salt: "Et0joOigYjdgHBKMN/ijxg==", - AuthKeyHash: "SeN3PMz4H/7q9lINB+VPKpygexAuK68wO8pDAgQ4OOQ=", - CipherKeyEnc: "f7aFFCh7YS1WlHEOxAmDfs8rUQQoX5tr8AB7ZJQaTYCEM8NhAZCbQTsjFgKOf5iPQhhkm8eDAgPNTuhO", - ClientKDFIteration: 100000, - ServerKDFIteration: 100000, - } - if email != "" { - account.Email = database.ToNullString(email) - } - - if err := db.Save(&account).Error; err != nil { - panic(errors.Wrap(err, "Failed to prepare account")) - } - - return account -} - -// SetupSession creates and returns a new user session -func SetupSession(t *testing.T, user database.User) database.Session { - db := database.DBConn - - session := database.Session{ - Key: "Vvgm3eBXfXGEFWERI7faiRJ3DAzJw+7DdT9J1LEyNfI=", - UserID: user.ID, - ExpiresAt: time.Now().Add(time.Hour * 24), - } - if err := db.Save(&session).Error; err != nil { - t.Fatal(errors.Wrap(err, "Failed to prepare user")) - } - - return session -} - -// SetupEmailPreferenceData creates and returns a new email frequency for a user -func SetupEmailPreferenceData(user database.User, digestWeekly bool) database.EmailPreference { - db := database.DBConn - - frequency := database.EmailPreference{ - UserID: user.ID, - DigestWeekly: digestWeekly, - } - - if err := db.Save(&frequency).Error; err != nil { - panic(errors.Wrap(err, "Failed to prepare email frequency")) - } - - return frequency -} - -// ClearData deletes all records from the database -func ClearData() { - db := database.DBConn - - if err := db.Delete(&database.Book{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear books")) - } - if err := db.Delete(&database.Note{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear notes")) - } - if err := db.Delete(&database.Notification{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear notifications")) - } - if err := db.Delete(&database.User{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear users")) - } - if err := db.Delete(&database.Account{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear accounts")) - } - if err := db.Delete(&database.Token{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear reset_tokens")) - } - if err := db.Delete(&database.EmailPreference{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear reset_tokens")) - } - if err := db.Delete(&database.Session{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear sessions")) - } - if err := db.Delete(&database.Digest{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear digests")) - } -} - -// HTTPDo makes an HTTP request and returns a response -func HTTPDo(t *testing.T, req *http.Request) *http.Response { - hc := http.Client{ - // Do not follow redirects. - // e.g. /logout redirects to a page but we'd like to test the redirect - // itself, not what happens after the redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { - return http.ErrUseLastResponse - }, - } - - res, err := hc.Do(req) - if err != nil { - t.Fatal(errors.Wrap(err, "performing http request")) - } - - return res -} - -// HTTPAuthDo makes an HTTP request with an appropriate authorization header for a user -func HTTPAuthDo(t *testing.T, req *http.Request, user database.User) *http.Response { - db := database.DBConn - - session := database.Session{ - Key: "Vvgm3eBXfXGEFWERI7faiRJ3DAzJw+7DdT9J1LEyNfI=", - UserID: user.ID, - ExpiresAt: time.Now().Add(time.Hour * 10 * 24), - } - if err := db.Save(&session).Error; err != nil { - t.Fatal(errors.Wrap(err, "Failed to prepare user")) - } - - req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", session.Key)) - - return HTTPDo(t, req) - -} - -// MakeReq makes an HTTP request and returns a response -func MakeReq(server *httptest.Server, method, url, data string) *http.Request { - endpoint := fmt.Sprintf("%s%s", server.URL, url) - - req, err := http.NewRequest(method, endpoint, strings.NewReader(data)) - if err != nil { - panic(errors.Wrap(err, "constructing http request")) - } - - return req -} - -// AssertStatusCode asserts that the reponse's status code is equal to the -// expected -func AssertStatusCode(t *testing.T, res *http.Response, expected int, message string) { - if res.StatusCode != expected { - body, err := ioutil.ReadAll(res.Body) - if err != nil { - panic(errors.Wrap(err, "reading body")) - } - - t.Errorf("status code mismatch. %s: got %v want %v. Message was: '%s'", message, res.StatusCode, expected, string(body)) - } -} - -// MustExec fails the test if the given database query has error -func MustExec(t *testing.T, db *gorm.DB, message string) { - if err := db.Error; err != nil { - t.Fatalf("%s: %s", message, err.Error()) - } -} - -// MustMarshalJSON marshalls the given interface into JSON. -// If there is any error, it fails the test. -func MustMarshalJSON(t *testing.T, v interface{}) []byte { - b, err := json.Marshal(v) - if err != nil { - t.Fatal("marshalling data") - } - - return b -} - -// GetCookieByName returns a cookie with the given name -func GetCookieByName(cookies []*http.Cookie, name string) *http.Cookie { - var ret *http.Cookie - - for i := 0; i < len(cookies); i++ { - if cookies[i].Name == name { - ret = cookies[i] - break - } - } - - return ret -} - -// CreateMockStripeBackend returns a mock stripe backend implementation that uses -// the given test server -func CreateMockStripeBackend(ts *httptest.Server) *stripe.BackendImplementation { - c := ts.Client() - bi := stripe.BackendImplementation{ - Type: stripe.APIBackend, - URL: ts.URL + "/v1", - HTTPClient: c, - } - - return &bi -} diff --git a/web/.babelrc b/web/.babelrc deleted file mode 100644 index 45c979bd..00000000 --- a/web/.babelrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": [ - [ - "@babel/preset-env", - ] - ], - "plugins": [ - ] -} diff --git a/web/.env.dev b/web/.env.dev deleted file mode 100644 index e954c9d9..00000000 --- a/web/.env.dev +++ /dev/null @@ -1 +0,0 @@ -API_HOST=http://localhost:5000/ diff --git a/web/.eslintrc b/web/.eslintrc deleted file mode 100644 index 335ed7d9..00000000 --- a/web/.eslintrc +++ /dev/null @@ -1,60 +0,0 @@ -{ "extends": ["eslint-config-airbnb", "prettier"], - "env": { - "browser": true, - "node": true, - "mocha": true - }, - "parser": "babel-eslint", - "rules": { - "strict": 0, - "react/no-multi-comp": 0, - "import/default": 0, - "import/no-duplicates": 0, - "import/named": 0, - "import/namespace": 0, - "import/no-unresolved": 0, - "import/no-named-as-default": 2, - "import/prefer-default-export": 0, - "comma-dangle": 0, // not sure why airbnb turned this on. gross! - "indent": [2, 2, {"SwitchCase": 1}], - "no-console": 0, - "no-alert": 0, - "arrow-body-style": 0, - "react/prop-types": 0, - "react/jsx-filename-extension": 0, - "react/prefer-stateless-function": 0, - "jsx-a11y/anchor-is-valid": 0, - "no-mixed-operators": 0, - "no-plusplus": 0, - "no-underscore-dangle": 0, - "prettier/prettier": "error", - "jsx-a11y/no-autofocus": 0, - "jsx-a11y/label-has-for": 0, - "prefer-destructuring": 0, - "react-hooks/rules-of-hooks": "error", - "react-hooks/exhaustive-deps": "warn", - "react/jsx-wrap-multilines": ["error", {"declaration": false, "assignment": false}], - "react/jsx-one-expression-per-line": 0 - }, - "plugins": [ - "react", "react-hooks", "import", "prettier" - ], - "settings": { - "import/parser": "babel-eslint", - "import/resolve": { - "moduleDirectory": ["node_modules", "src"] - } - }, - "globals": { - "__DEVELOPMENT__": true, - "__PRODUCTION__": true, - "__DISABLE_SSR__": true, - "__DEVTOOLS__": true, - "__DOMAIN__": true, - "__BASE_URL__": true, - "__BASE_NAME__": true, - "socket": true, - "webpackIsomorphicTools": true, - "StripeCheckout": true - } -} diff --git a/web/.gitignore b/web/.gitignore deleted file mode 100644 index fa26ed2a..00000000 --- a/web/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -node_modules -npm-debug.log -/static/dist -gin-bin -/server/api/api -/server/api/api_prod -/server/jobs/jobs -/server/jobs/jobs_prod - -.env -.env.api -__pycache__ -/dump - -app.zip -/compiled - -# Elastic Beanstalk Files -.elasticbeanstalk/* -!.elasticbeanstalk/*.cfg.yml -!.elasticbeanstalk/*.global.yml - -/public -/web -/vendor diff --git a/web/.prettierrc b/web/.prettierrc deleted file mode 100644 index 046cb41c..00000000 --- a/web/.prettierrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "singleQuote": true -} - diff --git a/web/Gopkg.lock b/web/Gopkg.lock deleted file mode 100644 index bc4a51be..00000000 --- a/web/Gopkg.lock +++ /dev/null @@ -1,28 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:ecd9aa82687cf31d1585d4ac61d0ba180e42e8a6182b85bd785fcca8dfeefc1b" - name = "github.com/joho/godotenv" - packages = ["."] - pruneopts = "UT" - revision = "23d116af351c84513e1946b527c88823e476be13" - version = "v1.3.0" - -[[projects]] - digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "UT" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/joho/godotenv", - "github.com/pkg/errors", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/web/Gopkg.toml b/web/Gopkg.toml deleted file mode 100644 index 50a1a8f9..00000000 --- a/web/Gopkg.toml +++ /dev/null @@ -1,38 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/joho/godotenv" - version = "1.3.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.1" - -[prune] - go-tests = true - unused-packages = true diff --git a/web/README.md b/web/README.md deleted file mode 100644 index f993ad6a..00000000 --- a/web/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Dnote web client - -The web client for Dnote, built with React. - -## scripts - -Develop locally - -* ./scripts/dev.sh - -Build prod bundle - -* ./scripts/build-prod.sh diff --git a/web/index.html b/web/index.html deleted file mode 100644 index 8f672473..00000000 --- a/web/index.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - Dnote - - - - - - - -
- - -
- -
- - - - diff --git a/web/karma.conf.js b/web/karma.conf.js deleted file mode 100644 index 27c8c9ee..00000000 --- a/web/karma.conf.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -const webpackConf = require('./webpack/rules/javascript'); - -module.exports = config => { - config.set({ - frameworks: ['mocha'], - reporters: ['mocha'], - browsers: ['ChromeHeadlessNoSandbox'], - customLaunchers: { - ChromeHeadlessNoSandbox: { - base: 'ChromeHeadless', - // specified because the default user of gitlab ci docker image is root, and chrome does not - // support running as root without no-sandbox - flags: ['--no-sandbox'] - } - }, - files: [ - 'node_modules/regenerator-runtime/runtime.js', - './src/**/*_test.js' - ], - preprocessors: { - './src/**/*.js': ['webpack'] - }, - webpack: { - mode: 'none', - module: { - rules: [webpackConf({ produciton: false, browser: true })] - } - } - }); -}; diff --git a/web/main.go b/web/main.go deleted file mode 100644 index e44cf075..00000000 --- a/web/main.go +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package main - -import ( - "log" - "net/http" - "net/http/httputil" - "net/url" - "os" - "strings" - - "github.com/joho/godotenv" - "github.com/pkg/errors" -) - -var apiProxy *httputil.ReverseProxy - -func appHandler(w http.ResponseWriter, r *http.Request) { - parts := strings.Split(r.URL.Path, "/") - if len(parts) >= 2 && parts[1] == "dist" { - fs := http.StripPrefix("/dist/", http.FileServer(http.Dir("./public/dist"))) - - fs.ServeHTTP(w, r) - return - } - - // All other requests should go to index.html - http.ServeFile(w, r, "./public/index.html") -} - -func init() { - if os.Getenv("GO_ENV") != "PRODUCTION" { - err := godotenv.Load(".env.dev") - if err != nil { - panic(errors.Wrap(err, "loading env vars")) - } - } - - apiHostURL, err := url.Parse(os.Getenv("API_HOST")) - if err != nil { - panic(errors.Wrap(err, "parsing api host url")) - } - - apiProxy = httputil.NewSingleHostReverseProxy(apiHostURL) -} - -func main() { - http.HandleFunc("/", appHandler) - http.Handle("/api/", http.StripPrefix("/api/", apiProxy)) - - port := os.Getenv("PORT") - log.Printf("Web listening on port %s", port) - - log.Println(http.ListenAndServe(":"+port, nil)) -} diff --git a/web/package-lock.json b/web/package-lock.json deleted file mode 100644 index bb6332b3..00000000 --- a/web/package-lock.json +++ /dev/null @@ -1,12872 +0,0 @@ -{ - "name": "dnote", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "@babel/code-frame": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", - "requires": { - "@babel/highlight": "^7.0.0" - } - }, - "@babel/core": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz", - "integrity": "sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helpers": "^7.4.4", - "@babel/parser": "^7.4.4", - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4", - "convert-source-map": "^1.1.0", - "debug": "^4.1.0", - "json5": "^2.1.0", - "lodash": "^4.17.11", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" - }, - "dependencies": { - "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.11", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", - "dev": true - }, - "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } - }, - "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.11" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "json5": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", - "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "@babel/generator": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.1.3.tgz", - "integrity": "sha512-ZoCZGcfIJFJuZBqxcY9OjC1KW2lWK64qrX1o4UYL3yshVhwKFYgzpWZ0vvtGMNJdTlvkw0W+HR1VnYN8q3QPFQ==", - "dev": true, - "requires": { - "@babel/types": "^7.1.3", - "jsesc": "^2.5.1", - "lodash": "^4.17.10", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/helper-annotate-as-pure": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz", - "integrity": "sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz", - "integrity": "sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==", - "dev": true, - "requires": { - "@babel/helper-explode-assignable-expression": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-builder-react-jsx": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.0.0.tgz", - "integrity": "sha512-ebJ2JM6NAKW0fQEqN8hOLxK84RbRz9OkUhGS/Xd5u56ejMfVbayJ4+LykERZCOUM6faa6Fp3SZNX3fcT16MKHw==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0", - "esutils": "^2.0.0" - } - }, - "@babel/helper-call-delegate": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz", - "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==", - "dev": true, - "requires": { - "@babel/helper-hoist-variables": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" - }, - "dependencies": { - "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.11", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", - "dev": true - }, - "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.11" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@babel/helper-create-class-features-plugin": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz", - "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==", - "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-member-expression-to-functions": "^7.0.0", - "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.4.4", - "@babel/helper-split-export-declaration": "^7.4.4" - }, - "dependencies": { - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helper-define-map": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz", - "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/types": "^7.4.4", - "lodash": "^4.17.11" - }, - "dependencies": { - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helper-explode-assignable-expression": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz", - "integrity": "sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==", - "dev": true, - "requires": { - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", - "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-hoist-variables": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz", - "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - }, - "dependencies": { - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helper-member-expression-to-functions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz", - "integrity": "sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==", - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-module-imports": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz", - "integrity": "sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-module-transforms": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz", - "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/template": "^7.4.4", - "@babel/types": "^7.4.4", - "lodash": "^4.17.11" - }, - "dependencies": { - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", - "dev": true - }, - "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helper-optimise-call-expression": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz", - "integrity": "sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==", - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-plugin-utils": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz", - "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==" - }, - "@babel/helper-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz", - "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==", - "dev": true, - "requires": { - "lodash": "^4.17.11" - } - }, - "@babel/helper-remap-async-to-generator": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz", - "integrity": "sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-wrap-function": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-replace-supers": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz", - "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==", - "requires": { - "@babel/helper-member-expression-to-functions": "^7.0.0", - "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" - }, - "dependencies": { - "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", - "requires": { - "@babel/types": "^7.4.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.11", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==" - }, - "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.11" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@babel/helper-simple-access": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz", - "integrity": "sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==", - "dev": true, - "requires": { - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0.tgz", - "integrity": "sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-wrap-function": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz", - "integrity": "sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/template": "^7.1.0", - "@babel/traverse": "^7.1.0", - "@babel/types": "^7.2.0" - }, - "dependencies": { - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/helpers": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz", - "integrity": "sha512-igczbR/0SeuPR8RFfC7tGrbdTbFL3QTvH6D+Z6zNxnTe//GyqmtHmDkzrqDmyZ3eSwPqB/LhyKoU5DXsp+Vp2A==", - "dev": true, - "requires": { - "@babel/template": "^7.4.4", - "@babel/traverse": "^7.4.4", - "@babel/types": "^7.4.4" - }, - "dependencies": { - "@babel/generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz", - "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4", - "jsesc": "^2.5.1", - "lodash": "^4.17.11", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", - "dev": true - }, - "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } - }, - "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.4.4", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.11" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@babel/highlight": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "@babel/parser": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.1.3.tgz", - "integrity": "sha512-gqmspPZOMW3MIRb9HlrnbZHXI1/KHTOroBwN1NcLL6pWxzqzEKGvRTq0W/PxS45OtQGbaFikSQpkS5zbnsQm2w==" - }, - "@babel/plugin-proposal-async-generator-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz", - "integrity": "sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0", - "@babel/plugin-syntax-async-generators": "^7.2.0" - } - }, - "@babel/plugin-proposal-class-properties": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz", - "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==", - "requires": { - "@babel/helper-create-class-features-plugin": "^7.4.4", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-proposal-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz", - "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-json-strings": "^7.2.0" - } - }, - "@babel/plugin-proposal-object-rest-spread": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz", - "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0" - } - }, - "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0" - } - }, - "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz", - "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" - } - }, - "@babel/plugin-syntax-async-generators": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz", - "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-syntax-json-strings": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz", - "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-syntax-jsx": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.0.0.tgz", - "integrity": "sha512-PdmL2AoPsCLWxhIr3kG2+F9v4WH06Q3z+NoGVpQgnUNGcagXHq5sB3OXxkSahKq9TLdNMN/AJzFYSOo8UKDMHg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-syntax-object-rest-spread": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz", - "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-syntax-optional-catch-binding": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz", - "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-arrow-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz", - "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-async-to-generator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz", - "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-remap-async-to-generator": "^7.1.0" - } - }, - "@babel/plugin-transform-block-scoped-functions": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz", - "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-block-scoping": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz", - "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "lodash": "^4.17.11" - } - }, - "@babel/plugin-transform-classes": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz", - "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-define-map": "^7.4.4", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-optimise-call-expression": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.4.4", - "@babel/helper-split-export-declaration": "^7.4.4", - "globals": "^11.1.0" - }, - "dependencies": { - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/plugin-transform-computed-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz", - "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-destructuring": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz", - "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-dotall-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz", - "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" - } - }, - "@babel/plugin-transform-duplicate-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.2.0.tgz", - "integrity": "sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-exponentiation-operator": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz", - "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==", - "dev": true, - "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.1.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-for-of": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz", - "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-function-name": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz", - "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==", - "dev": true, - "requires": { - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz", - "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-member-expression-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz", - "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-modules-amd": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz", - "integrity": "sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.1.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-modules-commonjs": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz", - "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.4.4", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-simple-access": "^7.1.0" - } - }, - "@babel/plugin-transform-modules-systemjs": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz", - "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==", - "dev": true, - "requires": { - "@babel/helper-hoist-variables": "^7.4.4", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-modules-umd": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz", - "integrity": "sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==", - "dev": true, - "requires": { - "@babel/helper-module-transforms": "^7.1.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.4.tgz", - "integrity": "sha512-Ki+Y9nXBlKfhD+LXaRS7v95TtTGYRAf9Y1rTDiE75zf8YQz4GDaWRXosMfJBXxnk88mGFjWdCRIeqDbon7spYA==", - "dev": true, - "requires": { - "regexp-tree": "^0.1.0" - } - }, - "@babel/plugin-transform-new-target": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz", - "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-object-super": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz", - "integrity": "sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-replace-supers": "^7.1.0" - } - }, - "@babel/plugin-transform-parameters": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz", - "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==", - "dev": true, - "requires": { - "@babel/helper-call-delegate": "^7.4.4", - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-property-literals": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz", - "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-react-constant-elements": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.2.0.tgz", - "integrity": "sha512-YYQFg6giRFMsZPKUM9v+VcHOdfSQdz9jHCx3akAi3UYgyjndmdYGSXylQ/V+HswQt4fL8IklchD9HTsaOCrWQQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-react-display-name": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.0.0.tgz", - "integrity": "sha512-BX8xKuQTO0HzINxT6j/GiCwoJB0AOMs0HmLbEnAvcte8U8rSkNa/eSCAY+l1OA4JnCVq2jw2p6U8QQryy2fTPg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-react-jsx": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.0.0.tgz", - "integrity": "sha512-0TMP21hXsSUjIQJmu/r7RiVxeFrXRcMUigbKu0BLegJK9PkYodHstaszcig7zxXfaBji2LYUdtqIkHs+hgYkJQ==", - "dev": true, - "requires": { - "@babel/helper-builder-react-jsx": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.0.0" - } - }, - "@babel/plugin-transform-react-jsx-self": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.0.0.tgz", - "integrity": "sha512-pymy+AK12WO4safW1HmBpwagUQRl9cevNX+82AIAtU1pIdugqcH+nuYP03Ja6B+N4gliAaKWAegIBL/ymALPHA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.0.0" - } - }, - "@babel/plugin-transform-react-jsx-source": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.0.0.tgz", - "integrity": "sha512-OSeEpFJEH5dw/TtxTg4nijl4nHBbhqbKL94Xo/Y17WKIf2qJWeIk/QeXACF19lG1vMezkxqruwnTjVizaW7u7w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.0.0" - } - }, - "@babel/plugin-transform-regenerator": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.4.tgz", - "integrity": "sha512-Zz3w+pX1SI0KMIiqshFZkwnVGUhDZzpX2vtPzfJBKQQq8WsP/Xy9DNdELWivxcKOCX/Pywge4SiEaPaLtoDT4g==", - "dev": true, - "requires": { - "regenerator-transform": "^0.13.4" - } - }, - "@babel/plugin-transform-reserved-words": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz", - "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz", - "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz", - "integrity": "sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz", - "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.0.0" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz", - "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz", - "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz", - "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/helper-regex": "^7.4.4", - "regexpu-core": "^4.5.4" - } - }, - "@babel/preset-env": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.4.tgz", - "integrity": "sha512-FU1H+ACWqZZqfw1x2G1tgtSSYSfxJLkpaUQL37CenULFARDo+h4xJoVHzRoHbK+85ViLciuI7ME4WTIhFRBBlw==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-async-generator-functions": "^7.2.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-object-rest-spread": "^7.4.4", - "@babel/plugin-proposal-optional-catch-binding": "^7.2.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-syntax-async-generators": "^7.2.0", - "@babel/plugin-syntax-json-strings": "^7.2.0", - "@babel/plugin-syntax-object-rest-spread": "^7.2.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.2.0", - "@babel/plugin-transform-arrow-functions": "^7.2.0", - "@babel/plugin-transform-async-to-generator": "^7.4.4", - "@babel/plugin-transform-block-scoped-functions": "^7.2.0", - "@babel/plugin-transform-block-scoping": "^7.4.4", - "@babel/plugin-transform-classes": "^7.4.4", - "@babel/plugin-transform-computed-properties": "^7.2.0", - "@babel/plugin-transform-destructuring": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/plugin-transform-duplicate-keys": "^7.2.0", - "@babel/plugin-transform-exponentiation-operator": "^7.2.0", - "@babel/plugin-transform-for-of": "^7.4.4", - "@babel/plugin-transform-function-name": "^7.4.4", - "@babel/plugin-transform-literals": "^7.2.0", - "@babel/plugin-transform-member-expression-literals": "^7.2.0", - "@babel/plugin-transform-modules-amd": "^7.2.0", - "@babel/plugin-transform-modules-commonjs": "^7.4.4", - "@babel/plugin-transform-modules-systemjs": "^7.4.4", - "@babel/plugin-transform-modules-umd": "^7.2.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.4", - "@babel/plugin-transform-new-target": "^7.4.4", - "@babel/plugin-transform-object-super": "^7.2.0", - "@babel/plugin-transform-parameters": "^7.4.4", - "@babel/plugin-transform-property-literals": "^7.2.0", - "@babel/plugin-transform-regenerator": "^7.4.4", - "@babel/plugin-transform-reserved-words": "^7.2.0", - "@babel/plugin-transform-shorthand-properties": "^7.2.0", - "@babel/plugin-transform-spread": "^7.2.0", - "@babel/plugin-transform-sticky-regex": "^7.2.0", - "@babel/plugin-transform-template-literals": "^7.4.4", - "@babel/plugin-transform-typeof-symbol": "^7.2.0", - "@babel/plugin-transform-unicode-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "browserslist": "^4.5.2", - "core-js-compat": "^3.0.0", - "invariant": "^2.2.2", - "js-levenshtein": "^1.1.3", - "semver": "^5.5.0" - }, - "dependencies": { - "@babel/types": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz", - "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.11", - "to-fast-properties": "^2.0.0" - } - } - } - }, - "@babel/preset-react": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.0.0.tgz", - "integrity": "sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-transform-react-display-name": "^7.0.0", - "@babel/plugin-transform-react-jsx": "^7.0.0", - "@babel/plugin-transform-react-jsx-self": "^7.0.0", - "@babel/plugin-transform-react-jsx-source": "^7.0.0" - } - }, - "@babel/register": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.4.4.tgz", - "integrity": "sha512-sn51H88GRa00+ZoMqCVgOphmswG4b7mhf9VOB0LUBAieykq2GnRFerlN+JQkO/ntT7wz4jaHNSRPg9IdMPEUkA==", - "dev": true, - "requires": { - "core-js": "^3.0.0", - "find-cache-dir": "^2.0.0", - "lodash": "^4.17.11", - "mkdirp": "^0.5.1", - "pirates": "^4.0.0", - "source-map-support": "^0.5.9" - } - }, - "@babel/runtime": { - "version": "7.4.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.3.tgz", - "integrity": "sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==", - "requires": { - "regenerator-runtime": "^0.13.2" - } - }, - "@babel/template": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.1.2.tgz", - "integrity": "sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag==", - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.1.2", - "@babel/types": "^7.1.2" - } - }, - "@babel/traverse": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.1.4.tgz", - "integrity": "sha512-my9mdrAIGdDiSVBuMjpn/oXYpva0/EZwWL3sm3Wcy/AVWO2eXnsoZruOT9jOGNRXU8KbCIu5zsKnXcAJ6PcV6Q==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.1.3", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.0.0", - "@babel/parser": "^7.1.3", - "@babel/types": "^7.1.3", - "debug": "^3.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.10" - } - }, - "@babel/types": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.1.3.tgz", - "integrity": "sha512-RpPOVfK+yatXyn8n4PB1NW6k9qjinrXrRR8ugBN8fD6hCy5RXI6PSbVqpOJBO9oSaY7Nom4ohj35feb0UR9hSA==", - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.10", - "to-fast-properties": "^2.0.0" - } - }, - "@hot-loader/react-dom": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.8.6.tgz", - "integrity": "sha512-+JHIYh33FVglJYZAUtRjfT5qZoT2mueJGNzU5weS2CVw26BgbxGKSujlJhO85BaRbg8sqNWyW1hYBILgK3ZCgA==", - "dev": true, - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.13.6" - } - }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "dev": true, - "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", - "dev": true - }, - "@types/node": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.0.tgz", - "integrity": "sha512-Jrb/x3HT4PTJp6a4avhmJCDEVrPdqLfl3e8GGMbpkGGdwAV5UGlIs4vVEfsHHfylZVOKZWpOqmqFH8CbfOZ6kg==", - "dev": true - }, - "@types/q": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz", - "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==", - "dev": true - }, - "@webassemblyjs/ast": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", - "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", - "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==" - }, - "@webassemblyjs/helper-api-error": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==" - }, - "@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==" - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", - "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", - "requires": { - "@webassemblyjs/wast-printer": "1.8.5" - } - }, - "@webassemblyjs/helper-fsm": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", - "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==" - }, - "@webassemblyjs/helper-module-context": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", - "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "mamacro": "^0.0.3" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", - "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==" - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==" - }, - "@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", - "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/floating-point-hex-parser": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-code-frame": "1.8.5", - "@webassemblyjs/helper-fsm": "1.8.5", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.1.1.tgz", - "integrity": "sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==" - }, - "acorn-dynamic-import": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz", - "integrity": "sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==" - }, - "acorn-jsx": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz", - "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==", - "dev": true - }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, - "ajv": { - "version": "6.5.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.4.tgz", - "integrity": "sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-errors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.0.tgz", - "integrity": "sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=" - }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" - }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-colors": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.1.0.tgz", - "integrity": "sha512-hTv1qPdi+sVEk3jYsdjox5nQI0C9HTbjKShbCdYLKb1LOfNbb7wsF4d7OEKIZoxIHx02tSp3m94jcPW2EfMjmA==", - "dev": true - }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "requires": { - "remove-trailing-separator": "^1.0.1" - } - } - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" - }, - "are-we-there-yet": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", - "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", - "dev": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" - } - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" - }, - "arraybuffer.slice": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", - "dev": true - }, - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=" - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "requires": { - "inherits": "2.0.1" - } - } - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" - }, - "ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", - "dev": true - }, - "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", - "dev": true - }, - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "^4.17.10" - } - }, - "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==" - }, - "async-foreach": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", - "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true - }, - "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" - }, - "autoprefixer": { - "version": "9.5.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz", - "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==", - "dev": true, - "requires": { - "browserslist": "^4.5.4", - "caniuse-lite": "^1.0.30000957", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.14", - "postcss-value-parser": "^3.3.1" - }, - "dependencies": { - "caniuse-lite": { - "version": "1.0.30000967", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz", - "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.16", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.16.tgz", - "integrity": "sha512-MOo8zNSlIqh22Uaa3drkdIAgUGEL+AD1ESiSdmElLUmE2uVDo1QloiT/IfW9qRw8Gw+Y/w69UVMGwbufMSftxA==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", - "dev": true - }, - "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } - }, - "babel-eslint": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.1.tgz", - "integrity": "sha512-z7OT1iNV+TjOwHNLLyJk+HN+YVWX+CLE6fPD2SymJZOZQBs+QIexFjhm4keGTm8MW9xr4EC9Q0PbaLB24V5GoQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.0.0", - "@babel/traverse": "^7.0.0", - "@babel/types": "^7.0.0", - "eslint-scope": "3.7.1", - "eslint-visitor-keys": "^1.0.0" - }, - "dependencies": { - "eslint-scope": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.1.tgz", - "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - } - } - }, - "babel-loader": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz", - "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==", - "dev": true, - "requires": { - "find-cache-dir": "^2.0.0", - "loader-utils": "^1.0.2", - "mkdirp": "^0.5.1", - "util.promisify": "^1.0.0" - } - }, - "babel-plugin-transform-react-remove-prop-types": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", - "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==", - "dev": true - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - } - } - }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", - "dev": true - }, - "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" - }, - "base64id": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "better-assert": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", - "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" - }, - "blob": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", - "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", - "dev": true - }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "~2.0.0" - } - }, - "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==" - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } - }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "requires": { - "pako": "~1.0.5" - } - }, - "browserslist": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.4.tgz", - "integrity": "sha512-rAjx494LMjqKnMPhFkuLmLp8JWEX0o8ADTGeAbOqaF+XCvYLreZrG5uVjnPBlAQ8REZK4pzXGvp0bWgrFtKaag==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000955", - "electron-to-chromium": "^1.3.122", - "node-releases": "^1.1.13" - } - }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true - }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" - }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", - "dev": true - }, - "cacache": { - "version": "11.3.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.2.tgz", - "integrity": "sha512-E0zP4EPGDOaT2chM08Als91eYnf8Z+eH1awwwVsngUmgppfM5jjJ8l3z5vO5p5w/I3LsiXawb1sW0VY65pQABg==", - "requires": { - "bluebird": "^3.5.3", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.3", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.2", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - }, - "dependencies": { - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==" - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" - } - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } - }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, - "requires": { - "callsites": "^2.0.0" - } - }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, - "requires": { - "caller-callsite": "^2.0.0" - } - }, - "callsite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", - "dev": true - }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - } - } - }, - "caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "caniuse-lite": { - "version": "1.0.30000955", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000955.tgz", - "integrity": "sha512-6AwmIKgqCYfDWWadRkAuZSHMQP4Mmy96xAXEdRBlN/luQhlRYOKgwOlZ9plpCOsVbBuqbTmGqDK3JUM/nlr8CA==", - "dev": true - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, - "chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", - "dev": true, - "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", - "dev": true - }, - "chokidar": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz", - "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==", - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "chownr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", - "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==" - }, - "chrome-trace-event": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz", - "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==", - "requires": { - "tslib": "^1.9.0" - } - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - } - }, - "classnames": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } - }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "dev": true, - "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" - } - }, - "coa": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", - "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", - "dev": true, - "requires": { - "@types/q": "^1.5.1", - "chalk": "^2.4.1", - "q": "^1.1.2" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } - }, - "color": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz", - "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==", - "dev": true, - "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - }, - "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", - "dev": true, - "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" - } - }, - "colors": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.3.tgz", - "integrity": "sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==", - "dev": true - }, - "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" - }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true - }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", - "dev": true - }, - "compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", - "dev": true, - "requires": { - "mime-db": ">= 1.40.0 < 2" - } - }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - } - }, - "connect": { - "version": "3.6.6", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz", - "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=", - "dev": true, - "requires": { - "debug": "2.6.9", - "finalhandler": "1.1.0", - "parseurl": "~1.3.2", - "utils-merge": "1.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", - "dev": true - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "requires": { - "date-now": "^0.1.4" - } - }, - "console-control-strings": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=" - }, - "contains-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", - "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", - "dev": true - }, - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" - }, - "core-js": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.0.1.tgz", - "integrity": "sha512-sco40rF+2KlE0ROMvydjkrVMMG1vYilP2ALoRXcYR4obqbYIuV3Bg+51GEDW+HF8n7NRA+iaA4qD0nD9lo9mew==" - }, - "core-js-compat": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.0.1.tgz", - "integrity": "sha512-2pC3e+Ht/1/gD7Sim/sqzvRplMiRnFQVlPpDVaHtY9l7zZP7knamr3VRD6NyGfHd84MrDC0tAM9ulNxYMW0T3g==", - "dev": true, - "requires": { - "browserslist": "^4.5.4", - "core-js": "3.0.1", - "core-js-pure": "3.0.1", - "semver": "^6.0.0" - }, - "dependencies": { - "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", - "dev": true - } - } - }, - "core-js-pure": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.0.1.tgz", - "integrity": "sha512-mSxeQ6IghKW3MoyF4cz19GJ1cMm7761ON+WObSyLfTu/Jn3x7w4NwNFnrZxgl4MTSvYYepVLNuRtlB4loMwJ5g==", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cosmiconfig": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.0.tgz", - "integrity": "sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==", - "dev": true, - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.0", - "parse-json": "^4.0.0" - }, - "dependencies": { - "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - } - } - }, - "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "create-react-context": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.2.3.tgz", - "integrity": "sha512-CQBmD0+QGgTaxDL3OX1IDXYqjkp2It4RIbcb99jS6AEg27Ga+a9G3JtK6SIu0HBwPLZlmwt9F7UwWA4Bn92Rag==", - "requires": { - "fbjs": "^0.8.0", - "gud": "^1.0.0" - } - }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", - "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "http://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-declaration-sorter": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz", - "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", - "dev": true, - "requires": { - "postcss": "^7.0.1", - "timsort": "^0.3.0" - } - }, - "css-loader": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz", - "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==", - "dev": true, - "requires": { - "camelcase": "^5.2.0", - "icss-utils": "^4.1.0", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.14", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^2.0.6", - "postcss-modules-scope": "^2.1.0", - "postcss-modules-values": "^2.0.0", - "postcss-value-parser": "^3.3.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.0.tgz", - "integrity": "sha512-Y05ICatFYPAfykDIB7VdwSJ0LUl1yq/BwO2OpyGGLjiRe1fgzTwVypPiWnzkGFOVFHXrCXUNBl86bpjBhZWSJg==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "loader-utils": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", - "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "postcss": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", - "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "css-select": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz", - "integrity": "sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^2.1.2", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" - } - }, - "css-select-base-adapter": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", - "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==", - "dev": true - }, - "css-tree": { - "version": "1.0.0-alpha.28", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz", - "integrity": "sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==", - "dev": true, - "requires": { - "mdn-data": "~1.1.0", - "source-map": "^0.5.3" - } - }, - "css-unit-converter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz", - "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=", - "dev": true - }, - "css-url-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-1.1.0.tgz", - "integrity": "sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=", - "dev": true - }, - "css-what": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", - "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "cssnano": { - "version": "4.1.10", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz", - "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", - "dev": true, - "requires": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.7", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" - } - }, - "cssnano-preset-default": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz", - "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", - "dev": true, - "requires": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.2", - "postcss-discard-duplicates": "^4.0.2", - "postcss-discard-empty": "^4.0.1", - "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.2", - "postcss-minify-params": "^4.0.2", - "postcss-minify-selectors": "^4.0.2", - "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.2", - "postcss-normalize-positions": "^4.0.2", - "postcss-normalize-repeat-style": "^4.0.2", - "postcss-normalize-string": "^4.0.2", - "postcss-normalize-timing-functions": "^4.0.2", - "postcss-normalize-unicode": "^4.0.1", - "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.2", - "postcss-unique-selectors": "^4.0.1" - } - }, - "cssnano-util-get-arguments": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz", - "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=", - "dev": true - }, - "cssnano-util-get-match": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz", - "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=", - "dev": true - }, - "cssnano-util-raw-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz", - "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "cssnano-util-same-parent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz", - "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==", - "dev": true - }, - "csso": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/csso/-/csso-3.5.1.tgz", - "integrity": "sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==", - "dev": true, - "requires": { - "css-tree": "1.0.0-alpha.29" - }, - "dependencies": { - "css-tree": { - "version": "1.0.0-alpha.29", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.29.tgz", - "integrity": "sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==", - "dev": true, - "requires": { - "mdn-data": "~1.1.0", - "source-map": "^0.5.3" - } - } - } - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "^1.0.1" - } - }, - "custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", - "dev": true - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=" - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "^0.10.9" - } - }, - "d3": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/d3/-/d3-5.9.2.tgz", - "integrity": "sha512-ydrPot6Lm3nTWH+gJ/Cxf3FcwuvesYQ5uk+j/kXEH/xbuYWYWTMAHTJQkyeuG8Y5WM5RSEYB41EctUrXQQytRQ==", - "requires": { - "d3-array": "1", - "d3-axis": "1", - "d3-brush": "1", - "d3-chord": "1", - "d3-collection": "1", - "d3-color": "1", - "d3-contour": "1", - "d3-dispatch": "1", - "d3-drag": "1", - "d3-dsv": "1", - "d3-ease": "1", - "d3-fetch": "1", - "d3-force": "1", - "d3-format": "1", - "d3-geo": "1", - "d3-hierarchy": "1", - "d3-interpolate": "1", - "d3-path": "1", - "d3-polygon": "1", - "d3-quadtree": "1", - "d3-random": "1", - "d3-scale": "2", - "d3-scale-chromatic": "1", - "d3-selection": "1", - "d3-shape": "1", - "d3-time": "1", - "d3-time-format": "2", - "d3-timer": "1", - "d3-transition": "1", - "d3-voronoi": "1", - "d3-zoom": "1" - } - }, - "d3-array": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz", - "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==" - }, - "d3-axis": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz", - "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==" - }, - "d3-brush": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz", - "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==", - "requires": { - "d3-dispatch": "1", - "d3-drag": "1", - "d3-interpolate": "1", - "d3-selection": "1", - "d3-transition": "1" - } - }, - "d3-chord": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz", - "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==", - "requires": { - "d3-array": "1", - "d3-path": "1" - } - }, - "d3-collection": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz", - "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==" - }, - "d3-color": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.3.tgz", - "integrity": "sha512-x37qq3ChOTLd26hnps36lexMRhNXEtVxZ4B25rL0DVdDsGQIJGB18S7y9XDwlDD6MD/ZBzITCf4JjGMM10TZkw==" - }, - "d3-contour": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz", - "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==", - "requires": { - "d3-array": "^1.1.1" - } - }, - "d3-dispatch": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.5.tgz", - "integrity": "sha512-vwKx+lAqB1UuCeklr6Jh1bvC4SZgbSqbkGBLClItFBIYH4vqDJCA7qfoy14lXmJdnBOdxndAMxjCbImJYW7e6g==" - }, - "d3-drag": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.3.tgz", - "integrity": "sha512-8S3HWCAg+ilzjJsNtWW1Mutl74Nmzhb9yU6igspilaJzeZVFktmY6oO9xOh5TDk+BM2KrNFjttZNoJJmDnkjkg==", - "requires": { - "d3-dispatch": "1", - "d3-selection": "1" - } - }, - "d3-dsv": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.1.1.tgz", - "integrity": "sha512-1EH1oRGSkeDUlDRbhsFytAXU6cAmXFzc52YUe6MRlPClmWb85MP1J5x+YJRzya4ynZWnbELdSAvATFW/MbxaXw==", - "requires": { - "commander": "2", - "iconv-lite": "0.4", - "rw": "1" - } - }, - "d3-ease": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.5.tgz", - "integrity": "sha512-Ct1O//ly5y5lFM9YTdu+ygq7LleSgSE4oj7vUt9tPLHUi8VCV7QoizGpdWRWAwCO9LdYzIrQDg97+hGVdsSGPQ==" - }, - "d3-fetch": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.1.2.tgz", - "integrity": "sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA==", - "requires": { - "d3-dsv": "1" - } - }, - "d3-force": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz", - "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==", - "requires": { - "d3-collection": "1", - "d3-dispatch": "1", - "d3-quadtree": "1", - "d3-timer": "1" - } - }, - "d3-format": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.3.2.tgz", - "integrity": "sha512-Z18Dprj96ExragQ0DeGi+SYPQ7pPfRMtUXtsg/ChVIKNBCzjO8XYJvRTC1usblx52lqge56V5ect+frYTQc8WQ==" - }, - "d3-geo": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.11.3.tgz", - "integrity": "sha512-n30yN9qSKREvV2fxcrhmHUdXP9TNH7ZZj3C/qnaoU0cVf/Ea85+yT7HY7i8ySPwkwjCNYtmKqQFTvLFngfkItQ==", - "requires": { - "d3-array": "1" - } - }, - "d3-hierarchy": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.8.tgz", - "integrity": "sha512-L+GHMSZNwTpiq4rt9GEsNcpLa4M96lXMR8M/nMG9p5hBE0jy6C+3hWtyZMenPQdwla249iJy7Nx0uKt3n+u9+w==" - }, - "d3-interpolate": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.3.2.tgz", - "integrity": "sha512-NlNKGopqaz9qM1PXh9gBF1KSCVh+jSFErrSlD/4hybwoNX/gt1d8CDbDW+3i+5UOHhjC6s6nMvRxcuoMVNgL2w==", - "requires": { - "d3-color": "1" - } - }, - "d3-path": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.7.tgz", - "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA==" - }, - "d3-polygon": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.5.tgz", - "integrity": "sha512-RHhh1ZUJZfhgoqzWWuRhzQJvO7LavchhitSTHGu9oj6uuLFzYZVeBzaWTQ2qSO6bz2w55RMoOCf0MsLCDB6e0w==" - }, - "d3-quadtree": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.6.tgz", - "integrity": "sha512-NUgeo9G+ENQCQ1LsRr2qJg3MQ4DJvxcDNCiohdJGHt5gRhBW6orIB5m5FJ9kK3HNL8g9F4ERVoBzcEwQBfXWVA==" - }, - "d3-random": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz", - "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==" - }, - "d3-scale": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz", - "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==", - "requires": { - "d3-array": "^1.2.0", - "d3-collection": "1", - "d3-format": "1", - "d3-interpolate": "1", - "d3-time": "1", - "d3-time-format": "2" - } - }, - "d3-scale-chromatic": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz", - "integrity": "sha512-BWTipif1CimXcYfT02LKjAyItX5gKiwxuPRgr4xM58JwlLocWbjPLI7aMEjkcoOQXMkYsmNsvv3d2yl/OKuHHw==", - "requires": { - "d3-color": "1", - "d3-interpolate": "1" - } - }, - "d3-selection": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.0.tgz", - "integrity": "sha512-EYVwBxQGEjLCKF2pJ4+yrErskDnz5v403qvAid96cNdCMr8rmCYfY5RGzWz24mdIbxmDf6/4EAH+K9xperD5jg==" - }, - "d3-shape": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.5.tgz", - "integrity": "sha512-VKazVR3phgD+MUCldapHD7P9kcrvPcexeX/PkMJmkUov4JM8IxsSg1DvbYoYich9AtdTsa5nNk2++ImPiDiSxg==", - "requires": { - "d3-path": "1" - } - }, - "d3-time": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.11.tgz", - "integrity": "sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw==" - }, - "d3-time-format": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.3.tgz", - "integrity": "sha512-6k0a2rZryzGm5Ihx+aFMuO1GgelgIz+7HhB4PH4OEndD5q2zGn1mDfRdNrulspOfR6JXkb2sThhDK41CSK85QA==", - "requires": { - "d3-time": "1" - } - }, - "d3-timer": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.9.tgz", - "integrity": "sha512-rT34J5HnQUHhcLvhSB9GjCkN0Ddd5Y8nCwDBG2u6wQEeYxT/Lf51fTFFkldeib/sE/J0clIe0pnCfs6g/lRbyg==" - }, - "d3-transition": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.2.0.tgz", - "integrity": "sha512-VJ7cmX/FPIPJYuaL2r1o1EMHLttvoIuZhhuAlRoOxDzogV8iQS6jYulDm3xEU3TqL80IZIhI551/ebmCMrkvhw==", - "requires": { - "d3-color": "1", - "d3-dispatch": "1", - "d3-ease": "1", - "d3-interpolate": "1", - "d3-selection": "^1.1.0", - "d3-timer": "1" - } - }, - "d3-voronoi": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz", - "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==" - }, - "d3-zoom": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.3.tgz", - "integrity": "sha512-xEBSwFx5Z9T3/VrwDkMt+mr0HCzv7XjpGURJ8lWmIC8wxe32L39eWHIasEe/e7Ox8MPU4p1hvH8PKN2olLzIBg==", - "requires": { - "d3-dispatch": "1", - "d3-drag": "1", - "d3-interpolate": "1", - "d3-selection": "1", - "d3-transition": "1" - } - }, - "damerau-levenshtein": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz", - "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=", - "dev": true - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "date-format": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.0.0.tgz", - "integrity": "sha512-M6UqVvZVgFYqZL1SfHsRGIQSz3ZL+qgbsV5Lp1Vj61LZVYuEwcMXYay7DRDtYs2HQQBK5hQtQ0fD9aEJ89V0LA==", - "dev": true - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=" - }, - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" - }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true - }, - "default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" - } - }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", - "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - } - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true - }, - "delegates": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", - "dev": true - }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", - "dev": true - }, - "di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true, - "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "^1.0.0" - } - }, - "doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "requires": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" - } - }, - "dom-serializer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", - "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", - "dev": true, - "requires": { - "domelementtype": "^1.3.0", - "entities": "^1.1.1" - } - }, - "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=" - }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==" - }, - "domelementtype": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", - "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", - "dev": true - }, - "domutils": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", - "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", - "dev": true, - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } - }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, - "requires": { - "is-obj": "^1.0.0" - } - }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - } - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.122", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.122.tgz", - "integrity": "sha512-3RKoIyCN4DhP2dsmleuFvpJAIDOseWH88wFYBzb22CSwoFDSWRc4UAMfrtc9h8nBdJjTNIN3rogChgOy6eFInw==", - "dev": true - }, - "elliptic": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz", - "integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==", - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } - }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true - }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "requires": { - "iconv-lite": "~0.4.13" - } - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "^1.4.0" - } - }, - "engine.io": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", - "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "engine.io-client": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", - "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "engine.io-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", - "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", - "dev": true, - "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.5", - "has-binary2": "~1.0.2" - } - }, - "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" - } - }, - "ent": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" - }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "requires": { - "prr": "~1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "^1.1.1", - "function-bind": "^1.1.1", - "has": "^1.0.1", - "is-callable": "^1.1.3", - "is-regex": "^1.0.4" - } - }, - "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } - }, - "es5-ext": { - "version": "0.10.47", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.47.tgz", - "integrity": "sha512-/1TItLfj+TTfWoeRcDn/0FbGV6SNo4R+On2GGVucPU/j3BWnXE2Co8h8CTo4Tu34gFJtnmwS9xiScKs4EjZhdw==", - "dev": true, - "requires": { - "es6-iterator": "~2.0.3", - "es6-symbol": "~3.1.1", - "next-tick": "1" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "^0.10.35", - "es6-symbol": "^3.1.1" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1", - "es5-ext": "~0.10.14" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0" - }, - "dependencies": { - "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "import-fresh": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.0.0.tgz", - "integrity": "sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "js-yaml": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz", - "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "eslint-config-airbnb": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz", - "integrity": "sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw==", - "dev": true, - "requires": { - "eslint-config-airbnb-base": "^13.1.0", - "object.assign": "^4.1.0", - "object.entries": "^1.0.4" - } - }, - "eslint-config-airbnb-base": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz", - "integrity": "sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw==", - "dev": true, - "requires": { - "eslint-restricted-globals": "^0.1.1", - "object.assign": "^4.1.0", - "object.entries": "^1.0.4" - } - }, - "eslint-config-prettier": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-4.2.0.tgz", - "integrity": "sha512-y0uWc/FRfrHhpPZCYflWC8aE0KRJRY04rdZVfl8cL3sEZmOYyaBdhdlQPjKZBnuRMyLVK+JUZr7HaZFClQiH4w==", - "dev": true, - "requires": { - "get-stdin": "^6.0.0" - } - }, - "eslint-import-resolver-node": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz", - "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==", - "dev": true, - "requires": { - "debug": "^2.6.9", - "resolve": "^1.5.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "eslint-module-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz", - "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==", - "dev": true, - "requires": { - "debug": "^2.6.8", - "pkg-dir": "^2.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "^2.1.0" - } - } - } - }, - "eslint-plugin-import": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz", - "integrity": "sha512-m+cSVxM7oLsIpmwNn2WXTJoReOF9f/CtLMo7qOVmKd1KntBy0hEcuNZ3erTmWjx+DxRO0Zcrm5KwAvI9wHcV5g==", - "dev": true, - "requires": { - "array-includes": "^3.0.3", - "contains-path": "^0.1.0", - "debug": "^2.6.9", - "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.2", - "eslint-module-utils": "^2.4.0", - "has": "^1.0.3", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "read-pkg-up": "^2.0.0", - "resolve": "^1.10.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "doctrine": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", - "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "isarray": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "eslint-plugin-jsx-a11y": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz", - "integrity": "sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==", - "dev": true, - "requires": { - "aria-query": "^3.0.0", - "array-includes": "^3.0.3", - "ast-types-flow": "^0.0.7", - "axobject-query": "^2.0.2", - "damerau-levenshtein": "^1.0.4", - "emoji-regex": "^7.0.2", - "has": "^1.0.3", - "jsx-ast-utils": "^2.0.1" - } - }, - "eslint-plugin-prettier": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz", - "integrity": "sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" - } - }, - "eslint-plugin-react": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz", - "integrity": "sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ==", - "dev": true, - "requires": { - "array-includes": "^3.0.3", - "doctrine": "^2.1.0", - "has": "^1.0.3", - "jsx-ast-utils": "^2.1.0", - "object.fromentries": "^2.0.0", - "prop-types": "^15.7.2", - "resolve": "^1.10.1" - }, - "dependencies": { - "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", - "dev": true, - "requires": { - "esutils": "^2.0.2" - } - }, - "jsx-ast-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz", - "integrity": "sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA==", - "dev": true, - "requires": { - "array-includes": "^3.0.3" - } - } - } - }, - "eslint-plugin-react-hooks": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.0.tgz", - "integrity": "sha512-lHBVRIaz5ibnIgNG07JNiAuBUeKhEf8l4etNx5vfAEwqQ5tcuK3jV9yjmopPgQDagQb7HwIuQVsE3IVcGrRnag==", - "dev": true - }, - "eslint-restricted-globals": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz", - "integrity": "sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc=", - "dev": true - }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true - }, - "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", - "dev": true - }, - "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", - "dev": true, - "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" - } - }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, - "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", - "dev": true, - "requires": { - "estraverse": "^4.0.0" - } - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "requires": { - "estraverse": "^4.1.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, - "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==" - }, - "events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", - "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" - }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "exenv": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", - "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50=" - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "express": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", - "dev": true, - "requires": { - "accepts": "~1.3.5", - "array-flatten": "1.1.1", - "body-parser": "1.18.3", - "content-disposition": "0.5.2", - "content-type": "~1.0.4", - "cookie": "0.3.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.1.1", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.4", - "qs": "6.5.2", - "range-parser": "~1.2.0", - "safe-buffer": "5.1.2", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "body-parser": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "~1.6.3", - "iconv-lite": "0.4.23", - "on-finished": "~2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "~1.6.16" - } - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "finalhandler": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", - "unpipe": "~1.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, - "raw-body": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", - "unpipe": "1.0.0" - } - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "external-editor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" - }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" - }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - }, - "dependencies": { - "core-js": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", - "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" - } - } - }, - "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" - }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } - }, - "file-loader": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-3.0.1.tgz", - "integrity": "sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "schema-utils": "^1.0.0" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } - }, - "finalhandler": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz", - "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.1", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.3.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", - "dev": true - } - } - }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } - }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "requires": { - "locate-path": "^3.0.0" - } - }, - "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^3.1.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, - "requires": { - "is-buffer": "~2.0.3" - }, - "dependencies": { - "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==", - "dev": true - } - } - }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "dev": true, - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - }, - "dependencies": { - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - } - } - }, - "flatted": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.0.tgz", - "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", - "dev": true - }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - } - }, - "follow-redirects": { - "version": "1.5.9", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.9.tgz", - "integrity": "sha512-Bh65EZI/RU8nx0wbYF9shkFZlqLP+6WT/5FnA3cE/djNSuKNHJEinGGZgu/cQEkeeb2GdFOgenAmn8qaqYke2w==", - "requires": { - "debug": "=3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "requires": { - "map-cache": "^0.2.2" - } - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - } - }, - "fs-access": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", - "dev": true, - "requires": { - "null-check": "^1.0.0" - } - }, - "fs-extra": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz", - "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", - "optional": true, - "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "bundled": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "bundled": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "optional": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "minipass": { - "version": "2.3.5", - "bundled": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } - }, - "minizlib": { - "version": "1.2.1", - "bundled": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.1.1", - "bundled": true, - "optional": true - }, - "needle": { - "version": "2.3.0", - "bundled": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "bundled": true, - "optional": true, - "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1", - "osenv": "^0.1.4" - } - }, - "npm-bundled": { - "version": "1.0.6", - "bundled": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "bundled": true, - "optional": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "optional": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "rimraf": { - "version": "2.6.3", - "bundled": true, - "optional": true, - "requires": { - "glob": "^7.1.3" - } - }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "bundled": true, - "optional": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, - "optional": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true - } - } - }, - "fstream": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", - "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "functional-red-black-tree": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", - "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", - "dev": true - }, - "gauge": { - "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", - "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "gaze": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", - "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", - "dev": true, - "requires": { - "globule": "^1.0.0" - } - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-func-name": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", - "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", - "dev": true - }, - "get-stdin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", - "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", - "dev": true - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", - "requires": { - "min-document": "^2.19.0", - "process": "~0.5.1" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } - }, - "globals": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", - "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==" - }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", - "dev": true, - "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" - }, - "growl": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", - "dev": true - }, - "gud": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", - "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" - }, - "handle-thing": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", - "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==", - "dev": true - }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "dev": true, - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - } - } - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - } - } - }, - "has-binary2": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", - "dev": true, - "requires": { - "isarray": "2.0.1" - }, - "dependencies": { - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - } - } - }, - "has-cors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", - "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - }, - "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", - "dev": true - }, - "has-unicode": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "hash.js": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", - "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } - }, - "he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true - }, - "hex-color-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", - "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", - "dev": true - }, - "highlight.js": { - "version": "9.15.6", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.6.tgz", - "integrity": "sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ==" - }, - "history": { - "version": "4.9.0", - "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz", - "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==", - "requires": { - "@babel/runtime": "^7.1.2", - "loose-envify": "^1.2.0", - "resolve-pathname": "^2.2.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0", - "value-equal": "^0.4.0" - } - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } - }, - "hoist-non-react-statics": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", - "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", - "requires": { - "react-is": "^16.7.0" - } - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz", - "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==", - "dev": true - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" - } - }, - "hsl-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", - "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=", - "dev": true - }, - "hsla-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", - "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=", - "dev": true - }, - "html-comment-regex": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz", - "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==", - "dev": true - }, - "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true - }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - } - }, - "http-parser-js": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.0.tgz", - "integrity": "sha512-cZdEF7r4gfRIq7ezX9J0T+kQmJNOub71dWbgAXVHDct80TKP4MCETtZQ31xyv38UwgzkWPYF/Xc0ge55dW9Z9w==", - "dev": true - }, - "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", - "requires": { - "eventemitter3": "^3.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } - }, - "http-proxy-middleware": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", - "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", - "dev": true, - "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" - } - }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" - }, - "iconv-lite": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", - "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "icss-utils": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.0.tgz", - "integrity": "sha512-3DEun4VOeMvSczifM3F2cKQrDQ5Pj6WKhkOq6HD4QTnDUAq8MQRxy5TX6Sy1iY6WPBe4gQ3p5vTECjbIkglkkQ==", - "dev": true, - "requires": { - "postcss": "^7.0.14" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", - "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" - }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", - "dev": true - }, - "import-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", - "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "dev": true, - "requires": { - "import-from": "^2.1.0" - } - }, - "import-fresh": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", - "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } - }, - "import-from": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", - "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - } - } - }, - "import-local": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", - "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true, - "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" - }, - "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - }, - "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", - "dev": true - }, - "inquirer": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.2.tgz", - "integrity": "sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==", - "dev": true, - "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.11", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "internal-ip": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", - "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true, - "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - } - }, - "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", - "dev": true - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", - "dev": true - }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true - }, - "ipaddr.js": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", - "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==", - "dev": true - }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true - }, - "is-color-stop": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", - "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", - "dev": true, - "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" - } - } - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-obj": { - "version": "1.0.1", - "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true - }, - "is-path-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz", - "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==", - "dev": true - }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } - }, - "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "requires": { - "isobject": "^3.0.1" - } - }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "^1.0.1" - } - }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" - }, - "is-svg": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", - "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", - "dev": true, - "requires": { - "html-comment-regex": "^1.1.0" - } - }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true, - "requires": { - "has-symbols": "^1.0.0" - } - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "isbinaryfile": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", - "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true, - "requires": { - "buffer-alloc": "^1.2.0" - } - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" - }, - "isomorphic-fetch": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", - "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", - "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" - } - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, - "js-base64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", - "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==", - "dev": true - }, - "js-cookie": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz", - "integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s=" - }, - "js-levenshtein": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", - "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, - "jsesc": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", - "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=" - }, - "json-parse-better-errors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", - "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" - }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" - }, - "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, - "jsx-ast-utils": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz", - "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=", - "dev": true, - "requires": { - "array-includes": "^3.0.3" - } - }, - "karma": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-4.1.0.tgz", - "integrity": "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw==", - "dev": true, - "requires": { - "bluebird": "^3.3.0", - "body-parser": "^1.16.1", - "braces": "^2.3.2", - "chokidar": "^2.0.3", - "colors": "^1.1.0", - "connect": "^3.6.0", - "core-js": "^2.2.0", - "di": "^0.0.1", - "dom-serialize": "^2.2.0", - "flatted": "^2.0.0", - "glob": "^7.1.1", - "graceful-fs": "^4.1.2", - "http-proxy": "^1.13.0", - "isbinaryfile": "^3.0.0", - "lodash": "^4.17.11", - "log4js": "^4.0.0", - "mime": "^2.3.1", - "minimatch": "^3.0.2", - "optimist": "^0.6.1", - "qjobs": "^1.1.4", - "range-parser": "^1.2.0", - "rimraf": "^2.6.0", - "safe-buffer": "^5.0.1", - "socket.io": "2.1.1", - "source-map": "^0.6.1", - "tmp": "0.0.33", - "useragent": "2.3.0" - }, - "dependencies": { - "core-js": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", - "integrity": "sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "karma-chrome-launcher": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", - "dev": true, - "requires": { - "fs-access": "^1.0.0", - "which": "^1.2.1" - } - }, - "karma-firefox-launcher": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz", - "integrity": "sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==", - "dev": true - }, - "karma-mocha": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/karma-mocha/-/karma-mocha-1.3.0.tgz", - "integrity": "sha1-7qrH/8DiAetjxGdEDStpx883eL8=", - "dev": true, - "requires": { - "minimist": "1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "karma-mocha-reporter": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz", - "integrity": "sha1-FRIAlejtgZGG5HoLAS8810GJVWA=", - "dev": true, - "requires": { - "chalk": "^2.1.0", - "log-symbols": "^2.1.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "karma-webpack": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-3.0.5.tgz", - "integrity": "sha512-nRudGJWstvVuA6Tbju9tyGUfXTtI1UXMXoRHVmM2/78D0q6s/Ye2IC157PKNDC15PWFGR0mVIRtWLAdcfsRJoA==", - "dev": true, - "requires": { - "async": "^2.0.0", - "babel-runtime": "^6.0.0", - "loader-utils": "^1.0.0", - "lodash": "^4.0.0", - "source-map": "^0.5.6", - "webpack-dev-middleware": "^2.0.6" - }, - "dependencies": { - "mime": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz", - "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==", - "dev": true - }, - "webpack-dev-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz", - "integrity": "sha512-tj5LLD9r4tDuRIDa5Mu9lnY2qBBehAITv6A9irqXhw/HQquZgTx3BCd57zYbU2gMDnncA49ufK2qVQSbaKJwOw==", - "dev": true, - "requires": { - "loud-rejection": "^1.6.0", - "memory-fs": "~0.4.1", - "mime": "^2.1.0", - "path-is-absolute": "^1.0.0", - "range-parser": "^1.0.3", - "url-join": "^2.0.2", - "webpack-log": "^1.0.1" - } - }, - "webpack-log": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-1.2.0.tgz", - "integrity": "sha512-U9AnICnu50HXtiqiDxuli5gLB5PGBo7VvcHx36jRZHwK4vzOYLbImqT4lwWwoMHdQWwEKw736fCHEekokTEKHA==", - "dev": true, - "requires": { - "chalk": "^2.1.0", - "log-symbols": "^2.1.0", - "loglevelnext": "^1.0.1", - "uuid": "^3.1.0" - } - } - } - }, - "killable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", - "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==" - }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } - }, - "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } - }, - "linkify-it": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.0.3.tgz", - "integrity": "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=", - "requires": { - "uc.micro": "^1.0.1" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "loader-runner": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", - "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==" - }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "requires": { - "chalk": "^2.0.1" - } - }, - "log4js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.1.1.tgz", - "integrity": "sha512-tSQUF9bBMdcBtuLD6vD7hBM9Ci6Lng/NVHZEq4YbuRGo7ObmLiZuhxz33HKAmJItit74pAjvZgirqYX2LRaoGA==", - "dev": true, - "requires": { - "date-format": "^2.0.0", - "debug": "^4.1.1", - "flatted": "^2.0.0", - "rfdc": "^1.1.2", - "streamroller": "^1.0.4" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "loglevel": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", - "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", - "dev": true - }, - "loglevelnext": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/loglevelnext/-/loglevelnext-1.0.5.tgz", - "integrity": "sha512-V/73qkPuJmx4BcBF19xPBr+0ZRVBhc4POxvZTZdMeXpJ4NItXSJ/MSwuFT0kQJlCbXvdlZoQQ/418bS1y9Jh6A==", - "dev": true, - "requires": { - "es6-symbol": "^3.1.1", - "object.assign": "^4.1.0" - } - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" - } - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "make-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", - "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, - "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==" - } - } - }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==" - }, - "map-age-cleaner": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", - "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "requires": { - "object-visit": "^1.0.0" - } - }, - "markdown-it": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-8.4.2.tgz", - "integrity": "sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==", - "requires": { - "argparse": "^1.0.7", - "entities": "~1.1.1", - "linkify-it": "^2.0.0", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" - } - }, - "md5.js": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", - "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "mdn-data": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.4.tgz", - "integrity": "sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==", - "dev": true - }, - "mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, - "mem": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", - "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - } - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, - "dependencies": { - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - } - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } - }, - "mime": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz", - "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==", - "dev": true - }, - "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "dev": true - }, - "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "dev": true, - "requires": { - "mime-db": "1.40.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "requires": { - "dom-walk": "^0.1.0" - } - }, - "mini-css-extract-plugin": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz", - "integrity": "sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" - } - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } - }, - "mocha": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz", - "integrity": "sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==", - "dev": true, - "requires": { - "ansi-colors": "3.2.3", - "browser-stdout": "1.3.1", - "debug": "3.2.6", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "find-up": "3.0.0", - "glob": "7.1.3", - "growl": "1.10.5", - "he": "1.2.0", - "js-yaml": "3.13.1", - "log-symbols": "2.2.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "ms": "2.1.1", - "node-environment-flags": "1.0.5", - "object.assign": "4.1.0", - "strip-json-comments": "2.0.1", - "supports-color": "6.0.0", - "which": "1.3.1", - "wide-align": "1.1.3", - "yargs": "13.2.2", - "yargs-parser": "13.0.0", - "yargs-unparser": "1.5.0" - }, - "dependencies": { - "ansi-colors": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz", - "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==", - "dev": true - }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - } - }, - "supports-color": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", - "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" - }, - "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, - "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, - "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", - "dev": true - }, - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==" - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - } - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "negotiator": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", - "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", - "dev": true - }, - "neo-async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.0.tgz", - "integrity": "sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==" - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, - "node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3", - "semver": "^5.7.0" - }, - "dependencies": { - "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", - "dev": true - } - } - }, - "node-fetch": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", - "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, - "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", - "dev": true - }, - "node-gyp": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", - "dev": true, - "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" - }, - "dependencies": { - "semver": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", - "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true - } - } - }, - "node-libs-browser": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.0.tgz", - "integrity": "sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==", - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.0", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "0.0.4" - }, - "dependencies": { - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } - } - }, - "node-modules-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", - "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=", - "dev": true - }, - "node-releases": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.13.tgz", - "integrity": "sha512-fKZGviSXR6YvVPyc011NHuJDSD8gFQvLPmc2d2V3BS4gr52ycyQ1Xzs7a8B+Ax3Ni/W+5h1h4SqmzeoA8WZRmA==", - "dev": true, - "requires": { - "semver": "^5.3.0" - } - }, - "node-sass": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", - "dev": true, - "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.11", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", - "sass-graph": "^2.2.4", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "cross-spawn": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", - "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "nopt": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", - "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", - "dev": true - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - }, - "npmlog": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, - "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" - } - }, - "nth-check": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", - "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", - "dev": true, - "requires": { - "boolbase": "~1.0.0" - } - }, - "null-check": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", - "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=", - "dev": true - }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "object-component": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", - "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", - "dev": true - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "requires": { - "isobject": "^3.0.0" - } - }, - "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" - } - }, - "object.entries": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", - "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.6.1", - "function-bind": "^1.1.0", - "has": "^1.0.1" - } - }, - "object.fromentries": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.0.tgz", - "integrity": "sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.11.0", - "function-bind": "^1.1.1", - "has": "^1.0.1" - } - }, - "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "requires": { - "isobject": "^3.0.1" - } - }, - "object.values": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", - "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.12.0", - "function-bind": "^1.1.1", - "has": "^1.0.3" - } - }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - } - }, - "opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } - }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, - "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } - }, - "original": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", - "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=" - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "osenv": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } - }, - "p-defer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", - "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", - "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", - "dev": true - }, - "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==" - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - } - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - }, - "dependencies": { - "callsites": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.0.0.tgz", - "integrity": "sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==", - "dev": true - } - } - }, - "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } - }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", - "dev": true - }, - "parseqs": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", - "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } - }, - "parseuri": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", - "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "pathval": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz", - "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", - "dev": true - }, - "pbkdf2": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", - "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, - "pirates": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", - "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", - "dev": true, - "requires": { - "node-modules-regexp": "^1.0.0" - } - }, - "pkg-dir": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", - "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "requires": { - "find-up": "^3.0.0" - } - }, - "popper.js": { - "version": "1.14.4", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.4.tgz", - "integrity": "sha1-juwdj/AqWjoVLdQ0FKFce3n9abY=" - }, - "portfinder": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.20.tgz", - "integrity": "sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==", - "dev": true, - "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" - }, - "postcss": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.5.tgz", - "integrity": "sha512-HBNpviAUFCKvEh7NZhw1e8MBPivRszIiUnhrJ+sBFVSYSqubrzwX3KG51mYgcRHX8j/cAgZJedONZcm5jTBdgQ==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.5.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } - }, - "postcss-calc": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz", - "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==", - "dev": true, - "requires": { - "css-unit-converter": "^1.1.1", - "postcss": "^7.0.5", - "postcss-selector-parser": "^5.0.0-rc.4", - "postcss-value-parser": "^3.3.1" - } - }, - "postcss-colormin": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz", - "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-convert-values": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz", - "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-discard-comments": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz", - "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-duplicates": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz", - "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-empty": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz", - "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-discard-overridden": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz", - "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-load-config": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz", - "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==", - "dev": true, - "requires": { - "cosmiconfig": "^4.0.0", - "import-cwd": "^2.0.0" - }, - "dependencies": { - "cosmiconfig": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz", - "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==", - "dev": true, - "requires": { - "is-directory": "^0.3.1", - "js-yaml": "^3.9.0", - "parse-json": "^4.0.0", - "require-from-string": "^2.0.1" - } - } - } - }, - "postcss-loader": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", - "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "postcss-merge-longhand": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz", - "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==", - "dev": true, - "requires": { - "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" - } - }, - "postcss-merge-rules": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz", - "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", - "dev": true, - "requires": { - "dot-prop": "^4.1.1", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "postcss-minify-font-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz", - "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-minify-gradients": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz", - "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-minify-params": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz", - "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" - } - }, - "postcss-minify-selectors": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz", - "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", - "dev": true, - "requires": { - "dot-prop": "^4.1.1", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "postcss-modules-extract-imports": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz", - "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", - "dev": true, - "requires": { - "postcss": "^7.0.5" - } - }, - "postcss-modules-local-by-default": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz", - "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==", - "dev": true, - "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0", - "postcss-value-parser": "^3.3.1" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", - "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss-modules-scope": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz", - "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==", - "dev": true, - "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", - "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss-modules-values": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz", - "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==", - "dev": true, - "requires": { - "icss-replace-symbols": "^1.1.0", - "postcss": "^7.0.6" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz", - "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "postcss-normalize-charset": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz", - "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", - "dev": true, - "requires": { - "postcss": "^7.0.0" - } - }, - "postcss-normalize-display-values": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz", - "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-positions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz", - "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-repeat-style": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz", - "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-string": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz", - "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", - "dev": true, - "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-timing-functions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz", - "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-unicode": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz", - "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-url": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz", - "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", - "dev": true, - "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-normalize-whitespace": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz", - "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", - "dev": true, - "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-ordered-values": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz", - "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", - "dev": true, - "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-reduce-initial": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz", - "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" - } - }, - "postcss-reduce-transforms": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz", - "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", - "dev": true, - "requires": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" - } - }, - "postcss-selector-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz", - "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==", - "dev": true, - "requires": { - "cssesc": "^2.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - }, - "dependencies": { - "cssesc": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz", - "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==", - "dev": true - } - } - }, - "postcss-svgo": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz", - "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", - "dev": true, - "requires": { - "is-svg": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" - } - }, - "postcss-unique-selectors": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz", - "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", - "dev": true, - "requires": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" - } - }, - "postcss-value-parser": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", - "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==", - "dev": true - }, - "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true - }, - "prettier": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.0.tgz", - "integrity": "sha512-sXe5lSt2WQlCbydGETgfm1YBShgOX4HxQkFPvbxkcwgDvGDeqVau8h+12+lmSVlP3rHPz0oavfddSZg/q+Szjw==", - "dev": true - }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", - "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==" - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "promise": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", - "requires": { - "asap": "~2.0.3" - } - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" - }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - }, - "proxy-addr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "dev": true, - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=" - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", - "dev": true - }, - "public-encrypt": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", - "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, - "dependencies": { - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - } - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, - "qjobs": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz", - "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==", - "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=" - }, - "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", - "dev": true - }, - "randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "requires": { - "safe-buffer": "^5.1.0" - } - }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } - }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", - "dev": true - }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - } - } - }, - "react": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz", - "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.13.6" - } - }, - "react-dom": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.8.6.tgz", - "integrity": "sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.13.6" - } - }, - "react-fast-compare": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-2.0.4.tgz", - "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" - }, - "react-helmet": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-5.2.1.tgz", - "integrity": "sha512-CnwD822LU8NDBnjCpZ4ySh8L6HYyngViTZLfBBb3NjtrpN8m49clH8hidHouq20I51Y6TpCTISCBbqiY5GamwA==", - "requires": { - "object-assign": "^4.1.1", - "prop-types": "^15.5.4", - "react-fast-compare": "^2.0.2", - "react-side-effect": "^1.1.0" - } - }, - "react-hot-loader": { - "version": "4.8.4", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.8.4.tgz", - "integrity": "sha512-O98btZXcm24ZgP+aPBD0W9N+GEnkOg6vlLEy/IMZ53u3K/dGqO0I/RU4qrmQzE+wMDLpwNo5TwxaAjVw9Y+IBA==", - "requires": { - "fast-levenshtein": "^2.0.6", - "global": "^4.3.0", - "hoist-non-react-statics": "^3.3.0", - "loader-utils": "^1.1.0", - "lodash": "^4.17.11", - "prop-types": "^15.6.1", - "react-lifecycles-compat": "^3.0.4", - "shallowequal": "^1.0.2", - "source-map": "^0.7.3" - }, - "dependencies": { - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" - } - } - }, - "react-is": { - "version": "16.8.6", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", - "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" - }, - "react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, - "react-redux": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-6.0.1.tgz", - "integrity": "sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ==", - "requires": { - "@babel/runtime": "^7.3.1", - "hoist-non-react-statics": "^3.3.0", - "invariant": "^2.2.4", - "loose-envify": "^1.4.0", - "prop-types": "^15.7.2", - "react-is": "^16.8.2" - } - }, - "react-router": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz", - "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==", - "requires": { - "@babel/runtime": "^7.1.2", - "create-react-context": "^0.2.2", - "history": "^4.9.0", - "hoist-non-react-statics": "^3.1.0", - "loose-envify": "^1.3.1", - "path-to-regexp": "^1.7.0", - "prop-types": "^15.6.2", - "react-is": "^16.6.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - }, - "dependencies": { - "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", - "requires": { - "isarray": "0.0.1" - } - } - } - }, - "react-router-config": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-router-config/-/react-router-config-5.0.0.tgz", - "integrity": "sha512-si94cIg3HRXgwZB4vJGW6xkxOTMwCe1BXyBjkLstqZ+1rpqqAvo280BeQ8ZjIyYgiM/TDOa5Yu+HC4swUwri1w==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, - "react-router-dom": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz", - "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==", - "requires": { - "@babel/runtime": "^7.1.2", - "history": "^4.9.0", - "loose-envify": "^1.3.1", - "prop-types": "^15.6.2", - "react-router": "5.0.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - } - }, - "react-side-effect": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz", - "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==", - "requires": { - "exenv": "^1.2.1", - "shallowequal": "^1.0.1" - } - }, - "react-tooltip": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.10.0.tgz", - "integrity": "sha512-GGdxJvM1zSFztkTP7gCQbLTstWr1OOoMpJ5WZUGhimj0nhRY+MPz+92MpEnKmj0cftJ9Pd/M6FfSl0sfzmZWkg==", - "requires": { - "classnames": "^2.2.5", - "prop-types": "^15.6.0" - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "^2.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^2.0.0" - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "^2.0.0", - "read-pkg": "^2.0.0" - }, - "dependencies": { - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "^2.0.0" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "^1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "^1.1.0" - } - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" - } - }, - "redux": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz", - "integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==", - "requires": { - "loose-envify": "^1.4.0", - "symbol-observable": "^1.2.0" - } - }, - "redux-thunk": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.3.0.tgz", - "integrity": "sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==" - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, - "regenerate-unicode-properties": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz", - "integrity": "sha512-SbA/iNrBUf6Pv2zU8Ekv1Qbhv92yxL4hiDa2siuxs4KKn4oOoMDHXjAf7+Nz9qinUQ46B1LcWEi/PhJfPWpZWQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.0" - } - }, - "regenerator-runtime": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", - "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" - }, - "regenerator-transform": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz", - "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==", - "dev": true, - "requires": { - "private": "^0.1.6" - } - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "regexp-tree": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.6.tgz", - "integrity": "sha512-LFrA98Dw/heXqDojz7qKFdygZmFoiVlvE1Zp7Cq2cvF+ZA+03Gmhy0k0PQlsC1jvHPiTUSs+pDHEuSWv6+6D7w==", - "dev": true - }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", - "dev": true - }, - "regexpu-core": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", - "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", - "dev": true, - "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.0.2", - "regjsgen": "^0.5.0", - "regjsparser": "^0.6.0", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.1.0" - } - }, - "regjsgen": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.0.tgz", - "integrity": "sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==", - "dev": true - }, - "regjsparser": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz", - "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" - }, - "repeat-element": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", - "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - } - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" - }, - "resolve": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.10.1.tgz", - "integrity": "sha512-KuIe4mf++td/eFb6wkaPbMDnP6kObCaEtIDuHOUED6MNUo4K670KZUHuuvYPZDxNF0WVLw49n06M2m2dXphEzA==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "resolve-pathname": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", - "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==" - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" - }, - "rfdc": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.2.tgz", - "integrity": "sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==", - "dev": true - }, - "rgb-regex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", - "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=", - "dev": true - }, - "rgba-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", - "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=", - "dev": true - }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "requires": { - "glob": "^7.1.3" - } - }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } - }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "requires": { - "aproba": "^1.1.1" - } - }, - "rw": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", - "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" - }, - "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "requires": { - "ret": "~0.1.10" - } - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", - "dev": true, - "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "^1.0.0" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "^1.0.0" - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "^2.0.0" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", - "dev": true, - "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" - } - }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", - "dev": true, - "requires": { - "camelcase": "^3.0.0" - } - } - } - }, - "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", - "dev": true, - "requires": { - "clone-deep": "^2.0.1", - "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", - "neo-async": "^2.5.0", - "pify": "^3.0.0", - "semver": "^5.5.0" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, - "scheduler": { - "version": "0.13.6", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz", - "integrity": "sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "scss-tokenizer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", - "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", - "dev": true, - "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selfsigned": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", - "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", - "dev": true, - "requires": { - "node-forge": "0.7.5" - } - }, - "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==" - }, - "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz", - "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==" - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, - "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", - "dev": true, - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" - }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==", - "dev": true - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } - }, - "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", - "dev": true, - "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "shallowequal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", - "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", - "dev": true, - "requires": { - "is-arrayish": "^0.3.1" - }, - "dependencies": { - "is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", - "dev": true - } - } - }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - } - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "requires": { - "kind-of": "^3.2.0" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "socket.io": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", - "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", - "dev": true, - "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "socket.io-adapter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", - "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=", - "dev": true - }, - "socket.io-client": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", - "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", - "dev": true, - "requires": { - "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", - "to-array": "0.1.4" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "socket.io-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", - "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", - "dev": true, - "requires": { - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true, - "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" - } - }, - "sockjs-client": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", - "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", - "dev": true, - "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - } - } - }, - "source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } - }, - "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" - }, - "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz", - "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==", - "dev": true - }, - "spdy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.0.tgz", - "integrity": "sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", - "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "readable-stream": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz", - "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "requires": { - "extend-shallow": "^3.0.0" - }, - "dependencies": { - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - } - }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true - }, - "stdout-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", - "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", - "dev": true, - "requires": { - "readable-stream": "^2.0.1" - } - }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } - }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" - }, - "streamroller": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.4.tgz", - "integrity": "sha512-Wc2Gm5ygjSX8ZpW9J7Y9FwiSzTlKSvcl0FTTMd3rn7RoxDXpBW+xD9TY5sWL2n0UR61COB0LG1BQvN6nTUQbLQ==", - "dev": true, - "requires": { - "async": "^2.6.1", - "date-format": "^2.0.0", - "debug": "^3.1.0", - "fs-extra": "^7.0.0", - "lodash": "^4.17.10" - } - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "^4.0.1" - }, - "dependencies": { - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - } - } - }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true - }, - "style-loader": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", - "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "stylehacks": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz", - "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" - }, - "dependencies": { - "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", - "dev": true, - "requires": { - "dot-prop": "^4.1.1", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" - } - } - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - }, - "svgo": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz", - "integrity": "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", - "css-tree": "1.0.0-alpha.28", - "css-url-regex": "^1.1.0", - "csso": "^3.5.1", - "js-yaml": "^3.12.0", - "mkdirp": "~0.5.1", - "object.values": "^1.1.0", - "sax": "~1.2.4", - "stable": "^0.1.8", - "unquote": "~1.1.1", - "util.promisify": "~1.0.0" - } - }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" - }, - "table": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/table/-/table-5.2.3.tgz", - "integrity": "sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==", - "dev": true, - "requires": { - "ajv": "^6.9.1", - "lodash": "^4.17.11", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "tapable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.0.tgz", - "integrity": "sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==" - }, - "tar": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", - "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.2", - "inherits": "2" - } - }, - "terser": { - "version": "3.17.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", - "integrity": "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==", - "requires": { - "commander": "^2.19.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.10" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "terser-webpack-plugin": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz", - "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==", - "requires": { - "cacache": "^11.0.2", - "find-cache-dir": "^2.0.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.4.0", - "source-map": "^0.6.1", - "terser": "^3.16.1", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "thunky": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", - "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==", - "dev": true - }, - "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", - "requires": { - "setimmediate": "^1.0.4" - } - }, - "timsort": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz", - "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", - "dev": true - }, - "tiny-invariant": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz", - "integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==" - }, - "tiny-warning": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz", - "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==" - }, - "tippy.js": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-2.6.0.tgz", - "integrity": "sha512-hBcy6UXK3epiFwpkycy7Pn1SSLofUmawpPnlYg5ginbXMc/3EX2ivjzHfjvr/WPEpUg71/7ssiovhxDtCWvL2A==", - "requires": { - "popper.js": "^1.14.3" - } - }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=" - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - }, - "dependencies": { - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - } - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "requires": { - "is-plain-object": "^2.0.4" - } - } - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", - "dev": true - }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "dev": true, - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } - } - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" - }, - "true-case-path": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", - "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", - "dev": true, - "requires": { - "glob": "^7.1.2" - } - }, - "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, - "requires": { - "prelude-ls": "~1.1.2" - } - }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" - }, - "ua-parser-js": { - "version": "0.7.19", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.19.tgz", - "integrity": "sha512-T3PVJ6uz8i0HzPxOF9SWzWAlfN/DavlpQqepn22xgve/5QecC+XMCAtmUNnY7C9StehaV6exjUCI801lOI7QlQ==" - }, - "uc.micro": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.5.tgz", - "integrity": "sha512-JoLI4g5zv5qNyT09f4YAvEZIIV1oOjqnewYg5D38dkQljIzpPT296dbIGvKro3digYI1bkb7W6EP1y4uDlmzLg==" - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", - "dev": true - }, - "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", - "dev": true - }, - "unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", - "dev": true, - "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" - } - }, - "unicode-match-property-value-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", - "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", - "dev": true - }, - "unicode-property-aliases-ecmascript": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", - "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", - "dev": true - }, - "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, - "unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.1.tgz", - "integrity": "sha512-n9cU6+gITaVu7VGj1Z8feKMmfAjEAQGhwD9fE3zvpRRa0wEIx8ODYkVGfSc94M2OX00tUFV8wH3zYbm1I8mxFg==", - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, - "unquote": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", - "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=", - "dev": true - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, - "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==" - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - } - } - }, - "url-join": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/url-join/-/url-join-2.0.5.tgz", - "integrity": "sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=", - "dev": true - }, - "url-loader": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-1.1.2.tgz", - "integrity": "sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "mime": "^2.0.3", - "schema-utils": "^1.0.0" - }, - "dependencies": { - "mime": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", - "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - } - } - }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" - }, - "useragent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", - "dev": true, - "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" - } - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "requires": { - "inherits": "2.0.3" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "util.promisify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", - "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" - } - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, - "v8-compile-cache": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz", - "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "value-equal": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", - "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "vendors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", - "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "requires": { - "indexof": "0.0.1" - } - }, - "void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=", - "dev": true - }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", - "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" - } - }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "^1.0.0" - } - }, - "webpack": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.31.0.tgz", - "integrity": "sha512-n6RVO3X0LbbipoE62akME9K/JI7qYrwwufs20VvgNNpqUoH4860KkaxJTbGq5bgkVZF9FqyyTG/0WPLH3PVNJA==", - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/wasm-edit": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "^6.0.5", - "acorn-dynamic-import": "^4.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^1.0.0", - "tapable": "^1.1.0", - "terser-webpack-plugin": "^1.1.0", - "watchpack": "^1.5.0", - "webpack-sources": "^1.3.0" - } - }, - "webpack-cli": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.2.tgz", - "integrity": "sha512-FLkobnaJJ+03j5eplxlI0TUxhGCOdfewspIGuvDVtpOlrAuKMFC57K42Ukxqs1tn8947/PM6tP95gQc0DCzRYA==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.0", - "findup-sync": "^2.0.0", - "global-modules": "^1.0.0", - "import-local": "^2.0.0", - "interpret": "^1.1.0", - "loader-utils": "^1.1.0", - "supports-color": "^5.5.0", - "v8-compile-cache": "^2.0.2", - "yargs": "^12.0.5" - }, - "dependencies": { - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "webpack-dev-middleware": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz", - "integrity": "sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==", - "dev": true, - "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.3.1", - "range-parser": "^1.0.3", - "webpack-log": "^2.0.0" - }, - "dependencies": { - "mime": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.1.tgz", - "integrity": "sha512-VRUfmQO0rCd3hKwBymAn3kxYzBHr3I/wdVMywgG3HhXOwrCQgN84ZagpdTm2tZ4TNtwsSmyJWYO88mb5XvzGqQ==", - "dev": true - } - } - }, - "webpack-dev-server": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz", - "integrity": "sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.1.5", - "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.0", - "express": "^4.16.4", - "html-entities": "^1.2.1", - "http-proxy-middleware": "^0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.2.0", - "ip": "^1.1.5", - "killable": "^1.0.1", - "loglevel": "^1.6.1", - "opn": "^5.5.0", - "portfinder": "^1.0.20", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.4", - "semver": "^6.0.0", - "serve-index": "^1.9.1", - "sockjs": "0.3.19", - "sockjs-client": "1.3.0", - "spdy": "^4.0.0", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "^3.6.2", - "webpack-log": "^2.0.0", - "yargs": "12.0.5" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "webpack-hot-middleware": { - "version": "2.24.4", - "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.24.4.tgz", - "integrity": "sha512-YFA4j2tg9WPkcQKcyHMZn6787QngWf/ahXvAJRZ1ripySa+4ihjzDcYBsfC4ihOucTd02IJ12v+VTGMsEGxq0w==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "html-entities": "^1.2.0", - "querystring": "^0.2.0", - "strip-ansi": "^3.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "webpack-log": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", - "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } - }, - "webpack-manifest-plugin": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.0.4.tgz", - "integrity": "sha512-nejhOHexXDBKQOj/5v5IZSfCeTO3x1Dt1RZEcGfBSul891X/eLIcIVH31gwxPDdsi2Z8LKKFGpM4w9+oTBOSCg==", - "dev": true, - "requires": { - "fs-extra": "^7.0.0", - "lodash": ">=3.5 <5", - "tapable": "^1.0.0" - } - }, - "webpack-sources": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", - "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - } - } - }, - "websocket-driver": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", - "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", - "dev": true, - "requires": { - "http-parser-js": ">=0.4.0", - "websocket-extensions": ">=0.1.1" - } - }, - "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", - "dev": true - }, - "whatwg-fetch": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz", - "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q==" - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "wide-align": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", - "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", - "dev": true, - "requires": { - "string-width": "^1.0.2 || 2" - } - }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true - }, - "worker-farm": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", - "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "requires": { - "errno": "~0.1.7" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" - }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - } - }, - "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - } - }, - "xmlhttprequest-ssl": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz", - "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=", - "dev": true - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz", - "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } - } - }, - "yargs-parser": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz", - "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - }, - "yargs-unparser": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.5.0.tgz", - "integrity": "sha512-HK25qidFTCVuj/D1VfNiEndpLIeJN78aqgR23nL3y4N0U/91cOAzqfHlF8n2BvoNDcZmJKin3ddNSvOxSr8flw==", - "dev": true, - "requires": { - "flat": "^4.1.0", - "lodash": "^4.17.11", - "yargs": "^12.0.5" - }, - "dependencies": { - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "yeast": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", - "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", - "dev": true - } - } -} diff --git a/web/package.json b/web/package.json deleted file mode 100644 index 0d1dc970..00000000 --- a/web/package.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "dnote", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "./node_modules/karma/bin/karma start ./karma.conf.js --single-run", - "lint": "./node_modules/.bin/eslint ./src" - }, - "author": "Sung Won Cho (https://dnote.io)", - "license": "AGPL", - "devDependencies": { - "@babel/core": "^7.4.4", - "@babel/plugin-transform-react-constant-elements": "^7.2.0", - "@babel/preset-env": "^7.4.4", - "@babel/preset-react": "^7.0.0", - "@babel/register": "^7.4.4", - "@hot-loader/react-dom": "^16.8.6", - "autoprefixer": "^9.5.1", - "babel-eslint": "^10.0.0", - "babel-loader": "^8.0.5", - "babel-plugin-transform-react-remove-prop-types": "^0.4.24", - "chai": "^4.2.0", - "css-loader": "^2.1.1", - "cssnano": "^4.1.10", - "eslint": "^5.16.0", - "eslint-config-airbnb": "^17.0.0", - "eslint-config-prettier": "^4.2.0", - "eslint-plugin-import": "^2.17.2", - "eslint-plugin-jsx-a11y": "^6.2.1", - "eslint-plugin-prettier": "^3.0.1", - "eslint-plugin-react": "^7.13.0", - "eslint-plugin-react-hooks": "^1.6.0", - "file-loader": "^3.0.1", - "karma": "^4.1.0", - "karma-chrome-launcher": "^2.2.0", - "karma-firefox-launcher": "^1.1.0", - "karma-mocha": "^1.3.0", - "karma-mocha-reporter": "^2.2.5", - "karma-webpack": "^3.0.5", - "mini-css-extract-plugin": "^0.5.0", - "mocha": "^6.1.4", - "node-sass": "^4.12.0", - "postcss-loader": "^3.0.0", - "prettier": "^1.17.0", - "sass-loader": "^7.0.1", - "source-map-support": "^0.5.12", - "style-loader": "^0.23.0", - "url-loader": "^1.0.1", - "webpack-cli": "^3.3.2", - "webpack-dev-middleware": "^3.6.2", - "webpack-dev-server": "^3.3.1", - "webpack-hot-middleware": "^2.24.4", - "webpack-manifest-plugin": "^2.0.2" - }, - "dependencies": { - "@babel/plugin-proposal-class-properties": "^7.4.4", - "classnames": "^2.2.5", - "core-js": "^3.0.1", - "d3": "^5.9.2", - "highlight.js": "^9.15.6", - "hoist-non-react-statics": "^3.3.0", - "http-proxy": "^1.14.0", - "js-cookie": "^2.2.0", - "lodash": "^4.17.4", - "markdown-it": "^8.4.1", - "moment": "^2.24.0", - "prop-types": "^15.7.2", - "qs": "^6.7.0", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "react-helmet": "^5.2.1", - "react-hot-loader": "^4.8.4", - "react-redux": "^6.0.1", - "react-router": "^5.0.0", - "react-router-config": "^5.0.0", - "react-router-dom": "^5.0.0", - "react-tooltip": "^3.10.0", - "redux": "^4.0.0", - "redux-thunk": "^2.1.0", - "regenerator-runtime": "^0.13.2", - "tippy.js": "^2.5.3", - "webpack": "^4.31.0" - } -} diff --git a/web/scripts/build-prod.sh b/web/scripts/build-prod.sh deleted file mode 100755 index 8ccb352d..00000000 --- a/web/scripts/build-prod.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# build.sh builds a production bundle -set -eux - -basePath="$GOPATH/src/github.com/dnote/dnote" -publicPath="$basePath/web/public" -compiledPath="$basePath/web/compiled" - - -baseUrl=https://dnote.io -assetBaseUrl=https://dnote.io - -# baseUrl=http://localhost:3000 -# assetBaseUrl=http://localhost:3000 - -STANDALONE=true \ -BASE_URL=$baseUrl \ -ASSET_BASE_URL=$assetBaseUrl \ -PUBLIC_PATH=$publicPath \ -COMPILED_PATH=$compiledPath \ -"$basePath"/web/scripts/build.sh - diff --git a/web/scripts/build.sh b/web/scripts/build.sh deleted file mode 100755 index e530f16d..00000000 --- a/web/scripts/build.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# build.sh builds a production bundle -set -eux - -basePath="$GOPATH/src/github.com/dnote/dnote" -standalone=${STANDALONE:-false} - -rm -rf "$basePath/web/public" -mkdir -p "$basePath/web/public/dist" - -pushd "$basePath/web" - PUBLIC_PATH="$PUBLIC_PATH" \ - COMPILED_PATH="$COMPILED_PATH" \ - "$basePath"/web/scripts/setup.sh - - OUTPUT_PATH="$COMPILED_PATH" \ - "$basePath"/web/node_modules/.bin/webpack\ - --colors\ - --display-error-details\ - --env.standalone="$standalone"\ - --config "$basePath"/web/webpack/prod.config.js - - NODE_ENV=PRODUCTION \ - BASE_URL=$BASE_URL \ - ASSET_BASE_URL=$ASSET_BASE_URL \ - PUBLIC_PATH=$PUBLIC_PATH \ - COMPILED_PATH=$COMPILED_PATH \ - "$basePath"/web/scripts/placeholder.sh - - cp "$COMPILED_PATH"/*.js "$COMPILED_PATH"/*.css "$PUBLIC_PATH"/dist - - # clean up compiled - rm -rf "$basePath"/web/compiled/* -popd diff --git a/web/scripts/dev.sh b/web/scripts/dev.sh deleted file mode 100755 index 00c6d6e0..00000000 --- a/web/scripts/dev.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# dev.sh builds and starts development environment for standalone app -set -eux -o pipefail - -basePath="$GOPATH/src/github.com/dnote/dnote" -appPath="$basePath"/web - -# run webpack-dev-server for js -( - cd "$appPath" && - - BASE_URL=http://localhost:8080 \ - ASSET_BASE_URL=http://localhost:3000 \ - COMPILED_PATH="$appPath"/compiled \ - PUBLIC_PATH="$appPath"/public \ - STANDALONE=true \ - COMPILED_PATH="$basePath/web/compiled" \ - "$appPath"/scripts/webpack-dev.sh -) & - -# run server -(cd "$appPath" && PORT=3000 go run main.go) diff --git a/web/scripts/placeholder.js b/web/scripts/placeholder.js deleted file mode 100644 index 15b115ac..00000000 --- a/web/scripts/placeholder.js +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -// placeholder.js replaces the placeholders in index.html with real values -// It is needed to load assets whose paths are not fixed because they change -// every time they are generated. - -const fs = require('fs'); -const path = require('path'); - -const publicPath = process.env.PUBLIC_PATH; -const compiledPath = process.env.COMPILED_PATH; - -const indexHtmlPath = `${publicPath}/index.html`; - -const assetManifestPath = path.resolve(compiledPath, 'webpack-manifest.json'); -let manifest; - -try { - // eslint-disable-next-line import/no-dynamic-require,global-require - manifest = require(assetManifestPath); - // eslint-disable-next-line no-empty -} catch (e) {} - -const isProduction = process.env.NODE_ENV === 'PRODUCTION'; - -const baseURL = process.env.BASE_URL; -const assetBaseURL = process.env.ASSET_BASE_URL; - -function getJSBundleTag() { - let jsBundleUrl; - if (isProduction) { - jsBundleUrl = `${baseURL}${manifest['app.js']}`; - } else { - jsBundleUrl = `${baseURL}/dist/app.js`; - } - - return ``; -} - -// Replace the placeholders with real values -fs.readFile(indexHtmlPath, 'utf8', (err, data) => { - if (err) { - console.log('Error while reading index.html'); - console.log(err); - process.exit(1); - } - - const jsBundleTag = getJSBundleTag(); - let result = data.replace(//g, jsBundleTag); - result = result.replace(//g, assetBaseURL); - - if (isProduction) { - const cssBundleUrl = `${baseURL}${manifest['app.css']}`; - const cssBundleTag = ``; - - result = result.replace(//g, cssBundleTag); - } - - fs.writeFile(indexHtmlPath, result, 'utf8', writeErr => { - if (writeErr) { - console.log('Error while writing index.html'); - console.log(writeErr); - process.exit(1); - } - }); -}); diff --git a/web/scripts/placeholder.sh b/web/scripts/placeholder.sh deleted file mode 100755 index 940ed21e..00000000 --- a/web/scripts/placeholder.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -eux - -basePath="$GOPATH/src/github.com/dnote/dnote" - -if [ -z "$BASE_URL" ]; then - echo "BASE_URL environment variable is not set" - exit 1 -fi -if [ -z "$ASSET_BASE_URL" ]; then - echo "ASSET_BASE_URL environment variable is not set" - exit 1 -fi -if [ -z "$PUBLIC_PATH" ]; then - echo "PUBLIC_PATH environment variable is not set" - exit 1 -fi -if [ -z "$COMPILED_PATH" ]; then - echo "COMPILED_PATH environment variable is not set" - exit 1 -fi - -BASE_URL=$BASE_URL \ -ASSET_BASE_URL=$ASSET_BASE_URL \ -PUBLIC_PATH=$PUBLIC_PATH \ -COMPILED_PATH=$COMPILED_PATH \ - node "$basePath/web/scripts/placeholder.js" diff --git a/web/scripts/setup.sh b/web/scripts/setup.sh deleted file mode 100755 index a377c2cb..00000000 --- a/web/scripts/setup.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# setup.sh prepares the directory structure and copies static files -set -eux -o pipefail - -basePath="$GOPATH/src/github.com/dnote/dnote" -appStaticDir=$PUBLIC_PATH -compiledPath=$COMPILED_PATH - -# prepare directories -rm -rf "$compiledPath" -rm -rf "$appStaticDir" -mkdir -p "$compiledPath" -mkdir -p "$appStaticDir/dist" - -# copy the assets and artifacts -cp -r "$basePath"/web/static/* "$appStaticDir/dist" -cp "$basePath/web/index.html" "$appStaticDir" diff --git a/web/scripts/start.sh b/web/scripts/start.sh deleted file mode 100755 index 754a8e1c..00000000 --- a/web/scripts/start.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# start.sh starts the server - -export PORT=3000 - -go run main.go diff --git a/web/scripts/webpack-dev.sh b/web/scripts/webpack-dev.sh deleted file mode 100755 index 63ccb631..00000000 --- a/web/scripts/webpack-dev.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -eux - -basePath="$GOPATH/src/github.com/dnote/dnote" -appPath="$basePath"/web - -( - cd "$appPath" && - PUBLIC_PATH=$PUBLIC_PATH \ - COMPILED_PATH=$COMPILED_PATH \ - "$appPath"/scripts/setup.sh && - - BASE_URL=$BASE_URL \ - ASSET_BASE_URL=$ASSET_BASE_URL \ - COMPILED_PATH=$COMPILED_PATH \ - PUBLIC_PATH=$PUBLIC_PATH \ - "$appPath"/scripts/placeholder.sh && - - "$appPath"/node_modules/.bin/webpack-dev-server\ - --env.standalone="$STANDALONE"\ - --config "$appPath"/webpack/dev.config.js -) diff --git a/web/src/actions/auth.js b/web/src/actions/auth.js deleted file mode 100644 index 8c042a70..00000000 --- a/web/src/actions/auth.js +++ /dev/null @@ -1,214 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import { getMe } from '../services/users'; -import { apiClient } from '../libs/http'; -import * as paymentService from '../services/payment'; -import * as usersService from '../services/users'; - -export const START_FETCHING_USER = 'auth/START_FETCHING_USER'; -export const RECEIVE_USER = 'auth/RECEIVE_USER'; -export const RECEIVE_USER_ERROR = 'auth/RECEIVE_USER_ERROR'; -export const RECEIVE_EMAIL_PREFERENCE = 'auth/RECEIVE_EMAIL_PREFERENCE'; -export const RECEIVE_EMAIL_PREFERENCE_ERROR = - 'auth/RECEIVE_EMAIL_PREFERENCE_ERROR'; -export const START_FETCHING_SUBSCRIPTION = 'auth/START_FETCHING_SUBSCRIPTION'; -export const RECEIVE_SUBSCRIPTION = 'auth/RECEIVE_SUBSCRIPTION'; -export const CLEAR_SUBSCRIPTION = 'auth/CLEAR_SUBSCRIPTION'; -export const RECEIVE_SUBSCRIPTION_ERROR = 'auth/RECEIVE_SUBSCRIPTION_ERROR'; -export const START_FETCHING_SOURCE = 'auth/START_FETCHING_SOURCE'; -export const RECEIVE_SOURCE = 'auth/RECEIVE_SOURCE'; -export const CLEAR_SOURCE = 'auth/CLEAR_SOURCE'; -export const RECEIVE_SOURCE_ERROR = 'auth/RECEIVE_SOURCE_ERROR'; - -function startFetchingUser() { - return { - type: START_FETCHING_USER - }; -} - -export function receiveUser(user) { - return { - type: RECEIVE_USER, - data: { user } - }; -} - -function receiveUserError(errorMessage) { - return { - type: RECEIVE_USER_ERROR, - data: { errorMessage } - }; -} - -export function receiveEmailPreference(emailPreference) { - return { - type: RECEIVE_EMAIL_PREFERENCE, - data: { emailPreference } - }; -} - -export function getEmailPreferenceError(errorMessage) { - return { - type: RECEIVE_EMAIL_PREFERENCE_ERROR, - data: { errorMessage } - }; -} - -export function getEmailPreference(token) { - return dispatch => { - return usersService - .getEmailPreference({ token }) - .then(emailPreference => { - dispatch(receiveEmailPreference(emailPreference)); - }) - .catch(err => { - console.log('error fetching email preference', err.message); - dispatch(getEmailPreferenceError(err.message)); - }); - }; -} - -export function getCurrentUser(options = {}) { - return dispatch => { - if (!options.refresh) { - dispatch(startFetchingUser()); - } - - return getMe() - .then(user => { - dispatch(receiveUser(user)); - - return user; - }) - .catch(err => { - // 401 if not logged in - if (err.response.status === 401) { - dispatch(receiveUser({})); - return; - } - - dispatch(receiveUserError(err.message)); - }); - }; -} - -export function startFetchingSubscription() { - return { - type: START_FETCHING_SUBSCRIPTION - }; -} - -export function receiveSubscription(subscription) { - return { - type: RECEIVE_SUBSCRIPTION, - data: { subscription } - }; -} - -export function clearSubscription() { - return { - type: CLEAR_SUBSCRIPTION - }; -} - -export function receiveSubscriptionError(errorMessage) { - return { - type: RECEIVE_SUBSCRIPTION_ERROR, - data: { errorMessage } - }; -} - -export function getSubscription() { - return dispatch => { - dispatch(startFetchingSubscription()); - - return paymentService - .getSubscription() - .then(subscription => { - dispatch(receiveSubscription(subscription)); - }) - .catch(err => { - console.log('error fetching subscription', err.message); - dispatch(receiveSubscriptionError(err.message)); - }); - }; -} - -export function startFetchingSource() { - return { - type: START_FETCHING_SOURCE - }; -} - -export function receiveSource(source) { - return { - type: RECEIVE_SOURCE, - data: { source } - }; -} - -export function clearSource() { - return { - type: CLEAR_SOURCE - }; -} - -export function receiveSourceError(errorMessage) { - return { - type: RECEIVE_SOURCE_ERROR, - data: { errorMessage } - }; -} - -export function getSource() { - return dispatch => { - dispatch(startFetchingSource()); - - return paymentService - .getSource() - .then(source => { - console.log('source', source); - dispatch(receiveSource(source)); - }) - .catch(err => { - console.log('error fetching source', err.message); - dispatch(receiveSourceError(err.message)); - }); - }; -} - -export function legacyGetCurrentUser() { - return dispatch => { - return apiClient - .get('/legacy/me') - .then(res => { - const { user } = res; - - dispatch(receiveUser(user)); - }) - .catch(err => { - // 401 if not logged in - if (err.status === 401) { - return; - } - - console.log('getUser error', err); - }); - }; -} diff --git a/web/src/actions/books.js b/web/src/actions/books.js deleted file mode 100644 index 54758729..00000000 --- a/web/src/actions/books.js +++ /dev/null @@ -1,82 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import * as booksService from '../services/books'; -import { decryptBook } from '../crypto/books'; - -export const RECEIVE = 'books/RECEIVE'; -export const ADD = 'books/ADD'; -export const REMOVE = 'books/REMOVE'; -export const START_FETCHING = 'books/START_FETCHING'; -export const FINISH_FETCHING = 'books/FINISH_FETCHING'; - -function receiveBooks(books) { - return { - type: RECEIVE, - data: { books } - }; -} - -function startFetchingBooks() { - return { - type: START_FETCHING - }; -} - -function finishFetchingBooks() { - return { - type: FINISH_FETCHING - }; -} - -export function getBooks(cipherKeyBuf, demo) { - return dispatch => { - dispatch(startFetchingBooks()); - - return booksService - .fetch({}, { demo }) - .then(books => { - const p = books.map(book => { - return decryptBook(book, cipherKeyBuf); - }); - - return Promise.all(p).then(booksDec => { - dispatch(receiveBooks(booksDec)); - dispatch(finishFetchingBooks()); - }); - }) - .catch(err => { - console.log('getBooks error', err); - // todo: handle error - }); - }; -} - -export function addBook(book) { - return { - type: ADD, - data: { book } - }; -} - -export function removeBook(bookUUID) { - return { - type: REMOVE, - data: { bookUUID } - }; -} diff --git a/web/src/actions/calendar.js b/web/src/actions/calendar.js deleted file mode 100644 index f4f69d87..00000000 --- a/web/src/actions/calendar.js +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import { fetchCalendar } from '../services/users'; - -export const RECEIVE_CALENDAR = 'calendar/RECEIVE_CALENDAR'; -export const RECEIVE_CALENDAR_ERROR = 'calendar/RECEIVE_CALENDAR_ERROR'; -export const START_FETCHING = 'calendar/START_FETCHING'; - -function receiveCalendar(items) { - return { - type: RECEIVE_CALENDAR, - data: { items } - }; -} - -function startFetchingCalendar() { - return { - type: START_FETCHING - }; -} - -function receiveCalendarError(error) { - return { - type: RECEIVE_CALENDAR_ERROR, - data: { - error: { - status: error.status, - message: error.message - } - } - }; -} - -export function getLessonCalendar(options = { demo: false }) { - return dispatch => { - dispatch(startFetchingCalendar()); - - const { demo } = options; - - return fetchCalendar({ demo }) - .then(res => { - dispatch(receiveCalendar(res)); - }) - .catch(err => { - dispatch(receiveCalendarError(err)); - }); - }; -} - -// helpers - -export function isCalendarLoaded(state) { - return state.calendar.isFetched && !state.calendar.error; -} diff --git a/web/src/actions/digest.js b/web/src/actions/digest.js deleted file mode 100644 index 92ddd5f9..00000000 --- a/web/src/actions/digest.js +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import { fetchDigestNotes } from '../services/digests'; -import { decryptNote } from '../crypto/notes'; - -export const START_FETCHING_DIGEST_NOTES = 'digest/START_FETCHING_DIGEST_NOTES'; -export const RECEIVE_DIGEST_NOTES = 'digest/RECEIVE_DIGEST_NOTES'; -export const RECEIVE_ERROR = 'digest/RECEIVE_ERROR'; - -function receiveDigestNotes(notes) { - return { - type: RECEIVE_DIGEST_NOTES, - data: { - notes - } - }; -} - -function startFetchingDigestNotes() { - return { - type: START_FETCHING_DIGEST_NOTES - }; -} - -function receiveError(error) { - return { - type: RECEIVE_ERROR, - data: { - error - } - }; -} - -export function getDigestNotes(cipherKeyBuf, digestUUID) { - return async dispatch => { - try { - dispatch(startFetchingDigestNotes()); - - const notes = await fetchDigestNotes(digestUUID); - - const p = notes.map(note => { - return decryptNote(note, cipherKeyBuf); - }); - - const notesDec = await Promise.all(p); - dispatch(receiveDigestNotes(notesDec)); - } catch (err) { - console.log('Error fetching digest notes', err.stack); - dispatch(receiveError(err.message)); - } - }; -} diff --git a/web/src/actions/editor.js b/web/src/actions/editor.js deleted file mode 100644 index 4e4dfbd9..00000000 --- a/web/src/actions/editor.js +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import * as notesOperation from '../operations/notes'; -import { receiveNote } from './note'; -import { refreshNoteInList } from './notes'; - -export const MARK_DIRTY = 'editor/MARK_DIRTY'; -export const STAGE_NOTE = 'editor/STAGE_NOTE'; -export const COMMIT_NOTE = 'editor/COMMIT_NOTE'; -export const UPDATE_CONTENT = 'editor/UPDATE_CONTENT'; -export const UPDATE_BOOK_UUID = 'editor/UPDATE_BOOK_UUID'; -export const RESET = 'editor/RESET'; - -export function stageNote({ noteUUID, bookUUID, content }) { - return { - type: STAGE_NOTE, - data: { noteUUID, bookUUID, content } - }; -} - -export function commitNote() { - return (dispatch, getState) => { - const { editor } = getState(); - - return notesOperation - .update(editor.noteUUID, { - content: editor.content, - bookUUID: editor.bookUUID - }) - .then(note => { - dispatch(receiveNote(note)); - dispatch( - refreshNoteInList({ noteUUID: note.uuid, refreshedNote: note }) - ); - dispatch({ - type: COMMIT_NOTE - }); - }) - .catch(err => { - // TODO: if deleted elsewhere, create - console.log('err', err); - }); - }; -} - -export function updateContent(content) { - return { - type: UPDATE_CONTENT, - data: { content } - }; -} - -export function updateBookUUID(uuid) { - return { - type: UPDATE_BOOK_UUID, - data: { - uuid - } - }; -} - -export function resetEditor() { - return { - type: RESET - }; -} - -export function markDirty() { - return { - type: MARK_DIRTY - }; -} diff --git a/web/src/actions/form.js b/web/src/actions/form.js deleted file mode 100644 index b79ecc81..00000000 --- a/web/src/actions/form.js +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -export const UPDATE_AUTH_EMAIL = 'form/UPDATE_AUTH_EMAIL'; - -export function updateAuthEmail(email) { - return { - type: UPDATE_AUTH_EMAIL, - data: { - email - } - }; -} diff --git a/web/src/actions/note.js b/web/src/actions/note.js deleted file mode 100644 index 147eba4b..00000000 --- a/web/src/actions/note.js +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import * as noteService from '../services/notes'; -import { decryptNote } from '../crypto/notes'; - -export const RECEIVE = 'note/RECEIVE'; -export const START_FETCHING = 'note/START_FETCHING'; -export const ERROR = 'note/ERROR'; -export const RESET = 'note/RESET'; - -export function receiveNote(note) { - return { - type: RECEIVE, - data: { note } - }; -} - -export function resetNote() { - return { - type: RESET - }; -} - -function startFetchingNote() { - return { - type: START_FETCHING - }; -} - -function receiveNoteError(errorMessage) { - return { - type: ERROR, - data: { errorMessage } - }; -} - -export function getNote(cipherKeyBuf, noteUUID, demo = false) { - return dispatch => { - dispatch(startFetchingNote()); - - return noteService - .fetchOne(noteUUID, { demo }) - .then(note => { - return decryptNote(note, cipherKeyBuf) - .then(noteDec => { - dispatch(receiveNote(noteDec)); - - return noteDec; - }) - .catch(err => { - dispatch(receiveNoteError(err.message)); - return note; - }); - }) - .catch(err => { - console.log('getNote error', err.message); - dispatch(receiveNoteError(err.message)); - }); - }; -} diff --git a/web/src/actions/notes.js b/web/src/actions/notes.js deleted file mode 100644 index 16307258..00000000 --- a/web/src/actions/notes.js +++ /dev/null @@ -1,267 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import * as notesService from '../services/notes'; -import { decryptNote } from '../crypto/notes'; -import { parsePrevDate } from '../libs/notes'; - -export const ADD = 'notes/ADD'; -export const REFRESH = 'notes/REFRESH'; -export const RECEIVE = 'notes/RECEIVE'; -export const RECEIVE_MORE = 'notes/RECEIVE_MORE'; -export const START_FETCHING = 'notes/START_FETCHING'; -export const START_FETCHING_MORE = 'notes/START_FETCHING_MORE'; -export const RECEIVE_ERROR = 'notes/RECEIVE_ERROR'; -export const RESET = 'notes/RESET'; -export const REMOVE = 'notes/REMOVE'; - -export function addNote(note, year, month) { - return { - type: ADD, - data: { - note: { - data: note, - errorMessage: null - }, - year, - month - } - }; -} - -export function removeNote({ year, month, noteUUID }) { - return { - type: REMOVE, - data: { - year, - month, - noteUUID - } - }; -} - -export function refreshNoteInList({ noteUUID, refreshedNote }) { - const date = new Date(); - const year = date.getUTCFullYear(); - const month = date.getUTCMonth() + 1; - - return { - type: REFRESH, - data: { - year, - month, - noteUUID, - book: refreshedNote.book, - content: refreshedNote.content, - isPublic: refreshedNote.public - } - }; -} - -function receiveNotes(notes, total, year, month, prevDate) { - return { - type: RECEIVE, - data: { - notes, - total, - year, - month, - prevDate - } - }; -} - -function receiveMoreNotes(notes, total, year, month, prevDate) { - return { - type: RECEIVE_MORE, - data: { - notes, - year, - month, - prevDate - } - }; -} - -function startFetchingNotes(year, month) { - return { - type: START_FETCHING, - data: { - year, - month - } - }; -} - -function startFetchingMoreNotes(year, month) { - return { - type: START_FETCHING_MORE, - data: { - year, - month - } - }; -} - -function receiveError(year, month, error) { - return { - type: RECEIVE_ERROR, - data: { - year, - month, - error - } - }; -} - -export function resetNotes() { - return { - type: RESET - }; -} - -function decryptNotes(notes, cipherKeyBuf) { - return notes.map(note => { - return decryptNote(note, cipherKeyBuf) - .then(noteDec => { - return { - data: noteDec, - errorMessage: null - }; - }) - .catch(err => { - return { - data: note, - errorMessage: err.message - }; - }); - }); -} - -export function getNotes(cipherKeyBuf, year, month, queryObj, demo) { - return async dispatch => { - dispatch(startFetchingNotes(year, month)); - - const { q, book } = queryObj; - - const query = { - year, - month - }; - if (q) { - query.q = q; - } - if (book) { - query.book = book; - } - - return notesService - .fetch(query, demo) - .then(res => { - const { notes, total, prev_date: prevDate } = res; - - const p = decryptNotes(notes, cipherKeyBuf); - - return Promise.all(p).then(notesDec => { - dispatch(receiveNotes(notesDec, total, year, month, prevDate)); - }); - }) - .catch(err => { - console.log('Error fetching notes', err.stack); - dispatch(receiveError(year, month, err.message)); - }); - }; -} - -export function getMoreNotes( - cipherKeyBuf, - year, - month, - page, - queryObj = {}, - demo = false -) { - return (dispatch, getState) => { - const state = getState(); - if (state.notes.isFetchingMore || !state.notes.prevDate) { - return null; - } - - dispatch(startFetchingMoreNotes(year, month)); - - const q = { - ...queryObj, - year, - month, - page - }; - - return notesService - .fetch(q, demo) - .then(res => { - const { notes, total, prev_date: prevDate } = res; - - const p = decryptNotes(notes, cipherKeyBuf); - - return Promise.all(p).then(notesDec => { - dispatch(receiveMoreNotes(notesDec, total, year, month, prevDate)); - }); - }) - .catch(err => { - console.log('err', err); - // dispatch(receiveError(year, month, err)); - }); - }; -} - -export function getInitialNotes({ facets, year, month, cipherKeyBuf, demo }) { - return async (dispatch, getState) => { - const { notes } = getState(); - const hasError = notes.groups.some(group => { - return Boolean(group.error); - }); - - if (!notes.prevDate || hasError) { - return; - } - - await dispatch(getNotes(cipherKeyBuf, year, month, facets, demo)); - - const { notes: updatedNotes } = getState(); - - const notesTotal = updatedNotes.groups.reduce((acc, group) => { - return acc + group.total; - }, 0); - - if (notesTotal < 8) { - const { year: prevYear, month: prevMonth } = parsePrevDate( - updatedNotes.prevDate - ); - - await dispatch( - getInitialNotes({ - facets, - cipherKeyBuf, - demo, - year: prevYear, - month: prevMonth - }) - ); - } - }; -} diff --git a/web/src/actions/ui.js b/web/src/actions/ui.js deleted file mode 100644 index 147cbf88..00000000 --- a/web/src/actions/ui.js +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -export const UPDATE_MESSAGE = 'ui/UPDATE_MESSAGE'; -export const RESET_MESSAGE = 'ui/RESET_MESSAGE'; -export const UPDATE_AUTH_FORM_EMAIL = 'ui/UPDATE_AUTH_FORM_EMAIL'; -export const TOGGLE_SIDEBAR = 'ui/TOGGLE_SIDEBAR'; -export const CLOSE_SIDEBAR = 'ui/CLOSE_SIDEBAR'; -export const TOGGLE_NOTE_SIDEBAR = 'ui/TOGGLE_NOTE_SIDEBAR'; -export const CLOSE_NOTE_SIDEBAR = 'ui/CLOSE_NOTE_SIDEBAR'; -export const INIT_LAYOUT = 'ui/INIT_LAYOUT'; - -export function updateMessage(message, type) { - return { - type: UPDATE_MESSAGE, - data: { message, type } - }; -} - -export function resetMessage() { - return { - type: RESET_MESSAGE - }; -} - -export function updateAuthFormEmail(email) { - return { - type: UPDATE_AUTH_FORM_EMAIL, - data: { - email - } - }; -} - -export function toggleSidebar() { - return { - type: TOGGLE_SIDEBAR - }; -} - -export function toggleNoteSidebar() { - return { - type: TOGGLE_NOTE_SIDEBAR - }; -} - -export function closeNoteSidebar() { - return { - type: CLOSE_NOTE_SIDEBAR - }; -} - -export function closeSidebar() { - return { - type: CLOSE_SIDEBAR - }; -} - -export function initLayout(data) { - return { - type: INIT_LAYOUT, - data - }; -} diff --git a/web/src/client.js b/web/src/client.js deleted file mode 100644 index 94a58237..00000000 --- a/web/src/client.js +++ /dev/null @@ -1,60 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import 'core-js/stable'; -import 'regenerator-runtime/runtime'; - -import React from 'react'; -import { render } from 'react-dom'; -import { BrowserRouter } from 'react-router-dom'; -import { Provider } from 'react-redux'; - -import App from './components/App'; -import configureStore from './configureStore'; -import { debounce } from './libs/perf'; -import { getLayout } from './libs/ui'; -import { initLayout } from './actions/ui'; - -const layout = getLayout(); - -const store = configureStore(); -store.dispatch(initLayout(layout)); - -function renderApp() { - render( - - - - - , - document.getElementById('app') - ); -} - -const splashEl = document.getElementById('splash'); -splashEl.parentNode.removeChild(splashEl); -renderApp(); - -// event listeners -window.addEventListener( - 'resize', - debounce(() => { - const l = getLayout(); - store.dispatch(initLayout(l)); - }, 100) -); diff --git a/web/src/components/App/App.module.scss b/web/src/components/App/App.module.scss deleted file mode 100644 index 8632a128..00000000 --- a/web/src/components/App/App.module.scss +++ /dev/null @@ -1,42 +0,0 @@ -@import '../App/variables'; -@import '../App/responsive'; -@import '../App/rem'; - -.app { - display: flex; - flex-direction: column; - - &.boxed { - height: 100vh; - } - &.full { - min-height: 100vh; - flex-direction: column; - } -} - -.wrapper { - display: flex; - position: relative; - - &.boxed-wrapper { - flex-grow: 1; - flex-basis: 0; - overflow-y: hidden; - } - - &.full-wrapper { - flex-grow: 1; - flex-direction: column; - } -} - -.main { - flex: 1; - height: 100%; - - &.full-main { - display: flex; - flex-direction: column; - } -} diff --git a/web/src/components/App/HeaderData.js b/web/src/components/App/HeaderData.js deleted file mode 100644 index b80fbeab..00000000 --- a/web/src/components/App/HeaderData.js +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import Helmet from 'react-helmet'; - -const title = 'Dnote - A Simple and encrypted notebook'; -const description = - 'Dnote is an open source note taking software that respects your privacy. It is end-to-end encrypted and can be used to build your own personal knowledge base.'; - -export default () => { - return ( - - - - - - - - - - - - - - ); -}; diff --git a/web/src/components/App/_buttons.scss b/web/src/components/App/_buttons.scss deleted file mode 100644 index c85d968b..00000000 --- a/web/src/components/App/_buttons.scss +++ /dev/null @@ -1,118 +0,0 @@ -@import './variables'; -@import './rem'; -@import './font'; - -@mixin button($text-color, $background-color) { - color: $text-color; - background-color: $background-color; - - &:not(:disabled):hover { - color: $text-color; - background-color: darken($background-color, 5%); - box-shadow: 0px 0px 4px 2px #cacaca; - } -} - -@mixin button-outline($color, $border-color) { - background: transparent; - border-color: $border-color; - border-width: 2px; - color: $color; - - &:not(:disabled):hover { - color: $color; - box-shadow: 0px 0px 4px 2px #cacaca; - } -} - -.button { - position: relative; - display: inline-block; - line-height: 1.25; - text-align: center; - white-space: nowrap; - vertical-align: middle; - user-select: none; - border-width: 1px; - border-style: solid; - border-color: transparent; - border-image: initial; - border-radius: 0.25rem; - transition: all 0.2s ease-in-out; - text-decoration: none; - border-radius: 5px; - cursor: pointer; - - &:not(.button-no-ui) { - padding: rem(8px) rem(16px); - @include font-size('small'); - } - - &:not(:disabled):hover { - text-decoration: none; - } - - &:disabled { - cursor: not-allowed; - opacity: 0.6; - } - - &:focus { - outline: 2px dotted #9c9c9c; - } -} - -button:disabled { - cursor: not-allowed; - opacity: 0.6; -} - -.button-large { - &:not(.button-no-ui) { - padding: rem(12px) rem(16px); - } -} - -.button-first { - @include button(#ffffff, #333745); -} - -.button-first-outline { - @include button-outline(#333745, #333745); -} - -.button-second { - @include button($black, $second); -} - -.button-second-outline { - @include button-outline($black, $second); -} - -.button-third { - @include button(#ffffff, $third); -} - -.button-third-outline { - @include button-outline($third, $third); -} - -.button-danger { - @include button-outline($danger-text, $danger-text); - font-weight: 600; -} - -.button-stretch { - width: 100%; -} - -.button ~ .button { - margin-left: rem(8px); -} - -.button-no-ui { - border: none; - background: none; - text-align: left; - cursor: pointer; -} diff --git a/web/src/components/App/_font.scss b/web/src/components/App/_font.scss deleted file mode 100644 index b6aee859..00000000 --- a/web/src/components/App/_font.scss +++ /dev/null @@ -1,69 +0,0 @@ -@import './responsive'; - -// font-size is a mixin for pre-defined font-size values in rem. -// It also includes px as a fallback for older browsers. -@mixin font-size($size, $responsive: true) { - $sizeValue: 16; - $mdSizeValue: 16; - $lgSizeValue: 16; - - @if $size == 'x-small' { - $sizeValue: 10; - $mdSizeValue: 10; - $lgSizeValue: 10; - } @else if $size == 'small' { - $sizeValue: 14; - $mdSizeValue: 14; - $lgSizeValue: 14; - } @else if $size == 'regular' { - $sizeValue: 16; - $mdSizeValue: 16; - $lgSizeValue: 16; - } @else if $size == 'medium' { - $sizeValue: 16; - $mdSizeValue: 18; - $lgSizeValue: 18; - } @else if $size == 'large' { - $sizeValue: 18; - $mdSizeValue: 18; - $lgSizeValue: 20; - } @else if $size == 'x-large' { - $sizeValue: 22; - $mdSizeValue: 22; - $lgSizeValue: 24; - } @else if $size == '2x-large' { - $sizeValue: 20; - $mdSizeValue: 24; - $lgSizeValue: 32; - } @else if $size == '3x-large' { - $sizeValue: 24; - $mdSizeValue: 32; - $lgSizeValue: 36; - } @else if $size == '4x-large' { - $sizeValue: 32; - $mdSizeValue: 32; - $lgSizeValue: 48; - } @else if $size == '5x-large' { - $sizeValue: 32; - $mdSizeValue: 36; - $lgSizeValue: 56; - } - - @if $responsive == true { - font-size: $sizeValue * 1px; - font-size: $sizeValue * 0.1rem; - - @include breakpoint(md) { - font-size: $mdSizeValue * 1px; - font-size: $mdSizeValue * 0.1rem; - } - - @include breakpoint(lg) { - font-size: $lgSizeValue * 1px; - font-size: $lgSizeValue * 0.1rem; - } - } @else { - font-size: $sizeValue * 1px; - font-size: $sizeValue * 0.1rem; - } -} diff --git a/web/src/components/App/_marker.scss b/web/src/components/App/_marker.scss deleted file mode 100644 index eabe31e0..00000000 --- a/web/src/components/App/_marker.scss +++ /dev/null @@ -1,21 +0,0 @@ -.marker { - display: inline-block; - padding: 0.25em 0.4em; - font-size: 75%; - font-weight: 700; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: 0.25rem; -} - -.marker-first { - color: #fff; - background-color: #007bff; -} - -.marker-info { - color: #fff; - background-color: #17a2b8; -} diff --git a/web/src/components/App/_responsive.scss b/web/src/components/App/_responsive.scss deleted file mode 100644 index b5f6e90e..00000000 --- a/web/src/components/App/_responsive.scss +++ /dev/null @@ -1,41 +0,0 @@ -$xl-breakpoint: 1441px; -$lg-breakpoint: 1280px; -//$md-breakpoint: 600px; -$md-breakpoint: 768px; -$sm-breakpoint: 321px; - -@mixin breakpoint($point) { - @if $point == xl { - @media (min-width: $xl-breakpoint) { - @content; - } - } @else if $point == lg { - @media (min-width: $lg-breakpoint) { - @content; - } - } @else if $point == md { - @media (min-width: $md-breakpoint) { - @content; - } - } @else if $point == sm { - @media (min-width: $sm-breakpoint) { - @content; - } - } @else if $point == smonly { - @media (min-width: $sm-breakpoint) and (max-width: $md-breakpoint - 1px) { - @content; - } - } @else if $point == smdown { - @media (max-width: $md-breakpoint - 1px) { - @content; - } - } @else if $point == mdonly { - @media (min-width: $md-breakpoint) and (max-width: $lg-breakpoint - 1px) { - @content; - } - } @else if $point == mddown { - @media (max-width: $lg-breakpoint - 1px) { - @content; - } - } -} diff --git a/web/src/components/App/_shared.scss b/web/src/components/App/_shared.scss deleted file mode 100644 index 8aad21e3..00000000 --- a/web/src/components/App/_shared.scss +++ /dev/null @@ -1,211 +0,0 @@ -@import './font'; - -@keyframes holderPulse { - 0% { - opacity: 0.4; - } - 50% { - opacity: 1; - } - 100% { - opacity: 0.4; - } -} - -// placeholder frames -.holder { - animation: holderPulse 800ms infinite; - background: #f4f4f4; -} - -.alert { - // display: flex; - // flex-direction: column; - // align-items: flex-start; - margin-bottom: 0; - - @include breakpoint(md) { - // flex-direction: row; - // align-items: center; - // justify-content: space-between; - } - - .alert-content { - margin-bottom: 0; - } - - .alert-action { - margin-top: 10px; - - @include breakpoint(md) { - margin-top: 0; - } - } -} - -// panels -.panel { - background-color: white; - list-style: none; - padding-left: 0; - margin-bottom: 0; - border-radius: 3px; - word-wrap: break-word; - - .panel-heading { - font-size: 2rem; - margin-bottom: 10px; - } -} - -.panel-padded { - padding: 16px 25px; -} - -.panel ~ .panel { - margin-top: 12px; -} - -// dropdown -.dropdown-content { - position: absolute; - list-style: none; - padding: 0; - margin-bottom: 0; - background-color: #ffffff; - color: #000000; - box-shadow: 0 0 4px rgba(0, 0, 0, 0.15), 0 2px 4px rgba(0, 0, 0, 0.29); - border-radius: 1.5px; - z-index: 1; - - .dropdown-content-header { - padding: 8px 14px; - display: block; - margin-bottom: 0; - font-size: 1.4rem; - color: #868e96; - white-space: nowrap; - } - - .dropdown-content-divider { - height: 0; - overflow: hidden; - border-top: 1px solid #e9ecef; - } - - &::after { - top: 0px; - border: 7px solid transparent; - border-bottom-color: #fff; - position: absolute; - display: inline-block; - content: ''; - } - - &::before { - top: -2px; - border: 8px solid transparent; - border-bottom-color: rgba(27, 31, 35, 0.15); - position: absolute; - display: inline-block; - content: ''; - } -} - -// dismissable - -.dismissable-overlay { - position: fixed; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; - // z-index: 2; -} - -input[type='text']:disabled, -input[type='email']:disabled, -input[type='number']:disabled, -input[type='password']:disabled, -textarea:disabled { - background: #ececec; - cursor: not-allowed; -} -textarea:focus { - outline: none; -} - -// used to copy things to clipboard -.copy-input { - position: absolute; - left: -999px; -} - -.list-unstyled { - list-style: none; - padding-left: 0; - margin-bottom: 0; -} - -.sr-only { - display: none; -} - -.scrollbar-measure { - position: absolute; - top: -9999px; - width: 50px; - height: 50px; - overflow: scroll; -} - -.page { - // padding: rem(14px) 0; - // - // @include breakpoint(md) { - // padding: rem(28px) 0; - // } - - // max-height: 100%; - height: 100%; - overflow-y: scroll; -} - -button { - img, - svg { - display: block; - } -} - -.text-input { - border: 1px solid $dark-light2; - padding: rem(4px) rem(12px); - position: relative; - border-radius: 2px; - - &::placeholder { - color: $dark-light4; - } - &:focus { - border: 1px solid $third; - } - - &:not(.text-input-transparent) { - background: $dark-light3; - } - &.text-input-transparent { - background: transparent; - } - - &.text-input-medium { - padding: rem(8px) rem(12px); - } -} - -.learning-count { - @include font-size('medium'); -} -.learning-date { - @include font-size('regular'); -} diff --git a/web/src/components/App/_variables.scss b/web/src/components/App/_variables.scss deleted file mode 100644 index 831446b8..00000000 --- a/web/src/components/App/_variables.scss +++ /dev/null @@ -1,38 +0,0 @@ -$dark: #3d4c53; -//$dark-light: #f5f5f5; -$dark-light: #f7f9fa; -$dark-light2: #e5e5e5; -$dark-light3: #f7f7f7; -$dark-light4: #929292; -$dark-light5: #6e6e6e; -$dark-bg: #f3f3f3; -$black: #2a2a2a; -$white: #ffffff; - -$border-color: #d8d8d8; -$border-color-light: #f3f3f3; - -//$danger-text: #721c24; -$danger-text: #cb2431; -$danger-background: #f8d7da; - -$first: #333745; -$second: #e7e7e7; - -$third: #245fc5; -// $third: #6d6daa; -// $third: #4d4d8b; - -//$third: #18a0fb; -//$third: #505061; -$third-light: #ecf4ff; - -$sidebar-width: 180px; -$note-sidebar-width: 244px; -$xl-note-sidebar-width: 320px; -$footer-height: 28px; - -$note-sidebar-threshold: 1280px; - -$link: #0061ff; -$link-hover: #0052d9; diff --git a/web/src/components/App/index.js b/web/src/components/App/index.js deleted file mode 100644 index 61f6868e..00000000 --- a/web/src/components/App/index.js +++ /dev/null @@ -1,172 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import { hot } from 'react-hot-loader/root'; -import React, { useEffect, useRef } from 'react'; -import { connect } from 'react-redux'; -import { Switch, Route } from 'react-router'; -import classnames from 'classnames'; -import isEqual from 'lodash/isEqual'; -import { withRouter } from 'react-router-dom'; - -import DemoHeader from '../Header/DemoHeader'; -import NoteHeader from '../Header/NoteHeader'; -import SubscriptionsHeader from '../Header/SubscriptionsHeader'; -import HeaderData from './HeaderData'; -import NoteSidebar from '../Home/NoteSidebar'; -import MainSidebar from '../Common/Sidebar/MainSidebar'; -import Flash from '../Common/Flash'; -import SettingsSidebar from '../Common/Sidebar/SettingsSidebar'; -import Splash from '../Splash'; -import Footer from '../Footer'; -import MainFooter from '../Footer/MainFooter'; -import { getCurrentUser } from '../../actions/auth'; -import render from '../../routes'; -import { footerPaths, isDemoPath, checkBoxedLayout } from '../../libs/paths'; -import SystemMessage from '../Common/SystemMessage'; - -import './module.scss'; -import styles from './App.module.scss'; - -function checkIsEditor(location, prevLocation) { - return ( - location.state && - location.state.editor && - // not initial render - !isEqual(prevLocation, location) - ); -} - -function App({ location, history, doGetCurrentUser, user }) { - const prevLocationRef = useRef(location); - - useEffect(() => { - doGetCurrentUser(); - }, [doGetCurrentUser]); - - useEffect(() => { - if ( - history.action !== 'POP' && - (!location.state || !location.state.editor) - ) { - prevLocationRef.current = location; - } - }); - - if (user.errorMessage) { - return ( - - Could not fetch the current user: {user.errorMessage} - - ); - } - - const isReady = !user.isFetched || user.isFetching; - - if (isReady) { - return ; - } - - const isDemo = isDemoPath(location.pathname); - const isEditor = checkIsEditor(location, prevLocationRef.current); - const isBoxedLayout = checkBoxedLayout(location, isEditor); - - return ( -
- - - - - { - if (isEditor) { - return null; - } - - return ; - }} - /> - - -
- - - { - return ; - }} - /> - -
- {render(isEditor)} -
-
- { - return
; - }} - /> - { - return ; - }} - /> -
- ); -} - -function mapStateToProps(state) { - return { - user: state.auth.user, - message: state.ui.message, - layout: state.ui.layout - }; -} - -const mapDispatchToProps = { - doGetCurrentUser: getCurrentUser -}; - -export default hot( - withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(App) - ) -); diff --git a/web/src/components/Books/BookHolder.js b/web/src/components/Books/BookHolder.js deleted file mode 100644 index 0d29da75..00000000 --- a/web/src/components/Books/BookHolder.js +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import styles from './BookHolder.module.scss'; - -export default () => { - return ( -
  • -
    -
    • - ); -}; diff --git a/web/src/components/Books/BookHolder.module.scss b/web/src/components/Books/BookHolder.module.scss deleted file mode 100644 index 92522816..00000000 --- a/web/src/components/Books/BookHolder.module.scss +++ /dev/null @@ -1,23 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/rem'; - -.wrapper { - background: #fff; - height: rem(48px); - position: relative; - border-bottom: 1px solid $border-color-light; -} - -.title { - position: absolute; - top: rem(12px); - left: rem(20px); - right: rem(20px); - height: rem(20px); - - @include breakpoint(md) { - right: auto; - width: 152px; - } -} diff --git a/web/src/components/Books/BookItem/Actions.js b/web/src/components/Books/BookItem/Actions.js deleted file mode 100644 index 15f2db26..00000000 --- a/web/src/components/Books/BookItem/Actions.js +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import TrashIcon from '../../Icons/Trash'; -import Tooltip from '../../Common/Tooltip'; -import styles from './Actions.module.scss'; - -function Actions({ bookUUID, onDeleteBook, shown }) { - return ( -
    - Delete this book} - wrapperClassName={styles['action-tooltip-wrapper']} - triggerClassName={styles['action-tooltip-trigger']} - > - - -
    - ); -} - -export default Actions; diff --git a/web/src/components/Books/BookItem/Actions.module.scss b/web/src/components/Books/BookItem/Actions.module.scss deleted file mode 100644 index 2d94537b..00000000 --- a/web/src/components/Books/BookItem/Actions.module.scss +++ /dev/null @@ -1,32 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/rem'; - -.actions-wrapper { - display: none; - position: absolute; - right: 0; - top: 0; - bottom: 0; - transform: none; - height: 100%; - z-index: 1; - - @include breakpoint(lg) { - &.shown { - display: block; - } - } -} - -.action-tooltip-trigger { - height: 100%; - display: inline-block; -} -.action-tooltip-wrapper { - height: 100%; -} - -.action { - padding: 0 rem(12px); - height: 100%; -} diff --git a/web/src/components/Books/BookItem/BookItem.module.scss b/web/src/components/Books/BookItem/BookItem.module.scss deleted file mode 100644 index 7506a9db..00000000 --- a/web/src/components/Books/BookItem/BookItem.module.scss +++ /dev/null @@ -1,59 +0,0 @@ -@import '../../App/rem'; -@import '../../App/font'; -@import '../../App/variables'; - -.item { - position: relative; - - &:not(:first-child) { - border-top: 1px solid $border-color-light; - } -} - -.link { - padding: rem(12px) rem(20px); - display: block; - color: inherit; - - &:hover { - text-decoration: none; - } -} - -.icon { - vertical-align: middle; -} - -.label { - @include font-size('medium'); - - display: inline-block; - font-weight: 400; - margin-bottom: 0; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - width: rem(200px); - display: block; - - @include breakpoint(sm) { - width: rem(240px); - } - - @include breakpoint(md) { - width: rem(440px); - } - @include breakpoint(lg) { - width: rem(700px); - } - @include breakpoint(xl) { - width: rem(852px); - } -} - -.active { - .link { - background: $third-light; - color: $black; - } -} diff --git a/web/src/components/Books/BookItem/MobileActions.js b/web/src/components/Books/BookItem/MobileActions.js deleted file mode 100644 index 3a25feb4..00000000 --- a/web/src/components/Books/BookItem/MobileActions.js +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState, useRef } from 'react'; -import classnames from 'classnames'; - -import Menu from '../../Common/Menu'; -import DotsIcon from '../../Icons/Dots'; -import styles from './MobileActions.module.scss'; - -function MobileActions({ bookUUID, onDeleteBook }) { - const [isOpen, setIsOpen] = useState(false); - - const optRefs = [useRef(null)]; - const options = [ - { - name: 'home', - value: ( - - ) - } - ]; - - return ( - } - wrapperClassName={styles.wrapper} - triggerClassName={styles.trigger} - contentClassName={styles.content} - alignment="top" - direction="left" - /> - ); -} - -export default MobileActions; diff --git a/web/src/components/Books/BookItem/MobileActions.module.scss b/web/src/components/Books/BookItem/MobileActions.module.scss deleted file mode 100644 index dfbe834f..00000000 --- a/web/src/components/Books/BookItem/MobileActions.module.scss +++ /dev/null @@ -1,35 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/rem'; - -.wrapper { - position: absolute; - right: 0; - top: 0; - bottom: 0; - height: 100%; - - @include breakpoint(lg) { - display: none; - } -} - -.trigger { - padding: 0 rem(12px); - height: 100%; -} - -.content { - background: $white; - z-index: 99; - width: rem(120px); -} - -button.action { - text-align: center; - padding: rem(4px) 0; -} - -.danger { - color: $danger-text; -} diff --git a/web/src/components/Books/BookItem/index.js b/web/src/components/Books/BookItem/index.js deleted file mode 100644 index d0c73ce5..00000000 --- a/web/src/components/Books/BookItem/index.js +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import classnames from 'classnames'; -import { Link } from 'react-router-dom'; - -import { homePath } from '../../../libs/paths'; -import Actions from './Actions'; -import MobileActions from './MobileActions'; - -import styles from './BookItem.module.scss'; - -export default ({ book, demo, isFocused, setFocusedOptEl, onDeleteBook }) => { - const [isHovered, setIsHovered] = useState(false); - const isActive = isFocused || isHovered; - - return ( -
  • { - if (isFocused) { - // eslint-disable-next-line no-param-reassign - setFocusedOptEl(el); - } - }} - onMouseEnter={() => { - setIsHovered(true); - }} - onMouseLeave={() => { - setIsHovered(false); - }} - > - -

    {book.label}

    - - - - - -
    • - ); -}; diff --git a/web/src/components/Books/BookList.js b/web/src/components/Books/BookList.js deleted file mode 100644 index 360a61b6..00000000 --- a/web/src/components/Books/BookList.js +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import BookItem from './BookItem'; -import BookHolder from './BookHolder'; -import styles from './BookList.module.scss'; - -const placeholders = new Array(12); -for (let i = 0; i < placeholders.length; ++i) { - placeholders[i] = ; -} - -function Placeholders() { - return placeholders; -} - -function Books({ books, demo, focusedIdx, setFocusedOptEl, onDeleteBook }) { - return books.map((book, idx) => { - const isFocused = idx === focusedIdx; - - return ( - - ); - }); -} - -export default ({ - isFetching, - isFetched, - books, - demo, - focusedIdx, - setFocusedOptEl, - onDeleteBook -}) => { - return ( -
      - {isFetching ? ( - - ) : ( - - )} -
    - ); -}; diff --git a/web/src/components/Books/BookList.module.scss b/web/src/components/Books/BookList.module.scss deleted file mode 100644 index 43a341a0..00000000 --- a/web/src/components/Books/BookList.module.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import '../App/rem'; -@import '../App/variables'; - -.list { - background-color: white; - list-style: none; - padding-left: 0; - margin-bottom: 0; - border-radius: 2px; - border: 1px solid $border-color; - - margin: rem(12px) 0; -} diff --git a/web/src/components/Books/Books.module.scss b/web/src/components/Books/Books.module.scss deleted file mode 100644 index 77d2ea37..00000000 --- a/web/src/components/Books/Books.module.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import '../App/rem'; -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/font'; - -.new-book-button { - display: block; - - @include breakpoint(lg) { - display: none; - } -} - -.count { - display: none; - - @include breakpoint(lg) { - @include font-size('small'); - color: $dark; - display: inline-block; - - &.hidden { - display: none; - } - } -} diff --git a/web/src/components/Books/Content.js b/web/src/components/Books/Content.js deleted file mode 100644 index 07ede24e..00000000 --- a/web/src/components/Books/Content.js +++ /dev/null @@ -1,197 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState, useEffect, useRef } from 'react'; -import { withRouter } from 'react-router'; -import classnames from 'classnames'; - -import BookList from './BookList'; -import EmptyList from './EmptyList'; -import SearchInput from '../Common/SearchInput'; -import Flash from '../Common/Flash'; -import Button from '../Common/Button'; - -import { escapesRegExp } from '../../libs/string'; -import { homePath } from '../../libs/paths'; -import DeleteBookModal from './DeleteBookModal'; -import { useSearchMenuKeydown, useScrollToFocused } from '../../libs/hooks/dom'; -import { getOptIdxByValue } from '../../helpers/accessibility'; -import styles from './Content.module.scss'; - -function filterBooks(books, searchInput) { - if (!searchInput) { - return books; - } - - const input = escapesRegExp(searchInput); - const re = new RegExp(input, 'i'); - - return books.filter(book => { - return re.test(book.label); - }); -} - -function handleMenuKeydownSelect(demo, history) { - return option => { - const destination = homePath( - { - book: option.uuid - }, - { demo } - ); - - history.push(destination); - }; -} - -function Content({ - books, - isFetching, - isFetched, - demo, - location, - match, - history, - containerEl, - onStartCreateBook -}) { - const [searchValue, setSearchValue] = useState(''); - const [searchFocus, setSearchFocus] = useState(''); - const [focusedIdx, setFocusedIdx] = useState(-1); - const [focusedOptEl, setFocusedOptEl] = useState(null); - const [successMessage, setSuccessMessage] = useState(''); - const [bookUUIDToDelete, setBookUUIDToDelete] = useState(''); - const inputRef = useRef(null); - - const filterdBooks = filterBooks(books, searchValue); - - const currentIdx = getOptIdxByValue(filterdBooks, searchValue); - useEffect(() => { - if (searchFocus) { - setFocusedIdx(currentIdx); - } else { - setFocusedIdx(-1); - } - }, [searchValue, searchFocus, currentIdx, containerEl]); - - useSearchMenuKeydown({ - options: filterdBooks, - containerEl, - focusedIdx, - setFocusedIdx, - onKeydownSelect: handleMenuKeydownSelect(demo, history), - location, - match, - history - }); - useScrollToFocused({ - shouldScroll: true, - offset: -80, - focusedOptEl, - containerEl - }); - - useEffect(() => { - if (!isFetching) { - if (inputRef.current) { - inputRef.current.focus(); - } - } - }, [isFetching]); - - const hasNoBooks = isFetched && books.length === 0; - - return ( -
    - {successMessage && ( - { - setSuccessMessage(''); - }} - > - {successMessage} - - )} - -
    - { - setSearchFocus(true); - }} - onBlur={() => { - setSearchFocus(false); - }} - /> - - -
    - - {hasNoBooks ? ( - - ) : ( - { - setBookUUIDToDelete(bookUUID); - }} - /> - )} - - { - setBookUUIDToDelete(null); - }} - bookUUID={bookUUIDToDelete} - setSuccessMessage={setSuccessMessage} - containerEl={containerEl} - demo={demo} - /> -
    - ); -} - -export default withRouter(Content); diff --git a/web/src/components/Books/Content.module.scss b/web/src/components/Books/Content.module.scss deleted file mode 100644 index cf906e52..00000000 --- a/web/src/components/Books/Content.module.scss +++ /dev/null @@ -1,40 +0,0 @@ -@import '../App/rem'; -@import '../App/responsive'; -@import '../App/variables'; - -.actions { - margin-top: rem(12px); - display: flex; - justify-content: space-between; - flex-direction: row; -} - -.search-input-wrapper { - width: 100%; - - @include breakpoint(lg) { - width: auto; - } -} - -.search-input { - width: 100%; - border: 1px solid transparent; - - &:focus { - border-color: $third; - } - - @include breakpoint(lg) { - width: rem(400px); - margin-top: 0; - } -} - -button.create-book-button { - display: none; - - @include breakpoint(lg) { - display: inline-block; - } -} diff --git a/web/src/components/Books/CreateBookModal.js b/web/src/components/Books/CreateBookModal.js deleted file mode 100644 index 4140392a..00000000 --- a/web/src/components/Books/CreateBookModal.js +++ /dev/null @@ -1,183 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import classnames from 'classnames'; -import { connect } from 'react-redux'; -import { withRouter } from 'react-router-dom'; - -import Modal, { Header } from '../Common/Modal'; -import * as booksOperation from '../../operations/books'; -import { addBook } from '../../actions/books'; -import { homePath } from '../../libs/paths'; -import Button from '../Common/Button'; -import Flash from '../Common/Flash'; - -import styles from './CreateBookModal.module.scss'; -import bodyStyles from '../Common/Modal/ModalBody.module.scss'; - -function checkDuplicate(books, bookLabel) { - for (let i = 0; i < books.length; ++i) { - const book = books[i]; - - if (book.label === bookLabel) { - return true; - } - } - - return false; -} - -function CreateBookModal({ - isOpen, - onDismiss, - doAddBook, - history, - booksData, - demo -}) { - const [inProgress, setInProgress] = useState(false); - const [bookName, setBookName] = useState(''); - const [errMessage, setErrMessage] = useState(''); - - const labelId = 'new-book-modal-label'; - const nameInputId = 'new-book-modal-name-input'; - - let msgId; - if (errMessage) { - msgId = 'new-book-modal-message'; - } - - return ( - -
    - - {msgId && ( - { - setErrMessage(''); - }} - hasBorder={false} - id={msgId} - > - {errMessage} - - )} - -
    { - e.preventDefault(); - setInProgress(true); - - if (!bookName) { - setInProgress(false); - setErrMessage('Book label is empty'); - return; - } - - // Check if the book label already exists. If the client somehow posts a duplicate label, - // Duplicate book labels will be resolved on the server side, anyway. - // IDEA: If duplicate, post it anyway and re-fetch books? - if (checkDuplicate(booksData.items, bookName)) { - setInProgress(false); - setErrMessage('Duplicate book exists'); - return; - } - - booksOperation - .create({ name: bookName }) - .then(book => { - doAddBook(book); - setInProgress(false); - - const dest = homePath({ book: book.uuid }); - history.push(dest); - }) - .catch(err => { - console.log('Error creating a book', err); - setInProgress(false); - setErrMessage(err.message); - }); - }} - > - - -
    - - -
    -
    - - ); -} - -function mapStateToProps(state) { - return { - booksData: state.books - }; -} - -const mapDispatchToProps = { - doAddBook: addBook -}; - -export default withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(CreateBookModal) -); diff --git a/web/src/components/Books/CreateBookModal.module.scss b/web/src/components/Books/CreateBookModal.module.scss deleted file mode 100644 index 62133307..00000000 --- a/web/src/components/Books/CreateBookModal.module.scss +++ /dev/null @@ -1,18 +0,0 @@ -@import '../App/rem'; -@import '../App/responsive'; -@import '../App/variables'; - -.input { - margin-top: rem(8px); - width: 100%; -} - -.label { - width: 100%; -} - -.actions { - display: flex; - justify-content: flex-end; - margin-top: rem(8px); -} diff --git a/web/src/components/Books/DeleteBookModal.js b/web/src/components/Books/DeleteBookModal.js deleted file mode 100644 index 39f87d93..00000000 --- a/web/src/components/Books/DeleteBookModal.js +++ /dev/null @@ -1,196 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState, useEffect } from 'react'; -import classnames from 'classnames'; -import { connect } from 'react-redux'; -import { withRouter } from 'react-router-dom'; - -import Modal, { Header } from '../Common/Modal'; -import Flash from '../Common/Flash'; -import * as booksOperation from '../../operations/books'; -import { removeBook } from '../../actions/books'; -import { scrollTo } from '../../libs/dom'; -import Button from '../Common/Button'; - -import styles from './DeleteBookModal.module.scss'; -import bodyStyles from '../Common/Modal/ModalBody.module.scss'; - -function getBookByUUID(books, uuid) { - for (let i = 0; i < books.length; ++i) { - const book = books[i]; - - if (book.uuid === uuid) { - return book; - } - } - - return {}; -} - -function DeleteBookModal({ - isOpen, - onDismiss, - doRemoveBook, - setSuccessMessage, - bookUUID, - booksData, - containerEl, - demo -}) { - const [inProgress, setInProgress] = useState(false); - const [bookLabel, setBookLabel] = useState(''); - const [errMessage, setErrMessage] = useState(''); - - const book = getBookByUUID(booksData.items, bookUUID); - - const labelId = 'delete-book-modal-label'; - const nameInputId = 'delete-book-modal-name-input'; - const descId = 'delete-book-modal-desc'; - - useEffect(() => { - if (!isOpen) { - setBookLabel(''); - setErrMessage(''); - } - }, [isOpen]); - - return ( - -
    - - {errMessage && ( - { - setErrMessage(''); - }} - hasBorder={false} - > - {errMessage} - - )} - - - - This action will permanently remove the following book including its - notes: - - {book.label} - - -
    { - e.preventDefault(); - - setSuccessMessage(''); - setInProgress(true); - - if (bookLabel !== book.label) { - setErrMessage('The book label did not match'); - setInProgress(false); - return; - } - - booksOperation - .remove(bookUUID) - .then(() => { - doRemoveBook(bookUUID); - setInProgress(false); - onDismiss(); - - // Scroll to top so that the message is visible. - setSuccessMessage(`Successfully removed the book: ${book.label}`); - scrollTo(containerEl, 0); - }) - .catch(err => { - console.log('Error deleting book', err); - setInProgress(false); - setErrMessage(err.message); - }); - }} - > - - -
    - - -
    -
    - - ); -} - -function mapStateToProps(state) { - return { - booksData: state.books - }; -} - -const mapDispatchToProps = { - doRemoveBook: removeBook -}; - -export default withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(DeleteBookModal) -); diff --git a/web/src/components/Books/DeleteBookModal.module.scss b/web/src/components/Books/DeleteBookModal.module.scss deleted file mode 100644 index 1cb08b85..00000000 --- a/web/src/components/Books/DeleteBookModal.module.scss +++ /dev/null @@ -1,47 +0,0 @@ -@import '../App/rem'; -@import '../App/responsive'; -@import '../App/variables'; - -.input { - margin-top: rem(8px); - width: 100%; -} - -.label { - width: 100%; -} - -.actions { - display: flex; - justify-content: flex-end; - margin-top: rem(8px); -} - -.book-label { - font-weight: 600; - margin-left: rem(4px); -} - -.spinner { - display: none; - - position: absolute; - top: 0; - left: 0; - right: 0; - margin-left: auto; - margin-right: auto; - bottom: 0; - margin-top: auto; - margin-bottom: auto; -} - -.in-progress { - .button-content { - visibility: hidden; - } - .spinner { - display: block; - position: absolute; - } -} diff --git a/web/src/components/Books/EmptyList.js b/web/src/components/Books/EmptyList.js deleted file mode 100644 index 410e9617..00000000 --- a/web/src/components/Books/EmptyList.js +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -import styles from './EmptyList.module.scss'; - -class EmptyList extends React.Component { - render() { - return ( -
    -

    You don't have any books.

    -
    - ); - } -} - -export default EmptyList; diff --git a/web/src/components/Books/EmptyList.module.scss b/web/src/components/Books/EmptyList.module.scss deleted file mode 100644 index 9615562f..00000000 --- a/web/src/components/Books/EmptyList.module.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import '../App/rem'; -@import '../App/font'; -@import '../App/variables'; - -.wrapper { - text-align: center; - padding: rem(48px) 0; - @include font-size('medium'); - color: $dark-light5; -} diff --git a/web/src/components/Books/index.js b/web/src/components/Books/index.js deleted file mode 100644 index 6e4aec7d..00000000 --- a/web/src/components/Books/index.js +++ /dev/null @@ -1,161 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useEffect, useState } from 'react'; -import Helmet from 'react-helmet'; -import { connect } from 'react-redux'; -import classnames from 'classnames'; - -import { getBooks } from '../../actions/books'; -import { getCipherKey } from '../../crypto'; -import BookPlusIcon from '../Icons/BookPlus'; -import Tooltip from '../Common/Tooltip'; - -import SubscriberWall from '../Common/SubscriberWall'; -import Header from '../Common/Page/Header'; -import Body from '../Common/Page/Body'; -import Content from './Content'; -import CreateBookModal from './CreateBookModal'; - -import styles from './Books.module.scss'; - -function ContentWrapper({ - userData, - booksData, - demo, - containerEl, - onStartCreateBook -}) { - const user = userData.data; - - if (demo || user.cloud) { - return ( - - ); - } - - return ; -} - -function Total({ isFetching, count }) { - return ( -
    - {count} total -
    - ); -} - -function Books({ demo, doGetBooks, userData, booksData }) { - const [containerEl, setContainerEl] = useState(null); - const [isCreateBookModalOpen, setIsCreateBookModalOpen] = useState(false); - - useEffect(() => { - const cipherKeyBuf = getCipherKey(demo); - doGetBooks(cipherKeyBuf, demo); - }, [doGetBooks, demo]); - - return ( -
    { - setContainerEl(el); - }} - > - - Books - - -
    - } - rightContent={ - Create a new book} - > - - - } - /> - - -
    -
    -
    - -
    -
    -
    - - - { - setIsCreateBookModalOpen(false); - }} - demo={demo} - /> -
    - ); -} - -function mapStateToProps(state) { - return { - userData: state.auth.user, - booksData: state.books - }; -} - -const mapDispatchToProps = { - doGetBooks: getBooks -}; - -export default connect( - mapStateToProps, - mapDispatchToProps -)(Books); diff --git a/web/src/components/Common/Auth.module.scss b/web/src/components/Common/Auth.module.scss deleted file mode 100644 index 2b805d8f..00000000 --- a/web/src/components/Common/Auth.module.scss +++ /dev/null @@ -1,73 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/font'; -@import '../App/rem'; - -.page { - background: $dark-bg; - text-align: center; - min-height: 100vh; - padding: 50px 0; -} - -.heading { - color: $black; - @include font-size('2x-large'); - font-weight: 300; - margin-top: rem(12px); - margin-bottom: 0; -} - -.body { - max-width: rem(420px); - margin-left: auto; - margin-right: auto; - margin-top: rem(20px); -} - -.referrer-flash { - margin: rem(24px) 0; -} -.error-flash { - margin-bottom: rem(24px); -} - -.footer { - margin-top: rem(20px); - line-height: rem(20px); -} - -.callout { - color: #7c7c7c; - @include font-size('small'); -} -.cta { - @include font-size('small'); -} - -.panel { - border: 1px solid $border-color; - background: $white; - border-radius: 2px; - padding: rem(20px); -} - -.form { - text-align: left; -} - -.auth-button { - margin-top: rem(16px); -} - -.input-row { - & ~ .input-row { - margin-top: rem(12px); - } -} -.label { - @include font-size('small'); - font-weight: 600; - width: 100%; - margin-bottom: 0; -} diff --git a/web/src/components/Common/Button/Button.module.scss b/web/src/components/Common/Button/Button.module.scss deleted file mode 100644 index 3d81c954..00000000 --- a/web/src/components/Common/Button/Button.module.scss +++ /dev/null @@ -1,25 +0,0 @@ -@import '../../App/rem'; - -.spinner { - display: none; - - position: absolute; - top: 0; - left: 0; - right: 0; - margin-left: auto; - margin-right: auto; - bottom: 0; - margin-top: auto; - margin-bottom: auto; -} - -.busy { - .content { - visibility: hidden; - } - .spinner { - display: block; - position: absolute; - } -} diff --git a/web/src/components/Common/Button/index.js b/web/src/components/Common/Button/index.js deleted file mode 100644 index 268846bd..00000000 --- a/web/src/components/Common/Button/index.js +++ /dev/null @@ -1,64 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -/* eslint-disable react/button-has-type */ - -import React from 'react'; -import classnames from 'classnames'; - -import SpinnerIcon from '../../Icons/Spinner'; - -import styles from './Button.module.scss'; - -function Button({ - id, - type, - kind, - children, - className, - isBusy, - stretch, - disabled, - onClick -}) { - return ( - - ); -} - -export default Button; diff --git a/web/src/components/Common/EmailPreferenceForm.js b/web/src/components/Common/EmailPreferenceForm.js deleted file mode 100644 index f8af3847..00000000 --- a/web/src/components/Common/EmailPreferenceForm.js +++ /dev/null @@ -1,131 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import { connect } from 'react-redux'; - -import { updateEmailPreference } from '../../services/users'; -import { receiveEmailPreference } from '../../actions/auth'; -import Button from './Button'; - -import styles from './EmailPreferenceForm.module.scss'; - -const digestWeekly = 'weekly'; -const digestNever = 'never'; - -function getDigestFrequency(emailPreference) { - if (emailPreference.digest_weekly) { - return digestWeekly; - } - - return digestNever; -} - -function EmailPreferenceForm({ - emailPreference, - doReceiveEmailPreference, - token, - setSuccessMsg, - setFailureMsg, - actionsClassName -}) { - const freq = getDigestFrequency(emailPreference); - const [digestFrequency, setDigestFrequency] = useState(freq); - const [inProgress, setInProgress] = useState(false); - - function handleSubmit(e) { - e.preventDefault(); - - setSuccessMsg(''); - setFailureMsg(''); - setInProgress(true); - - updateEmailPreference({ digestFrequency, token }) - .then(updatedPreference => { - doReceiveEmailPreference(updatedPreference); - - setSuccessMsg('Updated email preference'); - setInProgress(false); - }) - .catch(err => { - setFailureMsg(`Failed to update. Error: ${err.message}`); - setInProgress(false); - }); - } - - return ( -
    -
    -
    -
    Email digest frequency
    - -
    -
    - -
    - -
    - -
    -
    - -
    - -
    -
    -
    -
    - ); -} - -const mapDispatchToProps = { - doReceiveEmailPreference: receiveEmailPreference -}; - -export default connect( - null, - mapDispatchToProps -)(EmailPreferenceForm); diff --git a/web/src/components/Common/EmailPreferenceForm.module.scss b/web/src/components/Common/EmailPreferenceForm.module.scss deleted file mode 100644 index d65c94cd..00000000 --- a/web/src/components/Common/EmailPreferenceForm.module.scss +++ /dev/null @@ -1,16 +0,0 @@ -.heading { - font-size: 1.7rem; - margin-bottom: 7px; -} - -.radio { - display: inline-block; - - & ~ .radio { - margin-left: 26px; - } - - label { - padding-left: 3px; - } -} diff --git a/web/src/components/Common/EmailVerifyBanner.js b/web/src/components/Common/EmailVerifyBanner.js deleted file mode 100644 index 099a8886..00000000 --- a/web/src/components/Common/EmailVerifyBanner.js +++ /dev/null @@ -1,126 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { Fragment, useState } from 'react'; -import { connect } from 'react-redux'; -import classnames from 'classnames'; - -import Flash from './Flash'; -import Button from './Button'; - -import * as usersService from '../../services/users'; - -import styles from './EmailVerifyBanner.module.scss'; - -function EmailVerifyBanner({ demo, userData }) { - const [submitted, setSubmitted] = useState(false); - const [submitting, setSubmitting] = useState(false); - const [errorMsg, setErrorMsg] = useState(''); - - const user = userData.data; - - if (demo || !user.cloud || user.email_verified) { - return null; - } - - function handleSubmit(e) { - e.preventDefault(); - - setSubmitting(true); - setErrorMsg(''); - - usersService - .sendEmailVerificationEmail(user.api_key) - .then(() => { - setSubmitting(false); - setSubmitted(true); - }) - .catch(err => { - setSubmitting(false); - setErrorMsg(err.message); - }); - } - - function renderMessage() { - const { email } = user; - - if (submitted) { - return ( - - Your verification email was sent to - {email}. If you do not - receive it, please check spam. - - ); - } - - if (errorMsg) { - return ( - - Error sending verification email to{' '} - {email}: {errorMsg} - - ); - } - - return ( - - You need to verify your email - {email} - to receive weekly digest. - - ); - } - - let type; - - if (errorMsg) { - type = 'danger'; - } else { - type = 'info'; - } - - return ( - -
    {renderMessage()}
    - - {!submitted && ( -
    - -
    - )} -     - ); -} - -function mapStateToProps(state) { - return { - userData: state.auth.user - }; -} - -export default connect(mapStateToProps)(EmailVerifyBanner); diff --git a/web/src/components/Common/EmailVerifyBanner.module.scss b/web/src/components/Common/EmailVerifyBanner.module.scss deleted file mode 100644 index d0791b6c..00000000 --- a/web/src/components/Common/EmailVerifyBanner.module.scss +++ /dev/null @@ -1,41 +0,0 @@ -@import '../App/responsive'; -@import '../App/rem'; - -.banner { - display: flex; - margin-bottom: rem(24px); - margin-top: rem(24px); - height: auto; - - @include breakpoint(lg) { - height: rem(52px); - } -} - -.wrapper { - display: flex; - flex-direction: column; - justify-content: space-between; - flex-grow: 1; - - @include breakpoint(lg) { - flex-direction: row; - align-items: center; - justify-content: space-between; - } -} - -.address { - font-weight: 600; - margin: 0 rem(4px); -} - -.form { - margin-top: rem(4px); - text-align: right; - - @include breakpoint(lg) { - margin-top: 0; - text-align: initial; - } -} diff --git a/web/src/components/Common/Flash/Flash.module.scss b/web/src/components/Common/Flash/Flash.module.scss deleted file mode 100644 index 1c75e035..00000000 --- a/web/src/components/Common/Flash/Flash.module.scss +++ /dev/null @@ -1,57 +0,0 @@ -@import '../../App/rem'; - -.wrapper { - position: relative; - padding: rem(8px) rem(16px); - - &.border { - border: 1px solid transparent; - } - - &.dismissable { - padding-right: rem(32px); - } -} - -.dismiss { - position: absolute; - right: 0; - top: 50%; - transform: translateY(-50%); -} - -.success { - color: #155724; - background-color: #d4edda; - - &.border { - border-color: #c3e6cb; - } -} - -.info { - color: #0c5460; - background-color: #d1ecf1; - - &.border { - border-color: #bee5eb; - } -} - -.warning { - color: #856404; - background-color: #fff3cd; - - &.border { - border-color: #ffeeba; - } -} - -.danger { - color: #721c24; - background-color: #f8d7da; - - &.border { - border-color: #f5c6cb; - } -} diff --git a/web/src/components/Common/Flash/index.js b/web/src/components/Common/Flash/index.js deleted file mode 100644 index 4212ed9e..00000000 --- a/web/src/components/Common/Flash/index.js +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import CloseIcon from '../../Icons/Close'; - -import styles from './Flash.module.scss'; - -const TYPE_SUCCESS = 'success'; -const TYPE_INFO = 'info'; -const TYPE_WARNING = 'warning'; -const TYPE_DANGER = 'danger'; - -const validTypes = [TYPE_SUCCESS, TYPE_INFO, TYPE_WARNING, TYPE_DANGER]; - -function validateType(type) { - return validTypes.indexOf(type) > -1; -} - -function Flash({ - id, - type, - children, - hasBorder, - onDismiss, - wrapperClassName, - contentClassName -}) { - const dismissable = Boolean(onDismiss); - - if (!validateType(type)) { - console.log(`Invalid type ${type}`); - } - - return ( -
    -
    {children}
    - - {dismissable && ( - - )} -
    - ); -} - -Flash.defaultProps = { - hasBorder: true -}; - -export default Flash; diff --git a/web/src/components/Common/LegacyFooter.js b/web/src/components/Common/LegacyFooter.js deleted file mode 100644 index db12bef9..00000000 --- a/web/src/components/Common/LegacyFooter.js +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -export default () => { - return ( -
    -

    Why do I need this?

    -

    - From March 2019, all data on Dnote will be encrypted to respect your - privacy. To benefit from this new system, you are required to login here - and set your credentials. -

    - -

    How long does it take?

    -

    It will take a minute.

    - -

    What do I need to do?

    -

    - After logging in, you will choose an email/password combination. If you - already have one, you can reuse it. Then, the page will automatically - encrypt all your data from the beginning of time. -

    - -

    How will the encryption work?

    -

    - Dnote will use AES256 block cipher to encrypt everything before sending - it to the server. AES256 is considered unbreakable and is used by - government agencies around the world to encrypt top secrets. -

    - -

    Can I change email/password later?

    -

    Yes, you can.

    -
    - ); -}; diff --git a/web/src/components/Common/Link/SafeLink.js b/web/src/components/Common/Link/SafeLink.js deleted file mode 100644 index 71370fd2..00000000 --- a/web/src/components/Common/Link/SafeLink.js +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -// SafeLink is a link that pushes a new location to the history stack -// only if the current editor is not dirty. -import React from 'react'; -import { Link } from 'react-router-dom'; - -import { decorate } from './internal'; - -function SafeLink({ to, onClick, className, children }) { - const Decorated = decorate(Link, { - to, - onClick, - className, - children - }); - - return ; -} - -export default SafeLink; diff --git a/web/src/components/Common/Link/SafeNavLink.js b/web/src/components/Common/Link/SafeNavLink.js deleted file mode 100644 index eb3e3d2e..00000000 --- a/web/src/components/Common/Link/SafeNavLink.js +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { NavLink } from 'react-router-dom'; - -import { decorate } from './internal'; - -function SafeNavLink({ - to, - onClick, - className, - children, - activeClassName, - isActive -}) { - const Decorated = decorate(NavLink, { - to, - className, - onClick, - activeClassName, - isActive, - children - }); - - return ; -} - -export default SafeNavLink; diff --git a/web/src/components/Common/Link/internal.js b/web/src/components/Common/Link/internal.js deleted file mode 100644 index d0e67f18..00000000 --- a/web/src/components/Common/Link/internal.js +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { connect } from 'react-redux'; - -function handleLinkClick({ event, editorData }) { - if (editorData.dirty) { - const ok = window.confirm('Your unsaved changes will be lost. Continue?'); - - if (!ok) { - event.preventDefault(); - } - } -} - -function mapStateToProps(state) { - return { - editorData: state.editor - }; -} - -// decorate wraps the given link component from react-rotuer-dom to prevent -// navigation if the current draft is dirty. -export function decorate(LinkComponent, props) { - function Decorated({ noteData, editorData }) { - return ( - { - if (props.onClick) { - props.onClick(e); - } - - handleLinkClick({ event: e, noteData, editorData }); - }} - /> - ); - } - - return connect(mapStateToProps)(Decorated); -} diff --git a/web/src/components/Common/Menu/Menu.module.scss b/web/src/components/Common/Menu/Menu.module.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/web/src/components/Common/Menu/index.js b/web/src/components/Common/Menu/index.js deleted file mode 100644 index b7672173..00000000 --- a/web/src/components/Common/Menu/index.js +++ /dev/null @@ -1,154 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { Fragment, useState, useEffect } from 'react'; -import classnames from 'classnames'; - -import Popover from '../Popover'; -import { useEventListener } from '../../../libs/hooks'; -import { KEYCODE_UP, KEYCODE_DOWN } from '../../../helpers/keyboard'; - -const Content = ({ options, menuId, setContentEl, headerContent }) => { - return ( - - {headerContent} - - - ); -}; - -function Menu({ - options, - isOpen, - setIsOpen, - optRefs, - triggerContent, - triggerClassName, - contentClassName, - alignment, - direction, - headerContent, - wrapperClassName, - menuId, - triggerId, - disabled -}) { - const [currentOptionIdx, setCurrentOptionIdx] = useState(0); - const [contentEl, setContentEl] = useState(null); - - useEffect(() => { - if (isOpen) { - const ref = optRefs[currentOptionIdx]; - const el = ref.current; - - if (el) { - el.focus(); - } - } else { - setCurrentOptionIdx(0); - } - }, [isOpen, currentOptionIdx, optRefs]); - - useEventListener(contentEl, 'keydown', e => { - const { keyCode } = e; - - if (keyCode === KEYCODE_UP || keyCode === KEYCODE_DOWN) { - let nextOptionIdx; - if (currentOptionIdx === 0 && keyCode === KEYCODE_UP) { - nextOptionIdx = options.length - 1; - } else if ( - currentOptionIdx === options.length - 1 && - keyCode === KEYCODE_DOWN - ) { - nextOptionIdx = 0; - } else if (keyCode === KEYCODE_DOWN) { - nextOptionIdx = currentOptionIdx + 1; - } else if (keyCode === KEYCODE_UP) { - nextOptionIdx = currentOptionIdx - 1; - } - - setCurrentOptionIdx(nextOptionIdx); - } - }); - - let ariaExpanded; - if (isOpen) { - ariaExpanded = 'true'; - } - - return ( - { - return ( - - ); - }} - contentClassName={contentClassName} - wrapperClassName={wrapperClassName} - isOpen={isOpen} - setIsOpen={setIsOpen} - alignment={alignment} - direction={direction} - renderContent={() => { - return ( - - ); - }} - /> - ); -} - -export default Menu; diff --git a/web/src/components/Common/Modal/Body.js b/web/src/components/Common/Modal/Body.js deleted file mode 100644 index e2a76855..00000000 --- a/web/src/components/Common/Modal/Body.js +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -import styles from './ModalBody.module.scss'; - -function Body({ children }) { - return
    {children}
    ; -} - -export default Body; diff --git a/web/src/components/Common/Modal/Header.js b/web/src/components/Common/Modal/Header.js deleted file mode 100644 index 3c573bc2..00000000 --- a/web/src/components/Common/Modal/Header.js +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import CloseIcon from '../../Icons/Close'; - -import styles from './ModalHeader.module.scss'; - -function Header({ labelId, heading, onDismiss }) { - return ( -
    - {heading} - - -
    - ); -} - -export default Header; diff --git a/web/src/components/Common/Modal/Modal.module.scss b/web/src/components/Common/Modal/Modal.module.scss deleted file mode 100644 index fef85f22..00000000 --- a/web/src/components/Common/Modal/Modal.module.scss +++ /dev/null @@ -1,71 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/rem'; -@import '../../App/font'; - -.content { - overflow: auto; - background-color: white; - margin-left: rem(16px); - margin-right: rem(16px); - margin-top: rem(52px); - box-shadow: 0 0 18px rgba(0, 0, 0, 0.4); - border-radius: 2px; - - @include breakpoint(md) { - margin-left: auto; - margin-right: auto; - } - - &.small { - max-width: 100%; - - @include breakpoint(md) { - max-width: rem(480px); - } - } - &.regular { - max-width: 100%; - - @include breakpoint(md) { - max-width: rem(580px); - } - - @include breakpoint(lg) { - max-width: rem(682px); - } - } -} - -.overlay { - position: fixed; - top: 0px; - left: 0px; - right: 0px; - bottom: 0px; - background-color: rgba(0, 0, 0, 0.52); - z-index: 4; - - max-height: 100%; - overflow-y: scroll; -} - -.header { - background-color: #f6f8fa; - border-bottom: 1px solid #e7e9ec; - border-top-right-radius: 3px; - border-top-left-radius: 3px; - - display: flex; - justify-content: space-between; - padding: 9px 4px 9px 16px; - - .header-text { - @include font-size('small'); - font-weight: 600; - } -} - -.body { - border-bottom-right-radius: 3px; - border-bottom-left-radius: 3px; -} diff --git a/web/src/components/Common/Modal/ModalBody.module.scss b/web/src/components/Common/Modal/ModalBody.module.scss deleted file mode 100644 index ad1e9c2e..00000000 --- a/web/src/components/Common/Modal/ModalBody.module.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/rem'; -@import '../../App/font'; - -.wrapper { - padding: rem(16px) rem(16px) rem(12px); -} diff --git a/web/src/components/Common/Modal/ModalHeader.module.scss b/web/src/components/Common/Modal/ModalHeader.module.scss deleted file mode 100644 index a0fdce80..00000000 --- a/web/src/components/Common/Modal/ModalHeader.module.scss +++ /dev/null @@ -1,21 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/rem'; -@import '../../App/font'; - -.wrapper { - display: flex; - justify-content: space-between; - align-items: center; - width: 100%; - background: $dark-light; - height: rem(48px); - padding-left: rem(16px); - border-top-right-radius: 2px; - border-top-left-radius: 2px; - border-bottom: 1px solid $border-color; -} - -.button { - height: 100%; -} diff --git a/web/src/components/Common/Modal/index.js b/web/src/components/Common/Modal/index.js deleted file mode 100644 index 66b35f1e..00000000 --- a/web/src/components/Common/Modal/index.js +++ /dev/null @@ -1,152 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useEffect, useCallback, useState } from 'react'; -import ReactDOM from 'react-dom'; -import { withRouter } from 'react-router-dom'; -import classnames from 'classnames'; -import PropTypes from 'prop-types'; - -import scopeTab from '../../../libs/scopeTab'; -import { getScrollbarWidth } from '../../../libs/dom'; -import { useEventListener } from '../../../libs/hooks'; -import { KEYCODE_ESC, KEYCODE_TAB } from '../../../helpers/keyboard'; - -import styles from './Modal.module.scss'; - -let scrollbarWidth = 0; - -function Modal({ - isOpen, - onDismiss, - overlayClassName, - modalClassName, - ariaLabelledBy, - ariaDescribedBy, - size, - children, - modalId -}) { - const [contentEl, setContentEl] = useState(null); - - const focusContent = useCallback(() => { - if (!contentEl) { - return; - } - // check if content has focus - if ( - document.activeElement === contentEl || - contentEl.contains(document.activeElement) - ) { - return; - } - - contentEl.focus(); - }, [contentEl]); - - const handleMousedown = useCallback( - e => { - if (contentEl && !contentEl.contains(e.target)) { - onDismiss(); - } - }, - [contentEl, onDismiss] - ); - - useEventListener(document, 'mousedown', handleMousedown); - useEventListener(contentEl, 'keydown', e => { - switch (e.keyCode) { - case KEYCODE_ESC: - e.stopPropagation(); - - onDismiss(); - break; - case KEYCODE_TAB: { - if (!contentEl) { - return; - } - - scopeTab(contentEl, e); - break; - } - default: - // noop - } - }); - - useEffect(() => { - const pageEl = document.getElementsByClassName('page')[0]; - if (!pageEl) { - return; - } - - if (isOpen) { - scrollbarWidth = getScrollbarWidth(); - pageEl.classList.add('no-scroll'); - // Set padding-right if scrollbar was hidden - pageEl.style.paddingRight = `${scrollbarWidth}px`; - - focusContent(); - } else { - pageEl.classList.remove('no-scroll'); - pageEl.style.paddingRight = ''; - } - }, [isOpen, focusContent]); - - if (!isOpen) { - return null; - } - - const modalRoot = document.getElementById('modal-root'); - - return ReactDOM.createPortal( -
    -
    { - setContentEl(el); - }} - tabIndex="-1" - role="dialog" - aria-labelledby={ariaLabelledBy} - aria-describedby={ariaDescribedBy} - aria-modal="true" - > - {children} -
    -
    , - modalRoot - ); -} - -Modal.propTypes = { - onDismiss: PropTypes.func.isRequired -}; - -Modal.defaultProps = { - size: 'regular' -}; - -export default withRouter(Modal); - -export { default as Header } from './Header'; -export { default as Body } from './Body'; diff --git a/web/src/components/Common/NotFound.js b/web/src/components/Common/NotFound.js deleted file mode 100644 index cd344e2e..00000000 --- a/web/src/components/Common/NotFound.js +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -const NotFound = () => ( -
    -

    Not found

    -
    -); - -export default NotFound; diff --git a/web/src/components/Common/Note/Note.module.scss b/web/src/components/Common/Note/Note.module.scss deleted file mode 100644 index ce0210a9..00000000 --- a/web/src/components/Common/Note/Note.module.scss +++ /dev/null @@ -1,68 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/rem'; -@import '../../App/font'; - -.wrapper { - margin: 0 rem(12px); - width: 100%; - - @include breakpoint(sm) { - margin: 0 rem(20px); - } - @include breakpoint(md) { - width: rem(600px); - } - @include breakpoint(lg) { - width: rem(800px); - } - - box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); - background: white; -} - -.header { - display: flex; - align-items: center; - padding: rem(12px) rem(16px); - border-bottom: 1px solid $border-color; -} - -.book-icon { - vertical-align: middle; -} - -.book-label { - @include font-size('medium'); - font-weight: 600; - display: inline-block; - margin-left: rem(12px); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - max-width: rem(200px); - @include breakpoint(sm) { - max-width: rem(200px); - } - @include breakpoint(md) { - max-width: rem(420px); - } - @include breakpoint(lg) { - max-width: rem(600px); - } -} - -.content { - word-wrap: break-word; - padding: rem(12px) rem(16px); -} - -.footer { - padding: rem(12px) rem(16px); -} - -.ts { - @include font-size('small'); - color: #8c8c8c; -} diff --git a/web/src/components/Common/Note/Placeholder.js b/web/src/components/Common/Note/Placeholder.js deleted file mode 100644 index 9f541bab..00000000 --- a/web/src/components/Common/Note/Placeholder.js +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import noteStyles from './Note.module.scss'; -import styles from './Placeholder.module.scss'; - -function Placeholder() { - return ( -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - ); -} - -export default Placeholder; diff --git a/web/src/components/Common/Note/Placeholder.module.scss b/web/src/components/Common/Note/Placeholder.module.scss deleted file mode 100644 index eecbed98..00000000 --- a/web/src/components/Common/Note/Placeholder.module.scss +++ /dev/null @@ -1,53 +0,0 @@ -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/rem'; -@import '../../App/font'; - -.title { - width: rem(200px); - height: rem(16px); -} - -.line { - height: rem(16px); - - &:not(:first-child) { - margin-top: rem(16px); - } -} - -.line1 { - width: rem(100px); - - @include breakpoint(md) { - width: rem(400px); - } -} -.line2 { - width: rem(200px); - - @include breakpoint(md) { - width: rem(180px); - } -} -.line3 { - width: rem(80px); - - @include breakpoint(md) { - width: rem(220px); - } -} -.line4 { - width: 100%; - - @include breakpoint(md) { - width: rem(420px); - } -} -.line5 { - width: rem(120px); - - @include breakpoint(md) { - width: rem(280px); - } -} diff --git a/web/src/components/Common/Note/index.js b/web/src/components/Common/Note/index.js deleted file mode 100644 index ae5dd4ee..00000000 --- a/web/src/components/Common/Note/index.js +++ /dev/null @@ -1,66 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import BookIcon from '../../Icons/Book'; -import { parseMarkdown } from '../../../helpers/markdown'; -import { nanosecToMillisec, getShortMonthName } from '../../../helpers/time'; - -import styles from './Note.module.scss'; - -function formatAddedOn(ts) { - const ms = nanosecToMillisec(ts); - const d = new Date(ms); - - const month = getShortMonthName(d); - const date = d.getDate(); - const year = d.getFullYear(); - - return `${month} ${date}, ${year}`; -} - -function Note({ note }) { - return ( -
    -
    - - -
    {note.book.label}
    -
    -
    -
    -
    {formatAddedOn(note.added_on)}
    -
    -
    - ); -} - -export default Note; diff --git a/web/src/components/Common/Page/Body.js b/web/src/components/Common/Page/Body.js deleted file mode 100644 index 46751520..00000000 --- a/web/src/components/Common/Page/Body.js +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -import styles from './Body.module.scss'; - -function Body({ children }) { - return
    {children}
    ; -} - -export default Body; diff --git a/web/src/components/Common/Page/Body.module.scss b/web/src/components/Common/Page/Body.module.scss deleted file mode 100644 index 4087884b..00000000 --- a/web/src/components/Common/Page/Body.module.scss +++ /dev/null @@ -1,8 +0,0 @@ -@import '../../App/rem'; -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/font'; - -.wrapper { - margin-top: rem(48px); -} diff --git a/web/src/components/Common/Page/Header.js b/web/src/components/Common/Page/Header.js deleted file mode 100644 index 1864f0cf..00000000 --- a/web/src/components/Common/Page/Header.js +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { connect } from 'react-redux'; - -import { toggleSidebar } from '../../../actions/ui'; -import SidebarToggle from '../SidebarToggle'; - -import styles from './Header.module.scss'; - -function Header({ doToggleSidebar, heading, leftContent, rightContent }) { - return ( -
    -
    -
    -
    - - -
    -

    {heading}

    - - {leftContent} -
    -
    - - {rightContent} -
    -
    -
    - ); -} - -const mapDispatchToProps = { - doToggleSidebar: toggleSidebar -}; - -export default connect( - null, - mapDispatchToProps -)(Header); diff --git a/web/src/components/Common/Page/Header.module.scss b/web/src/components/Common/Page/Header.module.scss deleted file mode 100644 index 023f0e39..00000000 --- a/web/src/components/Common/Page/Header.module.scss +++ /dev/null @@ -1,49 +0,0 @@ -@import '../../App/rem'; -@import '../../App/responsive'; -@import '../../App/variables'; -@import '../../App/font'; - -.header { - background: $dark-light3; - border-bottom: 1px solid $border-color; - - @include breakpoint(lg) { - background: none; - padding: rem(44px) 0 0; - border-bottom: none; - } -} - -.content { - display: flex; - flex-direction: row; - align-items: center; - height: rem(52px); - justify-content: space-between; - - @include breakpoint(lg) { - height: auto; - } -} - -.left { - display: flex; -} - -.heading { - // fix alignment with the sidebar toggle button on mobile - margin-top: 3px; - @include breakpoint(md) { - margin-top: 0; - } - - margin-left: rem(12px); - margin-bottom: 0; - @include font-size('large'); - font-weight: 400; - - @include breakpoint(lg) { - margin-top: 0; - margin-left: 0; - } -} diff --git a/web/src/components/Common/Popover/Popover.module.scss b/web/src/components/Common/Popover/Popover.module.scss deleted file mode 100644 index d3a0f8eb..00000000 --- a/web/src/components/Common/Popover/Popover.module.scss +++ /dev/null @@ -1,40 +0,0 @@ -@import '../../App/font'; -@import '../../App/variables'; -@import '../../App/responsive'; -@import '../../App/rem'; - -.wrapper { - @include breakpoint(md) { - // position: relative; - } -} - -.trigger { - position: relative; - font-weight: 600; -} - -.is-open.has-arrow { - &:before { - border: 6px solid transparent; - border-bottom-color: $black; - position: absolute; - display: inline-block; - content: ''; - left: 50%; - margin-left: -8px; - } - - &.top { - &:before { - bottom: 90%; - transform: rotate(180deg); - } - } - - &.bottom { - &:before { - top: 90%; - } - } -} diff --git a/web/src/components/Common/Popover/PopoverContent.js b/web/src/components/Common/Popover/PopoverContent.js deleted file mode 100644 index e4d0cb31..00000000 --- a/web/src/components/Common/Popover/PopoverContent.js +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useEffect, useRef } from 'react'; -import classnames from 'classnames'; - -import styles from './PopoverContent.module.scss'; -import { KEYCODE_ESC } from '../../../helpers/keyboard'; - -const PopoverContent = ({ - contentId, - contentClassName, - onDismiss, - triggerEl, - children, - alignment, - direction, - hasBorder, - closeOnOutsideClick, - closeOnEscapeKeydown -}) => { - const contentRef = useRef(null); - - function handleOutsideClick(e) { - const contentEl = contentRef.current; - - if (!contentEl || !triggerEl) { - return; - } - - if (triggerEl.contains(e.target)) { - return; - } - - if (!contentEl.contains(e.target)) { - onDismiss(); - } - } - - function handleKeydown(e) { - if (e.keyCode === KEYCODE_ESC) { - onDismiss(); - } - } - - useEffect(() => { - if (closeOnOutsideClick) { - document.addEventListener('click', handleOutsideClick); - document.addEventListener('touchstart', handleOutsideClick); - } - - return () => { - document.removeEventListener('click', handleOutsideClick); - document.removeEventListener('touchstart', handleOutsideClick); - }; - }); - - useEffect(() => { - if (closeOnEscapeKeydown) { - document.addEventListener('keydown', handleKeydown); - } - - return () => { - document.addEventListener('keydown', handleKeydown); - }; - }); - - return ( -
    - {children} -
    - ); -}; - -export default PopoverContent; diff --git a/web/src/components/Common/Popover/PopoverContent.module.scss b/web/src/components/Common/Popover/PopoverContent.module.scss deleted file mode 100644 index 6d760e51..00000000 --- a/web/src/components/Common/Popover/PopoverContent.module.scss +++ /dev/null @@ -1,47 +0,0 @@ -@import '../../App/font'; -@import '../../App/variables'; -@import '../../App/responsive'; -@import '../../App/rem'; - -.content { - position: absolute; - - &.border { - background: #fff; - border: 1px solid $border-color; - border-radius: 4px; - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - } - - @include breakpoint(md) { - left: auto; - right: auto; - } -} - -.left-align { - left: 0; -} -.right-align { - right: 0; -} -.top-align { - top: 0; -} -.bottom-align { - bottom: 0; -} - -.top-direction { - bottom: calc(100% + 6px); -} -.bottom-direction { - top: calc(100% + 6px); -} -.left-direction { - right: calc(100% + 6px); -} - -.right-direction { - left: calc(100% + 6px); -} diff --git a/web/src/components/Common/Popover/index.js b/web/src/components/Common/Popover/index.js deleted file mode 100644 index 0325f230..00000000 --- a/web/src/components/Common/Popover/index.js +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useRef } from 'react'; -import classnames from 'classnames'; - -import PopoverContent from './PopoverContent'; -import styles from './Popover.module.scss'; - -const Popover = ({ - contentClassName, - wrapperClassName, - renderContent, - isOpen, - setIsOpen, - alignment, - direction, - renderTrigger, - contentId, - closeOnOutsideClick, - closeOnEscapeKeydown, - contentHasBorder, - hasArrow -}) => { - const triggerRef = useRef(null); - - return ( -
    - {renderTrigger({ - triggerClassName: classnames({ - [styles['is-open']]: isOpen, - [styles['has-arrow']]: hasArrow, - [styles.bottom]: direction === 'bottom', - [styles.top]: direction === 'top', - [styles.left]: direction === 'left', - [styles.right]: direction === 'right' - }), - triggerRef - })} - - {isOpen && ( - { - setIsOpen(false); - }} - contentClassName={contentClassName} - triggerEl={triggerRef.current} - alignment={alignment} - direction={direction} - contentId={contentId} - hasBorder={contentHasBorder} - closeOnOutsideClick={closeOnOutsideClick} - closeOnEscapeKeydown={closeOnEscapeKeydown} - > - {renderContent()} - - )} -
    - ); -}; - -Popover.defaultProps = { - closeOnOutsideClick: true, - closeOnEscapeKeydown: true, - contentHasBorder: true, - hasArrow: false -}; - -export default Popover; diff --git a/web/src/components/Common/SearchInput/SearchInput.module.scss b/web/src/components/Common/SearchInput/SearchInput.module.scss deleted file mode 100644 index 3536823e..00000000 --- a/web/src/components/Common/SearchInput/SearchInput.module.scss +++ /dev/null @@ -1,35 +0,0 @@ -@import '../../App/rem'; -@import '../../App/responsive'; -@import '../../App/variables'; - -.wrapper { - position: relative; - overflow: hidden; - background: $dark-light3; -} - -.search-icon { - position: absolute; - right: 16px; - top: 50%; - transform: translateY(-50%); - - path { - fill: $dark-light4; - } -} - -.input { - width: 100%; -} - -.focused { - .input { - padding-left: rem(12px); - } - - .search-icon { - position: absolute; - left: -25px; - } -} diff --git a/web/src/components/Common/SearchInput/index.js b/web/src/components/Common/SearchInput/index.js deleted file mode 100644 index 8914c68c..00000000 --- a/web/src/components/Common/SearchInput/index.js +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import classnames from 'classnames'; -import PropTypes from 'prop-types'; - -import SearchIcon from '../../Icons/Search'; - -import styles from './SearchInput.module.scss'; - -function SearchInput({ - value, - setValue, - wrapperClassName, - inputClassName, - placeholder, - onFocus, - onBlur, - autoFocus, - disabled, - inputRef, - size -}) { - const [isFocused, setIsFocused] = useState(false); - - let iconDimension; - if (size === 'medium') { - iconDimension = 20; - } else { - iconDimension = 16; - } - - return ( -
    - - { - const val = e.target.value; - - setValue(val); - }} - onFocus={e => { - setIsFocused(true); - - if (onFocus) { - onFocus(e); - } - }} - onBlur={e => { - setIsFocused(false); - - if (onBlur) { - onBlur(e); - } - }} - autoFocus={autoFocus} - /> -
    - ); -} - -const validSizes = ['regular', 'medium']; - -SearchInput.propTypes = { - size: PropTypes.oneOf(validSizes).isRequired -}; - -export default SearchInput; diff --git a/web/src/components/Common/SearchableMenu/General.module.scss b/web/src/components/Common/SearchableMenu/General.module.scss deleted file mode 100644 index 482a3984..00000000 --- a/web/src/components/Common/SearchableMenu/General.module.scss +++ /dev/null @@ -1,86 +0,0 @@ -@import '../../App/variables'; -@import '../../App/font'; -@import '../../App/rem'; -@import '../../App/responsive'; - -.content { - z-index: 3; -} - -.caret { - margin-left: rem(4px); -} - -.dropdown { - max-height: rem(300px); - overflow-y: auto; -} - -.combobox-item { - display: flex; - - &:not(:first-child) { - border-top: 1px solid #e6e6e6; - } -} - -.combobox-active-item { - background: $third; - color: white; -} - -.combobox-option { - position: relative; - padding: rem(4px) rem(16px) rem(4px) rem(28px); - flex-grow: 1; - color: black; - - &:hover { - background: $third; - color: white; - text-decoration: none; - } - - &.active { - background: $dark-light2; - } - - &.focused { - background: $third; - color: white; - - .check { - #check-core { - fill: white; - } - } - } -} - -.combobox-label { - display: block; - @include font-size('small'); - font-weight: 600; - background: $dark-light; - padding: rem(4px) rem(12px); - border-top-left-radius: 3px; - border-top-right-radius: 3px; - border-bottom: 1px solid #e6e6e6; -} - -.combobox { - padding: rem(8px); - //background: #e7f0ff; - border-bottom: 1px solid #e6e6e6; - background: $dark-light; -} -.textbox { - @include font-size('small'); -} - -.check-icon { - position: absolute; - left: rem(8px); - top: 50%; - transform: translateY(-50%); -} diff --git a/web/src/components/Common/SearchableMenu/SearchableMenu.module.scss b/web/src/components/Common/SearchableMenu/SearchableMenu.module.scss deleted file mode 100644 index d383a717..00000000 --- a/web/src/components/Common/SearchableMenu/SearchableMenu.module.scss +++ /dev/null @@ -1,25 +0,0 @@ -@import '../../App/variables'; -@import '../../App/rem'; - -.content { - z-index: 1; - right: 0; - left: 0; -} - -.item { - cursor: pointer; -} - -.dropdown { - overflow-y: auto; - outline: 0; -} - -.search-container { - padding: rem(12px); -} - -.search-input { - width: 100%; -} diff --git a/web/src/components/Common/SearchableMenu/index.js b/web/src/components/Common/SearchableMenu/index.js deleted file mode 100644 index fabb790a..00000000 --- a/web/src/components/Common/SearchableMenu/index.js +++ /dev/null @@ -1,193 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState, useRef, useEffect } from 'react'; -import { withRouter } from 'react-router-dom'; -import classnames from 'classnames'; - -import styles from './SearchableMenu.module.scss'; -import { makeOptionId, getOptIdxByValue } from '../../../helpers/accessibility'; -import { - useScrollToFocused, - useScrollToSelected, - useSearchMenuKeydown -} from '../../../libs/hooks/dom'; - -function useFocusedIdx(options, currentValue) { - const initialValue = getOptIdxByValue(options, currentValue); - - return useState(initialValue); -} - -function filterOptions(options, textboxValue) { - if (!textboxValue) { - return options; - } - - const searchReg = new RegExp(`${textboxValue}`, 'i'); - return options.filter(book => { - // The built-in 'All notes' option has a value of an empty string - return searchReg.test(book.label) && book.value !== ''; - }); -} - -function getScrollOffset(headerEl) { - let ret = 0; - if (headerEl) { - ret = headerEl.offsetHeight; - } - - return ret; -} - -function SearchableMenu({ - menuId, - isOpen, - setIsOpen, - options, - label, - listboxClassName, - currentValue, - textboxValue, - itemClassName, - labelClassName, - textboxWrapperClassName, - textboxClassName, - renderOption, - history, - onKeydownSelect, - location, - match, - renderInput, - disabled -}) { - const [containerEl, setContainerEl] = useState(null); - const [wrapperEl, setWrapperEl] = useState(null); - const [focusedOptEl, setFocusedOptEl] = useState(null); - const headerRef = useRef(null); - const selectedOptRef = useRef(null); - - const filteredOptions = filterOptions(options, textboxValue); - const [focusedIdx, setFocusedIdx] = useFocusedIdx( - filteredOptions, - currentValue - ); - - const currentIdx = getOptIdxByValue(filteredOptions, currentValue); - useEffect(() => { - setFocusedIdx(currentIdx); - }, [textboxValue, setFocusedIdx, currentIdx]); - - const offset = getScrollOffset(headerRef.current); - useScrollToSelected({ - shouldScroll: isOpen, - offset, - containerEl, - selectedOptEl: selectedOptRef.current - }); - useScrollToFocused({ - shouldScroll: isOpen, - focusedOptEl, - containerEl, - offset - }); - useSearchMenuKeydown({ - options: filteredOptions, - containerEl: wrapperEl, - focusedIdx, - setFocusedIdx, - setIsOpen, - onKeydownSelect, - location, - match, - history, - disabled - }); - - const currentOptId = makeOptionId(menuId, currentValue); - - return ( -
    { - setWrapperEl(el); - }} - > -
    - {label} - -
    - {renderInput({ - autoFocus: true, - type: 'text', - value: textboxValue, - placeholder: 'Find your book', - className: classnames(styles['search-input'], textboxClassName) - })} -
    -
    - -
      { - setContainerEl(el); - }} - id={menuId} - className={classnames('list-unstyled', listboxClassName)} - tabIndex="0" - role="menu" - aria-activedescendant={currentOptId} - > - {filteredOptions.map((option, idx) => { - const id = makeOptionId(menuId, option.value); - - const isSelected = option.value === currentValue; - const isFocused = idx === focusedIdx; - - return ( - // eslint-disable-next-line jsx-a11y/click-events-have-key-events -
    • { - if (disabled) { - return; - } - - setIsOpen(false); - }} - ref={el => { - if (isSelected) { - selectedOptRef.current = el; - } - - if (isFocused) { - setFocusedOptEl(el); - } - }} - > - {renderOption(option, { isSelected, isFocused })} -
      • - ); - })} -
    -
    - ); -} - -export default withRouter(SearchableMenu); diff --git a/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.js b/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.js deleted file mode 100644 index dac110a7..00000000 --- a/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.js +++ /dev/null @@ -1,338 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useCallback, useRef, useEffect } from 'react'; -import classnames from 'classnames'; -import { withRouter } from 'react-router-dom'; -import { connect } from 'react-redux'; - -import SafeNavLink from '../../Link/SafeNavLink'; -import SafeLink from '../../Link/SafeLink'; - -import { - homePath, - booksPath, - notePath, - dashboardPath, - subscriptionsPath -} from '../../../../libs/paths'; -import { parseSearchString } from '../../../../libs/url'; -import { - getWindowWidth, - noteSidebarThreshold, - sidebarOverlayThreshold -} from '../../../../libs/ui'; -import { addNote } from '../../../../actions/notes'; -import { addBook } from '../../../../actions/books'; -import { closeSidebar, closeNoteSidebar } from '../../../../actions/ui'; -import { getFacetsFromSearchStr } from '../../../../libs/facets'; -import NoteIcon from '../../../Icons/Note'; -import CloseIcon from '../../../Icons/Close'; -import BookIcon from '../../../Icons/Book'; -import DashboardIcon from '../../../Icons/Dashboard'; -import * as notesOperation from '../../../../operations/notes'; -import * as booksOperation from '../../../../operations/books'; - -import styles from './MainSidebar.module.scss'; -import sidebarStyles from '../Sidebar.module.scss'; - -async function getTargetBookUUID({ location, books }) { - if (books.length === 0) { - return null; - } - - const facets = getFacetsFromSearchStr(location.search); - if (facets.book) { - return facets.book; - } - - return books[0].uuid; -} - -async function createDefaultBook({ doAddBook }) { - try { - const book = await booksOperation.create({ name: 'Default' }); - doAddBook(book); - - return book; - } catch (err) { - throw new Error(`creating a book: ${err.message}`); - } -} - -async function getTargetBook({ location, books, doAddBook }) { - const bookUUID = await getTargetBookUUID({ location, books }); - if (!bookUUID) { - return createDefaultBook({ doAddBook }); - } - - try { - return booksOperation.get(bookUUID); - } catch (err) { - if (err.response.status === 404) { - return createDefaultBook({ doAddBook }); - } - - throw new Error(`getting the book: ${err.message}`); - } -} - -async function handleCreateNote({ - books, - doAddNote, - doAddBook, - doCloseSidebar, - doCloseNoteSidebar, - history, - location -}) { - const width = getWindowWidth(); - if (width < noteSidebarThreshold) { - doCloseSidebar(); - doCloseNoteSidebar(); - } - - let book; - try { - book = await getTargetBook({ - location, - books, - doAddBook - }); - } catch (err) { - throw new Error(`Checking if book exists ${err.message}`); - } - - try { - const note = await notesOperation.create({ - bookUUID: book.uuid, - content: '' - }); - const date = new Date(); - const year = date.getUTCFullYear(); - const month = date.getUTCMonth() + 1; - - doAddNote(note, year, month); - - const queryObj = parseSearchString(location.search); - const dest = notePath(note.uuid, queryObj, { isEditor: true }); - history.push(dest); - } catch (e) { - console.log('err', e); - } -} - -const Sidebar = ({ - demo, - location, - layoutData, - booksData, - userData, - doAddNote, - doAddBook, - history, - doCloseSidebar, - doCloseNoteSidebar -}) => { - const sidebarRef = useRef(null); - - const handleLinkClick = useCallback(() => { - const width = getWindowWidth(); - - if (width < noteSidebarThreshold) { - doCloseSidebar(); - } - }, [doCloseSidebar]); - - useEffect(() => { - function handleMousedown(e) { - const sidebarEl = sidebarRef.current; - - if (sidebarEl && !sidebarEl.contains(e.target)) { - doCloseSidebar(); - } - } - - const width = getWindowWidth(); - if (layoutData.sidebar && width < sidebarOverlayThreshold) { - document.addEventListener('mousedown', handleMousedown); - - return () => { - document.removeEventListener('mousedown', handleMousedown); - }; - } - - return () => null; - }, [layoutData.sidebar, doCloseSidebar]); - - const pathHome = homePath({}, { demo }); - const pathBooks = booksPath({ demo }); - const pathDashboard = dashboardPath({ demo }); - - const user = userData.data; - - return ( - - ); -}; - -function mapStateToProps(state) { - return { - layoutData: state.ui.layout, - booksData: state.books, - userData: state.auth.user - }; -} - -const mapDispatchToProps = { - doAddBook: addBook, - doAddNote: addNote, - doCloseSidebar: closeSidebar, - doCloseNoteSidebar: closeNoteSidebar -}; - -export default withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(Sidebar) -); diff --git a/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.module.scss b/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.module.scss deleted file mode 100644 index adb1aa31..00000000 --- a/web/src/components/Common/Sidebar/MainSidebar/MainSidebar.module.scss +++ /dev/null @@ -1,32 +0,0 @@ -@import '../../../App/variables'; -@import '../../../App/responsive'; -@import '../../../App/rem'; -@import '../../../App/font'; - -.bottom { - padding: 0 rem(12px); - text-align: center; -} - -.version { - @include font-size('small'); - font-weight: 600; - color: #bbb; -} - -.button-wrapper { - margin: 0 rem(12px); -} - -.upgrade-wrapper { - margin: rem(28px) rem(12px); - display: none; - - &.upgrade-wrapper-shown { - display: block; - - @include breakpoint(md) { - display: none; - } - } -} diff --git a/web/src/components/Common/Sidebar/MainSidebar/index.js b/web/src/components/Common/Sidebar/MainSidebar/index.js deleted file mode 100644 index ba1467f6..00000000 --- a/web/src/components/Common/Sidebar/MainSidebar/index.js +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { Switch, Route } from 'react-router'; - -import MainSidebar from './MainSidebar'; -import { mainSidebarPaths } from '../../../../libs/paths'; - -export default ({ isEditor, demo }) => { - return ( - - { - if (isEditor) { - return ; - } - - return null; - }} - /> - - { - return ; - }} - /> - - ); -}; diff --git a/web/src/components/Common/Sidebar/SettingsSidebar/SettingsSidebar.module.scss b/web/src/components/Common/Sidebar/SettingsSidebar/SettingsSidebar.module.scss deleted file mode 100644 index 0ce815ca..00000000 --- a/web/src/components/Common/Sidebar/SettingsSidebar/SettingsSidebar.module.scss +++ /dev/null @@ -1,43 +0,0 @@ -@import '../../../App/variables'; -@import '../../../App/responsive'; -@import '../../../App/rem'; -@import '../../../App/font'; - -.bottom { - padding: 0 rem(12px); - text-align: center; -} - -.button-wrapper { - margin: 0 rem(12px); -} - -.button-text { - // text-transform: uppercase; - margin-left: rem(8px); -} - -a.back-button { - display: flex; - justify-content: center; - align-items: center; -} - -.link { - font-weight: 400; -} -.link-active { - font-weight: 600; -} - -.link-list { - margin-top: rem(8px); -} - -.sidebar-heading { - display: block; - margin-top: rem(20px); - padding-left: rem(12px); - color: $dark-light5; - font-weight: 600; -} diff --git a/web/src/components/Common/Sidebar/SettingsSidebar/index.js b/web/src/components/Common/Sidebar/SettingsSidebar/index.js deleted file mode 100644 index a3b20392..00000000 --- a/web/src/components/Common/Sidebar/SettingsSidebar/index.js +++ /dev/null @@ -1,201 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useCallback, useRef, useEffect } from 'react'; -import classnames from 'classnames'; -import { withRouter, Link, NavLink } from 'react-router-dom'; -import { connect } from 'react-redux'; - -import { homePath, settingsPath } from '../../../../libs/paths'; -import { - getWindowWidth, - noteSidebarThreshold, - sidebarOverlayThreshold -} from '../../../../libs/ui'; -import { closeSidebar, closeNoteSidebar } from '../../../../actions/ui'; -import ArrowIcon from '../../../Icons/Arrow'; -import CloseIcon from '../../../Icons/Close'; - -import styles from './SettingsSidebar.module.scss'; -import sidebarStyles from '../Sidebar.module.scss'; - -const SettingsSidebar = ({ location, layoutData, doCloseSidebar }) => { - const sidebarRef = useRef(null); - - const maybeCloseSidebar = useCallback(() => { - const width = getWindowWidth(); - - if (width < noteSidebarThreshold) { - doCloseSidebar(); - } - }, [doCloseSidebar]); - - useEffect(() => { - function handleMousedown(e) { - const sidebarEl = sidebarRef.current; - - if (sidebarEl && !sidebarEl.contains(e.target)) { - doCloseSidebar(); - } - } - - const width = getWindowWidth(); - if (layoutData.sidebar && width < sidebarOverlayThreshold) { - document.addEventListener('mousedown', handleMousedown); - - return () => { - document.removeEventListener('mousedown', handleMousedown); - }; - } - - return () => null; - }, [layoutData.sidebar, doCloseSidebar]); - - return ( - - ); -}; - -function mapStateToProps(state) { - return { - layoutData: state.ui.layout, - booksData: state.books - }; -} - -const mapDispatchToProps = { - doCloseSidebar: closeSidebar, - doCloseNoteSidebar: closeNoteSidebar -}; - -export default withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(SettingsSidebar) -); diff --git a/web/src/components/Common/Sidebar/Sidebar.module.scss b/web/src/components/Common/Sidebar/Sidebar.module.scss deleted file mode 100644 index 027988dd..00000000 --- a/web/src/components/Common/Sidebar/Sidebar.module.scss +++ /dev/null @@ -1,133 +0,0 @@ -@import '../../App/variables'; -@import '../../App/responsive'; -@import '../../App/rem'; -@import '../../App/font'; - -.wrapper { - background: rgba(72, 72, 72, 0.87); - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - z-index: 4; - // transition: background 0.5s cubic-bezier(0, 0, 0, 1); - - &.wrapper-hidden { - background: none; - position: relative; - left: auto; - right: auto; - top: auto; - bottom: auto; - } - - @include breakpoint(lg) { - background: none; - position: relative; - left: auto; - right: auto; - top: auto; - bottom: auto; - } -} - -.sidebar { - background: $dark-light; - min-width: $sidebar-width; - width: $sidebar-width; - transition: 0.25s cubic-bezier(0, 0, 0, 1); - border-right: 1px solid $border-color; - padding-top: rem(12px); - height: 100%; - - position: absolute; - transform: translateX(0); - z-index: 4; - top: 0; - bottom: 0; - - @include breakpoint(lg) { - position: relative; - transform: initial; - top: auto; - bottom: auto; - } -} - -.sidebar-hidden { - min-width: 0; - width: 0; - transform: translateX(-100%); - - .sidebar-content { - position: absolute; - left: -$sidebar-width; - } -} - -.sidebar-content { - height: 100%; - display: flex; - flex-direction: column; - justify-content: space-between; -} - -.link-list { - margin-top: rem(12px); -} - -.link { - @include font-size('regular'); - color: $black; - flex: 1; - font-weight: 600; - display: inline-flex; - align-items: center; - height: rem(52px); - padding: 0 rem(12px); - - @include breakpoint(md) { - height: rem(36px); - } - - &:hover { - color: $black; - text-decoration: none; - background: #eaeaea; - } - - &:focus { - background: #eaeaea; - outline: none; - } - - &.link-active { - background: $dark-light2; - } -} - -.link-label { - margin-left: rem(12px); -} - -.link-item { - display: flex; -} - -.close-button { - position: absolute; - top: rem(16px); - right: rem(24px); - border-radius: 100%; - background: white; - border: none; - width: rem(28px); - height: rem(28px); - padding: 0; -} -.close-button-content { - display: flex; - align-items: center; - justify-content: center; -} diff --git a/web/src/components/Common/SidebarToggle.js b/web/src/components/Common/SidebarToggle.js deleted file mode 100644 index e8214a37..00000000 --- a/web/src/components/Common/SidebarToggle.js +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; - -import MenuIcon from '../Icons/Menu'; -import ArrowIcon from '../Icons/Arrow'; -import styles from './SidebarToggle.module.scss'; - -function SidebarToggle({ onClick, type }) { - return ( - - ); -} - -SidebarToggle.defaultProps = { - type: 'menu' -}; - -export default SidebarToggle; diff --git a/web/src/components/Common/SidebarToggle.module.scss b/web/src/components/Common/SidebarToggle.module.scss deleted file mode 100644 index 599d085d..00000000 --- a/web/src/components/Common/SidebarToggle.module.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; - -.button { - padding: 0; - - @media (min-width: $note-sidebar-threshold) { - display: none; - } -} diff --git a/web/src/components/Common/SubscriberWall.js b/web/src/components/Common/SubscriberWall.js deleted file mode 100644 index 213aa378..00000000 --- a/web/src/components/Common/SubscriberWall.js +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import classnames from 'classnames'; -import { Link } from 'react-router-dom'; - -import LockIcon from '../Icons/Lock'; -import { subscriptionsPath, homePath } from '../../libs/paths'; - -import styles from './SubscriberWall.module.scss'; - -function SubscriberWall({ wrapperClassName }) { - return ( -
    - - -
    Unlock Dnote Pro to get started.
    - -
    - - Get started - - - Live demo - -
    -
    - ); -} - -export default SubscriberWall; diff --git a/web/src/components/Common/SubscriberWall.module.scss b/web/src/components/Common/SubscriberWall.module.scss deleted file mode 100644 index 4afdd3b6..00000000 --- a/web/src/components/Common/SubscriberWall.module.scss +++ /dev/null @@ -1,24 +0,0 @@ -@import '../App/responsive'; -@import '../App/rem'; -@import '../App/font'; - -.wrapper { - text-align: center; - flex-grow: 1; - padding: rem(40px) 0; - - // landscape mode on mobile - @media (min-height: 600px) { - padding: rem(120px) 0; - } -} - -.lead { - @include font-size('x-large'); - margin-top: rem(16px); - text-align: center; -} - -.actions { - margin-top: rem(16px); -} diff --git a/web/src/components/Common/SystemMessage.js b/web/src/components/Common/SystemMessage.js deleted file mode 100644 index 2bf3e519..00000000 --- a/web/src/components/Common/SystemMessage.js +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { connect } from 'react-redux'; -import Flash from './Flash'; - -import { resetMessage } from '../../actions/ui'; - -function SystemMessage({ message, doResetMessage }) { - if (!message.content) { - return null; - } - - return ( - - {message.content} - - ); -} - -function mapStateToProps(state) { - return { - message: state.ui.message - }; -} - -const mapDispatchToProps = { - doResetMessage: resetMessage -}; - -export default connect( - mapStateToProps, - mapDispatchToProps -)(SystemMessage); diff --git a/web/src/components/Common/Tooltip/Tooltip.module.scss b/web/src/components/Common/Tooltip/Tooltip.module.scss deleted file mode 100644 index 333f372a..00000000 --- a/web/src/components/Common/Tooltip/Tooltip.module.scss +++ /dev/null @@ -1,33 +0,0 @@ -@import '../../App/variables'; -@import '../../App/rem'; -@import '../../App/font'; - -.wrapper { - position: relative; -} - -.overlay { - @include font-size('small'); - - pointer-events: none; - max-width: 100%; - position: absolute; - max-width: 100%; - background: $black; - color: white; - border: none; - padding: rem(4px) rem(8px); - border-radius: 4px; - z-index: 7; - - &.left { - left: 0; - } - &.right { - right: 0; - } -} - -.backdrop { - width: rem(200px); -} diff --git a/web/src/components/Common/Tooltip/index.js b/web/src/components/Common/Tooltip/index.js deleted file mode 100644 index f540c7ac..00000000 --- a/web/src/components/Common/Tooltip/index.js +++ /dev/null @@ -1,93 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import classnames from 'classnames'; - -import Popover from '../Popover'; - -import styles from './Tooltip.module.scss'; - -function Tooltip({ - id, - alignment, - direction, - contentClassName, - wrapperClassName, - triggerClassName, - overlay, - children -}) { - const [isOpen, setIsOpen] = useState(false); - - function show() { - setIsOpen(true); - } - - function hide() { - setIsOpen(false); - } - - return ( - { - return ( - - {children} - - ); - }} - contentClassName={classnames(styles.backdrop, contentClassName)} - wrapperClassName={classnames(styles.wrapper, wrapperClassName)} - isOpen={isOpen} - setIsOpen={setIsOpen} - alignment={alignment} - direction={direction} - contentId={id} - closeOnEscapeKeydown={false} - closeOnOutsideClick={false} - contentHasBorder={false} - hasArrow - renderContent={() => { - return ( -
    - {overlay} -
    - ); - }} - /> - ); -} - -export default Tooltip; diff --git a/web/src/components/Dashboard/Content.js b/web/src/components/Dashboard/Content.js deleted file mode 100644 index a1e812e1..00000000 --- a/web/src/components/Dashboard/Content.js +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -import LessonHeatmap from './LessonHeatmap'; -import EmailVerifyBanner from '../Common/EmailVerifyBanner'; - -import styles from './DashboardContent.module.scss'; - -export default class Content extends React.Component { - render() { - const { demo, calendar } = this.props; - - return ( -
    - - -
    -

    Learning Heatmap

    - - {calendar.isFetched && } -
    -
    - ); - } -} diff --git a/web/src/components/Dashboard/DashboardContent.module.scss b/web/src/components/Dashboard/DashboardContent.module.scss deleted file mode 100644 index c54aed9a..00000000 --- a/web/src/components/Dashboard/DashboardContent.module.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/rem'; - -.content { - border: 1px solid $border-color; - border-radius: 2px; - padding: rem(16px) rem(20px); - margin-top: rem(24px); - - @include breakpoint(lg) { - margin-top: 0; - } -} diff --git a/web/src/components/Dashboard/LessonHeatmap.js b/web/src/components/Dashboard/LessonHeatmap.js deleted file mode 100644 index f2e99ece..00000000 --- a/web/src/components/Dashboard/LessonHeatmap.js +++ /dev/null @@ -1,315 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import * as d3 from 'd3'; -import _ from 'lodash'; -import moment from 'moment'; -import tippy from 'tippy.js'; - -import styles from './LessonHeatmap.module.scss'; - -function getSystemDate(systemUtcOffsetSeconds) { - const date = new Date(); - const localUtcOffsetMinutes = 0 - date.getTimezoneOffset(); - const systemUtcOffsetMinutes = systemUtcOffsetSeconds / 60; - date.setMinutes( - date.getMinutes() - localUtcOffsetMinutes + systemUtcOffsetMinutes - ); - return date; -} - -function getDayDifference(a, b) { - const millisecondsPerDay = 1000 * 60 * 60 * 24; - const date1 = Date.UTC(a.getFullYear(), a.getMonth(), a.getDate()); - const date2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate()); - - return Math.floor((date2 - date1) / millisecondsPerDay); -} - -// Given a date object returns the day of the week in English -export const getDayName = date => - [ - 'Sunday', - 'Monday', - 'Tuesday', - 'Wednesday', - 'Thursday', - 'Friday', - 'Saturday' - ][date.getDay()]; - -function formatTooltipText({ date, count }) { - const dateObject = new Date(date); - const dateDayName = getDayName(dateObject); - const dateText = moment(dateObject).format('MMM D YYYY'); - - let contribText = 'No learning'; - if (count > 0) { - contribText = `${count} learning${count > 1 ? 's' : ''}`; - } - return `
    ${contribText}
    ${dateDayName} ${dateText}
    `; -} - -export default class LessonHeatmap extends React.Component { - constructor(props) { - super(props); - - this.daySpace = 1; - this.daySize = 12; - - this.daySizeWithSpace = this.daySize + this.daySpace * 2; - this.monthNames = [ - 'Jan', - 'Feb', - 'Mar', - 'Apr', - 'May', - 'Jun', - 'Jul', - 'Aug', - 'Sep', - 'Oct', - 'Nov', - 'Dec' - ]; - this.months = []; - this.group = 0; - - // Init color functions - this.colorKey = this.initColorKey(); - this.color = this.initColor(); - - // Loop through the timestamps to create a group of objects - // The group of objects will be grouped based on the day of the week they are - this.timestampsTmp = []; - - const today = getSystemDate(0); - today.setHours(0, 0, 0, 0, 0); - - const oneYearAgo = new Date(today); - oneYearAgo.setFullYear(today.getFullYear() - 1); - - const days = getDayDifference(oneYearAgo, today); - - for (let i = 0; i <= days; i += 1) { - const date = new Date(oneYearAgo); - date.setDate(date.getDate() + i); - - const day = date.getDay(); - const count = props.timestamps[moment(date).format('YYYY-M-D')] || 0; - - // Create a new group array if this is the first day of the week - // or if is first object - if ((day === 0 && i !== 0) || i === 0) { - this.timestampsTmp.push([]); - this.group += 1; - } - - // Push to the inner array the values that will be used to render map - const innerArray = this.timestampsTmp[this.group - 1]; - innerArray.push({ count, date, day }); - } - } - - componentDidMount() { - this.svg = this.renderSvg(); - this.renderDays(); - this.renderDayTitles(); - this.renderMonths(); - this.renderLegends(); - - tippy('.js-tooltip', { - arrow: true, - theme: 'dnote' - }); - } - - // Add extra padding for the last month label if it is also the last column - getExtraWidthPadding = group => { - let extraWidthPadding = 0; - const lastColMonth = this.timestampsTmp[group - 1][0].date.getMonth(); - const secondLastColMonth = this.timestampsTmp[group - 2][0].date.getMonth(); - - if (lastColMonth !== secondLastColMonth) { - extraWidthPadding = 9; - } - - return extraWidthPadding; - }; - - initColor = () => { - const colorRange = [ - '#ededed', - this.colorKey(0), - this.colorKey(1), - this.colorKey(2), - this.colorKey(3) - ]; - - return d3 - .scaleThreshold() - .domain([0, 2, 4, 6]) - .range(colorRange); - }; - - initColorKey = () => - d3 - .scaleLinear() - .range(['#aecfe5', '#06435A']) - .domain([0, 3]); - - renderSvg = () => { - const width = - (this.group + 1) * this.daySizeWithSpace + - this.getExtraWidthPadding(this.group); - - return d3 - .select('#lesson-heatmap') - .append('svg') - .attr('width', width) - .attr('height', 167) - .attr('class', 'lesson-calendar'); - }; - - renderDays = () => { - this.svg - .selectAll('g') - .data(this.timestampsTmp) - .enter() - .append('g') - .attr('transform', (group, i) => { - _.each(group, (stamp, a) => { - if (a === 0 && stamp.day === 0) { - const month = stamp.date.getMonth(); - const x = this.daySizeWithSpace * i + 1 + this.daySizeWithSpace; - const lastMonth = _.last(this.months); - if ( - lastMonth == null || - (month !== lastMonth.month && - x - this.daySizeWithSpace !== lastMonth.x) - ) { - this.months.push({ month, x }); - } - } - }); - return `translate(${this.daySizeWithSpace * i + - 1 + - this.daySizeWithSpace}, 18)`; - }) - .selectAll('rect') - .data(stamp => stamp) - .enter() - .append('rect') - .attr('x', '0') - .attr('y', stamp => this.daySizeWithSpace * stamp.day) - .attr('width', this.daySize) - .attr('height', this.daySize) - .attr('fill', stamp => - stamp.count !== 0 ? this.color(Math.min(stamp.count, 40)) : '#ededed' - ) - .attr('title', stamp => formatTooltipText(stamp)) - .attr('class', 'js-tooltip') - .on('click', this.clickDay); - }; - - renderDayTitles = () => { - const days = [ - { - text: 'M', - y: 29 + this.daySizeWithSpace * 1 - }, - { - text: 'W', - y: 29 + this.daySizeWithSpace * 3 - }, - { - text: 'F', - y: 29 + this.daySizeWithSpace * 5 - } - ]; - - this.svg - .append('g') - .selectAll('text') - .data(days) - .enter() - .append('text') - .attr('text-anchor', 'middle') - .attr('x', 8) - .attr('y', day => day.y) - .text(day => day.text) - .attr('class', 'user-contrib-text'); - }; - - renderMonths = () => { - this.svg - .append('g') - .attr('direction', 'ltr') - .selectAll('text') - .data(this.months) - .enter() - .append('text') - .attr('x', date => date.x) - .attr('y', 10) - .attr('class', 'user-contrib-text') - .text(date => this.monthNames[date.month]); - }; - - renderLegends = () => { - const keyValues = [ - '
    No learning
    ', - '
    1 learning
    ', - '
    2-3 learnings
    ', - '
    4-5 learnings
    ', - '
    5+ learnings
    ' - ]; - - const keyColors = [ - '#ededed', - this.colorKey(0), - this.colorKey(1), - this.colorKey(2), - this.colorKey(3) - ]; - - this.svg - .append('g') - .attr('transform', `translate(18, ${this.daySizeWithSpace * 8 + 16})`) - .selectAll('rect') - .data(keyColors) - .enter() - .append('rect') - .attr('width', this.daySize) - .attr('height', this.daySize) - .attr('x', (color, i) => this.daySizeWithSpace * i) - .attr('y', 0) - .attr('fill', color => color) - .attr('class', 'js-tooltip') - .attr('title', (color, i) => keyValues[i]) - .attr('data-container', 'body'); - }; - - render() { - return ( -
    -
    -
    - ); - } -} diff --git a/web/src/components/Dashboard/LessonHeatmap.module.scss b/web/src/components/Dashboard/LessonHeatmap.module.scss deleted file mode 100644 index 20c4259f..00000000 --- a/web/src/components/Dashboard/LessonHeatmap.module.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/rem'; - -.heatmap { - overflow-x: auto; - position: relative; - z-index: 0; -} diff --git a/web/src/components/Dashboard/index.js b/web/src/components/Dashboard/index.js deleted file mode 100644 index f2895d27..00000000 --- a/web/src/components/Dashboard/index.js +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useEffect } from 'react'; -import { connect } from 'react-redux'; -import Helmet from 'react-helmet'; - -import { getLessonCalendar } from '../../actions/calendar'; - -import Header from '../Common/Page/Header'; -import Body from '../Common/Page/Body'; -import SubscriberWall from '../Common/SubscriberWall'; -import Content from './Content'; - -function Dashboard({ demo, userData, calendarData, doGetLessonCalendar }) { - useEffect(() => { - doGetLessonCalendar({ demo }); - }, [demo, doGetLessonCalendar]); - - const user = userData.data; - - return ( -
    - - Dashboard - - -
    - - -
    - {demo || user.cloud ? ( - - ) : ( - - )} -
    - -
    - ); -} - -function mapStateToProps(state) { - return { - userData: state.auth.user, - calendarData: state.calendar - }; -} - -const mapDispatchToProps = { - doGetLessonCalendar: getLessonCalendar -}; - -export default connect( - mapStateToProps, - mapDispatchToProps -)(Dashboard); diff --git a/web/src/components/Dashboard/module.scss b/web/src/components/Dashboard/module.scss deleted file mode 100644 index b862dadd..00000000 --- a/web/src/components/Dashboard/module.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '../App/responsive'; - -.dashboard-page { - .heatmap-panel { - overflow: auto; - } -} diff --git a/web/src/components/Digest/index.js b/web/src/components/Digest/index.js deleted file mode 100644 index b5f1929b..00000000 --- a/web/src/components/Digest/index.js +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { connect } from 'react-redux'; -import Helmet from 'react-helmet'; - -import Note from '../Common/Note'; -import { getDigestNotes } from '../../actions/digest'; -import { getCipherKey } from '../../crypto'; - -import './module.scss'; - -class Digest extends React.Component { - componentDidMount() { - const { doGetDigestNotes, match } = this.props; - const { digestUUID } = match.params; - - // TODO: make demo - const cipherKeyBuf = getCipherKey(); - - doGetDigestNotes(cipherKeyBuf, digestUUID); - } - - render() { - const { notes } = this.props; - - return ( -
    - - Digest - - -
      - {notes.map(note => { - return ( -
    • - -
      • - ); - })} -
    -
    - ); - } -} - -function mapStateToProps(state) { - return { - notes: state.digest.notes, - error: state.digest.error - }; -} - -const mapDispatchToProps = { - doGetDigestNotes: getDigestNotes -}; - -export default connect( - mapStateToProps, - mapDispatchToProps -)(Digest); diff --git a/web/src/components/Digest/module.scss b/web/src/components/Digest/module.scss deleted file mode 100644 index c81c0175..00000000 --- a/web/src/components/Digest/module.scss +++ /dev/null @@ -1,29 +0,0 @@ -@import '../App/responsive'; - -.digest-page { - min-height: calc(100vh - 57px); - background: #f8f8f8; - padding-bottom: 5rem; - - .note-container { - display: flex; - justify-content: center; - padding-top: 4.5em; - padding-bottom: 4.5em; - - @include breakpoint(md) { - padding-top: 5em; - padding-bottom: 5em; - } - } - - .note-list { - list-style: none; - padding-left: 0; - margin-bottom: 0; - padding-top: 5rem; - } - .note-item ~ .note-item { - margin-top: 5rem; - } -} diff --git a/web/src/components/EmailPreference/EmailPreference.module.scss b/web/src/components/EmailPreference/EmailPreference.module.scss deleted file mode 100644 index a779a459..00000000 --- a/web/src/components/EmailPreference/EmailPreference.module.scss +++ /dev/null @@ -1,42 +0,0 @@ -@import '../App/responsive'; -@import '../App/variables'; -@import '../App/rem'; -@import '../App/font'; - -.wrapper { - text-align: center; - height: 100vh; - padding: rem(52px) 0; - background: $dark-bg; -} - -.heading { - @include font-size('2x-large'); - color: $black; - font-weight: 300; - margin-top: rem(16px); -} - -.body { - text-align: left; - padding: rem(20px) rem(28px); - margin-top: rem(20px); - max-width: rem(700px); - margin-left: auto; - margin-right: auto; - background-color: #fff; -} - -.footer { - @include font-size('small'); - text-align: center; - margin-top: rem(20px); - - a { - color: $dark-light5; - } -} - -.flash { - margin-bottom: rem(8px); -} diff --git a/web/src/components/EmailPreference/index.js b/web/src/components/EmailPreference/index.js deleted file mode 100644 index b18f2f3a..00000000 --- a/web/src/components/EmailPreference/index.js +++ /dev/null @@ -1,121 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { useState } from 'react'; -import classnames from 'classnames'; -import { Link, withRouter } from 'react-router-dom'; -import { connect } from 'react-redux'; -import Helmet from 'react-helmet'; - -import EmailPreferenceForm from '../Common/EmailPreferenceForm'; -import Logo from '../Icons/Logo'; -import Flash from '../Common/Flash'; - -import { parseSearchString } from '../../libs/url'; -import { getEmailPreference } from '../../actions/auth'; -import { loginPath } from '../../libs/paths'; - -import styles from './EmailPreference.module.scss'; - -function EmailPreference({ - location, - emailPreferenceData, - doGetEmailPreference -}) { - const emailPreference = emailPreferenceData.data; - const { isFetched, isFetching, errorMessage } = emailPreferenceData; - const { token } = parseSearchString(location.search); - - const [successMsg, setSuccessMsg] = useState(''); - const [failureMsg, setFailureMsg] = useState(''); - - useState(() => { - if (isFetched || isFetching) { - return; - } - - doGetEmailPreference(token); - }, []); - - return ( -
    - - Email Preference - - - - - -

    Dnote email settings

    - -
    -
    - {errorMessage && ( - - Error fetching email preference: {errorMessage}.{' '} - - Please login and try again. - - - )} - {successMsg && ( - - {successMsg} - - )} - {failureMsg && ( - - {failureMsg} - - )} - {isFetched && ( - - )} -
    -
    - Back to Dnote home -
    -
    -
    - ); -} - -function mapStateToProps(state) { - return { - emailPreferenceData: state.auth.emailPreference - }; -} - -const mapDispatchToProps = { - doGetEmailPreference: getEmailPreference -}; - -export default withRouter( - connect( - mapStateToProps, - mapDispatchToProps - )(EmailPreference) -); diff --git a/web/src/components/Footer/AccountMenu.js b/web/src/components/Footer/AccountMenu.js deleted file mode 100644 index 6ae13753..00000000 --- a/web/src/components/Footer/AccountMenu.js +++ /dev/null @@ -1,143 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React, { Fragment, useState, useRef } from 'react'; -import classnames from 'classnames'; -import { Link } from 'react-router-dom'; - -import Lock from '../Icons/Lock'; -import Menu from '../Common/Menu'; -import { signout } from '../../services/users'; -import { settingsPath } from '../../libs/paths'; - -import styles from './AccountMenu.module.scss'; - -function handleSignout(e) { - e.preventDefault(); - - signout().then(() => { - localStorage.removeItem('cipherKey'); - window.location.href = '/'; - }); -} - -const AccountMenu = ({ triggerClassName, demo, user }) => { - const [isOpen, setIsOpen] = useState(false); - const optRefs = [useRef(null), useRef(null), useRef(null)]; - - const options = [ - { - name: 'home', - value: ( - { - setIsOpen(false); - }} - innerRef={optRefs[0]} - tabIndex="-1" - > - Home - - ) - }, - { - name: 'settings', - value: ( - { - if (demo) { - e.preventDefault(); - return; - } - - setIsOpen(false); - }} - innerRef={optRefs[1]} - tabIndex="-1" - > - Settings - - ) - }, - { - name: 'logout', - value: ( -
    - -
    - ) - } - ]; - - return ( - - - Account - - } - headerContent={ - -
    -
    - -
    Signed in
    -
    -
    - {demo ? 'user@example.com' : user.email} -
    -
    -
    - - } - wrapperClassName={styles.wrapper} - triggerClassName={triggerClassName} - contentClassName={styles.content} - alignment="right" - direction="top" - /> - ); -}; - -export default AccountMenu; diff --git a/web/src/components/Footer/AccountMenu.module.scss b/web/src/components/Footer/AccountMenu.module.scss deleted file mode 100644 index 2209d15f..00000000 --- a/web/src/components/Footer/AccountMenu.module.scss +++ /dev/null @@ -1,91 +0,0 @@ -@import '../App/font'; -@import '../App/variables'; -@import '../App/rem'; -@import '../App/responsive'; - -.wrapper { - position: relative; -} - -.account-circle { - border-radius: 100%; - // background: white; - background: $third; - width: rem(8px); - height: rem(8px); - display: inline-block; - //border: 1px solid gray; -} - -.account-label { - margin-left: rem(8px); - font-weight: 600; -} - -.content { - width: rem(200px); - - @include breakpoint(md) { - width: rem(240px); - } -} - -.header { - padding: rem(8px) rem(12px); - display: block; - margin-bottom: 0; - font-size: 1.4rem; - color: #868e96; - white-space: nowrap; - @include font-size('small'); - - svg { - fill: #868e96; - } -} - -.divider { - height: 0; - overflow: hidden; - border-top: 1px solid #e9ecef; -} - -.link { - @include font-size('small'); - white-space: pre; - padding: rem(8px) rem(14px); - width: 100%; - display: block; - color: black; - - &:hover { - background: $dark-light3; - text-decoration: none; - color: #0056b3; - } - - &.disabled { - color: #d4d4d4; - cursor: not-allowed; - } - - &:not(.disabled):focus { - background: $dark-light3; - color: #0056b3; - outline: 1px dotted gray; - } -} - -.email { - font-weight: 600; - white-space: normal; -} - -.session-notice-wrapper { - display: flex; - align-items: center; -} - -.session-notice { - margin-left: rem(4px); -} diff --git a/web/src/components/Footer/Footer.js b/web/src/components/Footer/Footer.js deleted file mode 100644 index a37b5957..00000000 --- a/web/src/components/Footer/Footer.js +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { connect } from 'react-redux'; -import classnames from 'classnames'; - -import AccountMenu from './AccountMenu'; - -import styles from './Footer.module.scss'; - -const Footer = ({ user, demo }) => { - return ( -
    -
      -
    • - -
      • -
    -
    - ); -}; - -function mapStateToProps(state) { - return { - user: state.auth.user.data - }; -} - -export default connect(mapStateToProps)(Footer); diff --git a/web/src/components/Footer/Footer.module.scss b/web/src/components/Footer/Footer.module.scss deleted file mode 100644 index b1023fff..00000000 --- a/web/src/components/Footer/Footer.module.scss +++ /dev/null @@ -1,25 +0,0 @@ -@import '../App/font'; -@import '../App/variables'; -@import '../App/rem'; - -.footer { - @include font-size('small'); - border-top: 1px solid $border-color; - background: $dark-light; - z-index: 4; - height: $footer-height; - display: flex; - align-items: center; - padding: 0 rem(12px); - - display: flex; - justify-content: flex-end; -} - -.action { - font-weight: 600; - - &:hover { - color: $third; - } -} diff --git a/web/src/components/Footer/MainFooter.js b/web/src/components/Footer/MainFooter.js deleted file mode 100644 index 3b7ffe3f..00000000 --- a/web/src/components/Footer/MainFooter.js +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; - -import styles from './MainFooter.module.scss'; - -const year = new Date().getUTCFullYear(); - -const MainFooter = () => { - return ( -
    - © {year} Monomax Software Pty Ltd -
    - ); -}; - -export default MainFooter; diff --git a/web/src/components/Footer/MainFooter.module.scss b/web/src/components/Footer/MainFooter.module.scss deleted file mode 100644 index 74d8611d..00000000 --- a/web/src/components/Footer/MainFooter.module.scss +++ /dev/null @@ -1,10 +0,0 @@ -@import '../App/font'; -@import '../App/variables'; -@import '../App/rem'; - -.footer { - @include font-size('small'); - padding: rem(32px) 0; - text-align: center; - color: $dark-light5; -} diff --git a/web/src/components/Footer/index.js b/web/src/components/Footer/index.js deleted file mode 100644 index e897172c..00000000 --- a/web/src/components/Footer/index.js +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -import React from 'react'; -import { Switch, Route } from 'react-router'; - -import Footer from './Footer'; -import { footerPaths } from '../../libs/paths'; - -export default ({ isEditor, demo }) => { - return ( - - { - if (isEditor) { - return