diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2453be7..333c373 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -20,7 +20,15 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # for git describe
+ - name: Install Rust
+ uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
+ - name: Install wasm-pack
+ uses: jetli/wasm-pack-action@v0.4.0
+ with:
+ version: 'latest'
+ - name: build wasm
+ run: scripts/buildwasm
- uses: astral-sh/setup-uv@v3
with:
enable-cache: true
@@ -31,4 +39,4 @@ jobs:
- name: Deploy
run: |
VERSION=$(git describe --tags --match="v*" --abbrev=0)
- uv run mike deploy $VERSION latest --update-aliases --push
\ No newline at end of file
+ uv run mike deploy $VERSION latest --update-aliases --push
diff --git a/Cargo.lock b/Cargo.lock
index a4b1033..fd5b568 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11,6 +11,7 @@ dependencies = [
"cfg-if",
"getrandom",
"once_cell",
+ "serde",
"version_check",
"zerocopy",
]
@@ -86,12 +87,6 @@ version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
-[[package]]
-name = "appendlist"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2"
-
[[package]]
name = "approx"
version = "0.5.1"
@@ -124,32 +119,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
[[package]]
-name = "block-buffer"
-version = "0.10.4"
+name = "bit-set"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
- "generic-array",
+ "bit-vec",
]
[[package]]
-name = "boon"
-version = "0.6.1"
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baa187da765010b70370368c49f08244b1ae5cae1d5d33072f76c8cb7112fe3e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
dependencies = [
- "ahash",
- "appendlist",
- "base64",
- "fluent-uri",
- "idna",
- "once_cell",
- "percent-encoding",
- "regex",
- "regex-syntax",
- "serde",
- "serde_json",
- "url",
+ "generic-array",
]
[[package]]
@@ -158,6 +154,18 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3eeab4423108c5d7c744f4d234de88d18d636100093ae04caf4825134b9c3a32"
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+
+[[package]]
+name = "bytecount"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
+
[[package]]
name = "byteorder"
version = "1.5.0"
@@ -172,9 +180,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
-version = "4.5.27"
+version = "4.5.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796"
+checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff"
dependencies = [
"clap_builder",
"clap_derive",
@@ -194,9 +202,9 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.24"
+version = "4.5.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
dependencies = [
"heck",
"proc-macro2",
@@ -230,13 +238,13 @@ name = "cql2"
version = "0.3.3-alpha.0"
dependencies = [
"assert-json-diff",
- "boon",
"geo",
"geo-types",
"geojson",
"geozero",
"jiff",
"json_dotpath",
+ "jsonschema",
"lazy_static",
"like",
"pest",
@@ -272,6 +280,16 @@ dependencies = [
"pythonize",
]
+[[package]]
+name = "cql2-wasm"
+version = "0.3.3-alpha.0"
+dependencies = [
+ "cql2",
+ "getrandom",
+ "wasm-bindgen",
+ "web-sys",
+]
+
[[package]]
name = "crossbeam-deque"
version = "0.8.6"
@@ -344,12 +362,32 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+[[package]]
+name = "email_address"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
+dependencies = [
+ "serde",
+]
+
[[package]]
name = "equivalent"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+[[package]]
+name = "fancy-regex"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
+dependencies = [
+ "bit-set",
+ "regex-automata",
+ "regex-syntax",
+]
+
[[package]]
name = "float_next_after"
version = "1.0.0"
@@ -364,15 +402,17 @@ checksum = "1918b65d96df47d3591bed19c5cca17e3fa5d0707318e4b5ef2eae01764df7e5"
dependencies = [
"borrow-or-share",
"ref-cast",
+ "serde",
]
[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
+name = "fraction"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "0f158e3ff0a1b334408dc9fb811cd99b446986f4d8b741bb08f9df1604085ae7"
dependencies = [
- "percent-encoding",
+ "lazy_static",
+ "num",
]
[[package]]
@@ -511,8 +551,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"wasi",
+ "wasm-bindgen",
]
[[package]]
@@ -784,9 +826,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
[[package]]
name = "jiff"
-version = "0.1.29"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c04ef77ae73f3cf50510712722f0c4e8b46f5aaa1bf5ffad2ae213e6495e78e5"
+checksum = "ba926fdd8e5b5e7f9700355b0831d8c416afe94b014b1023424037a187c9c582"
dependencies = [
"jiff-tzdb-platform",
"log",
@@ -811,6 +853,16 @@ dependencies = [
"jiff-tzdb",
]
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
[[package]]
name = "json_dotpath"
version = "1.1.0"
@@ -823,6 +875,30 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "jsonschema"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c59cb1733c34377b6067a0419befd7f25073c5249ec3b0614a482bf499e1df5"
+dependencies = [
+ "ahash",
+ "base64",
+ "bytecount",
+ "email_address",
+ "fancy-regex",
+ "fraction",
+ "idna",
+ "itoa",
+ "num-cmp",
+ "once_cell",
+ "percent-encoding",
+ "referencing",
+ "regex-syntax",
+ "serde",
+ "serde_json",
+ "uuid-simd",
+]
+
[[package]]
name = "lazy_static"
version = "1.5.0"
@@ -853,6 +929,16 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
[[package]]
name = "log"
version = "0.4.25"
@@ -874,6 +960,76 @@ dependencies = [
"autocfg",
]
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-cmp"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
[[package]]
name = "num-traits"
version = "0.2.19"
@@ -886,9 +1042,38 @@ dependencies = [
[[package]]
name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+
+[[package]]
+name = "outref"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
[[package]]
name = "percent-encoding"
@@ -1154,6 +1339,15 @@ dependencies = [
"crossbeam-utils",
]
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+dependencies = [
+ "bitflags",
+]
+
[[package]]
name = "ref-cast"
version = "1.0.23"
@@ -1174,6 +1368,20 @@ dependencies = [
"syn",
]
+[[package]]
+name = "referencing"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce52678d53e5ee37e4af0a9036ca834d0cd34b33c82457c6b06a24f8d783344"
+dependencies = [
+ "ahash",
+ "fluent-uri",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "serde_json",
+]
+
[[package]]
name = "regex"
version = "1.11.1"
@@ -1265,12 +1473,24 @@ dependencies = [
"semver",
]
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
[[package]]
name = "ryu"
version = "1.0.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
[[package]]
name = "semver"
version = "1.0.25"
@@ -1467,9 +1687,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
[[package]]
name = "toml_edit"
-version = "0.22.23"
+version = "0.22.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
dependencies = [
"indexmap",
"toml_datetime",
@@ -1518,17 +1738,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
[[package]]
name = "utf16_iter"
version = "1.0.5"
@@ -1547,18 +1756,109 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+[[package]]
+name = "uuid"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
+
+[[package]]
+name = "uuid-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b082222b4f6619906941c17eb2297fff4c2fb96cb60164170522942a200bd8"
+dependencies = [
+ "outref",
+ "uuid",
+ "vsimd",
+]
+
[[package]]
name = "version_check"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+[[package]]
+name = "vsimd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
+
[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
[[package]]
name = "windows-sys"
version = "0.59.0"
@@ -1634,9 +1934,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
-version = "0.7.0"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419"
+checksum = "59690dea168f2198d1a3b0cac23b8063efcd11012f10ae4698f284808c8ef603"
dependencies = [
"memchr",
]
diff --git a/Cargo.toml b/Cargo.toml
index 16c1fb8..4febc03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,14 +22,15 @@ repository = { workspace = true }
license = { workspace = true }
keywords = ["cql2"]
+
[dependencies]
-boon = "0.6.1"
geo = "0.29.3"
geo-types = "0.7.15"
geojson = "0.24.1"
geozero = "0.14.0"
-jiff = "0.1.29"
+jiff = "0.2.0"
json_dotpath = "1.1.0"
+jsonschema = { version = "0.29.0", default-features = false }
lazy_static = "1.5"
like = "0.3.1"
pest = "2.7"
@@ -48,7 +49,7 @@ rstest = "0.24.0"
[workspace]
default-members = [".", "cli"]
-members = ["cli", "python"]
+members = ["cli", "python", "wasm"]
[workspace.dependencies]
-clap = "4.5"
+clap = "4.5.28"
diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index aac2a74..04d3c8b 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -120,12 +120,7 @@ impl Cli {
match self.verbose {
0 => "For more detailed validation information, use -v".to_string(),
1 => format!("For more detailed validation information, use -vv\n{error}"),
- 2 =>
- format!("For more detailed validation information, use -vvv\n{error:#}"),
- _ => {
- let detailed_output = error.detailed_output();
- format!("{detailed_output:#}")
- }
+ _ => format!("{error:#}"),
}
));
}
diff --git a/docs/cli.md b/docs/cli.md
index e88b218..453ca25 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -35,7 +35,7 @@ $ cql2 -o json < tests/fixtures/text/example01.txt
Use `-v` to get detailed validation information:
```shell
-$ cql2 'wrong' -v
+$ cql2 'wrong' -v
[ERROR] Invalid CQL2: wrong
For more detailed validation information, use -vv
jsonschema validation failed with file:///tmp/cql2.json#
@@ -58,7 +58,7 @@ jsonschema validation failed with file:///tmp/cql2.json#
cql2-text parsing errors are pretty-printed:
```shell
-$ cql2 '(foo ~= "bar")'
+$ cql2 '(foo ~= "bar")'
[ERROR] Parsing error: (foo ~= "bar")
--> 1:6
|
diff --git a/docs/playground.md b/docs/playground.md
new file mode 100644
index 0000000..0da445a
--- /dev/null
+++ b/docs/playground.md
@@ -0,0 +1,347 @@
+
+
+ CQL2 Playground
+ Examples:
+
+
+ Valid:
+
+ Parsed CQL2 Text
+
+
+
+ Parsed CQL2 JSON
+
+
diff --git a/mkdocs.yml b/mkdocs.yml
index df16fd6..37b275e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -34,6 +34,7 @@ nav:
- Python: python.md
- CLI: cli.md
- Rust: https://docs.rs/cql2
+ - Wasm Playground: playground.md
plugins:
- search
- social
@@ -63,4 +64,4 @@ markdown_extensions:
pygments_lang_class: true
- pymdownx.inlinehilite
- pymdownx.snippets
- - pymdownx.superfences
\ No newline at end of file
+ - pymdownx.superfences
diff --git a/scripts/buildwasm b/scripts/buildwasm
new file mode 100644
index 0000000..fc39bb7
--- /dev/null
+++ b/scripts/buildwasm
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+set -e
+
+wasm-pack build --no-typescript --target web --out-dir ../docs/pkg wasm
diff --git a/scripts/exampleoptions b/scripts/exampleoptions
new file mode 100755
index 0000000..81469fe
--- /dev/null
+++ b/scripts/exampleoptions
@@ -0,0 +1,17 @@
+#!/bin/bash
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+JSONFILES="$SCRIPT_DIR/../examples/json"
+TXTFILES="$SCRIPT_DIR/../examples/text"
+for i in $TXTFILES/*.txt
+do
+ name=`basename $i`
+ content=`cat $i`
+ content=${content//\"/\"}
+ echo ""
+done
+for i in $JSONFILES/*.json
+do
+ name=`basename $i`
+ content=`cat $i | jq -r @json`
+ echo ""
+done
diff --git a/src/expr.rs b/src/expr.rs
index 13bad4d..0a238bb 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -596,7 +596,7 @@ impl Expr {
match &value {
Ok(value) => {
let validator = Validator::new().expect("Could not create default validator");
- validator.validate(value).is_ok()
+ validator.is_valid(value)
}
_ => false,
}
diff --git a/src/validator.rs b/src/validator.rs
index cd20080..7e81da3 100644
--- a/src/validator.rs
+++ b/src/validator.rs
@@ -1,37 +1,27 @@
use crate::Error;
-use boon::{Compiler, SchemaIndex, Schemas, ValidationError};
+use jsonschema::{self, output::Output};
use serde_json::Value;
-/// A re-usable json-schema validator for CQL2.
-#[allow(missing_debug_implementations)]
+#[derive(Debug)]
+/// Validator for cql2 json schema
pub struct Validator {
- schemas: Schemas,
- index: SchemaIndex,
+ validator: jsonschema::Validator,
}
impl Validator {
- /// Creates a new validator.
- ///
- /// # Examples
- ///
- /// ```
- /// use cql2::Validator;
- ///
- /// let validator = Validator::new().unwrap();
- /// ```
- pub fn new() -> Result {
- let mut schemas = Schemas::new();
- let mut compiler = Compiler::new();
- let schema_json = serde_json::from_str(include_str!("cql2.json"))?;
- compiler
- .add_resource("/tmp/cql2.json", schema_json)
- .expect("the cql2 json-schema should compile");
- let index = compiler
- .compile("/tmp/cql2.json", &mut schemas)
- .expect("the cql2 json-schema should compile");
- Ok(Validator { schemas, index })
+ /// Instantiate Validator instance loading schema.
+ pub fn new() -> Result {
+ let schema_str = include_str!("cql2.json");
+ let schema_json: Value = serde_json::from_str(schema_str)?;
+ let validator =
+ jsonschema::validator_for(&schema_json).expect("Could not construct schema validator.");
+ Ok(Validator { validator })
}
+ /// Validate CQL2 Json
+ pub fn is_valid(&self, v: &Value) -> bool {
+ self.validator.is_valid(v)
+ }
/// Validates a [serde_json::Value].
///
/// # Examples
@@ -57,7 +47,17 @@ impl Validator {
/// });
/// validator.validate(&invalid).unwrap_err();
/// ```
- pub fn validate<'a, 'b>(&'a self, value: &'b Value) -> Result<(), ValidationError<'a, 'b>> {
- self.schemas.validate(value, self.index)
+ pub fn validate<'i>(&self, v: &'i Value) -> Result<(), jsonschema::ValidationError<'i>> {
+ self.validator.validate(v)
+ }
+
+ /// Apply a validator
+ pub fn apply<'a, 'b>(&'a self, v: &'b Value) -> Output<'a, 'b> {
+ self.validator.apply(v)
+ }
+
+ /// Iterate through validation errors
+ pub fn iter_errors<'i>(&'i self, v: &'i Value) -> jsonschema::ErrorIterator<'i> {
+ self.validator.iter_errors(v)
}
}
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
new file mode 100644
index 0000000..5a49a18
--- /dev/null
+++ b/wasm/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "cql2-wasm"
+version = { workspace = true }
+authors = { workspace = true }
+edition = { workspace = true }
+description = "WASM interface for Common Query Language (CQL2)"
+readme = "README.md"
+homepage = "https://github.com/developmentseed/cql2-rs"
+repository = { workspace = true }
+license = { workspace = true }
+keywords = ["cql2"]
+
+[lib]
+crate-type = ["cdylib"]
+
+[dependencies]
+cql2 = { path = ".." }
+wasm-bindgen = "0.2"
+getrandom = { version = "0.2.15", features = ["js"]}
+
+[dependencies.web-sys]
+version = "0.3.4"
+features = [
+ 'Document',
+ 'Element',
+ 'HtmlElement',
+ 'Node',
+ 'Window',
+]
diff --git a/wasm/README.md b/wasm/README.md
new file mode 100644
index 0000000..724994d
--- /dev/null
+++ b/wasm/README.md
@@ -0,0 +1,4 @@
+# cql2-wasm
+## To Build
+`export RUSTFLAGS='--cfg getrandom_backend="wasm_js'`
+`wasm-pack build`
diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs
new file mode 100644
index 0000000..47243bc
--- /dev/null
+++ b/wasm/src/lib.rs
@@ -0,0 +1,32 @@
+use wasm_bindgen::prelude::*;
+
+#[wasm_bindgen(js_name = CQL2)]
+pub struct CQL2Expression(cql2::Expr);
+
+#[wasm_bindgen(js_class = CQL2)]
+impl CQL2Expression {
+ #[wasm_bindgen(constructor)]
+ pub fn new(v: String) -> Result {
+ let e: cql2::Expr = v.parse()?;
+ Ok(CQL2Expression(e))
+ }
+
+ pub fn is_valid(&self) -> bool {
+ self.0.is_valid()
+ }
+
+ pub fn to_json(&self) -> Result {
+ let r = self.0.to_json()?;
+ Ok(r)
+ }
+
+ pub fn to_json_pretty(&self) -> Result {
+ let r = self.0.to_json_pretty()?;
+ Ok(r)
+ }
+
+ pub fn to_text(&self) -> Result {
+ let r = self.0.to_text()?;
+ Ok(r)
+ }
+}