From 0ca396148bdfa3dee04a8fd1e98f8a583531d68d Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Fri, 15 Nov 2024 22:46:53 -0800 Subject: [PATCH] working nix builds can compile both the react application statically so it can be served by nginx and then builds a docker container with nginx for easy deployment to something like fly.io I mean since it's static I could probably host it for free on a website like netlify or something, but I still wanted a docker container for now. Notably I did have to move the generated javascript parser into the mast-react-vite folder so that `buildNpmPackage` was scoped to the mast-react-vite folder. I'm not sure how to get it working in a truly monorepo style build working for it yet, but I'm not exactly inclined to make it super shiny right now either. --- flake.nix | 108 +- mast-react-vite/package-lock.json | 223 +++- mast-react-vite/package.json | 4 +- mast-react-vite/src/App.tsx | 20 +- mast-react-vite/src/Root.tsx | 78 ++ mast-react-vite/src/lib/command_parser.js | 1304 +++++++++++++++++++++ mast-react-vite/src/main.tsx | 94 +- mast-react-vite/tsconfig.json | 1 + 8 files changed, 1792 insertions(+), 40 deletions(-) create mode 100644 mast-react-vite/src/Root.tsx create mode 100644 mast-react-vite/src/lib/command_parser.js diff --git a/flake.nix b/flake.nix index 884acc3..faf15b1 100644 --- a/flake.nix +++ b/flake.nix @@ -9,20 +9,108 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - in - { + username = "admin"; + passwordHash = + "$apr1$bhZ6EAAr$E8cv5p/2RUBrxLZD.9Jpi."; # Replace with your hash + + nginxConfig = pkgs.writeText "nginx.conf" '' + worker_processes auto; + daemon off; + + events { + worker_connections 1024; + } + + http { + include ${pkgs.nginx}/conf/mime.types; + + server { + listen 8080; + + location / { + auth_basic "Restricted Content"; + auth_basic_user_file /etc/nginx/htpasswd; + + root /app; + index index.html; + try_files $uri $uri/ /index.html; + } + } + } + ''; + + htpasswd = pkgs.writeText "htpasswd" '' + ${username}:${passwordHash} + ''; + in { + packages = rec { + react = pkgs.buildNpmPackage { + pname = "mast-react"; + version = "0.0.1"; + src = ./mast-react-vite; + + npmDepsHash = "sha256-oqq55MEzXGEiF9UW7rZFyQrkyTPrUEkh2enZmbbZ7Ks="; + buildInputs = with pkgs; [ nodejs typescript ]; + nativeBuildInputs = with pkgs; [ nodejs ]; + + # npmWorkspace = ./mast-react-vite; + npmBuildScript = "build"; + installPhase = '' + mkdir -p $out + cp -r dist $out/ + ''; + }; + react-server = pkgs.dockerTools.buildImage { + name = "react-server"; + tag = "latest"; + + copyToRoot = pkgs.buildEnv { + name = "image-root"; + paths = [ + pkgs.nginx + react + (pkgs.writeScriptBin "start-server" '' + #!/usr/bin/env bash + + # Create necessary directories + mkdir -p /etc/nginx + cp ${htpasswd} /etc/nginx/htpasswd + + # Create app directory and copy built files + mkdir -p /app + cp -r ${react}/* /app/ + + # Start nginx + ${pkgs.nginx}/bin/nginx -c ${nginxConfig} + '') + ]; + pathsToLink = [ "/bin" ]; + }; + + config = { + Cmd = [ "/bin/start-server" ]; + ExposedPorts = { "8080/tcp" = { }; }; + }; + }; + }; devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ - go - pigeon - nodejs - sqlite - ]; + buildInputs = with pkgs; [ go pigeon nodejs sqlite git-bug openssl ]; shellHook = '' + alias start-dev='npm run dev' + alias build-dev='npm run build' + alias clean-dev='rm -rf dist node_modules' + alias ws-server='go run ./server/main.go' + alias gen-pass='openssl passwd -apr1 ' + echo "System: ${system}" + echo "Available commands:" + echo " start-dev - Start Vite dev server" + echo " build-dev - Build the application" + echo " clean-dev - Clean build artifacts" + echo " ws-server - Run the websocket server" + echo " gen-pass - Generate a basic_auth password" ''; }; - } - ); + }); } diff --git a/mast-react-vite/package-lock.json b/mast-react-vite/package-lock.json index fb302a3..adcbf03 100644 --- a/mast-react-vite/package-lock.json +++ b/mast-react-vite/package-lock.json @@ -8,10 +8,12 @@ "name": "mast-react", "version": "0.0.0", "dependencies": { + "@radix-ui/react-checkbox": "^1.1.2", "@radix-ui/react-icons": "^1.3.0", "@tanstack/react-table": "^8.20.5", "@vlcn.io/react": "^3.1.0", "@vlcn.io/rx-tbl": "^0.15.0", + "@vlcn.io/ws-browserdb": "^0.2.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "lucide-react": "^0.454.0", @@ -692,6 +694,68 @@ "node": ">=14" } }, + "node_modules/@radix-ui/primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.0.tgz", + "integrity": "sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==" + }, + "node_modules/@radix-ui/react-checkbox": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.2.tgz", + "integrity": "sha512-/i0fl686zaJbDQLNKrkCbMyDm6FQMt4jg323k7HuqitoANm9sE23Ql8yOK3Wusk34HSLKDChhMux05FnP6KUkw==", + "dependencies": { + "@radix-ui/primitive": "1.1.0", + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-presence": "1.1.1", + "@radix-ui/react-primitive": "2.0.0", + "@radix-ui/react-use-controllable-state": "1.1.0", + "@radix-ui/react-use-previous": "1.1.0", + "@radix-ui/react-use-size": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-compose-refs": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz", + "integrity": "sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-context": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", + "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-icons": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-icons/-/react-icons-1.3.0.tgz", @@ -700,6 +764,144 @@ "react": "^16.x || ^17.x || ^18.x" } }, + "node_modules/@radix-ui/react-presence": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.1.tgz", + "integrity": "sha512-IeFXVi4YS1K0wVZzXNrbaaUvIJ3qdY+/Ih4eHFhWA9SwGR9UDX7Ck8abvL57C4cv3wwMvUE0OG69Qc3NCcTe/A==", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0", + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz", + "integrity": "sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==", + "dependencies": { + "@radix-ui/react-slot": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.0.tgz", + "integrity": "sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-callback-ref": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", + "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", + "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", + "dependencies": { + "@radix-ui/react-use-callback-ref": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", + "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-previous": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", + "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-size": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", + "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.24.2", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.2.tgz", @@ -1203,13 +1405,13 @@ "version": "15.7.13", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", - "dev": true + "devOptional": true }, "node_modules/@types/react": { "version": "18.3.12", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.12.tgz", "integrity": "sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==", - "dev": true, + "devOptional": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -1219,7 +1421,7 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==", - "dev": true, + "devOptional": true, "dependencies": { "@types/react": "*" } @@ -1503,6 +1705,19 @@ "resolved": "https://registry.npmjs.org/@vlcn.io/wa-sqlite/-/wa-sqlite-0.22.0.tgz", "integrity": "sha512-OujKro0mAqP7/efUeCGB6zBiyMoSCFVe7jQKPF0n47U9ZhOaIW3kQUVCwF+CmzvzQfN1Vl4PrFQRNNxlSwTCNQ==" }, + "node_modules/@vlcn.io/ws-browserdb": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@vlcn.io/ws-browserdb/-/ws-browserdb-0.2.0.tgz", + "integrity": "sha512-TKPygQomMPurQ8mwAwEefN5BROw30FagL21S3FzvUunyCybOByysAEoV/OrJ7xNCvYXN9yjg0qyf7iZZfeOsYg==", + "dependencies": { + "@types/throttle-debounce": "^5.0.0", + "@vlcn.io/crsqlite-wasm": "0.16.0", + "@vlcn.io/rx-tbl": "0.15.0", + "@vlcn.io/ws-client": "0.2.0", + "@vlcn.io/ws-common": "0.2.0", + "@vlcn.io/xplat-api": "0.15.0" + } + }, "node_modules/@vlcn.io/ws-client": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@vlcn.io/ws-client/-/ws-client-0.2.0.tgz", @@ -1909,7 +2124,7 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "dev": true + "devOptional": true }, "node_modules/debug": { "version": "4.3.7", diff --git a/mast-react-vite/package.json b/mast-react-vite/package.json index 53d4b28..6eef330 100644 --- a/mast-react-vite/package.json +++ b/mast-react-vite/package.json @@ -5,15 +5,17 @@ "type": "module", "scripts": { "dev": "vite", - "build": "tsc -b && vite build", + "build": "vite build", "lint": "eslint .", "preview": "vite preview" }, "dependencies": { + "@radix-ui/react-checkbox": "^1.1.2", "@radix-ui/react-icons": "^1.3.0", "@tanstack/react-table": "^8.20.5", "@vlcn.io/react": "^3.1.0", "@vlcn.io/rx-tbl": "^0.15.0", + "@vlcn.io/ws-browserdb": "^0.2.0", "class-variance-authority": "^0.7.0", "clsx": "^2.1.1", "lucide-react": "^0.454.0", diff --git a/mast-react-vite/src/App.tsx b/mast-react-vite/src/App.tsx index 7f5d895..7fdc55d 100644 --- a/mast-react-vite/src/App.tsx +++ b/mast-react-vite/src/App.tsx @@ -1,18 +1,20 @@ import { useState } from 'react' -import { useCachedState, useQuery } from "@vlcn.io/react"; +import { useQuery } from "@vlcn.io/react"; import { ColumnDef, - flexRender, - getCoreRowModel, - useReactTable, } from "@tanstack/react-table" import { DataTable } from "@/components/ui/data-table" -import * as addParser from '../../parser/add_parser.js'; -import * as commandParser from '../../parser/command_parser.js'; +import * as commandParser from '@/lib/command_parser.js'; import { Checkbox } from "@/components/ui/checkbox" import { Input } from "@/components/ui/input" -function Marshall(parsed) { +interface MarshalledCommand { + description: string; + tags: string; + project: string; +} + +function Marshall(parsed): MarshalledCommand { let project = ""; const tags = []; for (const attr of parsed.attributes) { @@ -171,6 +173,10 @@ function App({ ctx }) { } } // React to key presses for selection + // TODO: + // We should use the react way + // Where we update based on changes to newText + // Rather than changes to the input value else if (e.target.value.trim() !== "") { try { const parsed = commandParser.parse(e.target.value); diff --git a/mast-react-vite/src/Root.tsx b/mast-react-vite/src/Root.tsx new file mode 100644 index 0000000..0de7e53 --- /dev/null +++ b/mast-react-vite/src/Root.tsx @@ -0,0 +1,78 @@ +import App from "./App.tsx"; +import schemaContent from "./schemas/main2.sql?raw"; +import { DBProvider } from "@vlcn.io/react"; +import { useEffect, useState } from "react"; + +/** + * Generates a random room name to sync with or pulls one from local storage. + */ +function getRoom(hash: HashBag): string { + return hash.room || localStorage.getItem("room") || newRoom(); +} + +function hashChanged() { + const hash = parseHash(); + const room = getRoom(hash); + if (room != hash.room) { + hash.room = room; + window.location.hash = writeHash(hash); + } + localStorage.setItem("room", room); + return room; +} +const room = hashChanged(); + +export default function Root() { + const [theRoom, setTheRoom] = useState(room); + useEffect(() => { + const cb = () => { + const room = hashChanged(); + if (room != theRoom) { + setTheRoom(room); + } + }; + addEventListener("hashchange", cb); + return () => { + removeEventListener("hashchange", cb); + }; + }, []); // ignore -- theRoom is managed by the effect + + return ( + } + > + ); +} + +type HashBag = { [key: string]: string }; +function parseHash(): HashBag { + const hash = window.location.hash; + const ret: { [key: string]: string } = {}; + if (hash.length > 1) { + const substr = hash.substring(1); + const parts = substr.split(","); + for (const part of parts) { + const [key, value] = part.split("="); + ret[key] = value; + } + } + + return ret; +} + +function writeHash(hash: HashBag) { + const parts = []; + for (const key in hash) { + parts.push(`${key}=${hash[key]}`); + } + return parts.join(","); +} + +function newRoom() { + return crypto.randomUUID().replaceAll("-", ""); +} diff --git a/mast-react-vite/src/lib/command_parser.js b/mast-react-vite/src/lib/command_parser.js new file mode 100644 index 0000000..bb19189 --- /dev/null +++ b/mast-react-vite/src/lib/command_parser.js @@ -0,0 +1,1304 @@ +// @generated by Peggy 4.1.1. +// +// https://peggyjs.org/ + + +function peg$subclass(child, parent) { + function C() { this.constructor = child; } + C.prototype = parent.prototype; + child.prototype = new C(); +} + +function peg$SyntaxError(message, expected, found, location) { + var self = Error.call(this, message); + // istanbul ignore next Check is a necessary evil to support older environments + if (Object.setPrototypeOf) { + Object.setPrototypeOf(self, peg$SyntaxError.prototype); + } + self.expected = expected; + self.found = found; + self.location = location; + self.name = "SyntaxError"; + return self; +} + +peg$subclass(peg$SyntaxError, Error); + +function peg$padEnd(str, targetLength, padString) { + padString = padString || " "; + if (str.length > targetLength) { return str; } + targetLength -= str.length; + padString += padString.repeat(targetLength); + return str + padString.slice(0, targetLength); +} + +peg$SyntaxError.prototype.format = function(sources) { + var str = "Error: " + this.message; + if (this.location) { + var src = null; + var k; + for (k = 0; k < sources.length; k++) { + if (sources[k].source === this.location.source) { + src = sources[k].text.split(/\r\n|\n|\r/g); + break; + } + } + var s = this.location.start; + var offset_s = (this.location.source && (typeof this.location.source.offset === "function")) + ? this.location.source.offset(s) + : s; + var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column; + if (src) { + var e = this.location.end; + var filler = peg$padEnd("", offset_s.line.toString().length, ' '); + var line = src[s.line - 1]; + var last = s.line === e.line ? e.column : line.length + 1; + var hatLen = (last - s.column) || 1; + str += "\n --> " + loc + "\n" + + filler + " |\n" + + offset_s.line + " | " + line + "\n" + + filler + " | " + peg$padEnd("", s.column - 1, ' ') + + peg$padEnd("", hatLen, "^"); + } else { + str += "\n at " + loc; + } + } + return str; +}; + +peg$SyntaxError.buildMessage = function(expected, found) { + var DESCRIBE_EXPECTATION_FNS = { + literal: function(expectation) { + return "\"" + literalEscape(expectation.text) + "\""; + }, + + class: function(expectation) { + var escapedParts = expectation.parts.map(function(part) { + return Array.isArray(part) + ? classEscape(part[0]) + "-" + classEscape(part[1]) + : classEscape(part); + }); + + return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]"; + }, + + any: function() { + return "any character"; + }, + + end: function() { + return "end of input"; + }, + + other: function(expectation) { + return expectation.description; + } + }; + + function hex(ch) { + return ch.charCodeAt(0).toString(16).toUpperCase(); + } + + function literalEscape(s) { + return s + .replace(/\\/g, "\\\\") + .replace(/"/g, "\\\"") + .replace(/\0/g, "\\0") + .replace(/\t/g, "\\t") + .replace(/\n/g, "\\n") + .replace(/\r/g, "\\r") + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + } + + function classEscape(s) { + return s + .replace(/\\/g, "\\\\") + .replace(/\]/g, "\\]") + .replace(/\^/g, "\\^") + .replace(/-/g, "\\-") + .replace(/\0/g, "\\0") + .replace(/\t/g, "\\t") + .replace(/\n/g, "\\n") + .replace(/\r/g, "\\r") + .replace(/[\x00-\x0F]/g, function(ch) { return "\\x0" + hex(ch); }) + .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x" + hex(ch); }); + } + + function describeExpectation(expectation) { + return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation); + } + + function describeExpected(expected) { + var descriptions = expected.map(describeExpectation); + var i, j; + + descriptions.sort(); + + if (descriptions.length > 0) { + for (i = 1, j = 1; i < descriptions.length; i++) { + if (descriptions[i - 1] !== descriptions[i]) { + descriptions[j] = descriptions[i]; + j++; + } + } + descriptions.length = j; + } + + switch (descriptions.length) { + case 1: + return descriptions[0]; + + case 2: + return descriptions[0] + " or " + descriptions[1]; + + default: + return descriptions.slice(0, -1).join(", ") + + ", or " + + descriptions[descriptions.length - 1]; + } + } + + function describeFound(found) { + return found ? "\"" + literalEscape(found) + "\"" : "end of input"; + } + + return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found."; +}; + +function peg$parse(input, options) { + options = options !== undefined ? options : {}; + + var peg$FAILED = {}; + var peg$source = options.grammarSource; + + var peg$startRuleFunctions = { Start: peg$parseStart }; + var peg$startRuleFunction = peg$parseStart; + + var peg$c0 = "add"; + var peg$c1 = "done"; + var peg$c2 = "filter"; + var peg$c3 = "-"; + var peg$c4 = ","; + var peg$c5 = "@"; + var peg$c6 = "pro:"; + var peg$c7 = "project:"; + var peg$c8 = "+"; + var peg$c9 = "priority:"; + var peg$c10 = "#"; + var peg$c11 = "am"; + var peg$c12 = "pm"; + + var peg$r0 = /^[HML]/; + var peg$r1 = /^[0-9]/; + var peg$r2 = /^[0-9:]/; + var peg$r3 = /^[a-zA-Z0-9_\-]/; + var peg$r4 = /^[ \t]/; + + var peg$e0 = peg$literalExpectation("add", false); + var peg$e1 = peg$literalExpectation("done", false); + var peg$e2 = peg$literalExpectation("filter", false); + var peg$e3 = peg$literalExpectation("-", false); + var peg$e4 = peg$literalExpectation(",", false); + var peg$e5 = peg$literalExpectation("@", false); + var peg$e6 = peg$literalExpectation("pro:", false); + var peg$e7 = peg$literalExpectation("project:", false); + var peg$e8 = peg$literalExpectation("+", false); + var peg$e9 = peg$literalExpectation("priority:", false); + var peg$e10 = peg$classExpectation(["H", "M", "L"], false, false); + var peg$e11 = peg$literalExpectation("#", false); + var peg$e12 = peg$classExpectation([["0", "9"]], false, false); + var peg$e13 = peg$classExpectation([["0", "9"], ":"], false, false); + var peg$e14 = peg$literalExpectation("am", false); + var peg$e15 = peg$literalExpectation("pm", false); + var peg$e16 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_", "-"], false, false); + var peg$e17 = peg$classExpectation([" ", "\t"], false, false); + var peg$e18 = peg$anyExpectation(); + + var peg$f0 = function(parts) { + return makeCommand('add', null, parts.filter(p => p !== null)); +}; + var peg$f1 = function(filters) { + return makeCommand('done', filters, null); +}; + var peg$f2 = function(filters, moreFilters) { + return makeCommand('filter', [...filters, ...moreFilters], null); +}; + var peg$f3 = function(filters) { + return makeCommand('filter', filters, null); +}; + var peg$f4 = function(first, rest) { + return [first, ...rest.map(r => r[1])]; +}; + var peg$f5 = function(start, end) { + const ids = []; + for (let i = start; i <= end; i++) { + ids.push(i); + } + return ids; +}; + var peg$f6 = function(id) { + return [id]; +}; + var peg$f7 = function(first, rest, trailing) { + const ids = [first, ...rest.map(r => r[1])].flat(); + return { + type: 'id', + ids: ids, + reconstruct: function() { return this.ids.join(','); } + }; +}; + var peg$f8 = function(chars) { + return { + type: "text", + value: chars, + reconstruct: function() { return this.value; } + }; +}; + var peg$f9 = function(value) { + return { + type: "due", + value: value, + reconstruct: function() { return `@${this.value}`; } + }; +}; + var peg$f10 = function(value) { + return { + type: "project", + value: value, + reconstruct: function() { return `+${this.value}`; } + }; +}; + var peg$f11 = function(value) { + return { + type: "priority", + value: value, + reconstruct: function() { return `priority:${this.value}`; } + }; +}; + var peg$f12 = function(value) { + return { + type: "tag", + value: value, + reconstruct: function() { return `#${this.value}`; } + }; +}; + var peg$f13 = function(digits) { + return parseInt(digits.join(''), 10); +}; + var peg$f14 = function(chars) { + return chars.join('') + (text() || ''); +}; + var peg$f15 = function(chars) { + return chars.join(''); +}; + var peg$f16 = function() { + return null; +}; + var peg$currPos = options.peg$currPos | 0; + var peg$savedPos = peg$currPos; + var peg$posDetailsCache = [{ line: 1, column: 1 }]; + var peg$maxFailPos = peg$currPos; + var peg$maxFailExpected = options.peg$maxFailExpected || []; + var peg$silentFails = options.peg$silentFails | 0; + + var peg$result; + + if (options.startRule) { + if (!(options.startRule in peg$startRuleFunctions)) { + throw new Error("Can't start parsing from rule \"" + options.startRule + "\"."); + } + + peg$startRuleFunction = peg$startRuleFunctions[options.startRule]; + } + + function text() { + return input.substring(peg$savedPos, peg$currPos); + } + + function offset() { + return peg$savedPos; + } + + function range() { + return { + source: peg$source, + start: peg$savedPos, + end: peg$currPos + }; + } + + function location() { + return peg$computeLocation(peg$savedPos, peg$currPos); + } + + function expected(description, location) { + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); + + throw peg$buildStructuredError( + [peg$otherExpectation(description)], + input.substring(peg$savedPos, peg$currPos), + location + ); + } + + function error(message, location) { + location = location !== undefined + ? location + : peg$computeLocation(peg$savedPos, peg$currPos); + + throw peg$buildSimpleError(message, location); + } + + function peg$literalExpectation(text, ignoreCase) { + return { type: "literal", text: text, ignoreCase: ignoreCase }; + } + + function peg$classExpectation(parts, inverted, ignoreCase) { + return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase }; + } + + function peg$anyExpectation() { + return { type: "any" }; + } + + function peg$endExpectation() { + return { type: "end" }; + } + + function peg$otherExpectation(description) { + return { type: "other", description: description }; + } + + function peg$computePosDetails(pos) { + var details = peg$posDetailsCache[pos]; + var p; + + if (details) { + return details; + } else { + if (pos >= peg$posDetailsCache.length) { + p = peg$posDetailsCache.length - 1; + } else { + p = pos; + while (!peg$posDetailsCache[--p]) {} + } + + details = peg$posDetailsCache[p]; + details = { + line: details.line, + column: details.column + }; + + while (p < pos) { + if (input.charCodeAt(p) === 10) { + details.line++; + details.column = 1; + } else { + details.column++; + } + + p++; + } + + peg$posDetailsCache[pos] = details; + + return details; + } + } + + function peg$computeLocation(startPos, endPos, offset) { + var startPosDetails = peg$computePosDetails(startPos); + var endPosDetails = peg$computePosDetails(endPos); + + var res = { + source: peg$source, + start: { + offset: startPos, + line: startPosDetails.line, + column: startPosDetails.column + }, + end: { + offset: endPos, + line: endPosDetails.line, + column: endPosDetails.column + } + }; + if (offset && peg$source && (typeof peg$source.offset === "function")) { + res.start = peg$source.offset(res.start); + res.end = peg$source.offset(res.end); + } + return res; + } + + function peg$fail(expected) { + if (peg$currPos < peg$maxFailPos) { return; } + + if (peg$currPos > peg$maxFailPos) { + peg$maxFailPos = peg$currPos; + peg$maxFailExpected = []; + } + + peg$maxFailExpected.push(expected); + } + + function peg$buildSimpleError(message, location) { + return new peg$SyntaxError(message, null, null, location); + } + + function peg$buildStructuredError(expected, found, location) { + return new peg$SyntaxError( + peg$SyntaxError.buildMessage(expected, found), + expected, + found, + location + ); + } + + function peg$parseStart() { + var s0; + + s0 = peg$parseAddCommand(); + if (s0 === peg$FAILED) { + s0 = peg$parseDoneCommand(); + if (s0 === peg$FAILED) { + s0 = peg$parseExplicitFilterCommand(); + if (s0 === peg$FAILED) { + s0 = peg$parseImplicitFilterCommand(); + } + } + } + + return s0; + } + + function peg$parseAddCommand() { + var s0, s1, s2, s3, s4; + + s0 = peg$currPos; + if (input.substr(peg$currPos, 3) === peg$c0) { + s1 = peg$c0; + peg$currPos += 3; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e0); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (s2 !== peg$FAILED) { + s3 = []; + s4 = peg$parsePart(); + if (s4 === peg$FAILED) { + s4 = peg$parse_(); + } + if (s4 !== peg$FAILED) { + while (s4 !== peg$FAILED) { + s3.push(s4); + s4 = peg$parsePart(); + if (s4 === peg$FAILED) { + s4 = peg$parse_(); + } + } + } else { + s3 = peg$FAILED; + } + if (s3 !== peg$FAILED) { + s4 = peg$parseEOF(); + if (s4 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f0(s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseDoneCommand() { + var s0, s1, s2, s3, s4; + + s0 = peg$currPos; + s1 = peg$parseFilters(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (s2 !== peg$FAILED) { + if (input.substr(peg$currPos, 4) === peg$c1) { + s3 = peg$c1; + peg$currPos += 4; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e1); } + } + if (s3 !== peg$FAILED) { + s4 = peg$parseEOF(); + if (s4 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f1(s1); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseExplicitFilterCommand() { + var s0, s1, s2, s3, s4, s5, s6; + + s0 = peg$currPos; + s1 = peg$parseFilters(); + if (s1 !== peg$FAILED) { + s2 = peg$parse_(); + if (s2 !== peg$FAILED) { + if (input.substr(peg$currPos, 6) === peg$c2) { + s3 = peg$c2; + peg$currPos += 6; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e2); } + } + if (s3 !== peg$FAILED) { + s4 = []; + s5 = peg$parse_(); + while (s5 !== peg$FAILED) { + s4.push(s5); + s5 = peg$parse_(); + } + s5 = []; + s6 = peg$parseFilters(); + while (s6 !== peg$FAILED) { + s5.push(s6); + s6 = peg$parseFilters(); + } + s6 = peg$parseEOF(); + if (s6 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f2(s1, s5); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseImplicitFilterCommand() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + s2 = peg$parseFilters(); + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + s2 = peg$parseFilters(); + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + s2 = peg$parseEOF(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f3(s1); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseFilters() { + var s0, s1, s2, s3, s4, s5; + + s0 = peg$currPos; + s1 = peg$parseFilter(); + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + s4 = peg$parse_(); + if (s4 !== peg$FAILED) { + s5 = peg$parseFilter(); + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + s4 = peg$parse_(); + if (s4 !== peg$FAILED) { + s5 = peg$parseFilter(); + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + peg$savedPos = s0; + s0 = peg$f4(s1, s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseIdRange() { + var s0, s1, s2, s3; + + s0 = peg$currPos; + s1 = peg$parseInteger(); + if (s1 !== peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 45) { + s2 = peg$c3; + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e3); } + } + if (s2 !== peg$FAILED) { + s3 = peg$parseInteger(); + if (s3 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f5(s1, s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseSingleId() { + var s0, s1; + + s0 = peg$currPos; + s1 = peg$parseInteger(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f6(s1); + } + s0 = s1; + + return s0; + } + + function peg$parseFilter() { + var s0; + + s0 = peg$parseIdFilter(); + if (s0 === peg$FAILED) { + s0 = peg$parseTag(); + if (s0 === peg$FAILED) { + s0 = peg$parseProject(); + if (s0 === peg$FAILED) { + s0 = peg$parsePriority(); + if (s0 === peg$FAILED) { + s0 = peg$parseDue(); + } + } + } + } + + return s0; + } + + function peg$parseIdFilter() { + var s0, s1, s2, s3, s4, s5; + + s0 = peg$currPos; + s1 = peg$parseIdRange(); + if (s1 === peg$FAILED) { + s1 = peg$parseSingleId(); + } + if (s1 !== peg$FAILED) { + s2 = []; + s3 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 44) { + s4 = peg$c4; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s4 !== peg$FAILED) { + s5 = peg$parseIdRange(); + if (s5 === peg$FAILED) { + s5 = peg$parseSingleId(); + } + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + while (s3 !== peg$FAILED) { + s2.push(s3); + s3 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 44) { + s4 = peg$c4; + peg$currPos++; + } else { + s4 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s4 !== peg$FAILED) { + s5 = peg$parseIdRange(); + if (s5 === peg$FAILED) { + s5 = peg$parseSingleId(); + } + if (s5 !== peg$FAILED) { + s4 = [s4, s5]; + s3 = s4; + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } else { + peg$currPos = s3; + s3 = peg$FAILED; + } + } + if (input.charCodeAt(peg$currPos) === 44) { + s3 = peg$c4; + peg$currPos++; + } else { + s3 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e4); } + } + if (s3 === peg$FAILED) { + s3 = null; + } + peg$savedPos = s0; + s0 = peg$f7(s1, s2, s3); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parsePart() { + var s0; + + s0 = peg$parseAttribute(); + if (s0 === peg$FAILED) { + s0 = peg$parseTextPart(); + } + + return s0; + } + + function peg$parseTextPart() { + var s0, s1; + + s0 = peg$currPos; + s1 = peg$parseWord(); + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f8(s1); + } + s0 = s1; + + return s0; + } + + function peg$parseAttribute() { + var s0; + + s0 = peg$parseDue(); + if (s0 === peg$FAILED) { + s0 = peg$parseTag(); + if (s0 === peg$FAILED) { + s0 = peg$parseProject(); + if (s0 === peg$FAILED) { + s0 = peg$parsePriority(); + } + } + } + + return s0; + } + + function peg$parseDue() { + var s0, s1, s2; + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 64) { + s1 = peg$c5; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e5); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parseTimeValue(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f9(s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseProject() { + var s0, s1, s2; + + s0 = peg$currPos; + if (input.substr(peg$currPos, 4) === peg$c6) { + s1 = peg$c6; + peg$currPos += 4; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e6); } + } + if (s1 === peg$FAILED) { + if (input.substr(peg$currPos, 8) === peg$c7) { + s1 = peg$c7; + peg$currPos += 8; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e7); } + } + if (s1 === peg$FAILED) { + if (input.charCodeAt(peg$currPos) === 43) { + s1 = peg$c8; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e8); } + } + } + } + if (s1 !== peg$FAILED) { + s2 = peg$parseWord(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f10(s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parsePriority() { + var s0, s1, s2; + + s0 = peg$currPos; + if (input.substr(peg$currPos, 9) === peg$c9) { + s1 = peg$c9; + peg$currPos += 9; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e9); } + } + if (s1 !== peg$FAILED) { + s2 = input.charAt(peg$currPos); + if (peg$r0.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e10); } + } + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f11(s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseTag() { + var s0, s1, s2; + + s0 = peg$currPos; + if (input.charCodeAt(peg$currPos) === 35) { + s1 = peg$c10; + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e11); } + } + if (s1 !== peg$FAILED) { + s2 = peg$parseWord(); + if (s2 !== peg$FAILED) { + peg$savedPos = s0; + s0 = peg$f12(s2); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseInteger() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + s2 = input.charAt(peg$currPos); + if (peg$r1.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + s2 = input.charAt(peg$currPos); + if (peg$r1.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e12); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f13(s1); + } + s0 = s1; + + return s0; + } + + function peg$parseTimeValue() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + s2 = input.charAt(peg$currPos); + if (peg$r2.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e13); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + s2 = input.charAt(peg$currPos); + if (peg$r2.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e13); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c11) { + s2 = peg$c11; + peg$currPos += 2; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e14); } + } + if (s2 === peg$FAILED) { + if (input.substr(peg$currPos, 2) === peg$c12) { + s2 = peg$c12; + peg$currPos += 2; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e15); } + } + } + if (s2 === peg$FAILED) { + s2 = null; + } + peg$savedPos = s0; + s0 = peg$f14(s1); + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + function peg$parseWord() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + s2 = input.charAt(peg$currPos); + if (peg$r3.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e16); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + s2 = input.charAt(peg$currPos); + if (peg$r3.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e16); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f15(s1); + } + s0 = s1; + + return s0; + } + + function peg$parse_() { + var s0, s1, s2; + + s0 = peg$currPos; + s1 = []; + s2 = input.charAt(peg$currPos); + if (peg$r4.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e17); } + } + if (s2 !== peg$FAILED) { + while (s2 !== peg$FAILED) { + s1.push(s2); + s2 = input.charAt(peg$currPos); + if (peg$r4.test(s2)) { + peg$currPos++; + } else { + s2 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e17); } + } + } + } else { + s1 = peg$FAILED; + } + if (s1 !== peg$FAILED) { + peg$savedPos = s0; + s1 = peg$f16(); + } + s0 = s1; + + return s0; + } + + function peg$parseEOF() { + var s0, s1; + + s0 = peg$currPos; + peg$silentFails++; + if (input.length > peg$currPos) { + s1 = input.charAt(peg$currPos); + peg$currPos++; + } else { + s1 = peg$FAILED; + if (peg$silentFails === 0) { peg$fail(peg$e18); } + } + peg$silentFails--; + if (s1 === peg$FAILED) { + s0 = undefined; + } else { + peg$currPos = s0; + s0 = peg$FAILED; + } + + return s0; + } + + + function makeCommand(type, filters, parts) { + + const validParts = parts || []; + // Extract pure description (without attributes) + const description = validParts + .filter(part => part.type === 'text') + .map(part => part.value) + .join(' ') + .trim(); + + // Collect all attributes + const attributes = validParts + .filter(part => part.type !== 'text') + .filter(part => part !== null); + + const project = validParts + .filter(part => part.type === 'project') + .map(part => part.value) + .join('') + .trim(); + + const tags = validParts + .filter(part => part.type === 'tag') + .map(part => part.value); + + + // Store original parts for reconstruction + const originalParts = validParts.filter(part => part !== null); + let validFilters; + if (!!filters) { + validFilters = filters.flat(); + } else { + validFilters = []; + } + + return { + type: type, + description: description || [], + attributes: attributes || [], + filters: validFilters, + project: project, + tags: JSON.stringify(tags), + parts: parts || [], + reconstruct: function() { + const filterStr = this.filters.map(f => f.reconstruct()).join(','); + const partsStr = this.parts.map(p => p.reconstruct()).join(' '); + return [filterStr, this.type, partsStr].filter(Boolean).join(' '); + } + }; + } + + peg$result = peg$startRuleFunction(); + + if (options.peg$library) { + return /** @type {any} */ ({ + peg$result, + peg$currPos, + peg$FAILED, + peg$maxFailExpected, + peg$maxFailPos + }); + } + if (peg$result !== peg$FAILED && peg$currPos === input.length) { + return peg$result; + } else { + if (peg$result !== peg$FAILED && peg$currPos < input.length) { + peg$fail(peg$endExpectation()); + } + + throw peg$buildStructuredError( + peg$maxFailExpected, + peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null, + peg$maxFailPos < input.length + ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1) + : peg$computeLocation(peg$maxFailPos, peg$maxFailPos) + ); + } +} + +const peg$allowedStartRules = [ + "Start" +]; + +export { + peg$allowedStartRules as StartRules, + peg$SyntaxError as SyntaxError, + peg$parse as parse +}; diff --git a/mast-react-vite/src/main.tsx b/mast-react-vite/src/main.tsx index 834b8d7..22b124b 100644 --- a/mast-react-vite/src/main.tsx +++ b/mast-react-vite/src/main.tsx @@ -2,31 +2,89 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' import './index.css' import App from "./App.tsx"; +import Root from "./Root.tsx"; +import { start } from "@vlcn.io/ws-client/worker.js"; +import { createDbProvider } from "@vlcn.io/ws-browserdb"; import initWasm from '@vlcn.io/crsqlite-wasm'; import wasmUrl from '@vlcn.io/crsqlite-wasm/crsqlite.wasm?url'; import tblrx from '@vlcn.io/rx-tbl'; -const sqlite = await initWasm(() => wasmUrl); +async function initializeDatabase() { + const sqlite = await initWasm(() => wasmUrl); + const db = await sqlite.open("todo.db"); + await db.exec(` + CREATE TABLE IF NOT EXISTS todos ( + id BLOB PRIMARY KEY NOT NULL, + description TEXT, + project text, + tags text, + due text, + wait text, + priority text, + urgency real, + completed INTEGER NOT NULL DEFAULT 0 + ); + SELECT crsql_as_crr('todos'); + `); + db.onUpdate(async () => { + const changes = await db.execA(`SELECT * FROM crsql_changes WHERE db_version > 0 AND site_id = crsql_site_id()`); -const db = await sqlite.open("todo.db"); -await db.exec(` - CREATE TABLE IF NOT EXISTS todos ( - id BLOB PRIMARY KEY NOT NULL, - description TEXT, - project text, - tags text, - due text, - wait text, - priority text, - urgency real, - completed INTEGER NOT NULL DEFAULT 0 - ); - SELECT crsql_as_crr('todos'); -`); + sendChangesToServer(changes); + }); + return db; +} -const rx = tblrx(db); -const ctx = { db, rx }; +const config = { + dbProvider: createDbProvider(), + transportProvider: (dbName) => new WebSocket(`ws://localhost:8080/sync/${dbName}`), +}; + +start(config); +const ws = new WebSocket('ws://localhost:8080/sync'); + +ws.onmessage = async function(event) { + const { type, data } = JSON.parse(event.data); + if (type === 'changes') { + await applyChanges(data); + } +}; + +function sendChangesToServer(changes) { + const formattedChanges = changes.map(change => ({ + TableName: change[0], + PK: Array.isArray(change[1]) ? btoa(String.fromCharCode.apply(null, change[1])) : btoa(change[1]), + ColumnName: change[2], + Value: Array.isArray(change[3]) ? btoa(String.fromCharCode.apply(null, change[3])) : change[3], + ColVersion: Number(change[4]), + DBVersion: Number(change[5]), + SiteID: Array.isArray(change[6]) ? btoa(new TextDecoder('utf8').decode(change[6])) : btoa(change[6]), + CL: Number(change[7]), + Seq: Number(change[8]) + })); + console.log(formattedChanges) + + const message = { + type: "changes", + data: formattedChanges + }; + + ws.send(JSON.stringify(message)); +} + +async function applyChanges(changes) { + const db = initializeDatabase(); + const rx = tblrx(db); + const ctx = { db, rx }; + await db.tx(async (tx) => { + for (const change of changes) { + await tx.exec( + `INSERT INTO crsql_changes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, + change + ); + } + }); +} document.getElementById("root")!.classList.add("dark"); diff --git a/mast-react-vite/tsconfig.json b/mast-react-vite/tsconfig.json index 696df04..b465b27 100644 --- a/mast-react-vite/tsconfig.json +++ b/mast-react-vite/tsconfig.json @@ -9,6 +9,7 @@ } ], "compilerOptions": { + "noEmitOnError": false, "baseUrl": ".", "paths": { "@/*": [