Remove jsonpath-rs build in travis.yml

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

.gitignore

@@ -2,4 +2,5 @@
 .vscode
 !.idea/runConfigurations/
 /target/
-Cargo.lock
+Cargo.lock
+callgrind.out.*

.idea/runConfigurations/all.xml

@@ -4,9 +4,12 @@
     <option name="command" value="test --package jsonpath_lib" />
     <option name="allFeatures" value="false" />
     <option name="nocapture" value="true" />
-    <option name="backtrace" value="SHORT" />
+    <option name="emulateTerminal" value="false" />
+    <option name="backtrace" value="NO" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <envs />
-    <method v="2" />
+    <method v="2">
+      <option name="CARGO.BUILD_TASK_PROVIDER" enabled="true" />
+    </method>
   </configuration>
 </component>

.idea/runConfigurations/mutable.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="selector" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+  <configuration default="false" name="mutable" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="channel" value="DEFAULT" />
-    <option name="command" value="test --package jsonpath_lib --test selector &quot;&quot;" />
+    <option name="command" value="test --package jsonpath_lib --test mutable &quot;&quot;" />
     <option name="allFeatures" value="false" />
     <option name="nocapture" value="false" />
     <option name="backtrace" value="SHORT" />

.idea/runConfigurations/parser.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="parser" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="channel" value="DEFAULT" />
-    <option name="command" value="test --package jsonpath_lib --test parser &quot;&quot;" />
+    <option name="command" value="test --package jsonpath_lib --lib parser::parser_tests" />
     <option name="allFeatures" value="false" />
     <option name="nocapture" value="false" />
     <option name="backtrace" value="SHORT" />

.idea/runConfigurations/readme.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="serde" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+  <configuration default="false" name="readme" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="channel" value="DEFAULT" />
-    <option name="command" value="test --package jsonpath_lib --test serde &quot;&quot;" />
+    <option name="command" value="test --package jsonpath_lib --test readme &quot;&quot;" />
     <option name="allFeatures" value="false" />
     <option name="nocapture" value="false" />
     <option name="backtrace" value="SHORT" />

.idea/runConfigurations/tokenizer.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="tokenizer" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
     <option name="channel" value="DEFAULT" />
-    <option name="command" value="test --package jsonpath_lib --test tokenizer &quot;&quot;" />
+    <option name="command" value="test --package jsonpath_lib --lib parser::tokenizer_tests" />
     <option name="allFeatures" value="false" />
     <option name="nocapture" value="false" />
     <option name="backtrace" value="SHORT" />

.travis.yml

@@ -1,5 +1,9 @@
 language: rust
-sudo: false
+sudo: required
+addons:
+  apt:
+    packages:
+      - libssl-dev
 
 cache: cargo
 
@@ -13,39 +17,33 @@ matrix:
     - rust: stable
       os: linux
       env: RUST_BACKTRACE=1
-      addons:
-        chrome: stable
+      before_cache: |
+        if [[ "$TRAVIS_RUST_VERSION" == stable ]]; then
+          cargo install cargo-tarpaulin -f
+        fi
       before_script:
-        - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
-        - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate)
-        - cargo install-update -a
-        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
+        - rustup component add clippy
       script:
+        - cargo clean
+        - cargo clippy -- -D warnings
         - cargo build --verbose --all
+        - cargo clippy --all-targets --all-features -- -D warnings -A clippy::cognitive_complexity
         - cargo test --verbose --all
-        - cd wasm
-        - wasm-pack build
-        - wasm-pack test --chrome --headless
+        - cd wasm && cargo clippy -- -D warnings -A clippy::suspicious_else_formatting
+        - cd ../../
+      after_success: |
+        cargo tarpaulin --exclude-files nodejs wasm parser/mod.rs --out Xml
+        bash <(curl -s https://codecov.io/bash)
     - rust: stable
       os: osx
       env: RUST_BACKTRACE=1
-      addons:
-        chrome: stable
-      before_script:
-        - (test -x $HOME/.cargo/bin/cargo-install-update || cargo install cargo-update)
-        - (test -x $HOME/.cargo/bin/cargo-generate || cargo install --vers "^0.2" cargo-generate)
-        - cargo install-update -a
-        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
       script:
+        - cargo clean
         - cargo build --verbose --all
         - cargo test --verbose --all
-        - cd wasm
-        - wasm-pack build
-        - wasm-pack test --chrome --headless
     - language: node_js
       os: linux
       node_js:
-        - 'node'
         - '11'
         - '10'
         - '9'
@@ -55,16 +53,15 @@ matrix:
         - sh /tmp/rustup.sh -y
         - export PATH="$HOME/.cargo/bin:$PATH"
         - source "$HOME/.cargo/env"
-        - cd nodejs
         - node -v
         - npm -v
-        - npm install
+      before_script:
+        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
       script:
-        - npm test
+        - bash ./build-wasm.sh
     - language: node_js
       os: osx
       node_js:
-        - 'node'
         - '11'
         - '10'
         - '9'
@@ -74,9 +71,9 @@ matrix:
         - sh /tmp/rustup.sh -y
         - export PATH="$HOME/.cargo/bin:$PATH"
         - source "$HOME/.cargo/env"
-        - cd nodejs
         - node -v
         - npm -v
-        - npm install
+      before_script:
+        - curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh -s -- -f
       script:
-        - npm test
+        - bash ./build-wasm.sh

Cargo.toml

@@ -1,36 +1,34 @@
 [package]
 name = "jsonpath_lib"
-version = "0.1.10"
+version = "0.2.4"
 authors = ["Changseok Han <freestrings@gmail.com>"]
 
-description = "It is JsonPath engine written in Rust. it provide a similar API interface in Webassembly and Javascript also. - Webassembly Demo: https://freestrings.github.io/jsonpath"
+description = "It is JsonPath engine written in Rust. it provide a similar API interface in Webassembly and Javascript too. - Webassembly Demo: https://freestrings.github.io/jsonpath"
 readme = "README.md"
 
-keywords = ["library", "jsonpath", "json", "webassembly", "nodejs", "javascript"]
+keywords = ["jsonpath", "json", "webassembly", "nodejs", "query"]
 
 repository = "https://github.com/freestrings/jsonpath"
-documentation = "https://docs.rs/jsonpath_lib/0.1.0/jsonpath_lib"
+documentation = "https://docs.rs/jsonpath_lib/0.2.4/jsonpath_lib"
 license = "MIT"
 
-categories = ["Parsing"]
+categories = ["parsing"]
 
 [badges]
 travis-ci = { repository = "freestrings/jsonpath", branch = "master" }
 
 [dependencies]
 log = "0.4"
-env_logger = "0.6.0"
+env_logger = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
-indexmap = "1.0.2"
-
-[dev-dependencies]
-bencher = "0.1.5"
+array_tool = "1.0.3"
 
 [lib]
 name = "jsonpath_lib"
 path = "src/lib.rs"
+crate-type = ["cdylib", "rlib"]
 
 [profile.release]
 #debug = true
-#lto = false
+#lto = false

README.md

@@ -2,58 +2,32 @@
 
 [![Build Status](https://travis-ci.org/freestrings/jsonpath.svg?branch=master)](https://travis-ci.org/freestrings/jsonpath)
 ![crates.io](https://img.shields.io/crates/v/jsonpath_lib.svg)
-![Crates.io](https://img.shields.io/crates/d/jsonpath_lib.svg?label=%60jsonpath_lib%60%20downloads)
-![npm](https://img.shields.io/npm/v/jsonpath-rs.svg?label=npm%20%60jsonpath-rs%60)
-![npm](https://img.shields.io/npm/dt/jsonpath-rs.svg?label=%60jsonpath-rs%60%20downloads)
 ![npm](https://img.shields.io/npm/v/jsonpath-wasm.svg?label=npm%20%60jsonpath-wasm%60)
+![Codecov](https://img.shields.io/codecov/c/github/freestrings/jsonpath.svg?token=92c41b4e7cf04a9cbebc08f68c5da615)
 
 `Rust` 버전 [JsonPath](https://goessner.net/articles/JsonPath/) 구현이다. `Webassembly`와 `Javascript`에서도 유사한 API 인터페이스를 제공 한다.
 
-It is JsonPath [JsonPath](https://goessner.net/articles/JsonPath/) engine written in `Rust`. it provide a similar API interface in `Webassembly` and` Javascript` also.
+It is JsonPath [JsonPath](https://goessner.net/articles/JsonPath/) engine written in `Rust`. it provide a similar API interface in `Webassembly` and` Javascript` too.
 
 - [Webassembly Demo](https://freestrings.github.io/jsonpath/)
 - [NPM jsonpath-wasm - webassembly](https://www.npmjs.com/package/jsonpath-wasm)
-- [NPM jsonpath-rs - native addon](https://www.npmjs.com/package/jsonpath-rs)
 
 ## Rust API
 
-- [jsonpath_lib crate](#jsonpath_lib-crate)
-- [Rust - jsonpath::Selector struct](#rust---jsonpathselector-struct)
-- [Rust - jsonpath::select(json: &serde_json::value::Value, jsonpath: &str)](#rust---jsonpathselectjson-serde_jsonvaluevalue-jsonpath-str)
-- [Rust - jsonpath::select_as_str(json_str: &str, jsonpath: &str)](#rust---jsonpathselect_as_strjson-str-jsonpath-str)
-- [Rust - jsonpath::select_as\<T: `serde::de::DeserializeOwned`\>(json_str: &str, jsonpath: &str)](#rust---jsonpathselect_ast-serdededeserializeownedjson-str-jsonpath-str)
-- [Rust - jsonpath::compile(jsonpath: &str)](#rust---jsonpathcompilejsonpath-str)
-- [Rust - jsonpath::selector(json: &serde_json::value::Value)](#rust---jsonpathselectorjson-serde_jsonvaluevalue)
-- [Rust - jsonpath::selector_as\<T: `serde::de::DeserializeOwned`\>(json: &serde_json::value::Value)](#rust---jsonpathselector_ast-serdededeserializeownedjson-serde_jsonvaluevalue)
-- [Rust - Other Examples](https://github.com/freestrings/jsonpath/wiki/rust-examples)
+<details><summary><b>jsonpath_lib crate</b></summary>
 
-## Javascript API
-
-- [npm package](#npm-package)
-- [Javascript - jsonpath.Selector class](#javascript---selector-class)
-- [Javascript - jsonpath.select(json: string|object, jsonpath: string)](#javascript---jsonpathselectjson-stringobject-jsonpath-string)
-- [Javascript - jsonpath.compile(jsonpath: string)](#javascript---jsonpathcompilejsonpath-string)
-- [Javascript - jsonpath.selector(json: string|object)](#javascript---jsonpathselectorjson-stringobject)
-- [Javascript - allocJson, deallocJson (Webassembly Only)](#javascript---allocjson-deallocjson-webassembly-only)
-- [Javascript - Other Examples](https://github.com/freestrings/jsonpath/wiki/Javascript-examples)
-
----
-
-### Rust API
-
-#### jsonpath_lib crate
-[Go to creates.io](https://crates.io/crates/jsonpath_lib)
+Go to [`jsonpath_lib` creates.io](https://crates.io/crates/jsonpath_lib)
 
 ```rust
 extern crate jsonpath_lib as jsonpath;
-#[macro_use]
-extern crate serde_json;
 ```
 
-#### Rust - jsonpath::Selector struct
+</details>
+
+<details><summary><b>Rust - jsonpath::Selector struct</b></summary>
 
 ```rust
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
+#[derive(Deserialize, PartialEq, Debug)]
 struct Friend {
     name: String,
     age: Option<u8>,
@@ -75,21 +49,67 @@ let mut selector = Selector::new();
 
 let result = selector
     .path("$..[?(@.age >= 30)]").unwrap()
-//    .value_from_str(&serde_json::to_string(&json_obj).unwrap() /*&str*/).unwrap()
-//    .value_from(&json_obj /*&impl serde::ser::Serialize*/).unwrap()
-    .value((&json_obj /*serde_json::value::Value*/ ).into()).unwrap()
-    .select_to_value().unwrap();
+    .value(&json_obj)
+    .select().unwrap();
 
-assert_eq!(json!([{"name": "친구3", "age": 30}]), result);
+assert_eq!(vec![&json!({"name": "친구3", "age": 30})], result);
 
-let result = selector.select_to_str().unwrap();
+let result = selector.select_as_str().unwrap();
 assert_eq!(r#"[{"name":"친구3","age":30}]"#, result);
 
-let result = selector.select_to::<Vec<Friend>>().unwrap();
+let result = selector.select_as::<Friend>().unwrap();
 assert_eq!(vec![Friend { name: "친구3".to_string(), age: Some(30) }], result);
 ```
 
-#### Rust - jsonpath::select(json: &serde_json::value::Value, jsonpath: &str)
+</details>
+
+<details><summary><b>Rust - jsonpath::SelectorMut struct</b></summary>
+
+```rust
+let json_obj = json!({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]});
+
+let mut selector_mut = SelectorMut::new();
+
+let result = selector_mut
+    .str_path("$..[?(@.age == 20)].age").unwrap()
+    .value(json_obj)
+    .replace_with(&mut |v| {
+        let age = if let Value::Number(n) = v {
+            n.as_u64().unwrap() * 2
+        } else {
+            0
+        };
+
+        Some(json!(age))
+    }).unwrap()
+    .take().unwrap();
+
+assert_eq!(result, json!({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 40},
+            {"name": "친구2", "age": 40}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]}));
+```
+
+</details>
+
+<details><summary><b>Rust - jsonpath::select(json: &serde_json::value::Value, jsonpath: &str)</b></summary>
 
 ```rust
 let json_obj = json!({
@@ -106,14 +126,16 @@ let json_obj = json!({
 
 let json = jsonpath::select(&json_obj, "$..friends[0]").unwrap();
 
-let ret = json!([
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
+assert_eq!(json, vec![
+    &json!({"name": "친구3", "age": 30}),
+    &json!({"name": "친구1", "age": 20})
 ]);
-assert_eq!(json, ret);
 ```
 
-#### Rust - jsonpath::select_as_str(json: &str, jsonpath: &str)
+</details>
+
+
+<details><summary><b>Rust - jsonpath::select_as_str(json_str: &str, jsonpath: &str)</b></summary>
 
 ```rust
 let ret = jsonpath::select_as_str(r#"
@@ -134,7 +156,9 @@ let ret = jsonpath::select_as_str(r#"
 assert_eq!(ret, r#"[{"name":"친구3","age":30},{"name":"친구1","age":20}]"#);
 ```
 
-#### Rust - jsonpath::select_as\<T: `serde::de::DeserializeOwned`\>(json: &str, jsonpath: &str)
+</details>
+
+<details><summary><b>Rust - jsonpath::select_as&lt;T: `serde::de::DeserializeOwned`&gt;(json_str: &str, jsonpath: &str)</b></summary>
 
 ```rust
 #[derive(Deserialize, PartialEq, Debug)]
@@ -144,7 +168,7 @@ struct Person {
     phones: Vec<String>,
 }
 
-let ret: Person = jsonpath::select_as(r#"
+let ret: Vec<Person> = jsonpath::select_as(r#"
 {
     "person":
         {
@@ -164,10 +188,12 @@ let person = Person {
     phones: vec!["+44 1234567".to_string(), "+44 2345678".to_string()],
 };
 
-assert_eq!(person, ret);
+assert_eq!(ret[0], person);
 ```
 
-#### Rust - jsonpath::compile(jsonpath: &str)
+</details>
+
+<details><summary><b>Rust - jsonpath::compile(jsonpath: &str)</b></summary>
 
 ```rust
 let mut template = jsonpath::compile("$..friends[0]");
@@ -186,15 +212,15 @@ let json_obj = json!({
 
 let json = template(&json_obj).unwrap();
 
-let ret = json!([
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
+assert_eq!(json, vec![
+    &json!({"name": "친구3", "age": 30}),
+    &json!({"name": "친구1", "age": 20})
 ]);
-
-assert_eq!(json, ret);
 ```
 
-#### Rust - jsonpath::selector(json: &serde_json::value::Value)
+</details>
+
+<details><summary><b>Rust - jsonpath::selector(json: &serde_json::value::Value)</b></summary>
 
 ```rust
 let json_obj = json!({
@@ -213,24 +239,22 @@ let mut selector = jsonpath::selector(&json_obj);
 
 let json = selector("$..friends[0]").unwrap();
 
-let ret = json!([
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
+assert_eq!(json, vec![
+    &json!({"name": "친구3", "age": 30}),
+    &json!({"name": "친구1", "age": 20})
 ]);
 
-assert_eq!(json, ret);
-
 let json = selector("$..friends[1]").unwrap();
 
-let ret = json!([
-    {"name": "친구4"},
-    {"name": "친구2", "age": 20}
+assert_eq!(json, vec![
+    &json!({"name": "친구4"}),
+    &json!({"name": "친구2", "age": 20})
 ]);
-
-assert_eq!(json, ret);
 ```
 
-#### Rust - jsonpath::selector_as\<T: `serde::de::DeserializeOwned`\>(json: &serde_json::value::Value)
+</details>
+
+<details><summary><b>Rust - jsonpath::selector_as&lt;T: serde::de::DeserializeOwned&gt;(json: &serde_json::value::Value)</b></summary>
 
 ```rust
 let json_obj = json!({
@@ -245,13 +269,13 @@ let json_obj = json!({
         {"name": "친구4"}
 ]});
 
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
+#[derive(Deserialize, PartialEq, Debug)]
 struct Friend {
     name: String,
     age: Option<u8>,
 }
 
-let mut selector = jsonpath::selector_as::<Vec<Friend>>(&json_obj);
+let mut selector = jsonpath::selector_as::<Friend>(&json_obj);
 
 let json = selector("$..friends[0]").unwrap();
 
@@ -271,14 +295,90 @@ let ret = vec!(
 assert_eq!(json, ret);
 ```
 
----
+</details>
 
-### Javascript API
+<details><summary><b>Rust - jsonpath::delete(value: &Value, path: &str)</b></summary>
 
-#### npm package
+```rust
+let json_obj = json!({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]});
+
+let ret = jsonpath::delete(json_obj, "$..[?(20 == @.age)]").unwrap();
+
+assert_eq!(ret, json!({
+    "school": {
+        "friends": [
+            null,
+            null
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]}));
+```
+
+</details>
+
+<details><summary><b>Rust - jsonpath::replace_with&lt;F: FnMut(&Value) -> Value&gt;(value: &Value, path: &str, fun: &mut F)</b></summary>
+
+```rust
+let json_obj = json!({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]});
+
+let ret = jsonpath::replace_with(json_obj, "$..[?(@.age == 20)].age", &mut |v| {
+    let age = if let Value::Number(n) = v {
+        n.as_u64().unwrap() * 2
+    } else {
+        0
+    };
+
+    Some(json!(age))
+}).unwrap();
+
+assert_eq!(ret, json!({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 40},
+            {"name": "친구2", "age": 40}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+]}));
+```
+
+</details>
+
+[Rust - Other Examples](https://github.com/freestrings/jsonpath/wiki/rust-examples)
+
+## Javascript API
+
+<details><summary><b>npm package</b></summary>
 
 ##### jsonpath-wasm
 
+Goto [`jsonpath-wasm` npmjs.org](https://www.npmjs.com/package/jsonpath-wasm)
+
 ```javascript
 // browser
 import * as jsonpath from "jsonpath-wasm";
@@ -286,16 +386,6 @@ import * as jsonpath from "jsonpath-wasm";
 const jsonpath = require('jsonpath-wasm');
 ```
 
-##### jsonpath-rs (NodeJS only)
-
-[Goto npmjs.org](https://www.npmjs.com/package/jsonpath-rs)
-
-```javascript
-const jsonpath = require('jsonpath-rs');
-```
-
-#### javascript - Selector class
-
 ##### jsonpath-wasm
 `wasm-bindgen` 리턴 타입 제약 때문에 빌더 패턴은 지원하지 않는다.
 
@@ -324,54 +414,76 @@ let selector = new jsonpath.Selector();
 selector.path('$..friends[0]');
 selector.value(jsonObj);
 
-let selectToObj = selector.selectTo();
-let selectToString = selector.selectToStr();
+let retObj = selector.select();
 
-console.log(
-    JSON.stringify(ret) == JSON.stringify(selectToObj),
-    JSON.stringify(ret) == selectToString
-);
+console.log(JSON.stringify(ret) == JSON.stringify(retObj));
 
-// => true, true
+// => true
 ```
 
-##### jsonpath-rs
+빌더 패턴 제약은 `Selector class`와 동일하다.
 
 ```javascript
 let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
+    'school': {
+        'friends': [
+            {'name': '친구1', 'age': 20},
+            {'name': '친구2', 'age': 20},
+        ],
     },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
+    'friends': [
+        {'name': '친구3', 'age': 30},
+        {'name': '친구4'},
+    ],
 };
 
-let ret = [
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
-];
+let selector = new jsonpath.SelectorMut();
+selector.path('$..[?(@.age == 20)]');
 
-let selector = new jsonpath.Selector()
-    .path('$..friends[0]')
-    .value(jsonObj);
+{
+    selector.value(jsonObj);
+    selector.deleteValue();
 
-let selectToObj = selector.selectTo();
-let selectToString = selector.selectToStr();
+    let resultObj = {
+        'school': {'friends': [null, null]},
+        'friends': [
+            {'name': '친구3', 'age': 30},
+            {'name': '친구4'},
+        ],
+    };
+    console.log(JSON.stringify(selector.take()) !== JSON.stringify(resultObj));
+    
+    // => true
+}
 
-console.log(
-    JSON.stringify(ret) == JSON.stringify(selectToObj),
-    JSON.stringify(ret) == selectToString
-);
+{
+    selector.value(jsonObj);
+    selector.replaceWith((v) => {
+        v.age = v.age * 2;
+        return v;
+    });
 
-// => true, true
+    let resultObj = {
+        'school': {
+            'friends': [
+                {'name': '친구1', 'age': 40},
+                {'name': '친구2', 'age': 40},
+            ],
+        },
+        'friends': [
+            {'name': '친구3', 'age': 30},
+            {'name': '친구4'},
+        ],
+    };
+    console.log(JSON.stringify(selector.take()) !== JSON.stringify(resultObj));
+    
+    // => true
+}
 ```
 
-#### Javascript - jsonpath.select(json: string|object, jsonpath: string)
+</details>
+
+<details><summary><b>Javascript - jsonpath.select(json: string|object, jsonpath: string)</b></summary>
 
 ```javascript
 let jsonObj = {
@@ -404,7 +516,9 @@ console.log(
 // => true, true
 ```
 
-#### Javascript - jsonpath.compile(jsonpath: string)
+</details>
+
+<details><summary><b>Javascript - jsonpath.compile(jsonpath: string)</b></summary>
 
 ```javascript
 let template = jsonpath.compile('$..friends[0]');
@@ -463,8 +577,10 @@ console.log(
 // => true, true
 ```
     
-#### Javascript - jsonpath.selector(json: string|object)
-    
+</details>
+
+<details><summary><b>Javascript - jsonpath.selector(json: string|object)</b></summary>
+
 ```javascript
 let jsonObj = {
     "school": {
@@ -504,14 +620,11 @@ console.log(
 // => true, true
 ```
 
-#### Javascript - allocJson, deallocJson (Webassembly Only)
-wasm-bindgen은 Javascript와 Webassembly간 값을 주고받을 때 JSON 객체는 String으로 변환되기 때문에, 반복해서 사용되는 JSON 객체는 Webassembly 영역에 생성해 두면 성능에 도움이 된다.
+</details>
 
-Since wasm-bindgen converts JSON objects to String when exchanging values between Javascript and Webassembly, creating frequently used JSON objects in the WebAssembly area helps performance.
+<details><summary><b>Javascript - jsonpath.deleteValue(json: string|object, path: string)</b></summary>
 
 ```javascript
-const jsonpath = require('jsonpath-wasm');
-
 let jsonObj = {
     "school": {
         "friends": [
@@ -525,37 +638,58 @@ let jsonObj = {
     ]
 };
 
-// allocate jsonObj in webassembly
-let ptr = jsonpath.allocJson(jsonObj);
+let _1 = jsonpath.deleteValue(jsonObj, '$..friends[0]');
+let result = jsonpath.deleteValue(_1, '$..friends[1]');
 
-// `0` is invalid pointer
-if(ptr == 0) {
-    console.error('invalid ptr'); 
-}
+console.log(JSON.stringify(result) !== JSON.stringify({
+    "school": { "friends": [null, null]},
+    "friends": [null, null]
+}));
 
-let path = '$..friends[0]';
-let template = jsonpath.compile(path);
-let selector = jsonpath.selector(jsonObj);
-// create selector as pointer
-let ptrSelector = jsonpath.selector(ptr);
+// => true
 
-let ret1 = selector(path)
-let ret2 = ptrSelector(path)
-let ret3 = template(jsonObj);
-// select as pointer
-let ret4 = template(ptr);
-let ret5 = jsonpath.select(jsonObj, path);
-// select as pointer
-let ret6 = jsonpath.select(ptr, path);
-
-console.log(
-    JSON.stringify(ret1) == JSON.stringify(ret2),
-    JSON.stringify(ret1) == JSON.stringify(ret3),
-    JSON.stringify(ret1) == JSON.stringify(ret4),
-    JSON.stringify(ret1) == JSON.stringify(ret5),
-    JSON.stringify(ret1) == JSON.stringify(ret6));
-
-// => true true true true true
-
-jsonpath.deallocJson(ptr);
 ```
+
+</details>
+
+<details><summary><b>Javascript - jsonpath.replaceWith(json: string|object, path: string, fun: function(json: object) => json: object</b></summary>
+
+```javascript
+let jsonObj = {
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+    ]
+};
+
+let result = jsonpath.replaceWith(jsonObj, '$..friends[0]', (v) => {
+    v.age = v.age * 2;
+    return v;
+});
+
+console.log(JSON.stringify(result) === JSON.stringify({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 40},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 60},
+        {"name": "친구4"}
+    ]
+}));
+
+// => true
+
+```
+
+</details>
+
+[Javascript - Other Examples](https://github.com/freestrings/jsonpath/wiki/Javascript-examples)

bench.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+#
+# rustup default nightly
+#
+
+cargo bench --manifest-path ./benchmark/Cargo.toml

benches/bench_bin/Cargo.toml

@@ -1,7 +0,0 @@
-[package]
-name = "bench_bin"
-version = "0.1.1"
-
-[dependencies]
-jsonpath_lib = {path = "../../"}
-serde_json = { version = "1.0", features = ["preserve_order"] }

benches/bench_native.sh

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -e
-DIR="$(pwd)"
-
-cd "${DIR}"/bench_bin && cargo build --release
-
-ITER=100000
-
-printf "\n\n$..book[?(@.price<30 && @.category=="fiction")] (loop ${ITER})"
-printf "\n\n"
-
-__default () {
-    echo "Rust - select: " && time ./bench.sh select ${ITER}
-    printf "\n"
-    sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath - query: " && time ./bench.sh jsonpath ${ITER}
-    printf "\n"
-    sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath-rs - select:" && time ./bench.sh nativeSelect ${ITER}
-}
-
-__extra () {
-    echo "Rust - selector: " && time ./bench.sh selector ${ITER}
-    printf "\n"
-    sleep 1
-    echo "Rust - compile: " && time ./bench.sh compile ${ITER}
-    printf "\n"
-    sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath - query: " && time ./bench.sh jsonpath ${ITER}
-    printf "\n"
-    sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath-rs - selector: " && time ./bench.sh nativeSelector ${ITER}
-    printf "\n"
-    sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath-rs - compile: " && time ./bench.sh nativeCompile ${ITER}
-}
-
-if [ "$1" = "extra" ]; then
-    __extra
-else
-    __default
-fi

benches/package-lock.json

@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}

benchmark/.gitignore

@@ -0,0 +1,4 @@
+.idea/*
+.vscode
+/target/
+Cargo.lock

benchmark/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "jsonpath_lib_benches"
+version = "0.1.0"
+authors = ["Changseok Han <freestrings@gmail.com>"]
+description = "jsonpath_lib benchmark"
+license = "MIT"
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["preserve_order"] }
+jsonpath_lib = { path = "../" }
+
+[dev-dependencies]
+bencher = "0.1.5"
+
+[[bin]]
+name = "jsonpath_lib_benches"
+path = "src/main.rs"

benchmark/bench_bin/Cargo.toml

@@ -0,0 +1,7 @@
+[package]
+name = "bench_bin"
+version = "0.2.0"
+
+[dependencies]
+jsonpath_lib = {path = "../../"}
+serde_json = { version = "1.0", features = ["preserve_order"] }

benchmark/bench_wasm.sh

@@ -36,9 +36,8 @@ __extra () {
     cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - compile: " && time ./bench.sh wasmCompile ${ITER}
     printf "\n"
     sleep 1
-    cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - compile-alloc: " && time ./bench.sh wasmCompileAlloc ${ITER}
-    sleep 1
     cd "${DIR}"/javascript && echo "NodeJs - jsonpath-wasm - Selector: " && time ./bench.sh wasmSelectorClass ${ITER}
+    printf "\n"
 }
 
 if [ "$1" = "extra" ]; then

benchmark/benches/bench.rs

@@ -1,18 +1,18 @@
 #![feature(test)]
+extern crate bencher;
 extern crate jsonpath_lib as jsonpath;
 extern crate serde;
 extern crate serde_json;
 extern crate test;
-extern crate bencher;
 
 use std::io::Read;
 
 use serde::Deserialize;
 use serde_json::Value;
 
+use jsonpath::{SelectorMut, Selector};
+
 use self::test::Bencher;
-use jsonpath::ref_value::model::RefValue;
-use serde::ser::Serialize;
 
 fn read_json(path: &str) -> String {
     let mut f = std::fs::File::open(path).unwrap();
@@ -22,7 +22,7 @@ fn read_json(path: &str) -> String {
 }
 
 fn get_string() -> String {
-    read_json("./benches/example.json")
+    read_json("./example.json")
 }
 
 fn get_json() -> Value {
@@ -101,28 +101,37 @@ fn bench_select_as(b: &mut Bencher) {
 
     b.iter(move || {
         for _ in 1..100 {
-            let _: Book = jsonpath::select_as(&json, r#"$..book[?(@.price<30 && @.category=="fiction")][0]"#).unwrap();
+            let _: Vec<Book> = jsonpath::select_as(&json, r#"$..book[?(@.price<30 && @.category=="fiction")][0]"#).unwrap();
         }
     });
 }
 
 #[bench]
-fn bench_serde_ser(b: &mut Bencher) {
+fn bench_delete(b: &mut Bencher) {
     let json = get_json();
+    let mut selector = SelectorMut::default();
+    let _ = selector.str_path(get_path());
 
     b.iter(move || {
         for _ in 1..100 {
-            let _: RefValue = json.serialize(jsonpath::ref_value::ser::Serializer).unwrap().into();
+            let _ = selector.value(json.clone()).delete();
         }
     });
 }
 
 #[bench]
-fn bench_serde_de(b: &mut Bencher) {
-    let json_string = get_string();
-    let json_str = json_string.as_str();
+fn bench_select_to_compare_with_delete(b: &mut Bencher) {
+    let json = &get_json();
 
-    b.iter(move || for _ in 1..100 {
-        let _: RefValue = serde_json::from_str(json_str).unwrap();
+    let mut selector = Selector::default();
+    let _ = selector.str_path(get_path());
+
+    b.iter(move || {
+        for _ in 1..100 {
+            let json = json.clone();
+            let mut s = Selector::default();
+            let _ = s.compiled_path(selector.node_ref().unwrap()).value(&json);
+            let _ = s.select();
+        }
     });
 }

benchmark/benches/bench_example.rs

@@ -0,0 +1,89 @@
+#![feature(test)]
+extern crate bencher;
+extern crate jsonpath_lib as jsonpath;
+extern crate serde;
+extern crate serde_json;
+extern crate test;
+
+use std::io::Read;
+
+use serde_json::Value;
+
+use self::test::Bencher;
+
+fn read_json(path: &str) -> String {
+    let mut f = std::fs::File::open(path).unwrap();
+    let mut contents = String::new();
+    f.read_to_string(&mut contents).unwrap();
+    contents
+}
+
+fn get_string() -> String {
+    read_json("./example.json")
+}
+
+fn get_json() -> Value {
+    let string = get_string();
+    serde_json::from_str(string.as_str()).unwrap()
+}
+
+fn get_path(i: usize) -> &'static str {
+    let paths = vec![
+        "$.store.book[*].author",   //0
+        "$..author",    //1
+        "$.store.*",    //2
+        "$.store..price",   //3
+        "$..book[2]",   //4
+        "$..book[-2]",  //5
+        "$..book[0,1]", //6
+        "$..book[:2]",  //7
+        "$..book[1:2]", //8
+        "$..book[-2:]", //9
+        "$..book[2:]",  //10
+        "$..book[?(@.isbn)]",   //11
+        "$.store.book[?(@.price == 10)]",    //12
+        "$..*", //13
+        "$..book[ ?( (@.price < 13 || $.store.bicycle.price < @.price) && @.price <=10 ) ]", //14
+        "$.store.book[?( (@.price < 10 || @.price > 10) && @.price > 10 )]"
+    ];
+    paths[i]
+}
+
+fn _selector(b: &mut Bencher, index: usize) {
+    let json = get_json();
+    b.iter(move || {
+        for _ in 1..100 {
+            let mut selector = jsonpath::Selector::default();
+            let _ = selector.str_path(get_path(index));
+            selector.value(&json);
+            let r = selector.select();
+            if r.is_err() {
+                panic!()
+            }
+        }
+    });
+}
+
+macro_rules! selector {
+    ($name:ident, $i:expr) => {
+        #[bench]
+        fn $name(b: &mut Bencher) { _selector(b, $i); }
+    };
+}
+
+selector!(example0_1, 0);
+selector!(example1_1, 1);
+selector!(example2_1, 2);
+selector!(example3_1, 3);
+selector!(example4_1, 4);
+selector!(example5_1, 5);
+selector!(example6_1, 6);
+selector!(example7_1, 7);
+selector!(example8_1, 8);
+selector!(example9_1, 9);
+selector!(example_10_1, 10);
+selector!(example_11_1, 11);
+selector!(example_12_1, 12);
+selector!(example_13_1, 13);
+selector!(example_14_1, 14);
+selector!(example_15_1, 15);

benchmark/example.json

@@ -34,4 +34,4 @@
     }
   },
   "expensive": 10
-}
+}

benchmark/javascript/bench.js

@@ -43,7 +43,6 @@ function getJson() {
 const path = '$..book[?(@.price<30 && @.category=="fiction")]';
 const jp = require('jsonpath');
 const jpw = require('jsonpath-wasm');
-const jpwRs = require('jsonpath-rs');
 
 function jsonpath() {
     for (var i = 0; i < iter; i++) {
@@ -51,26 +50,6 @@ function jsonpath() {
     }
 }
 
-function nativeCompile() {
-    let template = jpwRs.compile(path);
-    for (var i = 0; i < iter; i++) {
-        let _ = template(JSON.stringify(json));
-    }
-}
-
-function nativeSelector() {
-    let selector = jpwRs.selector(getJson());
-    for (var i = 0; i < iter; i++) {
-        let _ = selector(path);
-    }
-}
-
-function nativeSelect() {
-    for (var i = 0; i < iter; i++) {
-        let _ = jpwRs.select(JSON.stringify(json), path);
-    }
-}
-
 function wasmSelector() {
     let selector = jpw.selector(getJson());
     for (var i = 0; i < iter; i++) {
@@ -85,51 +64,18 @@ function wasmCompile() {
     }
 }
 
-function wasmCompileAlloc() {
-    let ptr = jpw.allocJson(getJson());
-    if (ptr == 0) {
-        console.error('Invalid pointer');
-        return;
-    }
-
-    try {
-        let template = jpw.compile(path);
-        for (var i = 0; i < iter; i++) {
-            let _ = template(ptr);
-        }
-    } finally {
-        jpw.deallocJson(ptr);
-    }
-}
-
 function wasmSelect() {
     for (var i = 0; i < iter; i++) {
         let _ = jpw.select(getJson(), path);
     }
 }
 
-function wasmSelectAlloc() {
-    let ptr = jpw.allocJson(getJson());
-    if (ptr == 0) {
-        console.error('Invalid pointer');
-        return;
-    }
-
-    try {
-        for (var i = 0; i < iter; i++) {
-            let _ = jpw.select(ptr, path);
-        }
-    } finally {
-        jpw.deallocJson(ptr);
-    }
-}
-
 function wasmSelectorClass() {
     let selector = new jpw.Selector();
     for (var i = 0; i < iter; i++) {
         selector.path(path);
         selector.value(jsonStr);
-        let _ = selector.selectToStr();
+        let _ = selector.select();
     }
 }
 

benchmark/src/main.rs

@@ -0,0 +1 @@
+fn main() {}

build-wasm.sh

@@ -0,0 +1,104 @@
+#!/bin/bash
+
+set -e
+
+# project_root
+DIR="$(pwd)"
+WASM="${DIR}"/wasm
+WASM_WWW="${WASM}"/www
+WASM_WWW_BENCH="${WASM}"/www_bench
+WASM_BROWSER_PKG="${WASM}"/browser_pkg
+WASM_NODEJS_PKG="${WASM}"/nodejs_pkg
+WASM_ALL_PKG="${WASM}"/all_pkg
+WASM_TEST="${WASM}"/tests
+DOCS="${DIR}"/docs
+DOCS_BENCH="${DOCS}"/bench
+
+__msg () {
+    echo ">>>>>>>>>>$1<<<<<<<<<<"
+}
+
+__cargo_clean () {
+    cd "${WASM}" && cargo clean && \
+    cd "${DIR}" && cargo clean
+}
+
+echo
+__msg "clean wasm"
+rm -rf \
+    "${WASM_NODEJS_PKG}" \
+    "${WASM_BROWSER_PKG}" \
+    "${WASM_ALL_PKG}" \
+    "${WASM_WWW}"/node_modules \
+    "${WASM_WWW_BENCH}"/node_modules \
+    "${WASM_WWW}"/dist \
+    "${WASM_WWW_BENCH}"/dist \
+    "${WASM_TEST}"/node_modules
+
+if [ "$1" = "all" ]; then
+    __msg "clean all wasm"
+    __cargo_clean
+fi
+
+__msg "npm install: wasm"
+cd "${WASM_WWW}" && npm install
+__msg "npm install: wasm_bench"
+cd "${WASM_WWW_BENCH}" && npm install
+__msg "npm install: wasm test"
+cd "${WASM_TEST}" && npm install
+
+echo
+echo
+__msg "wasm-pack"
+cd "${WASM}" && \
+    wasm-pack build --release --target=nodejs --out-dir "${WASM_NODEJS_PKG}"
+
+cd "${WASM}" && \
+    wasm-pack build --release --target=browser --out-dir "${WASM_BROWSER_PKG}"
+#    && \
+#    wasm-pack test --chrome --firefox --headless
+
+__msg "wasm npm packaging"
+cp -r "${WASM_BROWSER_PKG}" "${WASM_ALL_PKG}/" && \
+    sed "s/require[\(]'\.\/jsonpath_wasm_bg/require\('\.\/jsonpath_wasm_nodejs/" "${WASM_NODEJS_PKG}/jsonpath_wasm.js" \
+        > "${WASM_ALL_PKG}/jsonpath_wasm_main.js" && \
+    sed "s/require[\(]'\.\/jsonpath_wasm/require\('\.\/jsonpath_wasm_main/" "${WASM_NODEJS_PKG}/jsonpath_wasm_bg.js" \
+        > "${WASM_ALL_PKG}/jsonpath_wasm_nodejs.js" && \
+    jq ".files += [\"jsonpath_wasm_nodejs.js\"]" ${WASM_ALL_PKG}/package.json \
+        | jq ".main = \"jsonpath_wasm_main.js\"" \
+        | jq ".keywords += [\"jsonpath\", \"json\", \"webassembly\", \"parsing\", \"rust\"]" \
+        > ${WASM_ALL_PKG}/temp.json && \
+    mv -v "${WASM_ALL_PKG}/temp.json" "${WASM_ALL_PKG}/package.json" && \
+    cd "${WASM_ALL_PKG}" && npm link
+
+echo
+__msg "link"
+cd "${WASM_WWW}" && \
+    npm link jsonpath-wasm
+
+cd "${WASM_WWW_BENCH}" && \
+    npm link jsonpath-wasm
+
+cd "${WASM_TEST}" && \
+    npm link jsonpath-wasm
+
+echo
+echo
+__msg "wasm test"
+cd "${WASM_TEST}" && npm test
+
+if [ "$1" = "all" ] || [ "$1" = "docs" ]; then
+    echo
+    __msg "docs"
+    cd "${WASM_WWW}" && \
+        npm run build &&
+        rm -f "${DOCS}"/*.js "${DOCS}"/*.wasm "${DOCS}"/*.html && \
+        cp "${WASM_WWW}"/dist/*.* "${DOCS}"/
+
+    cd "${WASM_WWW_BENCH}" && \
+        npm run build &&
+        rm -f "${DOCS_BENCH}"/*.js "${DOCS_BENCH}"/*.wasm "${DOCS_BENCH}"/*.html && \
+        cp "${WASM_WWW_BENCH}"/dist/*.* "${DOCS_BENCH}"/
+fi
+
+__msg "wasm done"

build.sh

@@ -10,7 +10,8 @@ WASM_WWW_BENCH="${WASM}"/www_bench
 WASM_BROWSER_PKG="${WASM}"/browser_pkg
 WASM_NODEJS_PKG="${WASM}"/nodejs_pkg
 WASM_ALL_PKG="${WASM}"/all_pkg
-BENCHES="${DIR}"/benches
+WASM_TEST="${WASM}"/tests
+BENCHES="${DIR}"/benchmark
 BENCHES_JS="${BENCHES}"/javascript
 NODEJS="${DIR}"/nodejs
 DOCS="${DIR}"/docs
@@ -27,6 +28,16 @@ __cargo_clean () {
         cd "${DIR}" && cargo clean
 }
 
+if [ "$1" = "clippy" ]
+then
+    echo
+    __msg "clippy"
+    cargo clippy -- -D warnings && \
+    cargo clippy --all-targets --all-features -- -D warnings -A clippy::cognitive_complexity && \
+    cd "${WASM}" && cargo clippy -- -A clippy::suspicious_else_formatting && \
+    cd "${NODEJS}" && cargo clippy
+fi
+
 echo
 __msg "clean"
 rm -rf \
@@ -38,23 +49,28 @@ rm -rf \
     "${WASM_WWW}"/node_modules \
     "${WASM_WWW_BENCH}"/node_modules \
     "${WASM_WWW}"/dist \
-    "${WASM_WWW_BENCH}"/dist
+    "${WASM_WWW_BENCH}"/dist \
+    "${WASM_TEST}"/node_modules
 
 if [ "$1" = "all" ]; then
     __msg "clean targets"
     __cargo_clean
 fi
 
-__msg "npm install"
-echo
+__msg "npm install: wasm"
 cd "${WASM_WWW}" && npm install
+__msg "npm install: wasm_bench"
 cd "${WASM_WWW_BENCH}" && npm install
+__msg "npm install: nodejs"
 cd "${NODEJS}" && npm install
+__msg "npm install: benches_js"
 cd "${BENCHES_JS}" && npm install
+__msg "npm install: wasm test"
+cd "${WASM_TEST}" && npm install
 
 echo
 echo
-__msg "nodejs"
+__msg "nodejs test"
 cd "${NODEJS}" && npm test
 
 echo
@@ -64,8 +80,9 @@ cd "${WASM}" && \
     wasm-pack build --release --target=nodejs --out-dir "${WASM_NODEJS_PKG}"
 
 cd "${WASM}" && \
-    wasm-pack build --release --target=browser --out-dir "${WASM_BROWSER_PKG}" && \
-    wasm-pack test --chrome --firefox --headless
+    wasm-pack build --release --target=browser --out-dir "${WASM_BROWSER_PKG}"
+#    && \
+#    wasm-pack test --chrome --firefox --headless
 
 __msg "wasm npm packaging"
 cp -r "${WASM_BROWSER_PKG}" "${WASM_ALL_PKG}/" && \
@@ -89,8 +106,16 @@ cd "${WASM_WWW_BENCH}" && \
     npm link jsonpath-wasm
 
 cd "${BENCHES_JS}" && \
-    npm link jsonpath-wasm && \
-    npm link jsonpath-rs
+    npm link jsonpath-wasm
+
+cd "${WASM_TEST}" && \
+    npm link jsonpath-wasm
+
+echo
+echo
+__msg "wasm test"
+cd "${WASM_TEST}" && npm test
+
 
 echo
 __msg "docs"
@@ -104,4 +129,4 @@ cd "${WASM_WWW_BENCH}" && \
     rm -f "${DOCS_BENCH}"/*.js "${DOCS_BENCH}"/*.wasm "${DOCS_BENCH}"/*.html && \
     cp "${WASM_WWW_BENCH}"/dist/*.* "${DOCS_BENCH}"/
 
-__msg "done"
+__msg "done"

coverage.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+#
+# cargo install cargo-tarpaulin
+#
+
+set -e
+
+cargo tarpaulin --exclude-files nodejs wasm parser/mod.rs -v --all

docs/bench/bootstrap.js

@@ -55,8 +55,14 @@
 /******/ 		"../all_pkg/jsonpath_wasm_bg.wasm": function() {
 /******/ 			return {
 /******/ 				"./jsonpath_wasm": {
-/******/ 					"__wbindgen_string_new": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_string_new"](p0i32,p1i32);
+/******/ 					"__wbindgen_json_parse": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_parse"](p0i32,p1i32);
+/******/ 					},
+/******/ 					"__wbindgen_json_serialize": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_serialize"](p0i32,p1i32);
+/******/ 					},
+/******/ 					"__wbg_error_bb0b0e541b3bff31": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbg_error_bb0b0e541b3bff31"](p0i32,p1i32);
 /******/ 					},
 /******/ 					"__wbindgen_object_drop_ref": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_object_drop_ref"](p0i32);
@@ -64,17 +70,11 @@
 /******/ 					"__wbindgen_cb_forget": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_cb_forget"](p0i32);
 /******/ 					},
-/******/ 					"__wbindgen_json_parse": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_parse"](p0i32,p1i32);
+/******/ 					"__wbindgen_string_new": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_string_new"](p0i32,p1i32);
 /******/ 					},
-/******/ 					"__wbindgen_json_serialize": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_serialize"](p0i32,p1i32);
-/******/ 					},
-/******/ 					"__widl_f_log_1_": function(p0i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__widl_f_log_1_"](p0i32);
-/******/ 					},
-/******/ 					"__wbindgen_number_get": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_number_get"](p0i32,p1i32);
+/******/ 					"__wbg_call_88d2a6153573084e": function(p0i32,p1i32,p2i32,p3i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbg_call_88d2a6153573084e"](p0i32,p1i32,p2i32,p3i32);
 /******/ 					},
 /******/ 					"__wbindgen_is_string": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_is_string"](p0i32);
@@ -85,17 +85,20 @@
 /******/ 					"__wbindgen_object_clone_ref": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_object_clone_ref"](p0i32);
 /******/ 					},
+/******/ 					"__wbindgen_debug_string": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_debug_string"](p0i32,p1i32);
+/******/ 					},
 /******/ 					"__wbindgen_throw": function(p0i32,p1i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_throw"](p0i32,p1i32);
 /******/ 					},
 /******/ 					"__wbindgen_rethrow": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_rethrow"](p0i32);
 /******/ 					},
-/******/ 					"__wbindgen_closure_wrapper104": function(p0i32,p1i32,p2i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper104"](p0i32,p1i32,p2i32);
+/******/ 					"__wbindgen_closure_wrapper115": function(p0i32,p1i32,p2i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper115"](p0i32,p1i32,p2i32);
 /******/ 					},
-/******/ 					"__wbindgen_closure_wrapper106": function(p0i32,p1i32,p2i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper106"](p0i32,p1i32,p2i32);
+/******/ 					"__wbindgen_closure_wrapper117": function(p0i32,p1i32,p2i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper117"](p0i32,p1i32,p2i32);
 /******/ 					}
 /******/ 				}
 /******/ 			};
@@ -195,7 +198,7 @@
 /******/ 				promises.push(installedWasmModuleData);
 /******/ 			else {
 /******/ 				var importObject = wasmImportObjects[wasmModuleId]();
-/******/ 				var req = fetch(__webpack_require__.p + "" + {"../all_pkg/jsonpath_wasm_bg.wasm":"ddd003b015308ef8b732"}[wasmModuleId] + ".module.wasm");
+/******/ 				var req = fetch(__webpack_require__.p + "" + {"../all_pkg/jsonpath_wasm_bg.wasm":"33fd09cf53124f20b1e8"}[wasmModuleId] + ".module.wasm");
 /******/ 				var promise;
 /******/ 				if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') {
 /******/ 					promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {

docs/bootstrap.js

@@ -55,8 +55,14 @@
 /******/ 		"../all_pkg/jsonpath_wasm_bg.wasm": function() {
 /******/ 			return {
 /******/ 				"./jsonpath_wasm": {
-/******/ 					"__wbindgen_string_new": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_string_new"](p0i32,p1i32);
+/******/ 					"__wbindgen_json_parse": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_parse"](p0i32,p1i32);
+/******/ 					},
+/******/ 					"__wbindgen_json_serialize": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_serialize"](p0i32,p1i32);
+/******/ 					},
+/******/ 					"__wbg_error_bb0b0e541b3bff31": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbg_error_bb0b0e541b3bff31"](p0i32,p1i32);
 /******/ 					},
 /******/ 					"__wbindgen_object_drop_ref": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_object_drop_ref"](p0i32);
@@ -64,17 +70,11 @@
 /******/ 					"__wbindgen_cb_forget": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_cb_forget"](p0i32);
 /******/ 					},
-/******/ 					"__wbindgen_json_parse": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_parse"](p0i32,p1i32);
+/******/ 					"__wbindgen_string_new": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_string_new"](p0i32,p1i32);
 /******/ 					},
-/******/ 					"__wbindgen_json_serialize": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_json_serialize"](p0i32,p1i32);
-/******/ 					},
-/******/ 					"__widl_f_log_1_": function(p0i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__widl_f_log_1_"](p0i32);
-/******/ 					},
-/******/ 					"__wbindgen_number_get": function(p0i32,p1i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_number_get"](p0i32,p1i32);
+/******/ 					"__wbg_call_88d2a6153573084e": function(p0i32,p1i32,p2i32,p3i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbg_call_88d2a6153573084e"](p0i32,p1i32,p2i32,p3i32);
 /******/ 					},
 /******/ 					"__wbindgen_is_string": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_is_string"](p0i32);
@@ -85,17 +85,20 @@
 /******/ 					"__wbindgen_object_clone_ref": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_object_clone_ref"](p0i32);
 /******/ 					},
+/******/ 					"__wbindgen_debug_string": function(p0i32,p1i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_debug_string"](p0i32,p1i32);
+/******/ 					},
 /******/ 					"__wbindgen_throw": function(p0i32,p1i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_throw"](p0i32,p1i32);
 /******/ 					},
 /******/ 					"__wbindgen_rethrow": function(p0i32) {
 /******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_rethrow"](p0i32);
 /******/ 					},
-/******/ 					"__wbindgen_closure_wrapper104": function(p0i32,p1i32,p2i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper104"](p0i32,p1i32,p2i32);
+/******/ 					"__wbindgen_closure_wrapper115": function(p0i32,p1i32,p2i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper115"](p0i32,p1i32,p2i32);
 /******/ 					},
-/******/ 					"__wbindgen_closure_wrapper106": function(p0i32,p1i32,p2i32) {
-/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper106"](p0i32,p1i32,p2i32);
+/******/ 					"__wbindgen_closure_wrapper117": function(p0i32,p1i32,p2i32) {
+/******/ 						return installedModules["../all_pkg/jsonpath_wasm.js"].exports["__wbindgen_closure_wrapper117"](p0i32,p1i32,p2i32);
 /******/ 					}
 /******/ 				}
 /******/ 			};
@@ -195,7 +198,7 @@
 /******/ 				promises.push(installedWasmModuleData);
 /******/ 			else {
 /******/ 				var importObject = wasmImportObjects[wasmModuleId]();
-/******/ 				var req = fetch(__webpack_require__.p + "" + {"../all_pkg/jsonpath_wasm_bg.wasm":"ddd003b015308ef8b732"}[wasmModuleId] + ".module.wasm");
+/******/ 				var req = fetch(__webpack_require__.p + "" + {"../all_pkg/jsonpath_wasm_bg.wasm":"33fd09cf53124f20b1e8"}[wasmModuleId] + ".module.wasm");
 /******/ 				var promise;
 /******/ 				if(importObject instanceof Promise && typeof WebAssembly.compileStreaming === 'function') {
 /******/ 					promise = Promise.all([WebAssembly.compileStreaming(req), importObject]).then(function(items) {

examples/nodejs-rs/index.js

@@ -1,31 +0,0 @@
-const jsonpath = require('jsonpath-rs');
-
-let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
-    },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
-};
-
-let ret = [
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
-];
-
-let selector = new jsonpath.Selector();
-selector.path('$..friends[0]');
-selector.value(jsonObj);
-
-let selectToObj = selector.selectTo();
-let selectToString = selector.selectToStr();
-
-console.log(
-    JSON.stringify(ret) == JSON.stringify(selectToObj),
-    JSON.stringify(ret) == selectToString
-);

examples/nodejs-rs/package-lock.json

@@ -1,658 +0,0 @@
-{
-  "name": "jsonpath-rs-example",
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "ansi-escape-sequences": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz",
-      "integrity": "sha512-dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw==",
-      "requires": {
-        "array-back": "^3.0.1"
-      },
-      "dependencies": {
-        "array-back": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-          "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="
-        }
-      }
-    },
-    "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=="
-    },
-    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
-    },
-    "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"
-      }
-    },
-    "array-back": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz",
-      "integrity": "sha512-eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==",
-      "requires": {
-        "typical": "^2.6.1"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "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"
-      }
-    },
-    "builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og="
-    },
-    "chalk": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-      "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
-      "requires": {
-        "ansi-styles": "^3.1.0",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^4.0.0"
-      }
-    },
-    "chardet": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
-      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
-    },
-    "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=",
-      "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="
-    },
-    "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="
-    },
-    "command-line-args": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-4.0.7.tgz",
-      "integrity": "sha512-aUdPvQRAyBvQd2n7jXcsMDz68ckBJELXNzBybCHOibUWEg0mWTnaYCSRU8h9R+aNRSvDihJtssSRCiDRpLaezA==",
-      "requires": {
-        "array-back": "^2.0.0",
-        "find-replace": "^1.0.3",
-        "typical": "^2.6.1"
-      }
-    },
-    "command-line-commands": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/command-line-commands/-/command-line-commands-2.0.1.tgz",
-      "integrity": "sha512-m8c2p1DrNd2ruIAggxd/y6DgygQayf6r8RHwchhXryaLF8I6koYjoYroVP+emeROE9DXN5b9sP1Gh+WtvTTdtQ==",
-      "requires": {
-        "array-back": "^2.0.0"
-      }
-    },
-    "command-line-usage": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz",
-      "integrity": "sha512-MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==",
-      "requires": {
-        "ansi-escape-sequences": "^4.0.0",
-        "array-back": "^2.0.0",
-        "table-layout": "^0.4.2",
-        "typical": "^2.6.1"
-      }
-    },
-    "commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
-      "optional": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
-    },
-    "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="
-    },
-    "external-editor": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
-      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
-      "requires": {
-        "chardet": "^0.4.0",
-        "iconv-lite": "^0.4.17",
-        "tmp": "^0.0.33"
-      }
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "find-replace": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz",
-      "integrity": "sha1-uI5zZNLZyVlVnziMZmcNYTBEH6A=",
-      "requires": {
-        "array-back": "^1.0.4",
-        "test-value": "^2.1.0"
-      },
-      "dependencies": {
-        "array-back": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
-          "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
-          "requires": {
-            "typical": "^2.6.0"
-          }
-        }
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
-    },
-    "git-config": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/git-config/-/git-config-0.0.7.tgz",
-      "integrity": "sha1-qcij7wendsPXImE1bYtye2IgKyg=",
-      "requires": {
-        "iniparser": "~1.0.5"
-      }
-    },
-    "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"
-      }
-    },
-    "handlebars": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.1.tgz",
-      "integrity": "sha512-3Zhi6C0euYZL5sM0Zcy7lInLXKQ+YLcF/olbN010mzGQ4XVm50JeyBnMqofHh696GrciGruC7kCcApPDJvVgwA==",
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "has-flag": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-      "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "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="
-    },
-    "iniparser": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/iniparser/-/iniparser-1.0.5.tgz",
-      "integrity": "sha1-g21r7+bfv87gvM8c+fKsxwJ/eD0="
-    },
-    "inquirer": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
-      "requires": {
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.0",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^2.0.4",
-        "figures": "^2.0.0",
-        "lodash": "^4.3.0",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rx-lite": "^4.0.8",
-        "rx-lite-aggregates": "^4.0.8",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^4.0.0",
-        "through": "^2.3.6"
-      }
-    },
-    "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="
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-    },
-    "jsonpath-rs": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/jsonpath-rs/-/jsonpath-rs-0.1.7.tgz",
-      "integrity": "sha512-BSuCWJK5PaTevsPHmFaLb9kzoc1Wh56+TBm6XH+gObIKA8Z3SQp6gUrgibGlApCYipha4IDo59StrdyVcvVPqA==",
-      "requires": {
-        "neon-cli": "^0.2.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
-    },
-    "lodash.padend": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
-      "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4="
-    },
-    "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=="
-    },
-    "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.10",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
-      }
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
-    },
-    "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=="
-    },
-    "neon-cli": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/neon-cli/-/neon-cli-0.2.0.tgz",
-      "integrity": "sha512-IsrxCyUcuAyWiq4Z+JnTXrjurj2SAL2VtWnCXS8iBYGJeIs1NIhFuLaM6fe7+rOyFfDcqUUTWGxZmkvUqwweRA==",
-      "requires": {
-        "chalk": "~2.1.0",
-        "command-line-args": "^4.0.2",
-        "command-line-commands": "^2.0.0",
-        "command-line-usage": "^4.0.0",
-        "git-config": "0.0.7",
-        "handlebars": "^4.0.3",
-        "inquirer": "^3.0.6",
-        "mkdirp": "^0.5.1",
-        "quickly-copy-file": "^1.0.0",
-        "rimraf": "^2.6.1",
-        "rsvp": "^4.6.1",
-        "semver": "^5.1.0",
-        "toml": "^2.3.0",
-        "ts-typed-json": "^0.2.2",
-        "validate-npm-package-license": "^3.0.1",
-        "validate-npm-package-name": "^3.0.0"
-      }
-    },
-    "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=",
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      }
-    },
-    "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="
-    },
-    "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="
-    },
-    "quickly-copy-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/quickly-copy-file/-/quickly-copy-file-1.0.0.tgz",
-      "integrity": "sha1-n4/wZiMFEO50IrASFHKwk6hpCFk=",
-      "requires": {
-        "mkdirp": "~0.5.0"
-      }
-    },
-    "reduce-flatten": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz",
-      "integrity": "sha1-JYx479FT3fk8tWEjf2EYTzaW4yc="
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "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"
-      }
-    },
-    "rsvp": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.4.tgz",
-      "integrity": "sha512-6FomvYPfs+Jy9TfXmBpBuMWNH94SgCsZmJKcanySzgNNP6LjWxBvyLTa9KaMfDDM5oxRfrKDB0r/qeRsLwnBfA=="
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "rx-lite": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
-      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
-    },
-    "rx-lite-aggregates": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
-      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
-      "requires": {
-        "rx-lite": "*"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-      "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "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=="
-    },
-    "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==",
-      "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=="
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
-    "supports-color": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-      "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-      "requires": {
-        "has-flag": "^2.0.0"
-      }
-    },
-    "table-layout": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.4.tgz",
-      "integrity": "sha512-uNaR3SRMJwfdp9OUr36eyEi6LLsbcTqTO/hfTsNviKsNeyMBPICJCC7QXRF3+07bAP6FRwA8rczJPBqXDc0CkQ==",
-      "requires": {
-        "array-back": "^2.0.0",
-        "deep-extend": "~0.6.0",
-        "lodash.padend": "^4.6.1",
-        "typical": "^2.6.1",
-        "wordwrapjs": "^3.0.0"
-      }
-    },
-    "test-value": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/test-value/-/test-value-2.1.0.tgz",
-      "integrity": "sha1-Edpv9nDzRxpztiXKTz/c97t0gpE=",
-      "requires": {
-        "array-back": "^1.0.3",
-        "typical": "^2.6.0"
-      },
-      "dependencies": {
-        "array-back": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/array-back/-/array-back-1.0.4.tgz",
-          "integrity": "sha1-ZEun8JX3/898Q7Xw3DnTwfA8Bjs=",
-          "requires": {
-            "typical": "^2.6.0"
-          }
-        }
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "toml": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz",
-      "integrity": "sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="
-    },
-    "ts-typed-json": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/ts-typed-json/-/ts-typed-json-0.2.2.tgz",
-      "integrity": "sha1-UxhL7ok+RZkbc8jEY6OLWeJ81H4=",
-      "requires": {
-        "rsvp": "^3.5.0"
-      },
-      "dependencies": {
-        "rsvp": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
-          "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw=="
-        }
-      }
-    },
-    "typical": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz",
-      "integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0="
-    },
-    "uglify-js": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.5.4.tgz",
-      "integrity": "sha512-GpKo28q/7Bm5BcX9vOu4S46FwisbPbAmkkqPnGIpKvKTM96I85N6XHQV+k4I6FA2wxgLhcsSyHoNhzucwCflvA==",
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.0",
-        "source-map": "~0.6.1"
-      }
-    },
-    "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==",
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
-      "requires": {
-        "builtins": "^1.0.3"
-      }
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    },
-    "wordwrapjs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz",
-      "integrity": "sha512-mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==",
-      "requires": {
-        "reduce-flatten": "^1.0.1",
-        "typical": "^2.6.1"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
-    }
-  }
-}

examples/nodejs-rs/package.json

@@ -1,9 +0,0 @@
-{
-  "name": "jsonpath-rs-example",
-  "scripts": {
-    "start": "node index.js"
-  },
-  "dependencies": {
-    "jsonpath-rs": "0"
-  }
-}

examples/nodejs-wasm/.gitignore

@@ -1,2 +0,0 @@
-node_modules
-dist

lua/.gitignore

@@ -0,0 +1,5 @@
+.idea/*
+.vscode
+/target/
+Cargo.lock
+docker_example/ab_results/**

lua/Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "jsonpath_lua"
+version = "0.1.0"
+authors = ["Changseok Han <freestrings@gmail.com>"]
+license = "MIT"
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = { version = "1.0", features = ["preserve_order"] }
+jsonpath_lib = { path = "../" }
+
+[[bin]]
+name = "bench"
+path = "bench_lua_vs_rust/example.rs"
+

lua/bench_lua_vs_rust/example.lua

@@ -0,0 +1,22 @@
+local jsonpath = require("jsonpath")
+
+local iter;
+if arg[1] == nil or arg[1] == '' then
+    iter = 5000;
+else
+    iter = tonumber(arg[1]);
+end
+
+print(string.format("%s - %u", "lua iter", iter));
+
+local file = io.open("../../benchmark/example.json", "r");
+io.input(file)
+local data = io.read("*a");
+io.close(file);
+
+jsonpath.init('../target/release/deps/libjsonpath_lib.so')
+local template = jsonpath.compile("$..book[?(@.price<30 && @.category==\"fiction\")]");
+for i = 0, iter do
+    local r = template(data);
+--    print(r);
+end

lua/bench_lua_vs_rust/example.rs

@@ -0,0 +1,46 @@
+extern crate jsonpath_lib as jsonpath;
+extern crate serde;
+extern crate serde_json;
+
+use std::io::Read;
+
+use serde_json::Value;
+
+fn read_json(path: &str) -> String {
+    let mut f = std::fs::File::open(path).unwrap();
+    let mut contents = String::new();
+    f.read_to_string(&mut contents).unwrap();
+    contents
+}
+
+fn get_string() -> String {
+    read_json("../../benchmark/example.json")
+}
+
+fn get_json() -> Value {
+    let string = get_string();
+    serde_json::from_str(string.as_str()).unwrap()
+}
+
+fn get_path() -> &'static str {
+    r#"$..book[?(@.price<30 && @.category=="fiction")]"#
+}
+
+fn main() {
+    let args: Vec<String> = std::env::args().collect();
+    let iter = if args.len() < 2 { 5000_usize } else { args[1].as_str().parse::<usize>().unwrap() };
+
+    println!("rust iter - {}", iter);
+
+    let json = get_json();
+    for _ in 0..iter {
+        let mut selector = jsonpath::Selector::default();
+        let _ = selector.str_path(get_path());
+        selector.value(&json);
+        let r = selector.select();
+        if r.is_err() {
+            panic!();
+        }
+//        println!("{:?}", serde_json::to_string(&r.expect("")).unwrap());
+    }
+}

lua/bench_lua_vs_rust/run.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# cd lua/bench_lua_vs_rust && ./run.sh
+
+set -e
+
+# http://luajit.org/index.html
+
+# cargo clean && \
+cargo build --release
+
+export JSONPATH_LIB_PATH="${PWD}/../target/release/deps"
+export LUA_PATH="${PWD}/../?.lua;"
+
+echo
+time cargo run --release --bin bench -- 1000
+echo
+time luajit example.lua 1000
+echo
+time cargo run --release --bin bench -- 5000
+echo
+time luajit example.lua 5000
+echo
+time cargo run --release --bin bench -- 10000
+echo
+time luajit example.lua 10000
+

lua/docker_example/default.conf

@@ -0,0 +1,107 @@
+lua_package_path '/etc/jsonpath/?.lua;;';
+
+access_log /var/log/access.log;
+error_log /var/log/error.log info;
+
+lua_shared_dict jsonpaths 1m;
+
+init_by_lua_block {
+    local pathStrings = {
+        "$.store.book[*].author",
+        "$..author",
+        "$.store.*",
+        "$.store..price",
+        "$..book[2]",
+        "$..book[-2]",
+        "$..book[0,1]",
+        "$..book[:2]",
+        "$..book[1:2]",
+        "$..book[-2:]",
+        "$..book[2:]",
+        "$..book[?(@.isbn)]",
+        "$.store.book[?(@.price == 10)]",
+        "$..*",
+        "$..book[ ?( (@.price < 13 || $.store.bicycle.price < @.price) && @.price <=10 ) ]",
+        "$.store.book[?( (@.price < 10 || @.price > 10) && @.price > 10 )]",
+        "$..[?(@.originPrice > 1)]",
+        "$.pickBanner[?(@.originPrice > 1)]"
+    }
+
+    local jp = require("jsonpath")
+    jp.init("/etc/jsonpath/libjsonpath_lib.so")
+    local jsonpaths = ngx.shared.jsonpaths
+
+    for i, path in ipairs(pathStrings) do
+        jsonpaths:set(i, path)
+        jp.compile(path)
+    end
+
+}
+
+server {
+    listen 80;
+    server_name localhost;
+
+    gzip on;
+    gzip_types text/plain application/json;
+    #gzip_comp_level 6;
+    #gzip_vary on;
+
+    location / {
+        add_header 'Cache-Control' 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
+        expires off;
+
+        default_type 'text/plain';
+        root /etc/jsonpath/example;
+    }
+
+    location /filter {
+        # https://developer.mozilla.org/ko/docs/Web/HTTP/Headers/Accept-Encoding
+        proxy_set_header Accept-Encoding "*";
+
+        default_type 'text/plain';
+
+        rewrite /filter/(.*) /$1 break;
+        proxy_pass http://localhost;
+
+        header_filter_by_lua_block {
+            ngx.header["content-length"] = nil
+
+            local args = ngx.req.get_uri_args()
+            local jsonpaths = ngx.shared.jsonpaths
+            local path = jsonpaths:get(args['path'])
+
+            if path == nil then
+                 ngx.exit(ngx.HTTP_BAD_REQUEST)
+            end
+        }
+
+        body_filter_by_lua_block {
+            local chunk, eof = ngx.arg[1], ngx.arg[2]
+            local buf = ngx.ctx.buf
+
+            if eof then
+                if buf then
+                    local args = ngx.req.get_uri_args()
+                    local path = ngx.shared.jsonpaths:get(args['path'])
+                    local jsonpath = require("jsonpath")
+                    local template = jsonpath.exec(path)
+                    local json = buf .. chunk
+                    local result = template(json)
+                    ngx.arg[1] = result
+                    return
+                end
+
+                return
+            end
+
+            if buf then
+                ngx.ctx.buf = buf .. chunk
+            else
+                ngx.ctx.buf = chunk
+            end
+
+            ngx.arg[1] = nil
+        }
+    }
+}

lua/docker_example/init.lua

@@ -0,0 +1,3 @@
+local jsonpath = require("jsonpath")
+jsonpath.init("/etc/jsonpath/libjsonpath_lib.so")
+ngx.log(ngx.INFO, "loaded libjsonpath_lib.so")

lua/docker_example/run.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# cd lua && cargo build --release && cd docker_example && ./run.sh
+
+set -v
+
+[ "$(docker ps -a | grep jsonpath)" ] && docker kill jsonpath
+
+docker run -d --rm --name jsonpath \
+  -v "${PWD}/../../benchmark/example.json":/etc/jsonpath/example/example.json:ro \
+  -v "${PWD}/../../benchmark/big_example.json":/etc/jsonpath/example/big_example.json:ro \
+  -v "${PWD}/../jsonpath.lua":/etc/jsonpath/jsonpath.lua:ro \
+  -v "${PWD}/init.lua":/etc/jsonpath/init.lua:ro \
+  -v "${PWD}/../target/release/deps/libjsonpath_lib.so":/etc/jsonpath/libjsonpath_lib.so:ro \
+  -v "${PWD}/default.conf":/etc/nginx/conf.d/default.conf \
+  -p 8080:80 \
+  openresty/openresty:bionic
+
+#for i in {1..16}; do
+#  curl http://localhost:8080/filter/example.json?path=${i}
+#  echo
+#done
+
+#ab -n 1000 -c 10 http://localhost:8080/filter/big_example.json?path=17
+#ab -n 1000 -c 10 http://localhost:8080/filter/big_example.json?path=18

lua/jsonpath.lua

@@ -0,0 +1,60 @@
+local ffi = require('ffi')
+
+ffi.cdef [[
+const char* ffi_select(const char *json_str, const char *path);
+void *ffi_path_compile(const char *path);
+const char* ffi_select_with_compiled_path(void *ptr, const char *json_str);
+]]
+
+local jsonpath
+local cache = {}
+local module = {}
+
+local function existsVaiable(var)
+    for k, _ in pairs(_G) do
+        if k == var then
+            return true
+        end
+    end
+end
+
+local _ngx
+if existsVaiable('ngx') then
+    _ngx = ngx
+else
+    _ngx = {}
+    _ngx.log = function(level, msg)
+        print('['..level..'] ' .. msg)
+    end
+end
+
+function module.compile(path)
+    assert(jsonpath, '"libjsonpath_lib" is not loaded')
+
+    if(cache[path] == nil) then
+        cache[path] = jsonpath.ffi_path_compile(path)
+        _ngx.log(_ngx.INFO, 'compile : [' .. path .. ']')
+    end
+end
+
+function module.exec(path)
+    local compiledPath = cache[path]
+
+    if(cache[path] == nil) then
+        assert(jsonpath, path .. ": is not compiled")
+    end
+
+    return function(jsonStr)
+        local result = jsonpath.ffi_select_with_compiled_path(compiledPath, jsonStr)
+        return ffi.string(result);
+    end
+end
+
+function module.init(path)
+    if jsonpath == nil then
+        jsonpath = ffi.load(path)
+        _ngx.log(_ngx.INFO, '"' .. path .. '" initialized')
+    end
+end
+
+return module

nodejs/.gitignore

@@ -1,7 +0,0 @@
-native/target
-native/index.node
-native/artifacts.json
-**/*~
-**/node_modules
-.idea
-build

nodejs/README.md

@@ -1,191 +0,0 @@
-# jsonpath-rs
-
-[![Build Status](https://travis-ci.org/freestrings/jsonpath.svg?branch=master)](https://travis-ci.org/freestrings/jsonpath)
-
-It is native-addon of [jsonpath_lib](https://github.com/freestrings/jsonpath) that is [JsonPath](https://goessner.net/articles/JsonPath/) engine written in Rust.
-
-## Notice
-
-Pre-built 바이너리는 제공하진 않고 소스를 컴파일해서 설치한다. 만약 Rust가 설치되지 않았다면 자동으로 설치된다.
-
-Build from source instead of using pre-built binary, and if Rust is not installed, the latest version is automatically installed.
-
-> Not yet tested in Windows
-
-## APIs
-
-* [jsonpath.Selector](#jsonpathselector)
-* [jsonpath.select(json: string|object, jsonpath: string)](#jsonpathselectjson-stringobject-jsonpath-string)
-* [jsonpath.compile(jsonpath: string)](#jsonpathcompilejsonpath-string)
-* [jsonpath.selector(json: string|object)](#jsonpathselectorjson-stringobject)
-* [Other Examples](https://github.com/freestrings/jsonpath/wiki/Javascript-examples)
-
-### jsonpath.Selector
-
-```javascript
-let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
-    },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
-};
-
-let selector = new jsonpath.Selector().value(jsonObj);
-
-{
-    let jsonObj = selector.path('$..[?(@.age >= 30)]').selectTo();
-    let resultObj = [{"name": "친구3", "age": 30}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
-}
-
-{
-    let jsonObj = selector.path('$..[?(@.age == 20)]').selectTo();
-    let resultObj = [{"name": "친구1", "age": 20}, {"name": "친구2", "age": 20}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
-}
-
-{
-    let jsonObj = selector.value({"friends": [ {"name": "친구5", "age": 20} ]}).selectTo();
-    let resultObj = [{"name": "친구5", "age": 20}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
-}
-```
-
-### jsonpath.select(json: string|object, jsonpath: string)
-
-```javascript
-let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
-    },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
-};
-
-let ret = [
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
-];
-
-
-let selectAsString = jsonpath.select(JSON.stringify(jsonObj), '$..friends[0]');
-let selectAsObj = jsonpath.select(jsonObj, '$..friends[0]');
-
-console.log(
-    JSON.stringify(ret) == JSON.stringify(selectAsString),
-    JSON.stringify(ret) == JSON.stringify(selectAsObj)
-);
-
-// => true, true
-```
-
-### jsonpath.compile(jsonpath: string)
-
-```javascript
-let template = jsonpath.compile('$..friends[0]');
-
-let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
-    },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
-};
-
-let ret = [
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
-];
-
-let selectAsString = template(JSON.stringify(jsonObj));
-let selectAsObj = template(jsonObj);
-
-console.log(
-    JSON.stringify(ret) == JSON.stringify(selectAsString),
-    JSON.stringify(ret) == JSON.stringify(selectAsObj)
-);
-
-// => true, true
-
-let jsonObj2 = {
-    "school": {
-        "friends": [
-            {"name": "Millicent Norman"},
-            {"name": "Vincent Cannon"}
-        ]
-    },
-    "friends": [ {"age": 30}, {"age": 40} ]
-};
-
-let ret2 = [
-    {"age": 30},
-    {"name": "Millicent Norman"}
-];
-
-let selectAsString2 = template(JSON.stringify(jsonObj2));
-let selectAsObj2 = template(jsonObj2);
-
-console.log(
-        JSON.stringify(ret2) == JSON.stringify(selectAsString2),
-        JSON.stringify(ret2) == JSON.stringify(selectAsObj2)
-);
-
-// => true, true
-```
-
-### jsonpath.selector(json: string|object)
-
-```javascript
-let jsonObj = {
-    "school": {
-        "friends": [
-            {"name": "친구1", "age": 20},
-            {"name": "친구2", "age": 20}
-        ]
-    },
-    "friends": [
-        {"name": "친구3", "age": 30},
-        {"name": "친구4"}
-    ]
-};
-
-let ret1 = [
-    {"name": "친구3", "age": 30},
-    {"name": "친구1", "age": 20}
-];
-
-let ret2 = [
-    {"name": "친구4"},
-    {"name": "친구2", "age": 20}
-];
-
-let selector = jsonpath.selector(jsonObj);
-// or as json string 
-// let selector = jsonpath.selector(JSON.stringify(jsonObj));
-
-let select1 = selector('$..friends[0]');
-let select2 = selector('$..friends[1]');
-
-console.log(
-    JSON.stringify(ret1) == JSON.stringify(select1),
-    JSON.stringify(ret2) == JSON.stringify(select2)
-);
-
-// => true, true
-```

nodejs/build.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-if ! [ -x "$(command -v rustc)" ]; then
-    echo "install rust"
-    curl https://sh.rustup.rs -sSf > /tmp/rustup.sh
-    sh /tmp/rustup.sh -y
-    export PATH="$HOME/.cargo/bin:$PATH"
-    source "$HOME/.cargo/env"
-fi
-
-neon build --release

nodejs/lib/index.js

@@ -1,64 +0,0 @@
-const { CompileFn, SelectorFn, selectStr, Selector: _Selector } = require('../native');
-
-function compile(path) {
-    let compile = new CompileFn(path);
-    return (json) => {
-        if(typeof json != 'string') {
-            json = JSON.stringify(json)
-        }
-        return JSON.parse(compile.template(json));
-    };
-}
-
-function selector(json) {
-    if(typeof json != 'string') {
-        json = JSON.stringify(json)
-    }
-    let selector = new SelectorFn(json);
-    return (path) => {
-        return JSON.parse(selector.select(path));
-    }
-}
-
-function select(json, path) {
-    if(typeof json != 'string') {
-        json = JSON.stringify(json)
-    }
-    return JSON.parse(selectStr(json, path));
-}
-
-class Selector {
-    constructor() {
-        this._selector = new _Selector();
-        return this;
-    }
-
-    path(path) {
-        this._selector.path(path);
-        return this;
-    }
-
-    value(json) {
-        if(typeof json != 'string') {
-            json = JSON.stringify(json)
-        }
-        this._selector.value_from_str(json);
-        return this;
-    }
-
-    selectToStr() {
-        return this._selector.select_to_str();
-    }
-
-    selectTo() {
-        return JSON.parse(this.selectToStr());
-    }
-
-}
-
-module.exports = {
-    compile,
-    selector,
-    select,
-    Selector
-};

nodejs/native/.gitignore

@@ -1,5 +0,0 @@
-.idea/*
-.vscode
-!.idea/runConfigurations/
-/target/
-Cargo.lock

nodejs/native/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "jsonpath4nodejs"
-version = "0.1.1"
-authors = ["Changseok Han <freestrings@gmail.com>"]
-description = "jsonpath_lib bindings for nodejs"
-keywords = ["library", "jsonpath", "json", "nodejs"]
-repository = "https://github.com/freestrings/jsonpath"
-license = "MIT"
-
-build = "build.rs"
-exclude = ["artifacts.json", "index.node"]
-
-[build-dependencies]
-neon-build = "0.2.0"
-
-[dependencies]
-jsonpath_lib = "0.1.9"
-neon = "0.2.0"
-neon-serde = "0.1.1"
-serde_json = { version = "1.0", features = ["preserve_order"] }
-
-[lib]
-name = "jsonpath4nodejs"
-crate-type = ["dylib"]

nodejs/native/build.rs

@@ -1,7 +0,0 @@
-extern crate neon_build;
-
-fn main() {
-    neon_build::setup(); // must be called in build.rs
-
-    // add project-specific build logic here...
-}

nodejs/native/src/lib.rs

@@ -1,177 +0,0 @@
-extern crate jsonpath_lib as jsonpath;
-#[macro_use]
-extern crate neon;
-extern crate neon_serde;
-extern crate serde_json;
-
-use jsonpath::filter::value_filter::JsonValueFilter;
-use jsonpath::parser::parser::{Node, NodeVisitor, Parser};
-use jsonpath::ref_value::model::{RefValue, RefValueWrapper};
-use jsonpath::Selector;
-use neon::prelude::*;
-use serde_json::Value;
-use std::ops::Deref;
-
-///
-/// `neon_serde::from_value` has very poor performance.
-///
-fn select(mut ctx: FunctionContext) -> JsResult<JsValue> {
-    let json_val = ctx.argument::<JsValue>(0)?;
-    let json: Value = neon_serde::from_value(&mut ctx, json_val)?;
-    let path = ctx.argument::<JsString>(1)?.value();
-
-    match jsonpath::select(&json, path.as_str()) {
-        Ok(value) => Ok(neon_serde::to_value(&mut ctx, &value)?),
-        Err(e) => panic!("{:?}", e)
-    }
-}
-
-fn select_str(mut ctx: FunctionContext) -> JsResult<JsValue> {
-    let json_val = ctx.argument::<JsString>(0)?.value();
-    let path = ctx.argument::<JsString>(1)?.value();
-    match jsonpath::select_as_str(&json_val, path.as_str()) {
-        Ok(value) => Ok(JsString::new(&mut ctx, &value).upcast()),
-        Err(e) => panic!("{:?}", e)
-    }
-}
-
-pub struct CompileFn {
-    node: Node
-}
-
-pub struct SelectorFn {
-    json: RefValueWrapper
-}
-
-pub struct SelectorCls {
-    selector: Selector
-}
-
-declare_types! {
-    pub class JsCompileFn for CompileFn {
-        init(mut ctx) {
-            let path = ctx.argument::<JsString>(0)?.value();
-            let mut parser = Parser::new(path.as_str());
-
-            let node = match parser.compile() {
-                Ok(node) => node,
-                Err(e) => panic!("{:?}", e)
-            };
-
-            Ok(CompileFn { node })
-        }
-
-        method template(mut ctx) {
-            let this = ctx.this();
-
-            let node = {
-                let guard = ctx.lock();
-                let this = this.borrow(&guard);
-                this.node.clone()
-            };
-
-            let json_str = ctx.argument::<JsString>(0)?.value();
-            let ref_value: RefValue = match serde_json::from_str(&json_str) {
-                Ok(ref_value) => ref_value,
-                Err(e) => panic!("{:?}", e)
-            };
-
-            let mut jf = JsonValueFilter::new_from_value(ref_value.into());
-            jf.visit(node);
-            match serde_json::to_string(&jf.take_value().deref()) {
-                Ok(json_str) => Ok(JsString::new(&mut ctx, &json_str).upcast()),
-                Err(e) => panic!("{:?}", e)
-            }
-        }
-    }
-
-    pub class JsSelectorFn for SelectorFn {
-        init(mut ctx) {
-            let json_str = ctx.argument::<JsString>(0)?.value();
-            let ref_value: RefValue = match serde_json::from_str(&json_str) {
-                Ok(ref_value) => ref_value,
-                Err(e) => panic!("{:?}", e)
-            };
-
-            Ok(SelectorFn { json: ref_value.into() })
-        }
-
-        method select(mut ctx) {
-            let this = ctx.this();
-
-            let json = {
-                let guard = ctx.lock();
-                let this = this.borrow(&guard);
-                this.json.clone()
-            };
-
-            let path = ctx.argument::<JsString>(0)?.value();
-            let mut parser = Parser::new(path.as_str());
-
-            let node = match parser.compile() {
-                Ok(node) => node,
-                Err(e) => panic!("{:?}", e)
-            };
-
-            let mut jf = JsonValueFilter::new_from_value(json);
-            jf.visit(node);
-            match serde_json::to_string(&jf.take_value().deref()) {
-                Ok(json_str) => Ok(JsString::new(&mut ctx, &json_str).upcast()),
-                Err(e) => panic!("{:?}", e)
-            }
-        }
-    }
-
-    pub class JsSelector for SelectorCls {
-        init(mut _ctx) {
-            Ok(SelectorCls { selector: Selector::new() })
-        }
-
-        method path(mut ctx) {
-            let mut this = ctx.this();
-
-            let path = ctx.argument::<JsString>(0)?.value();
-            {
-                let guard = ctx.lock();
-                let mut this = this.borrow_mut(&guard);
-                let _ = this.selector.path(&path);
-            }
-            Ok(JsUndefined::new().upcast())
-        }
-
-        method value_from_str(mut ctx) {
-            let mut this = ctx.this();
-
-            let json_str = ctx.argument::<JsString>(0)?.value();
-            {
-                let guard = ctx.lock();
-                let mut this = this.borrow_mut(&guard);
-                let _ = this.selector.value_from_str(&json_str);
-            }
-            Ok(JsUndefined::new().upcast())
-        }
-
-        method select_to_str(mut ctx) {
-             let mut this = ctx.this();
-
-             let result = {
-                let guard = ctx.lock();
-                let mut this = this.borrow_mut(&guard);
-                this.selector.select_to_str()
-             };
-
-             match result {
-                Ok(json_str) => Ok(JsString::new(&mut ctx, &json_str).upcast()),
-                Err(e) => panic!("{:?}", e)
-             }
-        }
-    }
-}
-register_module!(mut m, {
-    m.export_class::<JsCompileFn>("CompileFn").expect("CompileFn class error");
-    m.export_class::<JsSelectorFn>("SelectorFn").expect("SelectorFn class error");
-    m.export_class::<JsSelector>("Selector").expect("Selector class error");
-    m.export_function("select", select)?;
-    m.export_function("selectStr", select_str)?;
-    Ok(())
-});

nodejs/package.json

@@ -1,30 +0,0 @@
-{
-  "name": "jsonpath-rs",
-  "version": "0.1.8",
-  "description": "It is JsonPath implementation. The core implementation is written in Rust",
-  "author": "Changseok Han <freestrings@gmail.com>",
-  "license": "MIT",
-  "keywords": [
-    "jsonpath",
-    "native-addon",
-    "rust-binding",
-    "rust",
-    "json",
-    "parsing"
-  ],
-  "main": "lib/index.js",
-  "dependencies": {
-    "neon-cli": "^0.2.0"
-  },
-  "scripts": {
-    "install": "./build.sh",
-    "test": "mocha"
-  },
-  "devDependencies": {
-    "mocha": "^6.0.2"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/freestrings/jsonpath.git"
-  }
-}

nodejs/test/index.spec.js

@@ -1,602 +0,0 @@
-const jsonpath = require('../lib/index.js');
-
-let jsonObj = {
-    "store": {
-        "book": [
-            {
-                "category": "reference",
-                "author": "Nigel Rees",
-                "title": "Sayings of the Century",
-                "price": 8.95
-            },
-            {
-                "category": "fiction",
-                "author": "Evelyn Waugh",
-                "title": "Sword of Honour",
-                "price": 12.99
-            },
-            {
-                "category": "fiction",
-                "author": "Herman Melville",
-                "title": "Moby Dick",
-                "isbn": "0-553-21311-3",
-                "price": 8.99
-            },
-            {
-                "category": "fiction",
-                "author": "J. R. R. Tolkien",
-                "title": "The Lord of the Rings",
-                "isbn": "0-395-19395-8",
-                "price": 22.99
-            }
-        ],
-        "bicycle": {
-            "color": "red",
-            "price": 19.95
-        }
-    },
-    "expensive": 10
-};
-
-let list = {
-    '$.store.book[*].author': [
-        "Nigel Rees",
-        "Evelyn Waugh",
-        "Herman Melville",
-        "J. R. R. Tolkien"
-    ],
-
-    '$..author':[
-        "Nigel Rees",
-        "Evelyn Waugh",
-        "Herman Melville",
-        "J. R. R. Tolkien"
-    ],
-
-    '$.store.*': [
-        [
-            {
-                "category": "reference",
-                "author": "Nigel Rees",
-                "title": "Sayings of the Century",
-                "price": 8.95
-            },
-            {
-                "category": "fiction",
-                "author": "Evelyn Waugh",
-                "title": "Sword of Honour",
-                "price": 12.99
-            },
-            {
-                "category": "fiction",
-                "author": "Herman Melville",
-                "title": "Moby Dick",
-                "isbn": "0-553-21311-3",
-                "price": 8.99
-            },
-            {
-                "category": "fiction",
-                "author": "J. R. R. Tolkien",
-                "title": "The Lord of the Rings",
-                "isbn": "0-395-19395-8",
-                "price": 22.99
-            }
-        ],
-        {
-            "color": "red",
-            "price": 19.95
-        }
-    ],
-
-    '$.store..price':[
-        8.95,
-        12.99,
-        8.99,
-        22.99,
-        19.95
-    ],
-
-    '$..book[2]': [
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        }
-    ],
-
-    '$..book[-2]': [
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        }
-    ],
-
-    '$..book[0,1]': [
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95
-        },
-        {
-            "category": "fiction",
-            "author": "Evelyn Waugh",
-            "title": "Sword of Honour",
-            "price": 12.99
-        }
-    ],
-
-    '$..book[:2]': [
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95
-        },
-        {
-            "category": "fiction",
-            "author": "Evelyn Waugh",
-            "title": "Sword of Honour",
-            "price": 12.99
-        }
-    ],
-
-    '$..book[1:2]': [
-        {
-            "category": "fiction",
-            "author": "Evelyn Waugh",
-            "title": "Sword of Honour",
-            "price": 12.99
-        }
-    ],
-
-    '$..book[-2:]': [
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        },
-        {
-            "category": "fiction",
-            "author": "J. R. R. Tolkien",
-            "title": "The Lord of the Rings",
-            "isbn": "0-395-19395-8",
-            "price": 22.99
-        }
-    ],
-
-    '$..book[2:]': [
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        },
-        {
-            "category": "fiction",
-            "author": "J. R. R. Tolkien",
-            "title": "The Lord of the Rings",
-            "isbn": "0-395-19395-8",
-            "price": 22.99
-        }
-    ],
-
-    '$..book[?(@.isbn)]': [
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        },
-        {
-            "category": "fiction",
-            "author": "J. R. R. Tolkien",
-            "title": "The Lord of the Rings",
-            "isbn": "0-395-19395-8",
-            "price": 22.99
-        }
-    ],
-
-    '$.store.book[?(@.price < 10)]': [
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95
-        },
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        }
-    ],
-
-    '$..*': [
-        {
-            "book": [
-                {
-                    "category": "reference",
-                    "author": "Nigel Rees",
-                    "title": "Sayings of the Century",
-                    "price": 8.95
-                },
-                {
-                    "category": "fiction",
-                    "author": "Evelyn Waugh",
-                    "title": "Sword of Honour",
-                    "price": 12.99
-                },
-                {
-                    "category": "fiction",
-                    "author": "Herman Melville",
-                    "title": "Moby Dick",
-                    "isbn": "0-553-21311-3",
-                    "price": 8.99
-                },
-                {
-                    "category": "fiction",
-                    "author": "J. R. R. Tolkien",
-                    "title": "The Lord of the Rings",
-                    "isbn": "0-395-19395-8",
-                    "price": 22.99
-                }
-            ],
-            "bicycle": {
-                "color": "red",
-                "price": 19.95
-            }
-        },
-        10,
-        [
-            {
-                "category": "reference",
-                "author": "Nigel Rees",
-                "title": "Sayings of the Century",
-                "price": 8.95
-            },
-            {
-                "category": "fiction",
-                "author": "Evelyn Waugh",
-                "title": "Sword of Honour",
-                "price": 12.99
-            },
-            {
-                "category": "fiction",
-                "author": "Herman Melville",
-                "title": "Moby Dick",
-                "isbn": "0-553-21311-3",
-                "price": 8.99
-            },
-            {
-                "category": "fiction",
-                "author": "J. R. R. Tolkien",
-                "title": "The Lord of the Rings",
-                "isbn": "0-395-19395-8",
-                "price": 22.99
-            }
-        ],
-        {
-            "color": "red",
-            "price": 19.95
-        },
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95
-        },
-        {
-            "category": "fiction",
-            "author": "Evelyn Waugh",
-            "title": "Sword of Honour",
-            "price": 12.99
-        },
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        },
-        {
-            "category": "fiction",
-            "author": "J. R. R. Tolkien",
-            "title": "The Lord of the Rings",
-            "isbn": "0-395-19395-8",
-            "price": 22.99
-        },
-        "reference",
-        "Nigel Rees",
-        "Sayings of the Century",
-        8.95,
-        "fiction",
-        "Evelyn Waugh",
-        "Sword of Honour",
-        12.99,
-        "fiction",
-        "Herman Melville",
-        "Moby Dick",
-        "0-553-21311-3",
-        8.99,
-        "fiction",
-        "J. R. R. Tolkien",
-        "The Lord of the Rings",
-        "0-395-19395-8",
-        22.99,
-        "red",
-        19.95
-    ],
-
-    '$..book[ ?( (@.price < 13 || $.store.bicycle.price < @.price) && @.price <=10 ) ]': [
-        {
-            "category": "reference",
-            "author": "Nigel Rees",
-            "title": "Sayings of the Century",
-            "price": 8.95
-        },
-        {
-            "category": "fiction",
-            "author": "Herman Melville",
-            "title": "Moby Dick",
-            "isbn": "0-553-21311-3",
-            "price": 8.99
-        }
-    ]
-};
-
-describe('compile test', () => {
-    it('basic', (done) => {
-        let template = jsonpath.compile('$.a');
-        let result = template({'a': 1});
-        if (result === 1) {
-            done();
-        }
-    });
-});
-
-describe('selector test', () => {
-    it('basic', (done) => {
-        let selector = jsonpath.selector({'a': 1});
-        let result = selector('$.a');
-        if (result === 1) {
-            done();
-        }
-    });
-});
-
-describe('select test', () => {
-    it('basic', (done) => {
-        let result = jsonpath.select({'a': 1}, '$.a');
-        if (result === 1) {
-            done();
-        }
-    });
-});
-
-describe('filter test', () => {
-
-    function run(done, path, expected) {
-        let result = jsonpath.select(jsonObj, path);
-        if (JSON.stringify(result) === JSON.stringify(expected)) {
-            done();
-        }
-    }
-
-    for( var i in list ) {
-        it(i, (done) => {
-            run (done, i, list[i]);
-        })
-    }
-});
-
-describe('Selector test', () => {
-    it('basic selectTo', (done) => {
-        let result = new jsonpath.Selector().path('$.a').value({'a': 1}).selectTo();
-        if (result === 1) {
-            done();
-        }
-    });
-
-    it('basic selectToStr', (done) => {
-        let result = new jsonpath.Selector().path('$.a').value({'a': 1}).selectToStr();
-        if (result === '1') {
-            done();
-        }
-    });
-
-    it('select', (done) => {
-        let selector = new jsonpath.Selector().value(jsonObj);
-        for(var i in list) {
-            if(JSON.stringify(list[i]) !== selector.path(i).selectToStr()) {
-                throw `fail: ${i}`;
-            }
-        }
-        done();
-    });
-});
-
-describe('README test', () => {
-    it('jsonpath.Selector', (done) => {
-        let jsonObj = {
-            "school": {
-                "friends": [
-                    {"name": "친구1", "age": 20},
-                    {"name": "친구2", "age": 20}
-                ]
-            },
-            "friends": [
-                {"name": "친구3", "age": 30},
-                {"name": "친구4"}
-            ]
-        };
-
-        let selector = new jsonpath.Selector().value(jsonObj);
-
-        {
-            let jsonObj = selector.path('$..[?(@.age >= 30)]').selectTo();
-            let resultObj = [{"name": "친구3", "age": 30}];
-            if(JSON.stringify(jsonObj) !== JSON.stringify(resultObj)) {
-                throw 'jsonpath.Selector: $..[?(@.age >= 30)]';
-            }
-        }
-
-        {
-            let jsonObj = selector.path('$..[?(@.age == 20)]').selectTo();
-            let resultObj = [{"name": "친구1", "age": 20}, {"name": "친구2", "age": 20}];
-            if(JSON.stringify(jsonObj) !== JSON.stringify(resultObj)) {
-                throw 'jsonpath.Selector: $..[?(@.age >= 20)]';
-            }
-        }
-
-        {
-            let jsonObj = selector.value({"friends": [ {"name": "친구5", "age": 20} ]}).selectTo();
-            let resultObj = [{"name": "친구5", "age": 20}];
-            if(JSON.stringify(jsonObj) !== JSON.stringify(resultObj)) {
-                throw 'jsonpath.Selector: change value';
-            }
-        }
-
-        done();
-    });
-
-    it('jsonpath.select(json: string|object, jsonpath: string)', (done) => {
-        let jsonObj = {
-            "school": {
-                "friends": [
-                    {"name": "친구1", "age": 20},
-                    {"name": "친구2", "age": 20}
-                ]
-            },
-            "friends": [
-                {"name": "친구3", "age": 30},
-                {"name": "친구4"}
-            ]
-        };
-
-        let ret = [
-            {"name": "친구3", "age": 30},
-            {"name": "친구1", "age": 20}
-        ];
-
-
-        let selectAsString = jsonpath.select(JSON.stringify(jsonObj), '$..friends[0]');
-        let selectAsObj = jsonpath.select(jsonObj, '$..friends[0]');
-
-        if(
-            JSON.stringify(ret) !== JSON.stringify(selectAsString) ||
-            JSON.stringify(ret) !== JSON.stringify(selectAsObj)
-        ) {
-            throw 'jsonpath.select(json: string|object, jsonpath: string)';
-        }
-
-        done();
-    });
-
-    it('jsonpath.compile(jsonpath: string)', (done) => {
-        let template = jsonpath.compile('$..friends[0]');
-
-        let jsonObj = {
-            "school": {
-                "friends": [
-                    {"name": "친구1", "age": 20},
-                    {"name": "친구2", "age": 20}
-                ]
-            },
-            "friends": [
-                {"name": "친구3", "age": 30},
-                {"name": "친구4"}
-            ]
-        };
-
-        let ret = [
-            {"name": "친구3", "age": 30},
-            {"name": "친구1", "age": 20}
-        ];
-
-        let selectAsString = template(JSON.stringify(jsonObj));
-        let selectAsObj = template(jsonObj);
-
-        if(
-            JSON.stringify(ret) !== JSON.stringify(selectAsString) ||
-            JSON.stringify(ret) !== JSON.stringify(selectAsObj)
-        ) {
-            throw 'jsonpath.compile(jsonpath: string) 1';
-        }
-
-        let jsonObj2 = {
-            "school": {
-                "friends": [
-                    {"name": "Millicent Norman"},
-                    {"name": "Vincent Cannon"}
-                ]
-            },
-            "friends": [ {"age": 30}, {"age": 40} ]
-        };
-
-        let ret2 = [
-            {"age": 30},
-            {"name": "Millicent Norman"}
-        ];
-
-        let selectAsString2 = template(JSON.stringify(jsonObj2));
-        let selectAsObj2 = template(jsonObj2);
-
-        if(
-            JSON.stringify(ret2) !== JSON.stringify(selectAsString2) ||
-            JSON.stringify(ret2) !== JSON.stringify(selectAsObj2)
-        ) {
-            throw 'jsonpath.compile(jsonpath: string) 2';
-        }
-
-        done();
-    });
-
-    it('jsonpath.selector(json: string|object)', (done) => {
-        let jsonObj = {
-            "school": {
-                "friends": [
-                    {"name": "친구1", "age": 20},
-                    {"name": "친구2", "age": 20}
-                ]
-            },
-            "friends": [
-                {"name": "친구3", "age": 30},
-                {"name": "친구4"}
-            ]
-        };
-
-        let ret1 = [
-            {"name": "친구3", "age": 30},
-            {"name": "친구1", "age": 20}
-        ];
-
-        let ret2 = [
-            {"name": "친구4"},
-            {"name": "친구2", "age": 20}
-        ];
-
-        let selector = jsonpath.selector(jsonObj);
-        let select1 = selector('$..friends[0]');
-        let select2 = selector('$..friends[1]');
-
-        if(
-            JSON.stringify(ret1) !== JSON.stringify(select1) ||
-            JSON.stringify(ret2) !== JSON.stringify(select2)
-        ) {
-            throw 'jsonpath.selector(json: string|object)';
-        }
-
-        done();
-    });
-});

profiling.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+valgrind \
+    --tool=callgrind \
+    --dump-instr=yes \
+    --collect-jumps=yes \
+    --simulate-cache=yes $1 -- $2

src/ffi/mod.rs

@@ -0,0 +1,59 @@
+use std::ffi::{CStr, CString};
+use std::os::raw::{c_char, c_void};
+
+use {parser, select, select_as_str};
+
+const INVALID_PATH: &str = "invalid path";
+const INVALID_JSON: &str = "invalud json";
+
+fn to_str(v: *const c_char, err_msg: &str) -> &str {
+    unsafe { CStr::from_ptr(v) }.to_str().expect(err_msg)
+}
+
+fn to_char_ptr(v: &str) -> *const c_char {
+    let s = CString::new(v).unwrap_or_else(|_| panic!("invalid string: {}", v));
+    let ptr = s.as_ptr();
+    std::mem::forget(s);
+    ptr
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_select(json_str: *const c_char, path: *const c_char) -> *const c_char {
+    let json_str = to_str(json_str, INVALID_JSON);
+    let path = to_str(path, INVALID_PATH);
+    match select_as_str(json_str, path) {
+        Ok(v) => to_char_ptr(v.as_str()),
+        Err(e) => {
+            panic!("{:?}", e);
+        }
+    }
+}
+
+#[no_mangle]
+#[allow(clippy::forget_copy)]
+pub extern "C" fn ffi_path_compile(path: *const c_char) -> *mut c_void {
+    let path = to_str(path, INVALID_PATH);
+    let ref_node = Box::into_raw(Box::new(parser::Parser::compile(path).unwrap()));
+    let ptr = ref_node as *mut c_void;
+    std::mem::forget(ref_node);
+    ptr
+}
+
+#[no_mangle]
+pub extern "C" fn ffi_select_with_compiled_path(
+    path_ptr: *mut c_void,
+    json_ptr: *const c_char,
+) -> *const c_char {
+    let node = unsafe { Box::from_raw(path_ptr as *mut parser::Node) };
+    let json_str = to_str(json_ptr, INVALID_JSON);
+    let json = serde_json::from_str(json_str)
+        .unwrap_or_else(|_| panic!("invalid json string: {}", json_str));
+
+    let mut selector = select::Selector::default();
+    let found = selector.compiled_path(&node).value(&json).select().unwrap();
+    std::mem::forget(node);
+
+    let result = serde_json::to_string(&found)
+        .unwrap_or_else(|_| panic!("json serialize error: {:?}", found));
+    to_char_ptr(result.as_str())
+}

src/filter/cmp.rs

@@ -1,191 +0,0 @@
-#[derive(Debug)]
-pub enum CmpType {
-    Eq,
-    Ne,
-    Gt,
-    Ge,
-    Lt,
-    Le,
-}
-
-#[derive(Debug)]
-pub enum CmpCondType {
-    And,
-    Or,
-}
-
-pub trait PrivCmp {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool;
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool;
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool;
-}
-
-pub trait IntoType {
-    fn into_type(&self) -> CmpType;
-}
-
-pub struct CmpEq;
-
-impl PrivCmp for CmpEq {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 == v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 == v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 == v2
-    }
-}
-
-impl IntoType for CmpEq {
-    fn into_type(&self) -> CmpType {
-        CmpType::Eq
-    }
-}
-
-pub struct CmpNe;
-
-impl PrivCmp for CmpNe {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 != v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 != v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 != v2
-    }
-}
-
-impl IntoType for CmpNe {
-    fn into_type(&self) -> CmpType {
-        CmpType::Ne
-    }
-}
-
-pub struct CmpGt;
-
-impl PrivCmp for CmpGt {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 > v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 > v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 > v2
-    }
-}
-
-impl IntoType for CmpGt {
-    fn into_type(&self) -> CmpType {
-        CmpType::Gt
-    }
-}
-
-pub struct CmpGe;
-
-impl PrivCmp for CmpGe {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 >= v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 >= v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 >= v2
-    }
-}
-
-impl IntoType for CmpGe {
-    fn into_type(&self) -> CmpType {
-        CmpType::Ge
-    }
-}
-
-pub struct CmpLt;
-
-impl PrivCmp for CmpLt {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 < v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 < v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 < v2
-    }
-}
-
-impl IntoType for CmpLt {
-    fn into_type(&self) -> CmpType {
-        CmpType::Lt
-    }
-}
-
-pub struct CmpLe;
-
-impl PrivCmp for CmpLe {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        v1 <= v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 <= v2
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        v1 <= v2
-    }
-}
-
-impl IntoType for CmpLe {
-    fn into_type(&self) -> CmpType {
-        CmpType::Le
-    }
-}
-
-pub struct CmpAnd;
-
-impl PrivCmp for CmpAnd {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        *v1 && *v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 > &0_f64 && v2 > &0_f64
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        !v1.is_empty() && !v2.is_empty()
-    }
-}
-
-pub struct CmpOr;
-
-impl PrivCmp for CmpOr {
-    fn cmp_bool(&self, v1: &bool, v2: &bool) -> bool {
-        *v1 || *v2
-    }
-
-    fn cmp_f64(&self, v1: &f64, v2: &f64) -> bool {
-        v1 > &0_f64 || v2 > &0_f64
-    }
-
-    fn cmp_string(&self, v1: &String, v2: &String) -> bool {
-        !v1.is_empty() || !v2.is_empty()
-    }
-}

src/filter/mod.rs

@@ -1,4 +0,0 @@
-mod cmp;
-mod term;
-pub mod value_filter;
-pub mod value_wrapper;

src/filter/term.rs

@@ -1,154 +0,0 @@
-use super::cmp::*;
-use super::value_filter::ValueFilterKey;
-use super::value_wrapper::*;
-
-#[derive(Debug)]
-pub enum TermContext {
-    Constants(ExprTerm),
-    Json(Option<ValueFilterKey>, ValueWrapper),
-}
-
-impl TermContext {
-    fn cmp<F: PrivCmp + IntoType>(&self, other: &TermContext, cmp_fn: F, default: bool) -> TermContext {
-        match self {
-            TermContext::Constants(et) => {
-                match other {
-                    TermContext::Constants(oet) => {
-                        trace!("const-const");
-                        TermContext::Constants(ExprTerm::Bool(et.cmp(oet, cmp_fn, default)))
-                    }
-                    TermContext::Json(key, v) => {
-                        trace!("const-json");
-                        TermContext::Json(None, v.take_with(key, et, cmp_fn, true))
-                    }
-                }
-            }
-            TermContext::Json(key, v) => {
-                match other {
-                    TermContext::Json(key_other, ov) => {
-                        trace!("json-json");
-
-                        fn is_json(t: &TermContext) -> bool {
-                            match t {
-                                TermContext::Json(_, _) => true,
-                                _ => false
-                            }
-                        }
-
-                        let mut c = v.into_term(key);
-                        let mut oc = ov.into_term(key_other);
-                        if is_json(&c) && is_json(&oc) {
-                            v.cmp(&ov, cmp_fn.into_type())
-                        } else {
-                            c.cmp(&mut oc, cmp_fn, default)
-                        }
-                    }
-                    TermContext::Constants(et) => {
-                        trace!("json-const");
-                        TermContext::Json(None, v.take_with(key, et, cmp_fn, false))
-                    }
-                }
-            }
-        }
-    }
-
-    fn cmp_cond(&self, other: &TermContext, cmp_cond_type: CmpCondType) -> TermContext {
-        match self {
-            TermContext::Constants(et) => {
-                match other {
-                    TermContext::Constants(oet) => {
-                        match cmp_cond_type {
-                            CmpCondType::Or => {
-                                TermContext::Constants(ExprTerm::Bool(et.cmp(oet, CmpOr, false)))
-                            }
-                            CmpCondType::And => {
-                                TermContext::Constants(ExprTerm::Bool(et.cmp(oet, CmpAnd, false)))
-                            }
-                        }
-                    }
-                    TermContext::Json(_, v) => {
-                        TermContext::Json(None, ValueWrapper::new(v.get_val().clone(), false))
-                    }
-                }
-            }
-            TermContext::Json(_, v) => {
-                match other {
-                    TermContext::Json(_, ov) => {
-                        match cmp_cond_type {
-                            CmpCondType::Or => TermContext::Json(None, v.union(ov)),
-                            CmpCondType::And => TermContext::Json(None, v.intersect(ov)),
-                        }
-                    }
-                    _ => {
-                        TermContext::Json(None, ValueWrapper::new(v.get_val().clone(), false))
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn eq(&self, other: &TermContext) -> TermContext {
-        trace!("eq");
-        self.cmp(other, CmpEq, false)
-    }
-
-    pub fn ne(&self, other: &TermContext) -> TermContext {
-        trace!("ne");
-        self.cmp(other, CmpNe, true)
-    }
-
-    pub fn gt(&self, other: &TermContext) -> TermContext {
-        trace!("gt");
-        self.cmp(other, CmpGt, false)
-    }
-
-    pub fn ge(&self, other: &TermContext) -> TermContext {
-        trace!("ge");
-        self.cmp(other, CmpGe, false)
-    }
-
-    pub fn lt(&self, other: &TermContext) -> TermContext {
-        trace!("lt");
-        self.cmp(other, CmpLt, false)
-    }
-
-    pub fn le(&self, other: &TermContext) -> TermContext {
-        trace!("le");
-        self.cmp(other, CmpLe, false)
-    }
-
-    pub fn and(&self, other: &TermContext) -> TermContext {
-        self.cmp_cond(other, CmpCondType::And)
-    }
-
-    pub fn or(&self, other: &TermContext) -> TermContext {
-        self.cmp_cond(other, CmpCondType::Or)
-    }
-}
-
-
-#[derive(Debug)]
-pub enum ExprTerm {
-    String(String),
-    Number(f64),
-    Bool(bool),
-}
-
-impl ExprTerm {
-    fn cmp<F: PrivCmp>(&self, other: &ExprTerm, cmp_fn: F, default: bool) -> bool {
-        match self {
-            ExprTerm::Bool(v1) => match other {
-                ExprTerm::Bool(v2) => cmp_fn.cmp_bool(v1, v2),
-                _ => default
-            }
-            ExprTerm::Number(v1) => match other {
-                ExprTerm::Number(v2) => cmp_fn.cmp_f64(v1, v2),
-                _ => default
-            }
-            ExprTerm::String(v1) => match other {
-                ExprTerm::String(v2) => cmp_fn.cmp_string(v1, v2),
-                _ => default
-            }
-        }
-    }
-}

src/filter/value_filter.rs

@@ -1,634 +0,0 @@
-use std::error::Error;
-use std::ops::Deref;
-use std::result::Result;
-
-use serde_json::Value;
-
-use filter::term::*;
-use filter::value_wrapper::*;
-use parser::parser::{FilterToken, NodeVisitor, ParseToken};
-use ref_value::model::*;
-
-trait ArrayIndex {
-    fn index(&self, v: &RefValueWrapper) -> usize;
-
-    fn take_value(&self, v: &RefValueWrapper) -> RefValueWrapper {
-        let idx = self.index(v);
-        match v.get(idx) {
-            Some(v) => v.clone(),
-            _ => RefValue::Null.into()
-        }
-    }
-}
-
-impl ArrayIndex for f64 {
-    fn index(&self, v: &RefValueWrapper) -> usize {
-        if v.is_array() && self < &0_f64 {
-            (v.as_array().unwrap().len() as f64 + self) as usize
-        } else {
-            *self as usize
-        }
-    }
-}
-
-impl ArrayIndex for isize {
-    fn index(&self, v: &RefValueWrapper) -> usize {
-        if v.is_array() && self < &0_isize {
-            (v.as_array().unwrap().len() as isize + self) as usize
-        } else {
-            *self as usize
-        }
-    }
-}
-
-impl ArrayIndex for usize {
-    fn index(&self, _: &RefValueWrapper) -> usize {
-        *self as usize
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum ValueFilterKey {
-    Num(usize),
-    String(String),
-    All,
-}
-
-#[derive(Debug)]
-pub struct ValueFilter {
-    val_wrapper: ValueWrapper,
-    last_key: Option<ValueFilterKey>,
-    filter_mode: bool,
-}
-
-impl ValueFilter {
-    pub fn new(v: RefValueWrapper, is_leaves: bool, filter_mode: bool) -> Self {
-        ValueFilter { val_wrapper: ValueWrapper::new(v, is_leaves), last_key: None, filter_mode }
-    }
-
-    fn iter_to_value_vec<'a, I: Iterator<Item=&'a RefValueWrapper>>(iter: I) -> Vec<RefValueWrapper> {
-        iter
-            .map(|v| v.clone())
-            .filter(|v| !v.is_null())
-            .collect()
-    }
-
-    fn get_nested_array<F: ArrayIndex>(v: &RefValueWrapper, key: F, filter_mode: bool) -> RefValueWrapper {
-        if v.is_array() && v.as_array().unwrap().get(key.index(v)).is_some() {
-            if filter_mode {
-                v.clone()
-            } else {
-                let idx = key.index(v);
-                v.get(idx).unwrap().clone()
-            }
-        } else {
-            key.take_value(v)
-        }
-    }
-
-    fn get_nested_object(v: &RefValueWrapper, key: &String, filter_mode: bool) -> RefValueWrapper {
-        if v.is_object() && v.as_object().unwrap().contains_key(key) {
-            if filter_mode {
-                v.clone()
-            } else {
-                v.get(key.clone()).unwrap().clone()
-            }
-        } else {
-            RefValue::Null.into()
-        }
-    }
-
-    fn collect_all(key: Option<&String>, v: &RefValueWrapper, buf: &mut Vec<RefValueWrapper>) {
-        match v.deref() {
-            RefValue::Array(vec) => {
-                if key.is_none() {
-                    for v in vec {
-                        buf.push(v.clone());
-                    }
-                }
-                for i in vec {
-                    Self::collect_all(key, i, buf);
-                }
-            }
-            RefValue::Object(v) => {
-                for (k, v) in v.into_iter() {
-                    if match key {
-                        Some(map_key) => map_key == k,
-                        _ => true
-                    } {
-                        buf.push(v.clone());
-                    }
-                }
-                for (_, v) in v.into_iter() {
-                    Self::collect_all(key, v, buf);
-                }
-            }
-            _ => {}
-        }
-    }
-
-    pub fn step_leaves_all(&mut self) -> &ValueWrapper {
-        debug!("step_leaves_all");
-        let mut buf = Vec::new();
-        Self::collect_all(None, &self.val_wrapper.get_val(), &mut buf);
-        trace!("step_leaves_all - {:?}", buf);
-        self.last_key = Some(ValueFilterKey::All);
-        self.val_wrapper = ValueWrapper::new(RefValue::Array(buf).into(), true);
-        &self.val_wrapper
-    }
-
-    pub fn step_leaves_str(&mut self, key: &str) -> &ValueWrapper {
-        self.step_leaves_string(&key.to_string())
-    }
-
-    pub fn step_leaves_string(&mut self, key: &String) -> &ValueWrapper {
-        debug!("step_leaves_string");
-        let mut buf = Vec::new();
-        Self::collect_all(Some(key), &self.val_wrapper.get_val(), &mut buf);
-        trace!("step_leaves_string - {:?}", buf);
-        self.last_key = Some(ValueFilterKey::String(key.clone()));
-        self.val_wrapper = ValueWrapper::new(RefValue::Array(buf).into(), true);
-        &self.val_wrapper
-    }
-
-    pub fn step_in_all(&mut self) -> &ValueWrapper {
-        debug!("step_in_all");
-
-        let vec = match self.val_wrapper.get_val().deref() {
-            RefValue::Object(ref map) => {
-                Self::iter_to_value_vec(map.values())
-            }
-            RefValue::Array(ref list) => {
-                Self::iter_to_value_vec(list.iter())
-            }
-            RefValue::Null => Vec::new(),
-            _ => vec![self.val_wrapper.get_val().clone()]
-        };
-
-        self.last_key = Some(ValueFilterKey::All);
-        self.val_wrapper.replace(RefValue::Array(vec).into());
-        trace!("step_in_all - {:?}", self.val_wrapper.get_val());
-        &self.val_wrapper
-    }
-
-    pub fn step_in_num(&mut self, key: &f64) -> &ValueWrapper {
-        debug!("step_in_num");
-        trace!("step_in_num - before: leaves {}, filterMode {} - {:?}"
-               , self.val_wrapper.is_leaves()
-               , self.filter_mode
-               , self.val_wrapper.get_val());
-
-        let v = if self.val_wrapper.is_leaves() {
-            let filter_mode = self.filter_mode;
-            match self.val_wrapper.get_val().deref() {
-                RefValue::Array(ref vec) => {
-                    let mut ret = Vec::new();
-                    for v in vec {
-                        let wrapper = Self::get_nested_array(v, *key, filter_mode);
-                        if !wrapper.is_null() {
-                            ret.push(wrapper.clone());
-                        }
-                    }
-                    RefValue::Array(ret).into()
-                }
-                _ => key.take_value(&self.val_wrapper.get_val())
-            }
-        } else {
-            key.take_value(&self.val_wrapper.get_val())
-        };
-
-        self.last_key = Some(ValueFilterKey::Num(key.index(&v)));
-        self.val_wrapper.replace(v);
-        trace!("step_in_num - after: {:?}", self.val_wrapper.get_val());
-        &self.val_wrapper
-    }
-
-    pub fn step_in_str(&mut self, key: &str) -> &ValueWrapper {
-        self.step_in_string(&key.to_string())
-    }
-
-    pub fn step_in_string(&mut self, key: &String) -> &ValueWrapper {
-        debug!("step_in_string");
-        trace!("step_in_string - before: {},{},{:?}"
-               , self.val_wrapper.is_leaves()
-               , self.filter_mode
-               , self.val_wrapper.get_val());
-
-        let filter_mode = self.filter_mode;
-        let is_leaves = self.val_wrapper.is_leaves();
-        let val = match self.val_wrapper.get_val().deref() {
-            RefValue::Array(ref vec) if is_leaves => {
-                let mut buf = Vec::new();
-                for mut v in vec {
-                    if v.is_array() {
-                        let vec = v.as_array().unwrap();
-                        let mut ret = Vec::new();
-                        for v in vec {
-                            let nested_wrapper = Self::get_nested_object(v, key, filter_mode);
-                            if !nested_wrapper.is_null() {
-                                ret.push(nested_wrapper.clone());
-                            }
-                        }
-                        buf.append(&mut ret);
-                    } else if v.is_object() {
-                        let nested_wrapper = Self::get_nested_object(v, key, filter_mode);
-                        if !nested_wrapper.is_null() {
-                            buf.push(nested_wrapper.clone());
-                        }
-                    } else {
-                        match v.get(key.clone()) {
-                            Some(v) => buf.push(v.clone()),
-                            _ => {}
-                        }
-                    }
-                }
-
-                RefValue::Array(buf).into()
-            }
-            RefValue::Array(ref vec) if !is_leaves => {
-                let mut ret = Vec::new();
-                for v in vec {
-                    let wrapper = Self::get_nested_object(v, key, filter_mode);
-                    if !wrapper.is_null() {
-                        ret.push(wrapper.clone());
-                    }
-                }
-                RefValue::Array(ret).into()
-            }
-            _ => {
-                match self.val_wrapper.get_val().get(key.clone()) {
-                    Some(v) => v.clone(),
-                    _ => RefValue::Null.into()
-                }
-            }
-        };
-
-        self.last_key = Some(ValueFilterKey::String(key.clone()));
-        self.val_wrapper.replace(val);
-        trace!("step_in_string - after: {},{},{:?}"
-               , self.val_wrapper.is_leaves()
-               , self.filter_mode
-               , self.val_wrapper.get_val());
-        &self.val_wrapper
-    }
-}
-
-pub struct JsonValueFilter {
-    json: RefValueWrapper,
-    filter_stack: Vec<ValueFilter>,
-    token_stack: Vec<ParseToken>,
-    term_stack: Vec<TermContext>,
-}
-
-impl JsonValueFilter {
-    pub fn new(json: &str) -> Result<Self, String> {
-        let json: RefValue = serde_json::from_str(json)
-            .map_err(|e| e.description().to_string())?;
-        Ok(JsonValueFilter::new_from_value(json.into()))
-    }
-
-    pub fn new_from_value(json: RefValueWrapper) -> Self {
-        JsonValueFilter {
-            json,
-            filter_stack: Vec::new(),
-            token_stack: Vec::new(),
-            term_stack: Vec::new(),
-        }
-    }
-
-    fn is_peek_token_array(&self) -> bool {
-        if let Some(ParseToken::Array) = self.token_stack.last() {
-            true
-        } else {
-            false
-        }
-    }
-
-    fn push_value_filter(&mut self, from_current: bool) {
-        if from_current {
-            self.filter_stack.last()
-                .map(|vf| {
-                    ValueFilter::new(vf.val_wrapper.get_val().clone(), vf.val_wrapper.is_leaves(), from_current)
-                })
-                .and_then(|vf| {
-                    Some(self.filter_stack.push(vf))
-                });
-        } else {
-            self.filter_stack.push({
-                ValueFilter::new(self.json.clone(), false, from_current)
-            });
-        }
-    }
-
-    fn replace_filter_stack(&mut self, v: RefValueWrapper, is_leaves: bool) {
-        if self.filter_stack.is_empty() {
-            self.filter_stack.push(ValueFilter::new(v, is_leaves, false));
-        } else {
-            match self.filter_stack.last_mut() {
-                Some(vf) => {
-                    vf.val_wrapper.set_leaves(is_leaves);
-                    if v.is_null() {
-                        vf.val_wrapper.replace(v);
-                    } else if v.is_array() && v.as_array().unwrap().is_empty() {
-                        vf.val_wrapper.replace(RefValue::Null.into());
-                    } else if vf.val_wrapper.is_array() {
-                        vf.val_wrapper.replace(v);
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    pub fn into_value(&self) -> Value {
-        match self.filter_stack.last() {
-            Some(v) => v.val_wrapper.into_value(),
-            _ => Value::Null
-        }
-    }
-
-    pub fn take_value(&mut self) -> RefValueWrapper {
-        match self.filter_stack.last_mut() {
-            Some(v) => v.val_wrapper.get_val().clone(),
-            _ => RefValue::Null.into()
-        }
-    }
-
-    fn token_union<F: ArrayIndex>(&mut self, indices: Vec<F>) {
-        self.token_stack.pop();
-
-        match self.filter_stack.last_mut() {
-            Some(ref mut vf) if vf.val_wrapper.is_array() && vf.val_wrapper.is_leaves() => {
-                let mut ret = Vec::new();
-                if let RefValue::Array(val) = vf.val_wrapper.get_val().deref() {
-                    for mut v in val {
-                        for i in &indices {
-                            let v = i.take_value(v);
-                            if !v.is_null() {
-                                ret.push(v.clone());
-                            }
-                        }
-                    }
-                }
-                vf.val_wrapper.replace(RefValue::Array(ret).into());
-            }
-            Some(ref mut vf) if vf.val_wrapper.is_array() && !vf.val_wrapper.is_leaves() => {
-                let mut ret = Vec::new();
-                for i in indices {
-                    let wrapper = i.take_value(&vf.val_wrapper.get_val());
-                    if !wrapper.is_null() {
-                        ret.push(wrapper.clone());
-                    }
-                }
-                vf.val_wrapper.replace(RefValue::Array(ret).into());
-            }
-            _ => {}
-        }
-    }
-
-    fn token_range(&mut self, from: Option<isize>, to: Option<isize>) {
-        self.token_stack.pop();
-
-        fn _from_to<F: ArrayIndex>(from: Option<F>, to: Option<F>, val: &RefValueWrapper) -> (usize, usize) {
-            let from = match from {
-                Some(v) => v.index(val),
-                _ => 0
-            };
-            let to = match to {
-                Some(v) => v.index(val),
-                _ => {
-                    if let RefValue::Array(v) = val.deref() {
-                        v.len()
-                    } else {
-                        0
-                    }
-                }
-            };
-            (from, to)
-        }
-
-        fn _range(from: usize, to: usize, v: &RefValueWrapper) -> Vec<RefValueWrapper> {
-            trace!("range - {}:{}", from, to);
-
-            (from..to).into_iter()
-                .map(|i| i.take_value(v))
-                .filter(|v| !v.is_null())
-                .map(|v| v.clone())
-                .collect()
-        }
-
-        match self.filter_stack.last_mut() {
-            Some(ref mut vf) if vf.val_wrapper.is_array() && vf.val_wrapper.is_leaves() => {
-                let mut buf = Vec::new();
-                if let RefValue::Array(vec) = vf.val_wrapper.get_val().deref() {
-                    for mut v in vec {
-                        let (from, to) = _from_to(from, to, v);
-                        let mut v: Vec<RefValueWrapper> = _range(from, to, v);
-                        buf.append(&mut v);
-                    }
-                }
-                vf.val_wrapper.replace(RefValue::Array(buf).into());
-            }
-            Some(ref mut vf) if vf.val_wrapper.is_array() && !vf.val_wrapper.is_leaves() => {
-                let (from, to) = _from_to(from, to, &vf.val_wrapper.get_val());
-                let vec: Vec<RefValueWrapper> = _range(from, to, vf.val_wrapper.get_val());
-                vf.val_wrapper.replace(RefValue::Array(vec).into());
-            }
-            _ => {}
-        }
-    }
-
-    fn token_key(&mut self, key: String) {
-        match self.filter_stack.last_mut() {
-            Some(vf) => {
-                match self.token_stack.pop() {
-                    Some(ParseToken::In) | Some(ParseToken::Array) => {
-                        vf.step_in_string(&key);
-                    }
-                    Some(ParseToken::Leaves) => {
-                        vf.step_leaves_string(&key);
-                    }
-                    _ => {
-                        self.term_stack.push(TermContext::Constants(ExprTerm::String(key)));
-                    }
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn token_all(&mut self) {
-        match self.filter_stack.last_mut() {
-            Some(vf) => {
-                match self.token_stack.pop() {
-                    Some(ParseToken::In) => {
-                        vf.step_in_all();
-                    }
-                    Some(ParseToken::Leaves) => {
-                        vf.step_leaves_all();
-                    }
-                    _ => {}
-                }
-            }
-            _ => {}
-        }
-    }
-
-    fn token_end_array(&mut self) {
-        trace!("array_eof - term_stack: {:?}", self.term_stack);
-        trace!("array_eof - filter_stack: {:?}", self.filter_stack);
-
-        match self.term_stack.pop() {
-            Some(TermContext::Constants(ExprTerm::Number(v))) => {
-                match self.filter_stack.last_mut() {
-                    Some(vf) => {
-                        vf.step_in_num(&v);
-                    }
-                    _ => {}
-                }
-            }
-            Some(TermContext::Constants(ExprTerm::Bool(false))) => {
-                self.replace_filter_stack(RefValue::Null.into(), false);
-            }
-            Some(TermContext::Json(_, vw)) => {
-                self.replace_filter_stack(vw.get_val().clone(), vw.is_leaves());
-            }
-            _ => {
-                match self.filter_stack.pop() {
-                    Some(mut vf) => {
-                        let is_leaves = vf.val_wrapper.is_leaves();
-                        match vf.val_wrapper.get_val().deref() {
-                            RefValue::Null | RefValue::Bool(false) => {
-                                self.replace_filter_stack(RefValue::Null.into(), is_leaves);
-                            }
-                            _ => {
-                                self.replace_filter_stack(vf.val_wrapper.get_val().clone(), is_leaves);
-                            }
-                        }
-                    }
-                    _ => {}
-                }
-            }
-        }
-    }
-
-    fn token_op(&mut self, ft: &FilterToken) {
-        let right = self.term_stack.pop();
-        let left = self.term_stack.pop();
-
-        trace!("left {:?}", left);
-        trace!("right {:?}", right);
-
-        if left.is_some() && right.is_some() {
-            let left = left.unwrap();
-            let right = right.unwrap();
-
-            let tc = match ft {
-                FilterToken::Equal => left.eq(&right),
-                FilterToken::NotEqual => left.ne(&right),
-                FilterToken::Greater => left.gt(&right),
-                FilterToken::GreaterOrEqual => left.ge(&right),
-                FilterToken::Little => left.lt(&right),
-                FilterToken::LittleOrEqual => left.le(&right),
-                FilterToken::And => left.and(&right),
-                FilterToken::Or => left.or(&right),
-            };
-            self.term_stack.push(tc);
-        }
-
-        trace!("filter - {:?}", self.term_stack)
-    }
-}
-
-impl NodeVisitor for JsonValueFilter {
-    fn visit_token(&mut self, token: ParseToken) {
-        debug!("visit_token: {:?}", token);
-
-        match token {
-            ParseToken::Absolute
-            | ParseToken::Relative => {
-                if self.is_peek_token_array() {
-                    self.token_stack.pop();
-                }
-                self.push_value_filter(ParseToken::Relative == token);
-            }
-            ParseToken::In
-            | ParseToken::Leaves => {
-                self.token_stack.push(token);
-            }
-            ParseToken::Array => {
-                if let Some(ParseToken::Leaves) = self.token_stack.last() {
-                    self.token_all();
-                }
-                self.token_stack.push(token);
-            }
-            ParseToken::ArrayEof => {
-                self.token_end_array();
-            }
-            ParseToken::All => {
-                self.token_all();
-            }
-            ParseToken::Key(key) => {
-                self.token_key(key);
-            }
-            ParseToken::Filter(ref ft) => {
-                self.token_op(ft);
-            }
-            ParseToken::Number(v) => {
-                self.term_stack.push(TermContext::Constants(ExprTerm::Number(v)))
-            }
-            ParseToken::Range(from, to) => {
-                self.token_range(from, to);
-            }
-            ParseToken::Union(v) => {
-                self.token_union(v);
-            }
-            ParseToken::Eof => {
-                debug!("visit_token eof");
-            }
-        }
-    }
-
-    fn end_term(&mut self) {
-        debug!("end_term");
-
-        if let Some(ParseToken::Array) = self.token_stack.last() {
-            self.token_stack.pop();
-        }
-
-        trace!("end_term - term_stack {:?}", self.term_stack);
-        trace!("end_term - token_stack {:?}", self.token_stack);
-        trace!("end_term - filter_stack {:?}", self.filter_stack);
-
-        if self.token_stack.is_empty() && self.filter_stack.len() > 1 {
-            match self.filter_stack.pop() {
-                Some(vf) => {
-                    self.term_stack.push(TermContext::Json(vf.last_key, vf.val_wrapper));
-                }
-                _ => {}
-            }
-        }
-
-        if match self.token_stack.last() {
-            Some(ParseToken::Key(_))
-            | Some(ParseToken::Number(_)) => true,
-            _ => false
-        } {
-            match self.token_stack.pop() {
-                Some(ParseToken::Key(ref v)) if v.eq_ignore_ascii_case("true") => {
-                    self.term_stack.push(TermContext::Constants(ExprTerm::Bool(true)))
-                }
-                Some(ParseToken::Key(ref v)) if v.eq_ignore_ascii_case("false") => {
-                    self.term_stack.push(TermContext::Constants(ExprTerm::Bool(false)))
-                }
-                Some(ParseToken::Key(v)) => {
-                    self.term_stack.push(TermContext::Constants(ExprTerm::String(v)))
-                }
-                Some(ParseToken::Number(v)) => {
-                    self.term_stack.push(TermContext::Constants(ExprTerm::Number(v)))
-                }
-                _ => {}
-            }
-        }
-    }
-}

src/filter/value_wrapper.rs

@@ -1,284 +0,0 @@
-use std::ops::Deref;
-
-use indexmap::IndexSet;
-use serde_json::Value;
-
-use ref_value::model::*;
-
-use super::cmp::*;
-use super::term::*;
-use super::value_filter::*;
-
-#[derive(Debug)]
-pub struct ValueWrapper {
-    val: RefValueWrapper,
-    is_leaves: bool,
-}
-
-impl ValueWrapper {
-    pub fn new(val: RefValueWrapper, leaves: bool) -> Self {
-        ValueWrapper { val, is_leaves: leaves }
-    }
-
-    pub fn is_leaves(&self) -> bool {
-        self.is_leaves
-    }
-
-    pub fn set_leaves(&mut self, is_leaves: bool) {
-        self.is_leaves = is_leaves;
-    }
-
-    pub fn cmp(&self, other: &ValueWrapper, cmp_type: CmpType) -> TermContext {
-        match cmp_type {
-            CmpType::Eq => {
-                TermContext::Json(None, self.intersect(other))
-            }
-            CmpType::Ne => {
-                TermContext::Json(None, self.except(other))
-            }
-            CmpType::Gt | CmpType::Ge | CmpType::Lt | CmpType::Le => {
-                TermContext::Constants(ExprTerm::Bool(false))
-            }
-        }
-    }
-
-    fn cmp_with_term<F: PrivCmp>(val: &RefValueWrapper, et: &ExprTerm, cmp_fn: &F, default: bool, reverse: bool) -> bool {
-        match val.deref() {
-            RefValue::Bool(ref v1) => {
-                match et {
-                    ExprTerm::Bool(v2) => if reverse { cmp_fn.cmp_bool(v2, v1) } else { cmp_fn.cmp_bool(v1, v2) },
-                    _ => default
-                }
-            }
-            RefValue::Number(ref v1) => match et {
-                ExprTerm::Number(v2) => if reverse { cmp_fn.cmp_f64(v2, &v1.as_f64().unwrap()) } else { cmp_fn.cmp_f64(&v1.as_f64().unwrap(), v2) },
-                _ => default
-            },
-            RefValue::String(ref v1) => {
-                match et {
-                    ExprTerm::String(v2) => if reverse { cmp_fn.cmp_string(v2, v1) } else { cmp_fn.cmp_string(v1, v2) },
-                    _ => default
-                }
-            }
-            _ => default
-        }
-    }
-
-    fn take_object_in_array<F: PrivCmp>(&self, key: &String, et: &ExprTerm, cmp: &F, reverse: bool) -> Option<Self> {
-        fn _filter_with_object<F: Fn(&RefValueWrapper) -> bool>(v: &RefValueWrapper, key: &String, fun: F) -> bool {
-            match v.deref() {
-                RefValue::Object(map) => {
-                    match map.get(key) {
-                        Some(val) => fun(val),
-                        _ => false
-                    }
-                }
-                _ => false
-            }
-        }
-
-        match self.val.deref() {
-            RefValue::Array(vec) => {
-                let mut set = IndexSet::new();
-                for v in vec {
-                    if _filter_with_object(v, key, |vv| {
-                        Self::cmp_with_term(vv, et, cmp, false, reverse)
-                    }) {
-                        set.insert(v.clone());
-                    }
-                }
-                let ret = set.into_iter().collect();
-                Some(ValueWrapper::new(RefValue::Array(ret).into(), false))
-            }
-            _ => None
-        }
-    }
-
-    fn take_with_key_type<F: PrivCmp>(&self, key: &Option<ValueFilterKey>, et: &ExprTerm, cmp: &F, reverse: bool) -> Option<Self> {
-        match key {
-            Some(ValueFilterKey::String(key)) => {
-                self.take_object_in_array(key, et, cmp, reverse)
-            }
-            _ => None
-        }
-    }
-
-    pub fn take_with<F: PrivCmp>(&self, key: &Option<ValueFilterKey>, et: &ExprTerm, cmp: F, reverse: bool) -> Self {
-        match self.take_with_key_type(key, et, &cmp, reverse) {
-            Some(vw) => vw,
-            _ => {
-                match &(*self.val) {
-                    RefValue::Array(vec) => {
-                        let mut set = IndexSet::new();
-                        for v in vec {
-                            if Self::cmp_with_term(v, et, &cmp, false, reverse) {
-                                set.insert(v.clone());
-                            }
-                        }
-                        let ret = set.into_iter().collect();
-                        ValueWrapper::new(RefValue::Array(ret).into(), false)
-                    }
-                    _ => {
-                        if Self::cmp_with_term(&self.val, et, &cmp, false, reverse) {
-                            ValueWrapper::new(self.val.clone(), false)
-                        } else {
-                            ValueWrapper::new(RefValue::Null.into(), false)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn replace(&mut self, val: RefValueWrapper) {
-        let is_null = match val.deref() {
-            RefValue::Array(v) => if v.is_empty() { true } else { false },
-            RefValue::Object(m) => if m.is_empty() { true } else { false },
-            _ => val.is_null()
-        };
-        self.val = if is_null {
-            RefValue::Null.into()
-        } else {
-            val
-        };
-    }
-
-    pub fn get_val(&self) -> &RefValueWrapper {
-        &self.val
-    }
-
-    pub fn into_value(&self) -> Value {
-        self.get_val().into()
-    }
-
-    pub fn is_array(&self) -> bool {
-        self.val.is_array()
-    }
-
-    fn into_hashset(&self) -> IndexSet<RefValueWrapper> {
-        trace!("into_hashset");
-        let mut hashset = IndexSet::new();
-        match self.val.deref() {
-            RefValue::Array(ref v1) => {
-                for v in v1 {
-                    hashset.insert(v.clone());
-                }
-            }
-            _ => {
-                hashset.insert(self.val.clone());
-            }
-        }
-        hashset
-    }
-
-    pub fn except(&self, other: &Self) -> Self {
-        trace!("except");
-        let hashset = self.into_hashset();
-        let mut ret: IndexSet<RefValueWrapper> = IndexSet::new();
-        match other.val.deref() {
-            RefValue::Array(ref v1) => {
-                for v in v1 {
-                    if !hashset.contains(v) {
-                        ret.insert(v.clone());
-                    }
-                }
-            }
-            _ => {
-                if !hashset.contains(&other.val) {
-                    ret.insert(other.val.clone());
-                }
-            }
-        }
-
-        let vec = ret.into_iter().map(|v| v.clone()).collect();
-        ValueWrapper::new(RefValue::Array(vec).into(), false)
-    }
-
-    pub fn intersect(&self, other: &Self) -> Self {
-        trace!("intersect");
-        let hashset = self.into_hashset();
-        let mut ret: IndexSet<RefValueWrapper> = IndexSet::new();
-        match other.val.deref() {
-            RefValue::Array(ref v1) => {
-                for v in v1 {
-                    if hashset.contains(v) {
-                        ret.insert(v.clone());
-                    }
-                }
-            }
-            _ => {
-                if hashset.contains(&other.val) {
-                    ret.insert(other.val.clone());
-                }
-            }
-        }
-
-        let vec = ret.into_iter().map(|v| v.clone()).collect();
-        ValueWrapper::new(RefValue::Array(vec).into(), false)
-    }
-
-    pub fn union(&self, other: &Self) -> Self {
-        trace!("union");
-        let mut hashset = self.into_hashset();
-        match other.val.deref() {
-            RefValue::Array(ref v1) => {
-                for v in v1 {
-                    if !hashset.contains(v) {
-                        hashset.insert(v.clone());
-                    }
-                }
-            }
-            _ => {
-                if !hashset.contains(&other.val) {
-                    hashset.insert(other.val.clone());
-                }
-            }
-        }
-
-        let mut vw = ValueWrapper::new(RefValue::Null.into(), false);
-        let list = hashset.into_iter().map(|val| val.clone()).collect();
-        vw.replace(RefValue::Array(list).into());
-        vw
-    }
-
-    pub fn into_term(&self, key: &Option<ValueFilterKey>) -> TermContext {
-        match self.val.deref() {
-            RefValue::String(ref s) => TermContext::Constants(ExprTerm::String(s.clone())),
-            RefValue::Number(ref n) => TermContext::Constants(ExprTerm::Number(n.as_f64().unwrap())),
-            RefValue::Bool(b) => TermContext::Constants(ExprTerm::Bool(*b)),
-            _ => TermContext::Json(match key {
-                Some(vk) => Some(vk.clone()),
-                _ => None
-            }, ValueWrapper::new(self.val.clone(), false))
-        }
-    }
-
-    pub fn filter(&self, key: &Option<ValueFilterKey>) -> Self {
-        trace!("filter");
-        let v = match self.val.deref() {
-            RefValue::Array(ref vec) => {
-                let mut ret = Vec::new();
-                for v in vec {
-                    if let Some(ValueFilterKey::String(k)) = key {
-                        if v.get(k.clone()).is_some() {
-                            ret.push(v.clone());
-                        }
-                    }
-                }
-                RefValue::Array(ret).into()
-            }
-            RefValue::Object(ref map) => {
-                match key {
-                    Some(ValueFilterKey::String(k)) => match map.get(k) {
-                        Some(v) => v.clone(),
-                        _ => RefValue::Null.into()
-                    },
-                    _ => RefValue::Null.into()
-                }
-            }
-            _ => self.val.clone()
-        };
-
-        ValueWrapper::new(v, false)
-    }
-}

src/lib.rs

@@ -1,271 +1,228 @@
-//! JsonPath implementation for Rust
+//! JsonPath implementation written in Rust.
 //!
 //! # Example
 //! ```
-//!    extern crate jsonpath_lib as jsonpath;
-//!    #[macro_use] extern crate serde_json;
+//! extern crate jsonpath_lib as jsonpath;
+//! #[macro_use] extern crate serde_json;
+//! let json_obj = json!({
+//!     "store": {
+//!         "book": [
+//!             {
+//!                 "category": "reference",
+//!                 "author": "Nigel Rees",
+//!                 "title": "Sayings of the Century",
+//!                 "price": 8.95
+//!             },
+//!             {
+//!                 "category": "fiction",
+//!                 "author": "Evelyn Waugh",
+//!                 "title": "Sword of Honour",
+//!                 "price": 12.99
+//!             },
+//!             {
+//!                 "category": "fiction",
+//!                 "author": "Herman Melville",
+//!                 "title": "Moby Dick",
+//!                 "isbn": "0-553-21311-3",
+//!                 "price": 8.99
+//!             },
+//!             {
+//!                 "category": "fiction",
+//!                 "author": "J. R. R. Tolkien",
+//!                 "title": "The Lord of the Rings",
+//!                 "isbn": "0-395-19395-8",
+//!                 "price": 22.99
+//!             }
+//!         ],
+//!         "bicycle": {
+//!             "color": "red",
+//!             "price": 19.95
+//!         }
+//!     },
+//!     "expensive": 10
+//! });
 //!
-//!    let json_obj = json!({
-//!    "store": {
-//!        "book": [
-//!            {
-//!                "category": "reference",
-//!                "author": "Nigel Rees",
-//!                "title": "Sayings of the Century",
-//!                "price": 8.95
-//!            },
-//!            {
-//!                "category": "fiction",
-//!                "author": "Evelyn Waugh",
-//!                "title": "Sword of Honour",
-//!                "price": 12.99
-//!            },
-//!            {
-//!                "category": "fiction",
-//!                "author": "Herman Melville",
-//!                "title": "Moby Dick",
-//!                "isbn": "0-553-21311-3",
-//!                "price": 8.99
-//!            },
-//!            {
-//!                "category": "fiction",
-//!                "author": "J. R. R. Tolkien",
-//!                "title": "The Lord of the Rings",
-//!                "isbn": "0-395-19395-8",
-//!                "price": 22.99
-//!            }
-//!        ],
-//!        "bicycle": {
-//!            "color": "red",
-//!            "price": 19.95
-//!        }
-//!    },
-//!    "expensive": 10
-//!    });
+//! let mut selector = jsonpath::selector(&json_obj);
 //!
-//!    let mut selector = jsonpath::selector(&json_obj);
+//! assert_eq!(selector("$.store.book[*].author").unwrap(),
+//!             vec![
+//!                 "Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"
+//!             ]);
 //!
-//!    //
-//!    // $.store.book[*].author
-//!    //
-//!    let json = selector("$.store.book[*].author").unwrap();
-//!    let ret = json!(["Nigel Rees","Evelyn Waugh","Herman Melville","J. R. R. Tolkien"]);
-//!    assert_eq!(json, ret);
+//! assert_eq!(selector("$..author").unwrap(),
+//!             vec![
+//!                 "Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"
+//!             ]);
 //!
-//!    //
-//!    // $..author
-//!    //
-//!    let json = selector("$..author").unwrap();
-//!    let ret = json!(["Nigel Rees","Evelyn Waugh","Herman Melville","J. R. R. Tolkien"]);
-//!    assert_eq!(json, ret);
+//! assert_eq!(selector("$.store.*").unwrap(),
+//!             vec![
+//!                 &json!([
+//!                     { "category": "reference", "author": "Nigel Rees", "title": "Sayings of the Century", "price": 8.95 },
+//!                     { "category": "fiction", "author": "Evelyn Waugh", "title": "Sword of Honour", "price": 12.99 },
+//!                     { "category": "fiction", "author": "Herman Melville", "title": "Moby Dick", "isbn": "0-553-21311-3", "price": 8.99 },
+//!                     { "category": "fiction", "author": "J. R. R. Tolkien", "title": "The Lord of the Rings", "isbn": "0-395-19395-8", "price": 22.99 }
+//!                 ]),
+//!                 &json!({ "color": "red", "price": 19.95 })
+//!             ]);
 //!
-//!    //
-//!    // $.store.*
-//!    //
-//!    let json = selector("$.store.*").unwrap();
-//!    let ret = json!([
-//!        [
-//!         {"category" : "reference", "author" : "Nigel Rees","title" : "Sayings of the Century", "price" : 8.95},
-//!         {"category" : "fiction", "author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99},
-//!         {"category" : "fiction", "author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99},
-//!         {"category" : "fiction", "author" : "J. R. R. Tolkien","title" : "The Lord of the Rings","isbn" : "0-395-19395-8","price" : 22.99}
-//!        ],
-//!        {"color" : "red","price" : 19.95},
-//!    ]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$.store..price").unwrap(),
+//!             vec![
+//!                 8.95, 12.99, 8.99, 22.99, 19.95
+//!             ]);
 //!
-//!    //
-//!    // $.store..price
-//!    //
-//!    let json = selector("$.store..price").unwrap();
-//!    let ret = json!([8.95, 12.99, 8.99, 22.99, 19.95]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[2]").unwrap(),
+//!             vec![
+//!                 &json!({
+//!                     "category" : "fiction",
+//!                     "author" : "Herman Melville",
+//!                     "title" : "Moby Dick",
+//!                     "isbn" : "0-553-21311-3",
+//!                     "price" : 8.99
+//!                 })
+//!             ]);
 //!
-//!    //
-//!    // $..book[2]
-//!    //
-//!    let json = selector("$..book[2]").unwrap();
-//!    let ret = json!([{
-//!        "category" : "fiction",
-//!        "author" : "Herman Melville",
-//!        "title" : "Moby Dick",
-//!        "isbn" : "0-553-21311-3",
-//!        "price" : 8.99
-//!    }]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[-2]").unwrap(),
+//!             vec![
+//!                 &json!({
+//!                     "category" : "fiction",
+//!                     "author" : "Herman Melville",
+//!                     "title" : "Moby Dick",
+//!                     "isbn" : "0-553-21311-3",
+//!                     "price" : 8.99
+//!                 })
+//!             ]);
 //!
-//!    //
-//!    // $..book[-2]
-//!    //
-//!    let json = selector("$..book[-2]").unwrap();
-//!    let ret = json!([{
-//!        "category" : "fiction",
-//!        "author" : "Herman Melville",
-//!        "title" : "Moby Dick",
-//!        "isbn" : "0-553-21311-3",
-//!        "price" : 8.99
-//!     }]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[0,1]").unwrap(),
+//!             vec![
+//!                 &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+//!                 &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+//!             ]);
 //!
-//!    //
-//!    // $..book[0,1]
-//!    //
-//!    let json = selector("$..book[0,1]").unwrap();
-//!    let ret = json!([
-//!        {"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95},
-//!        {"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99}
-//!    ]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[:2]").unwrap(),
+//!             vec![
+//!                 &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+//!                 &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+//!             ]);
 //!
-//!    //
-//!    // $..book[:2]
-//!    //
-//!    let json = selector("$..book[:2]").unwrap();
-//!    let ret = json!([
-//!        {"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95},
-//!        {"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99}
-//!    ]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[:2]").unwrap(),
+//!             vec![
+//!                 &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+//!                 &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+//!             ]);
 //!
-//!    //
-//!    // $..book[2:]
-//!    //
-//!    let json = selector("$..book[2:]").unwrap();
-//!    let ret = json!([
-//!        {"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99},
-//!        {"category" : "fiction","author" : "J. R. R. Tolkien","title" : "The Lord of the Rings","isbn" : "0-395-19395-8","price" : 22.99}
-//!    ]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$..book[?(@.isbn)]").unwrap(),
+//!             vec![
+//!                 &json!({"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99}),
+//!                 &json!({"category" : "fiction","author" : "J. R. R. Tolkien","title" : "The Lord of the Rings","isbn" : "0-395-19395-8","price" : 22.99})
+//!             ]);
 //!
-//!    //
-//!    // $..book[?(@.isbn)]
-//!    //
-//!    let json = selector("$..book[?(@.isbn)]").unwrap();
-//!    let ret = json!([
-//!        {"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99},
-//!        {"category" : "fiction","author" : "J. R. R. Tolkien","title" : "The Lord of the Rings","isbn" : "0-395-19395-8","price" : 22.99}
-//!    ]);
-//!    assert_eq!(ret, json);
-//!
-//!    //
-//!    // $.store.book[?(@.price < 10)]
-//!    //
-//!    let json = selector("$.store.book[?(@.price < 10)]").unwrap();
-//!    let ret = json!([
-//!        {"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95},
-//!        {"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99}
-//!    ]);
-//!    assert_eq!(ret, json);
+//! assert_eq!(selector("$.store.book[?(@.price < 10)]").unwrap(),
+//!             vec![
+//!                 &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+//!                 &json!({"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99})
+//!             ]);
 //! ```
-
+extern crate array_tool;
 extern crate core;
 extern crate env_logger;
-extern crate indexmap;
 #[macro_use]
 extern crate log;
-#[macro_use]
 extern crate serde;
 extern crate serde_json;
 
-use core::borrow::BorrowMut;
-use std::result;
-
 use serde_json::Value;
 
-#[doc(hidden)]
-pub mod parser;
-#[doc(hidden)]
-pub mod filter;
-#[doc(hidden)]
-pub mod ref_value;
-#[doc(hidden)]
-pub mod select;
+pub use parser::Parser; // TODO private
+pub use select::JsonPathError;
+pub use select::{Selector, SelectorMut};
 
-pub use select::Selector;
+#[doc(hidden)]
+mod ffi;
+#[doc(hidden)]
+mod parser;
+#[doc(hidden)]
+mod select;
 
-/// It is a high-order function. it compile a JsonPath and then returns a function. this return-function can be reused for different JsonObjects.
+/// It is a high-order function. it compile a jsonpath and then returns a closure that has JSON as argument. if you need to reuse a jsonpath, it is good for performance.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
 /// #[macro_use] extern crate serde_json;
 ///
-/// let mut template = jsonpath::compile("$..friends[0]");
+/// let mut first_firend = jsonpath::compile("$..friends[0]");
 ///
 /// let json_obj = json!({
-/// "school": {
-///    "friends": [
-///         {"name": "친구1", "age": 20},
-///         {"name": "친구2", "age": 20}
-///     ]
-/// },
-/// "friends": [
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구4"}
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
 /// ]});
 ///
-/// let json = template(&json_obj).unwrap();
-/// let ret = json!([
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구1", "age": 20}
+/// let json = first_firend(&json_obj).unwrap();
+///
+/// assert_eq!(json, vec![
+///     &json!({"name": "친구3", "age": 30}),
+///     &json!({"name": "친구1", "age": 20})
 /// ]);
-/// assert_eq!(json, ret);
 /// ```
-pub fn compile<'a>(path: &'a str) -> impl FnMut(&Value) -> result::Result<Value, String> + 'a {
-    let mut selector = select::Selector::new();
-    let _ = selector.path(path);
-    let mut selector = Box::new(selector);
-    move |json| {
-        let s: &mut select::Selector = selector.borrow_mut();
-        let _ = s.value(json.into());
-        s.select_to_value()
+pub fn compile(path: &str) -> impl FnMut(&Value) -> Result<Vec<&Value>, JsonPathError> {
+    let node = parser::Parser::compile(path);
+    move |json| match &node {
+        Ok(node) => {
+            let mut selector = Selector::default();
+            selector.compiled_path(node).value(json).select()
+        }
+        Err(e) => Err(JsonPathError::Path(e.to_string())),
     }
 }
 
-/// It is a high-order function that return a function. this return-function has a jsonpath as argument and return a serde_json::value::Value. so you can use different JsonPath for one JsonObject.
+/// It is a high-order function. it returns a closure that has a jsonpath string as argument. you can use diffenent jsonpath for one JSON object.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
 /// #[macro_use] extern crate serde_json;
 ///
 /// let json_obj = json!({
-/// "school": {
-///    "friends": [
-///         {"name": "친구1", "age": 20},
-///         {"name": "친구2", "age": 20}
-///     ]
-/// },
-/// "friends": [
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구4"}
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
 /// ]});
 ///
 /// let mut selector = jsonpath::selector(&json_obj);
 ///
 /// let json = selector("$..friends[0]").unwrap();
-/// let ret = json!([
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구1", "age": 20}
+///
+/// assert_eq!(json, vec![
+///     &json!({"name": "친구3", "age": 30}),
+///     &json!({"name": "친구1", "age": 20})
 /// ]);
-/// assert_eq!(json, ret);
 ///
 /// let json = selector("$..friends[1]").unwrap();
-/// let ret = json!([
-///     {"name": "친구4"},
-///     {"name": "친구2", "age": 20}
+///
+/// assert_eq!(json, vec![
+///     &json!({"name": "친구4"}),
+///     &json!({"name": "친구2", "age": 20})
 /// ]);
-/// assert_eq!(json, ret);
 /// ```
-pub fn selector<'a>(json: &Value) -> impl FnMut(&'a str) -> result::Result<Value, String> {
-    let mut selector = select::Selector::new();
-    let _ = selector.value(json.into());
-    let mut selector = Box::new(selector);
-    move |path: &'a str| {
-        let s: &mut select::Selector = selector.borrow_mut();
-        s.path(path)?.select_to_value()
-    }
+#[allow(clippy::needless_lifetimes)]
+pub fn selector<'a>(json: &'a Value) -> impl FnMut(&str) -> Result<Vec<&'a Value>, JsonPathError> {
+    let mut selector = Selector::default();
+    let _ = selector.value(json);
+    move |path: &str| selector.str_path(path)?.reset_value().select()
 }
 
-/// It is a high-order function that returns a function. this return-function has a jsonpath as argument and return a serde::Deserialize. so you can use different JsonPath for one JsonObject.
+/// It is the same to `selector` function. but it deserialize the result as given type `T`.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
@@ -275,26 +232,27 @@ pub fn selector<'a>(json: &Value) -> impl FnMut(&'a str) -> result::Result<Value
 /// use serde::{Deserialize, Serialize};
 ///
 /// let json_obj = json!({
-/// "school": {
-///    "friends": [
-///         {"name": "친구1", "age": 20},
-///         {"name": "친구2", "age": 20}
-///     ]
-/// },
-/// "friends": [
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구4"}
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
 /// ]});
 ///
-/// #[derive(Serialize, Deserialize, PartialEq, Debug)]
+/// #[derive(Deserialize, PartialEq, Debug)]
 /// struct Friend {
 ///     name: String,
 ///     age: Option<u8>,
 /// }
 ///
-/// let mut selector = jsonpath::selector_as::<Vec<Friend>>(&json_obj);
+/// let mut selector = jsonpath::selector_as::<Friend>(&json_obj);
 ///
 /// let json = selector("$..friends[0]").unwrap();
+///
 /// let ret = vec!(
 ///     Friend { name: "친구3".to_string(), age: Some(30) },
 ///     Friend { name: "친구1".to_string(), age: Some(20) }
@@ -302,67 +260,52 @@ pub fn selector<'a>(json: &Value) -> impl FnMut(&'a str) -> result::Result<Value
 /// assert_eq!(json, ret);
 ///
 /// let json = selector("$..friends[1]").unwrap();
+///
 /// let ret = vec!(
 ///     Friend { name: "친구4".to_string(), age: None },
 ///     Friend { name: "친구2".to_string(), age: Some(20) }
 /// );
+///
 /// assert_eq!(json, ret);
 /// ```
-pub fn selector_as<T: serde::de::DeserializeOwned>(json: &Value) -> impl FnMut(&str) -> result::Result<T, String> {
-    let mut selector = select::Selector::new();
-    let _ = selector.value(json.into());
-    move |path: &str| {
-        selector.path(path)?.select_to()
-    }
+pub fn selector_as<T: serde::de::DeserializeOwned>(
+    json: &Value,
+) -> impl FnMut(&str) -> Result<Vec<T>, JsonPathError> + '_ {
+    let mut selector = Selector::default();
+    let _ = selector.value(json);
+    move |path: &str| selector.str_path(path)?.reset_value().select_as()
 }
 
-#[deprecated(since = "0.1.4", note = "Please use the selector function instead")]
-pub fn reader<'a>(json: &Value) -> impl FnMut(&'a str) -> result::Result<Value, String> {
-    selector(json)
-}
-
-/// This function compile a jsonpath everytime and it convert `serde_json's Value` to `jsonpath's RefValue` everytime and then it return a `serde_json::value::Value`.
+/// It is a simple select function. but it compile the jsonpath argument every time.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
 /// #[macro_use] extern crate serde_json;
 ///
 /// let json_obj = json!({
-/// "school": {
-///    "friends": [
-///         {"name": "친구1", "age": 20},
-///         {"name": "친구2", "age": 20}
-///     ]
-/// },
-/// "friends": [
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구4"}
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
 /// ]});
 ///
 /// let json = jsonpath::select(&json_obj, "$..friends[0]").unwrap();
 ///
-/// let ret = json!([
-///     {"name": "친구3", "age": 30},
-///     {"name": "친구1", "age": 20}
+/// assert_eq!(json, vec![
+///     &json!({"name": "친구3", "age": 30}),
+///     &json!({"name": "친구1", "age": 20})
 /// ]);
-/// assert_eq!(json, ret);
 /// ```
-pub fn select(json: &Value, path: &str) -> result::Result<Value, String> {
-    let mut selector = select::Selector::new();
-    selector.path(path)?.value(json.into())?.select_to_value()
+pub fn select<'a>(json: &'a Value, path: &str) -> Result<Vec<&'a Value>, JsonPathError> {
+    Selector::default().str_path(path)?.value(json).select()
 }
 
-#[deprecated(since = "0.1.4", note = "Please use the select function instead")]
-pub fn read(json: &Value, path: &str) -> result::Result<Value, String> {
-    select(json, path)
-}
-
-#[deprecated(since = "0.1.7", note = "Please use the select_as_str function instead")]
-pub fn select_str(json: &str, path: &str) -> result::Result<String, String> {
-    select_as_str(json, path)
-}
-
-/// This function compile a jsonpath everytime and it convert `&str` to `jsonpath's RefValue` everytime and then it return a json string.
+/// It is the same to `select` function but it return the result as string.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
@@ -385,14 +328,13 @@ pub fn select_str(json: &str, path: &str) -> result::Result<String, String> {
 ///
 /// assert_eq!(ret, r#"[{"name":"친구3","age":30},{"name":"친구1","age":20}]"#);
 /// ```
-pub fn select_as_str(json: &str, path: &str) -> result::Result<String, String> {
-    select::Selector::new()
-        .path(path)?
-        .value_from_str(json)?
-        .select_to_str()
+pub fn select_as_str(json_str: &str, path: &str) -> Result<String, JsonPathError> {
+    let json = serde_json::from_str(json_str).map_err(|e| JsonPathError::Serde(e.to_string()))?;
+    let ret = Selector::default().str_path(path)?.value(&json).select()?;
+    serde_json::to_string(&ret).map_err(|e| JsonPathError::Serde(e.to_string()))
 }
 
-/// This function compile a jsonpath everytime and it convert `&str` to `jsonpath's RefValue` everytime and then it return a deserialized-instance of type `T`.
+/// It is the same to `select` function but it deserialize the the result as given type `T`.
 ///
 /// ```rust
 /// extern crate jsonpath_lib as jsonpath;
@@ -408,7 +350,7 @@ pub fn select_as_str(json: &str, path: &str) -> result::Result<String, String> {
 ///     phones: Vec<String>,
 /// }
 ///
-/// let ret: Person = jsonpath::select_as(r#"
+/// let ret: Vec<Person> = jsonpath::select_as(r#"
 /// {
 ///     "person":
 ///         {
@@ -428,11 +370,101 @@ pub fn select_as_str(json: &str, path: &str) -> result::Result<String, String> {
 ///     phones: vec!["+44 1234567".to_string(), "+44 2345678".to_string()],
 /// };
 ///
-/// assert_eq!(person, ret);
+/// assert_eq!(ret[0], person);
 /// ```
-pub fn select_as<T: serde::de::DeserializeOwned>(json: &str, path: &str) -> result::Result<T, String> {
-    select::Selector::new()
-        .path(path)?
-        .value_from_str(json)?
-        .select_to()
-}
+pub fn select_as<T: serde::de::DeserializeOwned>(
+    json_str: &str,
+    path: &str,
+) -> Result<Vec<T>, JsonPathError> {
+    let json = serde_json::from_str(json_str).map_err(|e| JsonPathError::Serde(e.to_string()))?;
+    Selector::default().str_path(path)?.value(&json).select_as()
+}
+
+/// Delete(= replace with null) the JSON property using the jsonpath.
+///
+/// ```rust
+/// extern crate jsonpath_lib as jsonpath;
+/// #[macro_use] extern crate serde_json;
+///
+/// let json_obj = json!({
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
+/// ]});
+///
+/// let ret = jsonpath::delete(json_obj, "$..[?(20 == @.age)]").unwrap();
+///
+/// assert_eq!(ret, json!({
+///     "school": {
+///         "friends": [
+///             null,
+///             null
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
+/// ]}));
+/// ```
+pub fn delete(value: Value, path: &str) -> Result<Value, JsonPathError> {
+    let mut selector = SelectorMut::default();
+    let value = selector.str_path(path)?.value(value).delete()?;
+    Ok(value.take().unwrap_or(Value::Null))
+}
+
+/// Select JSON properties using a jsonpath and transform the result and then replace it. via closure that implements `FnMut` you can transform the selected results.
+///
+/// ```rust
+/// extern crate jsonpath_lib as jsonpath;
+/// #[macro_use] extern crate serde_json;
+///
+/// use serde_json::Value;
+///
+/// let json_obj = json!({
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 20},
+///             {"name": "친구2", "age": 20}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
+/// ]});
+///
+/// let ret = jsonpath::replace_with(json_obj, "$..[?(@.age == 20)].age", &mut |v| {
+///     let age = if let Value::Number(n) = v {
+///         n.as_u64().unwrap() * 2
+///     } else {
+///         0
+///     };
+///
+///     Some(json!(age))
+/// }).unwrap();
+///
+/// assert_eq!(ret, json!({
+///     "school": {
+///         "friends": [
+///             {"name": "친구1", "age": 40},
+///             {"name": "친구2", "age": 40}
+///         ]
+///     },
+///     "friends": [
+///         {"name": "친구3", "age": 30},
+///         {"name": "친구4"}
+/// ]}));
+/// ```
+pub fn replace_with<F>(value: Value, path: &str, fun: &mut F) -> Result<Value, JsonPathError>
+where
+    F: FnMut(Value) -> Option<Value>,
+{
+    let mut selector = SelectorMut::default();
+    let value = selector.str_path(path)?.value(value).replace_with(fun)?;
+    Ok(value.take().unwrap_or(Value::Null))
+}

src/parser/parser.rs

@@ -1,677 +0,0 @@
-use std::result::Result;
-
-use super::tokenizer::*;
-
-const DUMMY: usize = 0;
-
-type ParseResult<T> = Result<T, String>;
-
-mod utils {
-
-    pub fn string_to_isize<F>(string: &String, msg_handler: F) -> Result<isize, String>
-        where F: Fn() -> String {
-        match string.as_str().parse::<isize>() {
-            Ok(n) => Ok(n),
-            _ => Err(msg_handler())
-        }
-    }
-
-    pub fn string_to_f64<F>(string: &String, msg_handler: F) -> Result<f64, String>
-        where F: Fn() -> String {
-        match string.as_str().parse::<f64>() {
-            Ok(n) => Ok(n),
-            _ => Err(msg_handler())
-        }
-    }
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum ParseToken {
-    // '$'
-    Absolute,
-    // '@'
-    Relative,
-    // '.'
-    In,
-    // '..'
-    Leaves,
-    // '*'
-    All,
-
-    Key(String),
-    // []
-    Array,
-    // 메타토큰
-    ArrayEof,
-    // ?( filter )
-    Filter(FilterToken),
-    // 1 : 2
-    Range(Option<isize>, Option<isize>),
-    // 1, 2, 3
-    Union(Vec<isize>),
-
-    Number(f64),
-
-    Eof,
-}
-
-#[derive(Debug, PartialEq, Clone)]
-pub enum FilterToken {
-    Equal,
-    NotEqual,
-    Little,
-    LittleOrEqual,
-    Greater,
-    GreaterOrEqual,
-    And,
-    Or,
-}
-
-#[derive(Debug, Clone)]
-pub struct Node {
-    left: Option<Box<Node>>,
-    right: Option<Box<Node>>,
-    token: ParseToken,
-}
-
-pub struct Parser<'a> {
-    tokenizer: PreloadedTokenizer<'a>
-}
-
-impl<'a> Parser<'a> {
-    pub fn new(input: &'a str) -> Self {
-        Parser { tokenizer: PreloadedTokenizer::new(input) }
-    }
-
-    pub fn compile(&mut self) -> ParseResult<Node> {
-        Ok(self.json_path()?)
-    }
-
-    pub fn parse<V: NodeVisitor>(&mut self, visitor: &mut V) -> ParseResult<()> {
-        let node = self.json_path()?;
-        visitor.visit(node);
-        Ok(())
-    }
-
-    fn json_path(&mut self) -> ParseResult<Node> {
-        debug!("#json_path");
-        match self.tokenizer.next_token() {
-            Ok(Token::Absolute(_)) => {
-                let node = self.node(ParseToken::Absolute);
-                self.paths(node)
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn paths(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#paths");
-        match self.tokenizer.peek_token() {
-            Ok(Token::Dot(_)) => {
-                self.eat_token();
-                self.paths_dot(prev)
-            }
-            Ok(Token::OpenArray(_)) => {
-                self.eat_token();
-                self.eat_whitespace();
-                let node = self.array(prev)?;
-                self.paths(node)
-            }
-            _ => {
-                Ok(prev)
-            }
-        }
-    }
-
-    fn paths_dot(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#paths_dot");
-        let node = self.path(prev)?;
-        match self.tokenizer.peek_token() {
-            Ok(Token::Equal(_))
-            | Ok(Token::NotEqual(_))
-            | Ok(Token::Little(_))
-            | Ok(Token::LittleOrEqual(_))
-            | Ok(Token::Greater(_))
-            | Ok(Token::GreaterOrEqual(_))
-            | Ok(Token::And(_))
-            | Ok(Token::Or(_)) => {
-                Ok(node)
-            }
-            _ => {
-                self.paths(node)
-            }
-        }
-    }
-
-    fn path(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path");
-        match self.tokenizer.peek_token() {
-            Ok(Token::Dot(_)) => {
-                self.path_leaves(prev)
-            }
-            Ok(Token::Asterisk(_)) => {
-                self.path_in_all(prev)
-            }
-            Ok(Token::Key(_, _)) => {
-                self.path_in_key(prev)
-            }
-            Ok(Token::OpenArray(_)) => {
-                self.eat_token();
-                self.array(prev)
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn path_leaves(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path_leaves");
-        self.eat_token();
-        match self.tokenizer.peek_token() {
-            Ok(Token::Asterisk(_)) => {
-                self.path_leaves_all(prev)
-            }
-            Ok(Token::OpenArray(_)) => {
-                let mut leaves_node = self.node(ParseToken::Leaves);
-                leaves_node.left = Some(Box::new(prev));
-                Ok(self.paths(leaves_node)?)
-            }
-            _ => {
-                self.path_leaves_key(prev)
-            }
-        }
-    }
-
-    fn path_leaves_key(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path_leaves_key");
-        Ok(Node {
-            token: ParseToken::Leaves,
-            left: Some(Box::new(prev)),
-            right: Some(Box::new(self.key()?)),
-        })
-    }
-
-    fn path_leaves_all(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path_leaves_all");
-        self.eat_token();
-        Ok(Node {
-            token: ParseToken::Leaves,
-            left: Some(Box::new(prev)),
-            right: Some(Box::new(self.node(ParseToken::All))),
-        })
-    }
-
-    fn path_in_all(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path_in_all");
-        self.eat_token();
-        Ok(Node {
-            token: ParseToken::In,
-            left: Some(Box::new(prev)),
-            right: Some(Box::new(self.node(ParseToken::All))),
-        })
-    }
-
-    fn path_in_key(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#path_in_key");
-        Ok(Node {
-            token: ParseToken::In,
-            left: Some(Box::new(prev)),
-            right: Some(Box::new(self.key()?)),
-        })
-    }
-
-    fn key(&mut self) -> ParseResult<Node> {
-        debug!("#key");
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(_, v)) => {
-                Ok(self.node(ParseToken::Key(v)))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn array_quota_value(&mut self) -> ParseResult<Node> {
-        debug!("#array_quota_value");
-        match self.tokenizer.next_token() {
-            Ok(Token::SingleQuoted(_, val))
-            | Ok(Token::DoubleQuoted(_, val)) => {
-                Ok(self.node(ParseToken::Key(val)))
-            }
-            Err(TokenError::Eof) => {
-                Ok(self.node(ParseToken::Eof))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn array_start(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#array_start");
-        match self.tokenizer.peek_token() {
-            Ok(Token::Question(_)) => {
-                self.eat_token();
-                Ok(Node {
-                    token: ParseToken::Array,
-                    left: Some(Box::new(prev)),
-                    right: Some(Box::new(self.filter()?)),
-                })
-            }
-            Ok(Token::Asterisk(_)) => {
-                self.eat_token();
-                Ok(Node {
-                    token: ParseToken::Array,
-                    left: Some(Box::new(prev)),
-                    right: Some(Box::new(self.node(ParseToken::All))),
-                })
-            }
-            _ => {
-                Ok(Node {
-                    token: ParseToken::Array,
-                    left: Some(Box::new(prev)),
-                    right: Some(Box::new(self.array_value()?)),
-                })
-            }
-        }
-    }
-
-    fn array(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#array");
-        let ret = self.array_start(prev)?;
-        self.eat_whitespace();
-        self.close_token(ret, Token::CloseArray(DUMMY))
-    }
-
-    fn array_value_key(&mut self) -> ParseResult<Node> {
-        debug!("#array_value_key");
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(pos, ref val)) => {
-                let digit = utils::string_to_isize(val, || self.tokenizer.err_msg_with_pos(pos))?;
-                self.eat_whitespace();
-
-                match self.tokenizer.peek_token() {
-                    Ok(Token::Comma(_)) => {
-                        self.union(digit)
-                    }
-                    Ok(Token::Split(_)) => {
-                        self.range_from(digit)
-                    }
-                    _ => {
-                        Ok(self.node(ParseToken::Number(digit as f64)))
-                    }
-                }
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-
-    fn array_value(&mut self) -> ParseResult<Node> {
-        debug!("#array_value");
-        match self.tokenizer.peek_token() {
-            Ok(Token::Key(_, _)) => {
-                self.array_value_key()
-            }
-            Ok(Token::Split(_)) => {
-                self.eat_token();
-                self.range_to()
-            }
-            Ok(Token::DoubleQuoted(_, _))
-            | Ok(Token::SingleQuoted(_, _)) => {
-                self.array_quota_value()
-            }
-            Err(TokenError::Eof) => {
-                Ok(self.node(ParseToken::Eof))
-            }
-            _ => {
-                self.eat_token();
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn union(&mut self, num: isize) -> ParseResult<Node> {
-        debug!("#union");
-        let mut values = vec![num];
-        while match self.tokenizer.peek_token() {
-            Ok(Token::Comma(_)) => true,
-            _ => false
-        } {
-            self.eat_token();
-            self.eat_whitespace();
-            match self.tokenizer.next_token() {
-                Ok(Token::Key(pos, ref val)) => {
-                    let digit = utils::string_to_isize(val, || self.tokenizer.err_msg_with_pos(pos))?;
-                    values.push(digit);
-                }
-                _ => {
-                    return Err(self.tokenizer.err_msg());
-                }
-            }
-        }
-        Ok(self.node(ParseToken::Union(values)))
-    }
-
-    fn range_from(&mut self, num: isize) -> ParseResult<Node> {
-        debug!("#range_from");
-        self.eat_token();
-        self.eat_whitespace();
-        match self.tokenizer.peek_token() {
-            Ok(Token::Key(_, _)) => {
-                self.range(num)
-            }
-            _ => {
-                Ok(self.node(ParseToken::Range(Some(num), None)))
-            }
-        }
-    }
-
-    fn range_to(&mut self) -> ParseResult<Node> {
-        debug!("#range_to");
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(pos, ref val)) => {
-                let digit = utils::string_to_isize(val, || self.tokenizer.err_msg_with_pos(pos))?;
-                Ok(self.node(ParseToken::Range(None, Some(digit))))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn range(&mut self, num: isize) -> ParseResult<Node> {
-        debug!("#range");
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(pos, ref val)) => {
-                let digit = utils::string_to_isize(val, || self.tokenizer.err_msg_with_pos(pos))?;
-                Ok(self.node(ParseToken::Range(Some(num), Some(digit))))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn filter(&mut self) -> ParseResult<Node> {
-        debug!("#filter");
-        match self.tokenizer.next_token() {
-            Ok(Token::OpenParenthesis(_)) => {
-                let ret = self.exprs()?;
-                self.eat_whitespace();
-                self.close_token(ret, Token::CloseParenthesis(DUMMY))
-            }
-            Err(TokenError::Eof) => {
-                Ok(self.node(ParseToken::Eof))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn exprs(&mut self) -> ParseResult<Node> {
-        self.eat_whitespace();
-        debug!("#exprs");
-        let node = match self.tokenizer.peek_token() {
-            Ok(Token::OpenParenthesis(_)) => {
-                self.eat_token();
-                trace!("\t-exprs - open_parenthesis");
-                let ret = self.exprs()?;
-                self.eat_whitespace();
-                self.close_token(ret, Token::CloseParenthesis(DUMMY))?
-            }
-            _ => {
-                trace!("\t-exprs - else");
-                self.expr()?
-            }
-        };
-        self.eat_whitespace();
-        self.condition_expr(node)
-    }
-
-    fn condition_expr(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#condition_expr");
-        match self.tokenizer.peek_token() {
-            Ok(Token::And(_)) => {
-                self.eat_token();
-                Ok(Node {
-                    token: ParseToken::Filter(FilterToken::And),
-                    left: Some(Box::new(prev)),
-                    right: Some(Box::new(self.exprs()?)),
-                })
-            }
-            Ok(Token::Or(_)) => {
-                self.eat_token();
-                Ok(Node {
-                    token: ParseToken::Filter(FilterToken::Or),
-                    left: Some(Box::new(prev)),
-                    right: Some(Box::new(self.exprs()?)),
-                })
-            }
-            _ => {
-                Ok(prev)
-            }
-        }
-    }
-
-    fn expr(&mut self) -> ParseResult<Node> {
-        debug!("#expr");
-
-        let has_prop_candidate = match self.tokenizer.peek_token() {
-            Ok(Token::At(_)) => true,
-            _ => false
-        };
-
-        let node = self.term()?;
-        self.eat_whitespace();
-
-        if match self.tokenizer.peek_token() {
-            Ok(Token::Equal(_))
-            | Ok(Token::NotEqual(_))
-            | Ok(Token::Little(_))
-            | Ok(Token::LittleOrEqual(_))
-            | Ok(Token::Greater(_))
-            | Ok(Token::GreaterOrEqual(_)) => true,
-            _ => false
-        } {
-            self.op(node)
-        } else if has_prop_candidate {
-            Ok(node)
-        } else {
-            return Err(self.tokenizer.err_msg());
-        }
-    }
-
-    fn term_num(&mut self) -> ParseResult<Node> {
-        debug!("#term_num");
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(pos, val)) => {
-                match self.tokenizer.peek_token() {
-                    Ok(Token::Dot(_)) => {
-                        self.term_num_float(val.as_str())
-                    }
-                    _ => {
-                        let number = utils::string_to_f64(&val, || self.tokenizer.err_msg_with_pos(pos))?;
-                        Ok(self.node(ParseToken::Number(number)))
-                    }
-                }
-            }
-            Err(TokenError::Eof) => {
-                Ok(self.node(ParseToken::Eof))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn term_num_float(&mut self, mut num: &str) -> ParseResult<Node> {
-        debug!("#term_num_float");
-        self.eat_token();
-        match self.tokenizer.next_token() {
-            Ok(Token::Key(pos, frac)) => {
-                let mut f = String::new();
-                f.push_str(&mut num);
-                f.push('.');
-                f.push_str(frac.as_str());
-                let number = utils::string_to_f64(&f, || self.tokenizer.err_msg_with_pos(pos))?;
-                Ok(self.node(ParseToken::Number(number)))
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn term(&mut self) -> ParseResult<Node> {
-        debug!("#term");
-        match self.tokenizer.peek_token() {
-            Ok(Token::At(_)) => {
-                self.eat_token();
-                let node = self.node(ParseToken::Relative);
-
-                match self.tokenizer.peek_token() {
-                    Ok(Token::Whitespace(_, _)) => {
-                        self.eat_whitespace();
-                        Ok(node)
-                    }
-                    _ => {
-                        self.paths(node)
-                    }
-                }
-            }
-            Ok(Token::Absolute(_)) => {
-                self.json_path()
-            }
-            Ok(Token::DoubleQuoted(_, _))
-            | Ok(Token::SingleQuoted(_, _)) => {
-                self.array_quota_value()
-            }
-            Ok(Token::Key(_, _)) => {
-                self.term_num()
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-
-    fn op(&mut self, prev: Node) -> ParseResult<Node> {
-        debug!("#op");
-        let token = match self.tokenizer.next_token() {
-            Ok(Token::Equal(_)) => {
-                ParseToken::Filter(FilterToken::Equal)
-            }
-            Ok(Token::NotEqual(_)) => {
-                ParseToken::Filter(FilterToken::NotEqual)
-            }
-            Ok(Token::Little(_)) => {
-                ParseToken::Filter(FilterToken::Little)
-            }
-            Ok(Token::LittleOrEqual(_)) => {
-                ParseToken::Filter(FilterToken::LittleOrEqual)
-            }
-            Ok(Token::Greater(_)) => {
-                ParseToken::Filter(FilterToken::Greater)
-            }
-            Ok(Token::GreaterOrEqual(_)) => {
-                ParseToken::Filter(FilterToken::GreaterOrEqual)
-            }
-            Err(TokenError::Eof) => {
-                ParseToken::Eof
-            }
-            _ => {
-                return Err(self.tokenizer.err_msg());
-            }
-        };
-
-        self.eat_whitespace();
-
-        Ok(Node {
-            token,
-            left: Some(Box::new(prev)),
-            right: Some(Box::new(self.term()?)),
-        })
-    }
-
-    fn eat_whitespace(&mut self) {
-        while let Ok(Token::Whitespace(_, _)) = self.tokenizer.peek_token() {
-            let _ = self.tokenizer.next_token();
-        }
-    }
-
-    fn eat_token(&mut self) {
-        let _ = self.tokenizer.next_token();
-    }
-
-    fn node(&mut self, token: ParseToken) -> Node {
-        Node { left: None, right: None, token: token }
-    }
-
-    fn close_token(&mut self, ret: Node, token: Token) -> ParseResult<Node> {
-        debug!("#close_token");
-        match self.tokenizer.next_token() {
-            Ok(ref t) if t.partial_eq(token) => {
-                Ok(ret)
-            }
-            _ => {
-                Err(self.tokenizer.err_msg())
-            }
-        }
-    }
-}
-
-pub trait NodeVisitor {
-    fn visit(&mut self, node: Node) {
-        match node.token {
-            ParseToken::Absolute
-            | ParseToken::Relative
-            | ParseToken::All
-            | ParseToken::Key(_) => {
-                self.visit_token(node.token);
-            }
-            ParseToken::In
-            | ParseToken::Leaves => {
-                node.left.map(|n| self.visit(*n));
-                self.visit_token(node.token);
-                node.right.map(|n| self.visit(*n));
-            }
-            | ParseToken::Range(_, _)
-            | ParseToken::Union(_)
-            | ParseToken::Number(_) => {
-                self.visit_token(node.token);
-            }
-
-            | ParseToken::Array => {
-                node.left.map(|n| self.visit(*n));
-                self.visit_token(node.token);
-                node.right.map(|n| self.visit(*n));
-                self.visit_token(ParseToken::ArrayEof);
-            }
-            ParseToken::Filter(FilterToken::And)
-            | ParseToken::Filter(FilterToken::Or) => {
-                node.left.map(|n| self.visit(*n));
-                node.right.map(|n| self.visit(*n));
-                self.visit_token(node.token);
-            }
-            ParseToken::Filter(_) => {
-                node.left.map(|n| self.visit(*n));
-                self.end_term();
-                node.right.map(|n| self.visit(*n));
-                self.end_term();
-                self.visit_token(node.token);
-            }
-            _ => {}
-        }
-    }
-
-    fn visit_token(&mut self, token: ParseToken);
-    fn end_term(&mut self) {}
-}

src/parser/path_reader.rs

@@ -12,10 +12,7 @@ pub struct PathReader<'a> {
 
 impl<'a> PathReader<'a> {
     pub fn new(input: &'a str) -> Self {
-        PathReader {
-            input,
-            pos: 0,
-        }
+        PathReader { input, pos: 0 }
     }
 
     pub fn peek_char(&self) -> Result<(usize, char), ReaderError> {
@@ -24,8 +21,8 @@ impl<'a> PathReader<'a> {
     }
 
     pub fn take_while<F>(&mut self, fun: F) -> Result<(usize, String), ReaderError>
-        where
-            F: Fn(&char) -> bool
+    where
+        F: Fn(&char) -> bool,
     {
         let mut char_len: usize = 0;
         let mut ret = String::new();
@@ -53,4 +50,4 @@ impl<'a> PathReader<'a> {
     pub fn current_pos(&self) -> usize {
         self.pos
     }
-}
+}

src/parser/tokenizer.rs

@@ -1,31 +1,30 @@
-use std::io::Write;
 use std::result::Result;
 
 use super::path_reader::{PathReader, ReaderError};
 
-const ABSOLUTE: &'static str = "$";
-const DOT: &'static str = ".";
-const AT: &'static str = "@";
-const OPEN_ARRAY: &'static str = "[";
-const CLOSE_ARRAY: &'static str = "]";
-const ASTERISK: &'static str = "*";
-const QUESTION: &'static str = "?";
-const COMMA: &'static str = ",";
-const SPLIT: &'static str = ":";
-const OPEN_PARENTHESIS: &'static str = "(";
-const CLOSE_PARENTHESIS: &'static str = ")";
-const KEY: &'static str = "Key";
-const DOUBLE_QUOTA: &'static str = "\"";
-const SINGLE_QUOTA: &'static str = "'";
-const EQUAL: &'static str = "==";
-const GREATER_OR_EQUAL: &'static str = ">=";
-const GREATER: &'static str = ">";
-const LITTLE: &'static str = "<";
-const LITTLE_OR_EQUAL: &'static str = "<=";
-const NOT_EQUAL: &'static str = "!=";
-const AND: &'static str = "&&";
-const OR: &'static str = "||";
-const WHITESPACE: &'static str = " ";
+pub const ABSOLUTE: &str = "$";
+pub const DOT: &str = ".";
+pub const AT: &str = "@";
+pub const OPEN_ARRAY: &str = "[";
+pub const CLOSE_ARRAY: &str = "]";
+pub const ASTERISK: &str = "*";
+pub const QUESTION: &str = "?";
+pub const COMMA: &str = ",";
+pub const SPLIT: &str = ":";
+pub const OPEN_PARENTHESIS: &str = "(";
+pub const CLOSE_PARENTHESIS: &str = ")";
+pub const KEY: &str = "Key";
+pub const DOUBLE_QUOTE: &str = "\"";
+pub const SINGLE_QUOTE: &str = "'";
+pub const EQUAL: &str = "==";
+pub const GREATER_OR_EQUAL: &str = ">=";
+pub const GREATER: &str = ">";
+pub const LITTLE: &str = "<";
+pub const LITTLE_OR_EQUAL: &str = "<=";
+pub const NOT_EQUAL: &str = "!=";
+pub const AND: &str = "&&";
+pub const OR: &str = "||";
+pub const WHITESPACE: &str = " ";
 
 const CH_DOLLA: char = '$';
 const CH_DOT: char = '.';
@@ -44,8 +43,8 @@ const CH_PIPE: char = '|';
 const CH_LITTLE: char = '<';
 const CH_GREATER: char = '>';
 const CH_EXCLAMATION: char = '!';
-const CH_SINGLE_QUOTA: char = '\'';
-const CH_DOUBLE_QUOTA: char = '"';
+const CH_SINGLE_QUOTE: char = '\'';
+const CH_DOUBLE_QUOTE: char = '"';
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum TokenError {
@@ -55,7 +54,7 @@ pub enum TokenError {
 
 fn to_token_error(read_err: ReaderError) -> TokenError {
     match read_err {
-        ReaderError::Eof => TokenError::Eof
+        ReaderError::Eof => TokenError::Eof,
     }
 }
 
@@ -91,6 +90,11 @@ impl Token {
         self.to_simple() == other.to_simple()
     }
 
+    pub fn simple_eq(&self, str_token: &str) -> bool {
+        self.to_simple() == str_token
+    }
+
+    #[cfg_attr(tarpaulin, skip)]
     fn to_simple(&self) -> &'static str {
         match self {
             Token::Absolute(_) => ABSOLUTE,
@@ -105,8 +109,8 @@ impl Token {
             Token::OpenParenthesis(_) => OPEN_PARENTHESIS,
             Token::CloseParenthesis(_) => CLOSE_PARENTHESIS,
             Token::Key(_, _) => KEY,
-            Token::DoubleQuoted(_, _) => DOUBLE_QUOTA,
-            Token::SingleQuoted(_, _) => SINGLE_QUOTA,
+            Token::DoubleQuoted(_, _) => DOUBLE_QUOTE,
+            Token::SingleQuoted(_, _) => SINGLE_QUOTE,
             Token::Equal(_) => EQUAL,
             Token::GreaterOrEqual(_) => GREATER_OR_EQUAL,
             Token::Greater(_) => GREATER,
@@ -115,7 +119,7 @@ impl Token {
             Token::NotEqual(_) => NOT_EQUAL,
             Token::And(_) => AND,
             Token::Or(_) => OR,
-            Token::Whitespace(_, _) => WHITESPACE
+            Token::Whitespace(_, _) => WHITESPACE,
         }
     }
 }
@@ -133,7 +137,7 @@ fn simple_matched_token(ch: char, pos: usize) -> Option<Token> {
         CH_QUESTION => Some(Token::Question(pos)),
         CH_COMMA => Some(Token::Comma(pos)),
         CH_SEMICOLON => Some(Token::Split(pos)),
-        _ => None
+        _ => None,
     }
 }
 
@@ -143,20 +147,42 @@ pub struct Tokenizer<'a> {
 
 impl<'a> Tokenizer<'a> {
     pub fn new(input: &'a str) -> Self {
+        trace!("input: {}", input);
         Tokenizer {
             input: PathReader::new(input),
         }
     }
 
-    fn single_quota(&mut self, pos: usize, ch: char) -> Result<Token, TokenError> {
-        let (_, val) = self.input.take_while(|c| *c != ch).map_err(to_token_error)?;
-        self.input.next_char().map_err(to_token_error)?;
+    fn quote(&mut self, ch: char) -> Result<String, TokenError> {
+        let (_, mut val) = self
+            .input
+            .take_while(|c| *c != ch)
+            .map_err(to_token_error)?;
+
+        if let Some('\\') = val.chars().last() {
+            self.input.next_char().map_err(to_token_error)?;
+            let _ = val.pop();
+            let (_, val_remain) = self
+                .input
+                .take_while(|c| *c != ch)
+                .map_err(to_token_error)?;
+            self.input.next_char().map_err(to_token_error)?;
+            val.push(ch);
+            val.push_str(val_remain.as_str());
+        } else {
+            self.input.next_char().map_err(to_token_error)?;
+        }
+
+        Ok(val)
+    }
+
+    fn single_quote(&mut self, pos: usize, ch: char) -> Result<Token, TokenError> {
+        let val = self.quote(ch)?;
         Ok(Token::SingleQuoted(pos, val))
     }
 
-    fn double_quota(&mut self, pos: usize, ch: char) -> Result<Token, TokenError> {
-        let (_, val) = self.input.take_while(|c| *c != ch).map_err(to_token_error)?;
-        self.input.next_char().map_err(to_token_error)?;
+    fn double_quote(&mut self, pos: usize, ch: char) -> Result<Token, TokenError> {
+        let val = self.quote(ch)?;
         Ok(Token::DoubleQuoted(pos, val))
     }
 
@@ -167,7 +193,7 @@ impl<'a> Tokenizer<'a> {
                 self.input.next_char().map_err(to_token_error)?;
                 Ok(Token::Equal(pos))
             }
-            _ => Err(TokenError::Position(pos))
+            _ => Err(TokenError::Position(pos)),
         }
     }
 
@@ -178,7 +204,7 @@ impl<'a> Tokenizer<'a> {
                 self.input.next_char().map_err(to_token_error)?;
                 Ok(Token::NotEqual(pos))
             }
-            _ => Err(TokenError::Position(pos))
+            _ => Err(TokenError::Position(pos)),
         }
     }
 
@@ -211,7 +237,7 @@ impl<'a> Tokenizer<'a> {
                 let _ = self.input.next_char().map_err(to_token_error);
                 Ok(Token::And(pos))
             }
-            _ => Err(TokenError::Position(pos))
+            _ => Err(TokenError::Position(pos)),
         }
     }
 
@@ -222,27 +248,31 @@ impl<'a> Tokenizer<'a> {
                 self.input.next_char().map_err(to_token_error)?;
                 Ok(Token::Or(pos))
             }
-            _ => Err(TokenError::Position(pos))
+            _ => Err(TokenError::Position(pos)),
         }
     }
 
     fn whitespace(&mut self, pos: usize, _: char) -> Result<Token, TokenError> {
-        let (_, vec) = self.input.take_while(|c| c.is_whitespace()).map_err(to_token_error)?;
+        let (_, vec) = self
+            .input
+            .take_while(|c| c.is_whitespace())
+            .map_err(to_token_error)?;
         Ok(Token::Whitespace(pos, vec.len()))
     }
 
     fn other(&mut self, pos: usize, ch: char) -> Result<Token, TokenError> {
-        let fun = |c: &char| {
-            match simple_matched_token(*c, pos) {
-                Some(_) => false,
-                _ if c == &CH_LITTLE
-                    || c == &CH_GREATER
-                    || c == &CH_EQUAL
-                    || c == &CH_AMPERSAND
-                    || c == &CH_PIPE
-                    || c == &CH_EXCLAMATION => false,
-                _ => !c.is_whitespace()
+        let fun = |c: &char| match simple_matched_token(*c, pos) {
+            Some(_) => false,
+            _ if c == &CH_LITTLE
+                || c == &CH_GREATER
+                || c == &CH_EQUAL
+                || c == &CH_AMPERSAND
+                || c == &CH_PIPE
+                || c == &CH_EXCLAMATION =>
+            {
+                false
             }
+            _ => !c.is_whitespace(),
         };
         let (_, mut vec) = self.input.take_while(fun).map_err(to_token_error)?;
         vec.insert(0, ch);
@@ -253,20 +283,18 @@ impl<'a> Tokenizer<'a> {
         let (pos, ch) = self.input.next_char().map_err(to_token_error)?;
         match simple_matched_token(ch, pos) {
             Some(t) => Ok(t),
-            None => {
-                match ch {
-                    CH_SINGLE_QUOTA => self.single_quota(pos, ch),
-                    CH_DOUBLE_QUOTA => self.double_quota(pos, ch),
-                    CH_EQUAL => self.equal(pos, ch),
-                    CH_GREATER => self.greater(pos, ch),
-                    CH_LITTLE => self.little(pos, ch),
-                    CH_AMPERSAND => self.and(pos, ch),
-                    CH_PIPE => self.or(pos, ch),
-                    CH_EXCLAMATION => self.not_equal(pos, ch),
-                    _ if ch.is_whitespace() => self.whitespace(pos, ch),
-                    _ => self.other(pos, ch),
-                }
-            }
+            None => match ch {
+                CH_SINGLE_QUOTE => self.single_quote(pos, ch),
+                CH_DOUBLE_QUOTE => self.double_quote(pos, ch),
+                CH_EQUAL => self.equal(pos, ch),
+                CH_GREATER => self.greater(pos, ch),
+                CH_LITTLE => self.little(pos, ch),
+                CH_AMPERSAND => self.and(pos, ch),
+                CH_PIPE => self.or(pos, ch),
+                CH_EXCLAMATION => self.not_equal(pos, ch),
+                _ if ch.is_whitespace() => self.whitespace(pos, ch),
+                _ => self.other(pos, ch),
+            },
         }
     }
 
@@ -275,7 +303,7 @@ impl<'a> Tokenizer<'a> {
     }
 }
 
-pub struct PreloadedTokenizer<'a> {
+pub struct TokenReader<'a> {
     origin_input: &'a str,
     err: TokenError,
     err_pos: usize,
@@ -283,7 +311,7 @@ pub struct PreloadedTokenizer<'a> {
     curr_pos: Option<usize>,
 }
 
-impl<'a> PreloadedTokenizer<'a> {
+impl<'a> TokenReader<'a> {
     pub fn new(input: &'a str) -> Self {
         let mut tokenizer = Tokenizer::new(input);
         let mut tokens = vec![];
@@ -293,8 +321,8 @@ impl<'a> PreloadedTokenizer<'a> {
                     tokens.insert(0, (tokenizer.current_pos(), t));
                 }
                 Err(e) => {
-                    return PreloadedTokenizer {
-                        origin_input: input.clone(),
+                    return TokenReader {
+                        origin_input: input,
                         err: e,
                         err_pos: tokenizer.current_pos(),
                         tokens,
@@ -305,6 +333,13 @@ impl<'a> PreloadedTokenizer<'a> {
         }
     }
 
+    pub fn peek_is(&self, simple_token: &str) -> bool {
+        match self.peek_token() {
+            Ok(t) => t.simple_eq(simple_token),
+            _ => false,
+        }
+    }
+
     pub fn peek_token(&self) -> Result<&Token, TokenError> {
         match self.tokens.last() {
             Some((_, t)) => {
@@ -333,23 +368,13 @@ impl<'a> PreloadedTokenizer<'a> {
     }
 
     pub fn err_msg_with_pos(&self, pos: usize) -> String {
-        let mut w = Vec::new();
-        writeln!(&mut w, "{}", self.origin_input).unwrap();
-        writeln!(&mut w, "{}", "^".repeat(pos)).unwrap();
-        match std::str::from_utf8(&w[..]) {
-            Ok(s) => s.to_owned(),
-            Err(_) => panic!("Invalid UTF-8")
-        }
+        format!("{}\n{}", self.origin_input, "^".repeat(pos))
     }
 
     pub fn err_msg(&self) -> String {
         match self.curr_pos {
-            Some(pos) => {
-                self.err_msg_with_pos(pos)
-            }
-            _ => {
-                self.err_msg_with_pos(self.err_pos)
-            }
+            Some(pos) => self.err_msg_with_pos(pos),
+            _ => self.err_msg_with_pos(self.err_pos),
         }
     }
-}
+}

src/ref_value/mod.rs

@@ -1,4 +0,0 @@
-pub mod model;
-pub mod de;
-pub mod ser;
-pub mod serde_error;

src/ref_value/model.rs

@@ -1,273 +0,0 @@
-use std::hash::{Hash, Hasher};
-use std::ops::Deref;
-use std::sync::Arc;
-
-use indexmap::map::IndexMap;
-use serde::ser::Serialize;
-use serde_json::{Number, Value};
-
-type TypeRefValue = Arc<Box<RefValue>>;
-
-#[derive(Debug, PartialEq)]
-pub struct RefValueWrapper {
-    data: TypeRefValue
-}
-
-impl Eq for RefValueWrapper {}
-
-impl Deref for RefValueWrapper {
-    type Target = RefValue;
-
-    fn deref(&self) -> &Self::Target {
-        &(**self.data)
-    }
-}
-
-impl Hash for RefValueWrapper {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        self.deref().hash(state)
-    }
-}
-
-impl Clone for RefValueWrapper {
-    fn clone(&self) -> Self {
-        RefValueWrapper {
-            data: self.data.clone()
-        }
-    }
-}
-
-///
-/// serde_json::Value 참고
-///
-pub trait RefIndex {
-    fn index_into<'v>(&self, v: &'v RefValue) -> Option<&'v RefValueWrapper>;
-    fn index_into_mut<'v>(&self, v: &'v mut RefValue) -> Option<&'v mut RefValueWrapper>;
-    fn index_or_insert<'v>(&self, v: &'v mut RefValue) -> &'v mut RefValueWrapper;
-}
-
-impl RefIndex for usize {
-    fn index_into<'v>(&self, v: &'v RefValue) -> Option<&'v RefValueWrapper> {
-        match *v {
-            RefValue::Array(ref vec) => vec.get(*self),
-            _ => None,
-        }
-    }
-    fn index_into_mut<'v>(&self, v: &'v mut RefValue) -> Option<&'v mut RefValueWrapper> {
-        match *v {
-            RefValue::Array(ref mut vec) => vec.get_mut(*self),
-            _ => None,
-        }
-    }
-    fn index_or_insert<'v>(&self, v: &'v mut RefValue) -> &'v mut RefValueWrapper {
-        match *v {
-            RefValue::Array(ref mut vec) => {
-                let len = vec.len();
-                vec.get_mut(*self).unwrap_or_else(|| {
-                    panic!(
-                        "cannot access index {} of JSON array of length {}",
-                        self, len
-                    )
-                })
-            }
-            _ => panic!("cannot access index {} of JSON {:?}", self, v),
-        }
-    }
-}
-
-impl RefIndex for str {
-    fn index_into<'v>(&self, v: &'v RefValue) -> Option<&'v RefValueWrapper> {
-        match *v {
-            RefValue::Object(ref map) => map.get(self),
-            _ => None,
-        }
-    }
-    fn index_into_mut<'v>(&self, v: &'v mut RefValue) -> Option<&'v mut RefValueWrapper> {
-        match *v {
-            RefValue::Object(ref mut map) => map.get_mut(self),
-            _ => None,
-        }
-    }
-    fn index_or_insert<'v>(&self, v: &'v mut RefValue) -> &'v mut RefValueWrapper {
-        if let RefValue::Null = *v {
-            *v = RefValue::Object(IndexMap::new());
-        }
-        match *v {
-            RefValue::Object(ref mut map) => {
-                map.entry(self.to_owned()).or_insert(RefValue::Null.into())
-            }
-            _ => panic!("cannot access key {:?} in JSON {:?}", self, v),
-        }
-    }
-}
-
-impl RefIndex for String {
-    fn index_into<'v>(&self, v: &'v RefValue) -> Option<&'v RefValueWrapper> {
-        self[..].index_into(v)
-    }
-    fn index_into_mut<'v>(&self, v: &'v mut RefValue) -> Option<&'v mut RefValueWrapper> {
-        self[..].index_into_mut(v)
-    }
-    fn index_or_insert<'v>(&self, v: &'v mut RefValue) -> &'v mut RefValueWrapper {
-        self[..].index_or_insert(v)
-    }
-}
-
-#[derive(Debug, PartialEq)]
-pub enum RefValue {
-    Null,
-    Bool(bool),
-    Number(Number),
-    String(String),
-    Array(Vec<RefValueWrapper>),
-    Object(IndexMap<String, RefValueWrapper>),
-}
-
-static REF_VALUE_NULL: &'static str = "$jsonpath::ref_value::model::RefValue::Null";
-
-impl Hash for RefValue {
-    fn hash<H: Hasher>(&self, state: &mut H) {
-        match self {
-            RefValue::Null => {
-                REF_VALUE_NULL.hash(state)
-            }
-            RefValue::Bool(b) => {
-                b.hash(state)
-            }
-            RefValue::Number(n) => {
-                if n.is_f64() {
-                    n.as_f64().unwrap().to_string().hash(state)
-                } else if n.is_i64() {
-                    n.as_i64().unwrap().hash(state);
-                } else {
-                    n.as_u64().unwrap().hash(state);
-                }
-            }
-            RefValue::String(s) => {
-                s.hash(state)
-            }
-            RefValue::Object(map) => {
-                for (_, v) in map {
-                    v.hash(state);
-                }
-            }
-            RefValue::Array(v) => {
-                for i in v {
-                    i.hash(state);
-                }
-            }
-        }
-    }
-}
-
-impl Eq for RefValue {}
-
-impl RefValue {
-    pub fn get<I: RefIndex>(&self, index: I) -> Option<&RefValueWrapper> {
-        index.index_into(self)
-    }
-
-    pub fn is_object(&self) -> bool {
-        self.as_object().is_some()
-    }
-
-    pub fn as_object(&self) -> Option<&IndexMap<String, RefValueWrapper>> {
-        match *self {
-            RefValue::Object(ref map) => Some(map),
-            _ => None,
-        }
-    }
-
-    pub fn is_array(&self) -> bool {
-        self.as_array().is_some()
-    }
-
-    pub fn as_array(&self) -> Option<&Vec<RefValueWrapper>> {
-        match *self {
-            RefValue::Array(ref array) => Some(&*array),
-            _ => None,
-        }
-    }
-
-    pub fn is_string(&self) -> bool {
-        self.as_str().is_some()
-    }
-
-    pub fn as_str(&self) -> Option<&str> {
-        match *self {
-            RefValue::String(ref s) => Some(s),
-            _ => None,
-        }
-    }
-
-    pub fn is_number(&self) -> bool {
-        match *self {
-            RefValue::Number(_) => true,
-            _ => false,
-        }
-    }
-
-    pub fn as_number(&self) -> Option<Number> {
-        match *self {
-            RefValue::Number(ref n) => Some(n.clone()),
-            _ => None,
-        }
-    }
-
-    pub fn is_boolean(&self) -> bool {
-        self.as_bool().is_some()
-    }
-
-    pub fn as_bool(&self) -> Option<bool> {
-        match *self {
-            RefValue::Bool(b) => Some(b),
-            _ => None,
-        }
-    }
-
-    pub fn is_null(&self) -> bool {
-        self.as_null().is_some()
-    }
-
-    pub fn as_null(&self) -> Option<()> {
-        match *self {
-            RefValue::Null => Some(()),
-            _ => None,
-        }
-    }
-}
-
-impl Into<RefValueWrapper> for RefValue {
-    fn into(self) -> RefValueWrapper {
-        RefValueWrapper {
-            data: Arc::new(Box::new(self))
-        }
-    }
-}
-
-impl Into<RefValue> for &Value {
-    fn into(self) -> RefValue {
-        match self.serialize(super::ser::Serializer) {
-            Ok(v) => v,
-            Err(e) => panic!("Error Value into RefValue: {:?}", e)
-        }
-    }
-}
-
-impl Into<RefValueWrapper> for &Value {
-    fn into(self) -> RefValueWrapper {
-        match self.serialize(super::ser::Serializer) {
-            Ok(v) => v.into(),
-            Err(e) => panic!("Error Value into RefValue: {:?}", e)
-        }
-    }
-}
-
-impl Into<Value> for &RefValueWrapper {
-    fn into(self) -> Value {
-        match serde_json::to_value(self.deref()) {
-            Ok(v) => v,
-            Err(e) => panic!("Error RefValueWrapper into Value: {:?}", e)
-        }
-    }
-}

src/ref_value/ser.rs

@@ -1,624 +0,0 @@
-use std::result::Result;
-
-use indexmap::IndexMap;
-use serde::{self, Serialize};
-use serde::ser::Impossible;
-
-use ref_value::model::{RefValue, RefValueWrapper};
-
-use super::serde_error::SerdeError;
-
-///
-/// see `serde_json/value/ser.rs`
-///
-impl Serialize for RefValue {
-    #[inline]
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where
-            S: ::serde::Serializer,
-    {
-        match *self {
-            RefValue::Null => serializer.serialize_unit(),
-            RefValue::Bool(b) => serializer.serialize_bool(b),
-            RefValue::Number(ref n) => n.serialize(serializer),
-            RefValue::String(ref s) => serializer.serialize_str(s),
-            RefValue::Array(ref v) => {
-                use std::ops::Deref;
-                let v: Vec<&RefValue> = v.iter().map(|v| v.deref()).collect();
-                v.serialize(serializer)
-            }
-            RefValue::Object(ref m) => {
-                use serde::ser::SerializeMap;
-                use std::ops::Deref;
-                let mut map = try!(serializer.serialize_map(Some(m.len())));
-                for (k, v) in m {
-                    try!(map.serialize_key(k));
-                    try!(map.serialize_value(v.deref()));
-                }
-                map.end()
-            }
-        }
-    }
-}
-
-pub struct Serializer;
-
-impl serde::Serializer for Serializer {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    type SerializeSeq = SerializeVec;
-    type SerializeTuple = SerializeVec;
-    type SerializeTupleStruct = SerializeVec;
-    type SerializeTupleVariant = SerializeTupleVariant;
-    type SerializeMap = SerializeMap;
-    type SerializeStruct = SerializeMap;
-    type SerializeStructVariant = SerializeStructVariant;
-
-    #[inline]
-    fn serialize_bool(self, value: bool) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::Bool(value))
-    }
-
-    #[inline]
-    fn serialize_i8(self, value: i8) -> Result<RefValue, Self::Error> {
-        self.serialize_i64(value as i64)
-    }
-
-    #[inline]
-    fn serialize_i16(self, value: i16) -> Result<RefValue, Self::Error> {
-        self.serialize_i64(value as i64)
-    }
-
-    #[inline]
-    fn serialize_i32(self, value: i32) -> Result<RefValue, Self::Error> {
-        self.serialize_i64(value as i64)
-    }
-
-    fn serialize_i64(self, value: i64) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::Number(value.into()))
-    }
-
-    #[inline]
-    fn serialize_u8(self, value: u8) -> Result<RefValue, Self::Error> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u16(self, value: u16) -> Result<RefValue, Self::Error> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u32(self, value: u32) -> Result<RefValue, Self::Error> {
-        self.serialize_u64(value as u64)
-    }
-
-    #[inline]
-    fn serialize_u64(self, value: u64) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::Number(value.into()))
-    }
-
-    #[inline]
-    fn serialize_f32(self, value: f32) -> Result<RefValue, Self::Error> {
-        self.serialize_f64(value as f64)
-    }
-
-    #[inline]
-    fn serialize_f64(self, value: f64) -> Result<RefValue, Self::Error> {
-        Ok(serde_json::Number::from_f64(value).map_or(RefValue::Null, RefValue::Number))
-    }
-
-    #[inline]
-    fn serialize_char(self, value: char) -> Result<RefValue, Self::Error> {
-        let mut s = String::new();
-        s.push(value);
-        self.serialize_str(&s)
-    }
-
-    #[inline]
-    fn serialize_str(self, value: &str) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::String(value.to_owned()))
-    }
-
-    fn serialize_bytes(self, value: &[u8]) -> Result<RefValue, Self::Error> {
-        let vec = value.iter().map(|&b| RefValue::Number(b.into()).into()).collect();
-        Ok(RefValue::Array(vec))
-    }
-
-    #[inline]
-    fn serialize_unit(self) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::Null)
-    }
-
-    #[inline]
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<RefValue, Self::Error> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-    ) -> Result<RefValue, Self::Error> {
-        self.serialize_str(variant)
-    }
-
-    #[inline]
-    fn serialize_newtype_struct<T: ?Sized>(
-        self,
-        _name: &'static str,
-        value: &T,
-    ) -> Result<RefValue, Self::Error>
-        where
-            T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_newtype_variant<T: ?Sized>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        value: &T,
-    ) -> Result<RefValue, Self::Error>
-        where
-            T: Serialize,
-    {
-        let mut values: IndexMap<String, RefValueWrapper> = IndexMap::new();
-        values.insert(String::from(variant), {
-            value.serialize(Serializer)?.into()
-        });
-        Ok(RefValue::Object(values))
-    }
-
-    #[inline]
-    fn serialize_none(self) -> Result<RefValue, Self::Error> {
-        self.serialize_unit()
-    }
-
-    #[inline]
-    fn serialize_some<T: ?Sized>(self, value: &T) -> Result<RefValue, Self::Error>
-        where
-            T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Ok(SerializeVec {
-            vec: Vec::with_capacity(len.unwrap_or(0)),
-        })
-    }
-
-    fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {
-        self.serialize_seq(Some(len))
-    }
-
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
-        self.serialize_seq(Some(len))
-    }
-
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
-        Ok(SerializeTupleVariant {
-            name: String::from(variant),
-            vec: Vec::with_capacity(len),
-        })
-    }
-
-    fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Ok(SerializeMap::Map {
-            map: IndexMap::new(),
-            next_key: None,
-        })
-    }
-
-    fn serialize_struct(
-        self,
-        name: &'static str,
-        len: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        match name {
-            _ => self.serialize_map(Some(len)),
-        }
-    }
-
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Ok(SerializeStructVariant {
-            name: String::from(variant),
-            map: IndexMap::new(),
-        })
-    }
-}
-
-pub struct SerializeVec {
-    vec: Vec<RefValueWrapper>,
-}
-
-pub struct SerializeTupleVariant {
-    name: String,
-    vec: Vec<RefValueWrapper>,
-}
-
-pub enum SerializeMap {
-    Map {
-        map: IndexMap<String, RefValueWrapper>,
-        next_key: Option<String>,
-    },
-}
-
-pub struct SerializeStructVariant {
-    name: String,
-    map: IndexMap<String, RefValueWrapper>,
-}
-
-impl serde::ser::SerializeSeq for SerializeVec {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        self.vec.push({
-            value.serialize(Serializer)?.into()
-        });
-        Ok(())
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        Ok(RefValue::Array(self.vec))
-    }
-}
-
-impl serde::ser::SerializeTuple for SerializeVec {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        serde::ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        serde::ser::SerializeSeq::end(self)
-    }
-}
-
-impl serde::ser::SerializeTupleStruct for SerializeVec {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        serde::ser::SerializeSeq::serialize_element(self, value)
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        serde::ser::SerializeSeq::end(self)
-    }
-}
-
-impl serde::ser::SerializeTupleVariant for SerializeTupleVariant {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        self.vec.push({
-            let a: RefValue = value.serialize(Serializer)?;
-            a.into()
-        });
-        Ok(())
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        let mut object: IndexMap<String, RefValueWrapper> = IndexMap::new();
-
-        object.insert(self.name, RefValue::Array(self.vec).into());
-
-        Ok(RefValue::Object(object))
-    }
-}
-
-impl serde::ser::SerializeMap for SerializeMap {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        match *self {
-            SerializeMap::Map {
-                ref mut next_key, ..
-            } => {
-                *next_key = Some(key.serialize(MapKeySerializer)?);
-                Ok(())
-            }
-        }
-    }
-
-    fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        match *self {
-            SerializeMap::Map {
-                ref mut map,
-                ref mut next_key,
-            } => {
-                let key = next_key.take();
-                // Panic because this indicates a bug in the program rather than an
-                // expected failure.
-                let key = key.expect("serialize_value called before serialize_key");
-                map.insert(key, {
-                    let a: RefValue = value.serialize(Serializer)?;
-                    a.into()
-                });
-                Ok(())
-            }
-        }
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        match self {
-            SerializeMap::Map { map, .. } => Ok(RefValue::Object(map)),
-        }
-    }
-}
-
-struct MapKeySerializer;
-
-fn key_must_be_a_string() -> SerdeError {
-    SerdeError::from_str("key must be string")
-}
-
-impl serde::Serializer for MapKeySerializer {
-    type Ok = String;
-    type Error = SerdeError;
-
-    type SerializeSeq = Impossible<String, Self::Error>;
-    type SerializeTuple = Impossible<String, Self::Error>;
-    type SerializeTupleStruct = Impossible<String, Self::Error>;
-    type SerializeTupleVariant = Impossible<String, Self::Error>;
-    type SerializeMap = Impossible<String, Self::Error>;
-    type SerializeStruct = Impossible<String, Self::Error>;
-    type SerializeStructVariant = Impossible<String, Self::Error>;
-
-    #[inline]
-    fn serialize_unit_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        variant: &'static str,
-    ) -> Result<Self::Ok, Self::Error> {
-        Ok(variant.to_owned())
-    }
-
-    #[inline]
-    fn serialize_newtype_struct<T: ?Sized>(
-        self,
-        _name: &'static str,
-        value: &T,
-    ) -> Result<Self::Ok, Self::Error>
-        where
-            T: Serialize,
-    {
-        value.serialize(self)
-    }
-
-    fn serialize_bool(self, _value: bool) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_i8(self, value: i8) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_i16(self, value: i16) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_i32(self, value: i32) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_i64(self, value: i64) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_u8(self, value: u8) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_u16(self, value: u16) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_u32(self, value: u32) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_u64(self, value: u64) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_string())
-    }
-
-    fn serialize_f32(self, _value: f32) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_f64(self, _value: f64) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    #[inline]
-    fn serialize_char(self, value: char) -> Result<Self::Ok, Self::Error> {
-        Ok({
-            let mut s = String::new();
-            s.push(value);
-            s
-        })
-    }
-
-    #[inline]
-    fn serialize_str(self, value: &str) -> Result<Self::Ok, Self::Error> {
-        Ok(value.to_owned())
-    }
-
-    fn serialize_bytes(self, _value: &[u8]) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_newtype_variant<T: ?Sized>(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _value: &T,
-    ) -> Result<Self::Ok, Self::Error>
-        where
-            T: Serialize,
-    {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_none(self) -> Result<Self::Ok, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_some<T: ?Sized>(self, _value: &T) -> Result<Self::Ok, Self::Error>
-        where
-            T: Serialize,
-    {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_seq(self, _len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_tuple(self, _len: usize) -> Result<Self::SerializeTuple, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_tuple_struct(
-        self,
-        _name: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleStruct, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_tuple_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeTupleVariant, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_struct(
-        self,
-        _name: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStruct, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-
-    fn serialize_struct_variant(
-        self,
-        _name: &'static str,
-        _variant_index: u32,
-        _variant: &'static str,
-        _len: usize,
-    ) -> Result<Self::SerializeStructVariant, Self::Error> {
-        Err(key_must_be_a_string())
-    }
-}
-
-impl serde::ser::SerializeStruct for SerializeMap {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        match *self {
-            SerializeMap::Map { .. } => {
-                serde::ser::SerializeMap::serialize_key(self, key)?;
-                serde::ser::SerializeMap::serialize_value(self, value)
-            }
-        }
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        match self {
-            SerializeMap::Map { .. } => serde::ser::SerializeMap::end(self),
-        }
-    }
-}
-
-impl serde::ser::SerializeStructVariant for SerializeStructVariant {
-    type Ok = RefValue;
-    type Error = SerdeError;
-
-    fn serialize_field<T: ?Sized>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
-        where
-            T: Serialize,
-    {
-        self.map.insert(String::from(key), {
-            let a: RefValue = value.serialize(Serializer)?;
-            a.into()
-        });
-        Ok(())
-    }
-
-    fn end(self) -> Result<RefValue, Self::Error> {
-        let mut object: IndexMap<String, RefValueWrapper> = IndexMap::new();
-
-        object.insert(self.name, RefValue::Object(self.map).into());
-
-        Ok(RefValue::Object(object))
-    }
-}

src/ref_value/serde_error.rs

@@ -1,38 +0,0 @@
-use std::fmt;
-
-#[derive(Debug)]
-pub struct SerdeError {
-    msg: String,
-}
-
-impl<'a> SerdeError {
-    pub fn new(msg: String) -> Self {
-        SerdeError { msg: msg }
-    }
-
-    pub fn from_str(msg: &str) -> Self {
-        SerdeError { msg: msg.to_string() }
-    }
-}
-
-impl serde::de::Error for SerdeError {
-    #[cold]
-    fn custom<T: fmt::Display>(msg: T) -> SerdeError {
-        SerdeError { msg: msg.to_string() }
-    }
-}
-
-impl serde::ser::Error for SerdeError {
-    #[cold]
-    fn custom<T: fmt::Display>(msg: T) -> SerdeError {
-        SerdeError { msg: msg.to_string() }
-    }
-}
-
-impl std::error::Error for SerdeError {}
-
-impl fmt::Display for SerdeError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self.msg)
-    }
-}

tests/common.rs

@@ -0,0 +1,56 @@
+extern crate env_logger;
+extern crate jsonpath_lib as jsonpath;
+extern crate serde_json;
+
+use std::io::Read;
+
+use serde_json::Value;
+
+use self::jsonpath::Selector;
+
+#[allow(dead_code)]
+pub fn setup() {
+    let _ = env_logger::try_init();
+}
+
+#[allow(dead_code)]
+pub fn read_json(path: &str) -> Value {
+    let mut f = std::fs::File::open(path).unwrap();
+    let mut contents = String::new();
+    f.read_to_string(&mut contents).unwrap();
+    serde_json::from_str(&contents).unwrap()
+}
+
+#[allow(dead_code)]
+pub fn read_contents(path: &str) -> String {
+    let mut f = std::fs::File::open(path).unwrap();
+    let mut contents = String::new();
+    f.read_to_string(&mut contents).unwrap();
+    contents
+}
+
+#[allow(dead_code)]
+pub fn select_and_then_compare(path: &str, json: Value, target: Value) {
+    let mut selector = Selector::default();
+    let result = selector
+        .str_path(path)
+        .unwrap()
+        .value(&json)
+        .select_as::<Value>()
+        .unwrap();
+    assert_eq!(
+        result,
+        match target {
+            Value::Array(vec) => vec,
+            _ => panic!("Give me the Array!"),
+        },
+        "{}",
+        path
+    );
+}
+
+#[allow(dead_code)]
+pub fn compare_result(result: Vec<&Value>, target: Value) {
+    let result = serde_json::to_value(result).unwrap();
+    assert_eq!(result, target);
+}

tests/lib.rs

@@ -1,134 +1,172 @@
-extern crate env_logger;
 extern crate jsonpath_lib as jsonpath;
-extern crate log;
 extern crate serde;
 #[macro_use]
 extern crate serde_json;
 
-use std::io::Read;
-
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
 use serde_json::Value;
 
-fn read_json(path: &str) -> Value {
-    let mut f = std::fs::File::open(path).unwrap();
-    let mut contents = String::new();
-    f.read_to_string(&mut contents).unwrap();
-    serde_json::from_str(contents.as_str()).unwrap()
-}
+use common::{compare_result, read_contents, read_json, setup};
+use jsonpath::JsonPathError;
 
-fn read_contents(path: &str) -> String {
-    let mut f = std::fs::File::open(path).unwrap();
-    let mut contents = String::new();
-    f.read_to_string(&mut contents).unwrap();
-    contents
-}
+mod common;
 
 #[test]
 fn compile() {
-    let mut template = jsonpath::compile("$..friends[2]");
-    let json_obj = read_json("./benches/data_obj.json");
-    let json = template(&json_obj).unwrap();
-    let ret = json!([
+    let compile_object = |path| {
+        let mut template = jsonpath::compile(path);
+        let json_obj = read_json("./benchmark/data_obj.json");
+        let json = template(&json_obj).unwrap();
+        let ret = json!([
             {"id": 2,"name": "Gray Berry"},
             {"id": 2,"name": "Gray Berry"}
         ]);
-    assert_eq!(json, ret);
+        compare_result(json, ret);
+    };
 
-    let json_obj = read_json("./benches/data_array.json");
-    let json = template(&json_obj).unwrap();
-    let ret = json!([
+    let compile_array = |path| {
+        let mut template = jsonpath::compile(path);
+        let json_obj = read_json("./benchmark/data_array.json");
+        let json = template(&json_obj).unwrap();
+        let ret = json!([
             {"id": 2,"name": "Gray Berry"},
             {"id": 2,"name": "Rosetta Erickson"}
         ]);
-    assert_eq!(json, ret);
+        compare_result(json, ret);
+    };
+
+    fn compile_error() {
+        let mut template = jsonpath::compile("$[");
+        assert!(template(&Value::Null).is_err());
+    }
+
+    setup();
+
+    compile_object("$..friends[2]");
+    compile_array("$..friends[2]");
+    compile_error();
 }
 
 #[test]
 fn selector() {
-    let json_obj = read_json("./benches/data_obj.json");
-    let mut reader = jsonpath::selector(&json_obj);
-    let json = reader("$..friends[2]").unwrap();
-    let ret = json!([
+    setup();
+
+    fn select<'a, F>(selector: &mut F, path: &'a str, target: Value)
+    where
+        F: FnMut(&'a str) -> Result<Vec<&Value>, JsonPathError>,
+    {
+        let json = selector(path).unwrap();
+        compare_result(json, target);
+    };
+
+    let json_obj = read_json("./benchmark/data_obj.json");
+    let mut selector = jsonpath::selector(&json_obj);
+
+    select(
+        &mut selector,
+        "$..friends[2]",
+        json!([
             {"id": 2,"name": "Gray Berry"},
             {"id": 2,"name": "Gray Berry"}
-        ]);
-    assert_eq!(json, ret);
-
-    let json = reader("$..friends[0]").unwrap();
-    let ret = json!([
+        ]),
+    );
+    select(
+        &mut selector,
+        "$..friends[0]",
+        json!([
             {"id": 0},
             {"id": 0,"name": "Millicent Norman"}
-        ]);
-    assert_eq!(json, ret);
+        ]),
+    );
 }
 
 #[test]
 fn selector_as() {
-    let json_obj = read_json("./benches/data_obj.json");
-    let mut selector = jsonpath::selector_as::<Vec<Friend>>(&json_obj);
-
-    #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    #[derive(Deserialize, PartialEq, Debug)]
     struct Friend {
         id: u8,
         name: Option<String>,
     }
 
-    let json = selector("$..friends[2]").unwrap();
+    fn select<'a, F>(selector: &mut F, path: &'a str, target: Vec<Friend>)
+    where
+        F: FnMut(&'a str) -> Result<Vec<Friend>, JsonPathError>,
+    {
+        let json = selector(path).unwrap();
+        assert_eq!(json, target);
+    };
 
-    let ret = vec!(
-        Friend { id: 2, name: Some("Gray Berry".to_string()) },
-        Friend { id: 2, name: Some("Gray Berry".to_string()) },
-    );
-    assert_eq!(json, ret);
+    let json_obj = read_json("./benchmark/data_obj.json");
+    let mut selector = jsonpath::selector_as::<Friend>(&json_obj);
 
-    let json = selector("$..friends[0]").unwrap();
-    let ret = vec!(
-        Friend { id: 0, name: None },
-        Friend { id: 0, name: Some("Millicent Norman".to_string()) },
+    select(
+        &mut selector,
+        "$..friends[2]",
+        vec![
+            Friend {
+                id: 2,
+                name: Some("Gray Berry".to_string()),
+            },
+            Friend {
+                id: 2,
+                name: Some("Gray Berry".to_string()),
+            },
+        ],
+    );
+
+    select(
+        &mut selector,
+        "$..friends[0]",
+        vec![
+            Friend { id: 0, name: None },
+            Friend {
+                id: 0,
+                name: Some("Millicent Norman".to_string()),
+            },
+        ],
     );
-    assert_eq!(json, ret);
 }
 
 #[test]
 fn select() {
-    let json_obj = read_json("./benches/example.json");
+    let json_obj = read_json("./benchmark/example.json");
     let json = jsonpath::select(&json_obj, "$..book[2]").unwrap();
     let ret = json!([{
-            "category" : "fiction",
-            "author" : "Herman Melville",
-            "title" : "Moby Dick",
-            "isbn" : "0-553-21311-3",
-            "price" : 8.99
-        }]);
-    assert_eq!(json, ret);
+        "category" : "fiction",
+        "author" : "Herman Melville",
+        "title" : "Moby Dick",
+        "isbn" : "0-553-21311-3",
+        "price" : 8.99
+    }]);
+    compare_result(json, ret);
 }
 
 #[test]
 fn select_str() {
-    let json_str = read_contents("./benches/example.json");
+    let json_str = read_contents("./benchmark/example.json");
     let result_str = jsonpath::select_as_str(&json_str, "$..book[2]").unwrap();
     let ret = json!([{
-            "category" : "fiction",
-            "author" : "Herman Melville",
-            "title" : "Moby Dick",
-            "isbn" : "0-553-21311-3",
-            "price" : 8.99
-        }]);
+        "category" : "fiction",
+        "author" : "Herman Melville",
+        "title" : "Moby Dick",
+        "isbn" : "0-553-21311-3",
+        "price" : 8.99
+    }]);
     let json: Value = serde_json::from_str(&result_str).unwrap();
     assert_eq!(json, ret);
 }
 
 #[test]
 fn test_to_struct() {
-    #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    #[derive(Deserialize, PartialEq, Debug)]
     struct Person {
         name: String,
         age: u8,
         phones: Vec<String>,
     }
 
-    let ret: Person = jsonpath::select_as(r#"
+    let ret: Vec<Person> = jsonpath::select_as(
+        r#"
     {
         "person":
             {
@@ -140,7 +178,10 @@ fn test_to_struct() {
                 ]
             }
     }
-    "#, "$.person").unwrap();
+    "#,
+        "$.person",
+    )
+    .unwrap();
 
     let person = Person {
         name: "Doe John".to_string(),
@@ -148,5 +189,5 @@ fn test_to_struct() {
         phones: vec!["+44 1234567".to_string(), "+44 2345678".to_string()],
     };
 
-    assert_eq!(person, ret);
-}
+    assert_eq!(vec![person], ret);
+}

tests/parser.rs

@@ -1,312 +0,0 @@
-extern crate env_logger;
-extern crate jsonpath_lib as jsonpath;
-
-use std::result;
-use jsonpath::parser::parser::{Parser, ParseToken, NodeVisitor, FilterToken};
-
-struct NodeVisitorTestImpl<'a> {
-    input: &'a str,
-    stack: Vec<ParseToken>,
-}
-
-impl<'a> NodeVisitorTestImpl<'a> {
-    fn new(input: &'a str) -> Self {
-        NodeVisitorTestImpl { input, stack: Vec::new() }
-    }
-
-    fn visit(&mut self) -> result::Result<Vec<ParseToken>, String> {
-        let mut parser = Parser::new(self.input);
-        parser.parse(self)?;
-        Ok(self.stack.split_off(0))
-    }
-}
-
-impl<'a> NodeVisitor for NodeVisitorTestImpl<'a> {
-    fn visit_token(&mut self, token: ParseToken) {
-        self.stack.push(token);
-    }
-}
-
-fn setup() {
-    let _ = env_logger::try_init();
-}
-
-fn run(input: &str) -> result::Result<Vec<ParseToken>, String> {
-    let mut interpreter = NodeVisitorTestImpl::new(input);
-    interpreter.visit()
-}
-
-#[test]
-fn parse_path() {
-    setup();
-
-    assert_eq!(run("$.aa"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::In,
-        ParseToken::Key("aa".to_owned())
-    ]));
-
-    assert_eq!(run("$.00.a"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::In,
-        ParseToken::Key("00".to_owned()),
-        ParseToken::In,
-        ParseToken::Key("a".to_owned())
-    ]));
-
-    assert_eq!(run("$.00.韓창.seok"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::In,
-        ParseToken::Key("00".to_owned()),
-        ParseToken::In,
-        ParseToken::Key("韓창".to_owned()),
-        ParseToken::In,
-        ParseToken::Key("seok".to_owned())
-    ]));
-
-    assert_eq!(run("$.*"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::In,
-        ParseToken::All
-    ]));
-
-    assert_eq!(run("$..*"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Leaves,
-        ParseToken::All
-    ]));
-
-    assert_eq!(run("$..[0]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Leaves,
-        ParseToken::Array,
-        ParseToken::Number(0.0),
-        ParseToken::ArrayEof
-    ]));
-
-    match run("$.") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$..") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$. a") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-}
-
-#[test]
-fn parse_array_sytax() {
-    setup();
-
-    assert_eq!(run("$.book[?(@.isbn)]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::In,
-        ParseToken::Key("book".to_string()),
-        ParseToken::Array,
-        ParseToken::Relative,
-        ParseToken::In,
-        ParseToken::Key("isbn".to_string()),
-        ParseToken::ArrayEof
-    ]));
-
-    //
-    // Array도 컨텍스트 In으로 간주 할거라서 중첩되면 하나만
-    //
-    assert_eq!(run("$.[*]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[*]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[*].가"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof,
-        ParseToken::In, ParseToken::Key("가".to_owned())
-    ]));
-
-    assert_eq!(run("$.a[0][1]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Number(0_f64),
-        ParseToken::ArrayEof,
-        ParseToken::Array,
-        ParseToken::Number(1_f64),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[1,2]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Union(vec![1, 2]),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[10:]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Range(Some(10), None),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[:11]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Range(None, Some(11)),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[-12:13]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Range(Some(-12), Some(13)),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[?(1>2)]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Number(1_f64), ParseToken::Number(2_f64), ParseToken::Filter(FilterToken::Greater),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$.a[?($.b>3)]"), Ok(vec![
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Array,
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("b".to_owned()), ParseToken::Number(3_f64), ParseToken::Filter(FilterToken::Greater),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$[?($.c>@.d && 1==2)]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("c".to_owned()),
-        ParseToken::Relative, ParseToken::In, ParseToken::Key("d".to_owned()),
-        ParseToken::Filter(FilterToken::Greater),
-        ParseToken::Number(1_f64), ParseToken::Number(2_f64), ParseToken::Filter(FilterToken::Equal),
-        ParseToken::Filter(FilterToken::And),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$[?($.c>@.d&&(1==2||3>=4))]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::Absolute, ParseToken::In, ParseToken::Key("c".to_owned()),
-        ParseToken::Relative, ParseToken::In, ParseToken::Key("d".to_owned()),
-        ParseToken::Filter(FilterToken::Greater),
-        ParseToken::Number(1_f64), ParseToken::Number(2_f64), ParseToken::Filter(FilterToken::Equal),
-        ParseToken::Number(3_f64), ParseToken::Number(4_f64), ParseToken::Filter(FilterToken::GreaterOrEqual),
-        ParseToken::Filter(FilterToken::Or),
-        ParseToken::Filter(FilterToken::And),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$[?(@.a<@.b)]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::Relative, ParseToken::In, ParseToken::Key("a".to_owned()),
-        ParseToken::Relative, ParseToken::In, ParseToken::Key("b".to_owned()),
-        ParseToken::Filter(FilterToken::Little),
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$[*][*][*]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof,
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof,
-        ParseToken::Array,
-        ParseToken::All,
-        ParseToken::ArrayEof
-    ]));
-
-    assert_eq!(run("$['a']['bb']"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::Key("a".to_string()),
-        ParseToken::ArrayEof,
-        ParseToken::Array,
-        ParseToken::Key("bb".to_string()),
-        ParseToken::ArrayEof
-    ]));
-
-    match run("$[") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[a]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?($.a)]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?(@.a > @.b]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?(@.a < @.b&&(@.c < @.d)]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-}
-
-#[test]
-fn parse_array_float() {
-    setup();
-
-    assert_eq!(run("$[?(1.1<2.1)]"), Ok(vec![
-        ParseToken::Absolute,
-        ParseToken::Array,
-        ParseToken::Number(1.1), ParseToken::Number(2.1), ParseToken::Filter(FilterToken::Little),
-        ParseToken::ArrayEof
-    ]));
-
-    match run("$[1.1]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?(1.1<.2)]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?(1.1<2.)]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-
-    match run("$[?(1.1<2.a)]") {
-        Ok(_) => panic!(),
-        _ => {}
-    }
-}

tests/readme.rs

@@ -0,0 +1,543 @@
+extern crate jsonpath_lib as jsonpath;
+extern crate serde;
+#[macro_use]
+extern crate serde_json;
+
+use serde::Deserialize;
+use serde_json::Value;
+
+use jsonpath::{Selector, SelectorMut};
+
+mod common;
+
+#[test]
+fn readme() {
+    let json_obj = json!({
+        "store": {
+            "book": [
+                {
+                    "category": "reference",
+                    "author": "Nigel Rees",
+                    "title": "Sayings of the Century",
+                    "price": 8.95
+                },
+                {
+                    "category": "fiction",
+                    "author": "Evelyn Waugh",
+                    "title": "Sword of Honour",
+                    "price": 12.99
+                },
+                {
+                    "category": "fiction",
+                    "author": "Herman Melville",
+                    "title": "Moby Dick",
+                    "isbn": "0-553-21311-3",
+                    "price": 8.99
+                },
+                {
+                    "category": "fiction",
+                    "author": "J. R. R. Tolkien",
+                    "title": "The Lord of the Rings",
+                    "isbn": "0-395-19395-8",
+                    "price": 22.99
+                }
+            ],
+            "bicycle": {
+                "color": "red",
+                "price": 19.95
+            }
+        },
+        "expensive": 10
+    });
+
+    let mut selector = jsonpath::selector(&json_obj);
+
+    assert_eq!(
+        selector("$.store.book[*].author").unwrap(),
+        vec![
+            "Nigel Rees",
+            "Evelyn Waugh",
+            "Herman Melville",
+            "J. R. R. Tolkien"
+        ]
+    );
+
+    assert_eq!(
+        selector("$..author").unwrap(),
+        vec![
+            "Nigel Rees",
+            "Evelyn Waugh",
+            "Herman Melville",
+            "J. R. R. Tolkien"
+        ]
+    );
+
+    assert_eq!(
+        selector("$.store.*").unwrap(),
+        vec![
+            &json!([
+                { "category": "reference", "author": "Nigel Rees", "title": "Sayings of the Century", "price": 8.95 },
+                { "category": "fiction", "author": "Evelyn Waugh", "title": "Sword of Honour", "price": 12.99 },
+                { "category": "fiction", "author": "Herman Melville", "title": "Moby Dick", "isbn": "0-553-21311-3", "price": 8.99 },
+                { "category": "fiction", "author": "J. R. R. Tolkien", "title": "The Lord of the Rings", "isbn": "0-395-19395-8", "price": 22.99 }
+            ]),
+            &json!({ "color": "red", "price": 19.95 })
+        ]
+    );
+
+    assert_eq!(
+        selector("$.store..price").unwrap(),
+        vec![8.95, 12.99, 8.99, 22.99, 19.95]
+    );
+
+    assert_eq!(
+        selector("$..book[2]").unwrap(),
+        vec![&json!({
+            "category" : "fiction",
+            "author" : "Herman Melville",
+            "title" : "Moby Dick",
+            "isbn" : "0-553-21311-3",
+            "price" : 8.99
+        })]
+    );
+
+    assert_eq!(
+        selector("$..book[-2]").unwrap(),
+        vec![&json!({
+            "category" : "fiction",
+            "author" : "Herman Melville",
+            "title" : "Moby Dick",
+            "isbn" : "0-553-21311-3",
+            "price" : 8.99
+        })]
+    );
+
+    assert_eq!(
+        selector("$..book[0,1]").unwrap(),
+        vec![
+            &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+            &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+        ]
+    );
+
+    assert_eq!(
+        selector("$..book[:2]").unwrap(),
+        vec![
+            &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+            &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+        ]
+    );
+
+    assert_eq!(
+        selector("$..book[:2]").unwrap(),
+        vec![
+            &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+            &json!({"category" : "fiction","author" : "Evelyn Waugh","title" : "Sword of Honour","price" : 12.99})
+        ]
+    );
+
+    assert_eq!(
+        selector("$..book[?(@.isbn)]").unwrap(),
+        vec![
+            &json!({"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99}),
+            &json!({"category" : "fiction","author" : "J. R. R. Tolkien","title" : "The Lord of the Rings","isbn" : "0-395-19395-8","price" : 22.99})
+        ]
+    );
+
+    assert_eq!(
+        selector("$.store.book[?(@.price < 10)]").unwrap(),
+        vec![
+            &json!({"category" : "reference","author" : "Nigel Rees","title" : "Sayings of the Century","price" : 8.95}),
+            &json!({"category" : "fiction","author" : "Herman Melville","title" : "Moby Dick","isbn" : "0-553-21311-3","price" : 8.99})
+        ]
+    );
+}
+
+#[test]
+fn readme_selector() {
+    #[derive(Deserialize, PartialEq, Debug)]
+    struct Friend {
+        name: String,
+        age: Option<u8>,
+    }
+
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let mut selector = Selector::default();
+
+    let result = selector
+        .str_path("$..[?(@.age >= 30)]")
+        .unwrap()
+        .value(&json_obj)
+        .select()
+        .unwrap();
+
+    assert_eq!(vec![&json!({"name": "친구3", "age": 30})], result);
+
+    let result = selector.select_as_str().unwrap();
+    assert_eq!(r#"[{"name":"친구3","age":30}]"#, result);
+
+    let result = selector.select_as::<Friend>().unwrap();
+    assert_eq!(
+        vec![Friend {
+            name: "친구3".to_string(),
+            age: Some(30)
+        }],
+        result
+    );
+}
+
+#[test]
+fn readme_selector_mut() {
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let mut selector_mut = SelectorMut::default();
+
+    let result = selector_mut
+        .str_path("$..[?(@.age == 20)].age")
+        .unwrap()
+        .value(json_obj)
+        .replace_with(&mut |v| {
+            let age = if let Value::Number(n) = v {
+                n.as_u64().unwrap() * 2
+            } else {
+                0
+            };
+
+            Some(json!(age))
+        })
+        .unwrap()
+        .take()
+        .unwrap();
+
+    assert_eq!(
+        result,
+        json!({
+            "school": {
+                "friends": [
+                    {"name": "친구1", "age": 40},
+                    {"name": "친구2", "age": 40}
+                ]
+            },
+            "friends": [
+                {"name": "친구3", "age": 30},
+                {"name": "친구4"}
+        ]})
+    );
+}
+
+#[test]
+fn readme_select() {
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let json = jsonpath::select(&json_obj, "$..friends[0]").unwrap();
+
+    assert_eq!(
+        json,
+        vec![
+            &json!({"name": "친구3", "age": 30}),
+            &json!({"name": "친구1", "age": 20})
+        ]
+    );
+}
+
+#[test]
+fn readme_select_as_str() {
+    let ret = jsonpath::select_as_str(
+        r#"
+    {
+        "school": {
+            "friends": [
+                    {"name": "친구1", "age": 20},
+                    {"name": "친구2", "age": 20}
+                ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+        ]
+    }
+    "#,
+        "$..friends[0]",
+    )
+    .unwrap();
+
+    assert_eq!(
+        ret,
+        r#"[{"name":"친구3","age":30},{"name":"친구1","age":20}]"#
+    );
+}
+
+#[test]
+fn readme_select_as() {
+    #[derive(Deserialize, PartialEq, Debug)]
+    struct Person {
+        name: String,
+        age: u8,
+        phones: Vec<String>,
+    }
+
+    let ret: Vec<Person> = jsonpath::select_as(
+        r#"{
+                    "person":
+                        {
+                            "name": "Doe John",
+                            "age": 44,
+                            "phones": [
+                                "+44 1234567",
+                                "+44 2345678"
+                            ]
+                        }
+                }"#,
+        "$.person",
+    )
+    .unwrap();
+
+    let person = Person {
+        name: "Doe John".to_string(),
+        age: 44,
+        phones: vec!["+44 1234567".to_string(), "+44 2345678".to_string()],
+    };
+
+    assert_eq!(ret[0], person);
+}
+
+#[test]
+fn readme_compile() {
+    let mut first_firend = jsonpath::compile("$..friends[0]");
+
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let json = first_firend(&json_obj).unwrap();
+
+    assert_eq!(
+        json,
+        vec![
+            &json!({"name": "친구3", "age": 30}),
+            &json!({"name": "친구1", "age": 20})
+        ]
+    );
+}
+
+#[test]
+fn readme_selector_fn() {
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let mut selector = jsonpath::selector(&json_obj);
+
+    let json = selector("$..friends[0]").unwrap();
+
+    assert_eq!(
+        json,
+        vec![
+            &json!({"name": "친구3", "age": 30}),
+            &json!({"name": "친구1", "age": 20})
+        ]
+    );
+
+    let json = selector("$..friends[1]").unwrap();
+
+    assert_eq!(
+        json,
+        vec![
+            &json!({"name": "친구4"}),
+            &json!({"name": "친구2", "age": 20})
+        ]
+    );
+}
+
+#[test]
+fn readme_selector_as() {
+    let json_obj = json!({
+        "school": {
+           "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    #[derive(Deserialize, PartialEq, Debug)]
+    struct Friend {
+        name: String,
+        age: Option<u8>,
+    }
+
+    let mut selector = jsonpath::selector_as::<Friend>(&json_obj);
+
+    let json = selector("$..friends[0]").unwrap();
+
+    let ret = vec![
+        Friend {
+            name: "친구3".to_string(),
+            age: Some(30),
+        },
+        Friend {
+            name: "친구1".to_string(),
+            age: Some(20),
+        },
+    ];
+    assert_eq!(json, ret);
+
+    let json = selector("$..friends[1]").unwrap();
+
+    let ret = vec![
+        Friend {
+            name: "친구4".to_string(),
+            age: None,
+        },
+        Friend {
+            name: "친구2".to_string(),
+            age: Some(20),
+        },
+    ];
+
+    assert_eq!(json, ret);
+}
+
+#[test]
+fn readme_delete() {
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let ret = jsonpath::delete(json_obj, "$..[?(20 == @.age)]").unwrap();
+
+    assert_eq!(
+        ret,
+        json!({
+            "school": {
+                "friends": [
+                    null,
+                    null
+                ]
+            },
+            "friends": [
+                {"name": "친구3", "age": 30},
+                {"name": "친구4"}
+        ]})
+    );
+}
+
+#[test]
+fn readme_delete2() {
+    let json_obj = common::read_json("./benchmark/example.json");
+
+    let ret = jsonpath::delete(json_obj, "$.store.book").unwrap();
+
+    assert_eq!(
+        ret,
+        json!({
+            "store": {
+                "book": null,
+                "bicycle": {
+                    "color": "red",
+                    "price": 19.95
+                }
+            },
+            "expensive": 10
+        })
+    );
+}
+
+#[test]
+fn readme_replace_with() {
+    let json_obj = json!({
+        "school": {
+            "friends": [
+                {"name": "친구1", "age": 20},
+                {"name": "친구2", "age": 20}
+            ]
+        },
+        "friends": [
+            {"name": "친구3", "age": 30},
+            {"name": "친구4"}
+    ]});
+
+    let result = jsonpath::replace_with(json_obj, "$..[?(@.age == 20)].age", &mut |v| {
+        let age = if let Value::Number(n) = v {
+            n.as_u64().unwrap() * 2
+        } else {
+            0
+        };
+
+        Some(json!(age))
+    })
+    .unwrap();
+
+    assert_eq!(
+        result,
+        json!({
+            "school": {
+                "friends": [
+                    {"name": "친구1", "age": 40},
+                    {"name": "친구2", "age": 40}
+                ]
+            },
+            "friends": [
+                {"name": "친구3", "age": 30},
+                {"name": "친구4"}
+        ]})
+    );
+}

tests/selector.rs

@@ -1,92 +1,131 @@
 extern crate jsonpath_lib as jsonpath;
-extern crate serde;
+#[macro_use]
 extern crate serde_json;
 
-use serde::{Deserialize, Serialize};
+use common::{read_json, setup};
+use jsonpath::{Parser, Selector, SelectorMut};
 use serde_json::Value;
 
-use jsonpath::Selector;
-
-#[derive(Serialize, Deserialize, PartialEq, Debug)]
-struct Person {
-    name: String,
-    age: u8,
-    phone: String,
-}
-
-fn input_str() -> &'static str {
-    r#"[
-        {
-            "name": "이름1",
-            "age": 40,
-            "phone": "+33 12341234"
-        },
-        {
-            "name": "이름2",
-            "age": 42,
-            "phone": "++44 12341234"
-        }
-    ]"#
-}
-
-fn input_json() -> Value {
-    serde_json::from_str(input_str()).unwrap()
-}
-
-fn input_person() -> Vec<Person> {
-    serde_json::from_str(input_str()).unwrap()
-}
-#[test]
-fn selector_value_from() {
-    let result = Selector::new()
-        .path("$..[?(@.age > 40)]").unwrap()
-        .value_from(&input_person()).unwrap()
-        .select_to::<Vec<Person>>().unwrap();
-    assert_eq!(input_person()[1], result[0]);
-}
+mod common;
 
 #[test]
-fn selector_value() {
-    let result = Selector::new()
-        .path("$..[?(@.age > 40)]").unwrap()
-        .value((&input_json()).into()).unwrap()
-        .select_to_value().unwrap();
-    assert_eq!(input_json()[1], result[0]);
-}
+fn selector_mut() {
+    setup();
 
-#[test]
-fn selector_value_from_str() {
-    let result = Selector::new()
-        .path("$..[?(@.age > 40)]").unwrap()
-        .value_from_str(input_str()).unwrap()
-        .select_to_value().unwrap();
-    assert_eq!(input_json()[1], result[0]);
-}
+    let mut selector_mut = SelectorMut::default();
 
-#[test]
-fn selector_select_to() {
-    let mut selector = Selector::new();
+    let mut nums = Vec::new();
+    let result = selector_mut
+        .str_path(r#"$.store..price"#)
+        .unwrap()
+        .value(read_json("./benchmark/example.json"))
+        .replace_with(&mut |v| {
+            if let Value::Number(n) = v {
+                nums.push(n.as_f64().unwrap());
+            }
+            Some(Value::String("a".to_string()))
+        })
+        .unwrap()
+        .take()
+        .unwrap();
 
+    assert_eq!(
+        nums,
+        vec![8.95_f64, 12.99_f64, 8.99_f64, 22.99_f64, 19.95_f64]
+    );
+
+    let mut selector = Selector::default();
     let result = selector
-        .path("$..[?(@.age > 40)]").unwrap()
-        .value_from_str(input_str()).unwrap()
-        .select_to_value().unwrap();
-    assert_eq!(input_json()[1], result[0]);
+        .str_path(r#"$.store..price"#)
+        .unwrap()
+        .value(&result)
+        .select()
+        .unwrap();
 
-    let result = selector.select_to_str().unwrap();
-    assert_eq!(serde_json::to_string(&vec![&input_json()[1].clone()]).unwrap(), result);
+    assert_eq!(
+        vec![
+            &json!("a"),
+            &json!("a"),
+            &json!("a"),
+            &json!("a"),
+            &json!("a")
+        ],
+        result
+    );
+}
 
-    let result = selector.select_to::<Vec<Person>>().unwrap();
-    assert_eq!(input_person()[1], result[0]);
+#[test]
+fn selector_node_ref() {
+    let node = Parser::compile("$.*").unwrap();
+    let mut selector = Selector::default();
+    selector.compiled_path(&node);
+    assert!(std::ptr::eq(selector.node_ref().unwrap(), &node));
+}
 
-    let _ = selector.path("$..[?(@.age == 40)]");
+#[test]
+fn selector_delete() {
+    setup();
 
-    let result = selector.select_to_value().unwrap();
-    assert_eq!(input_json()[0], result[0]);
+    let mut selector_mut = SelectorMut::default();
 
-    let result = selector.select_to_str().unwrap();
-    assert_eq!(serde_json::to_string(&vec![&input_json()[0].clone()]).unwrap(), result);
+    let result = selector_mut
+        .str_path(r#"$.store..price[?(@>13)]"#)
+        .unwrap()
+        .value(read_json("./benchmark/example.json"))
+        .delete()
+        .unwrap()
+        .take()
+        .unwrap();
 
-    let result = selector.select_to::<Vec<Person>>().unwrap();
-    assert_eq!(input_person()[0], result[0]);
-}
+    let mut selector = Selector::default();
+    let result = selector
+        .str_path(r#"$.store..price"#)
+        .unwrap()
+        .value(&result)
+        .select()
+        .unwrap();
+
+    assert_eq!(
+        result,
+        vec![
+            &json!(8.95),
+            &json!(12.99),
+            &json!(8.99),
+            &Value::Null,
+            &Value::Null
+        ]
+    );
+}
+
+#[test]
+fn selector_remove() {
+    setup();
+
+    let mut selector_mut = SelectorMut::default();
+
+    let result = selector_mut
+        .str_path(r#"$.store..price[?(@>13)]"#)
+        .unwrap()
+        .value(read_json("./benchmark/example.json"))
+        .remove()
+        .unwrap()
+        .take()
+        .unwrap();
+
+    let mut selector = Selector::default();
+    let result = selector
+        .str_path(r#"$.store..price"#)
+        .unwrap()
+        .value(&result)
+        .select()
+        .unwrap();
+
+    assert_eq!(
+        result,
+        vec![
+            &json!(8.95),
+            &json!(12.99),
+            &json!(8.99)
+        ]
+    );
+}

tests/serde.rs

@@ -1,39 +0,0 @@
-extern crate jsonpath_lib as jsonpath;
-extern crate serde;
-extern crate serde_json;
-
-use std::io::Read;
-
-use serde_json::Value;
-use jsonpath::ref_value::model::{RefValue, RefValueWrapper};
-
-fn read_json(path: &str) -> String {
-    let mut f = std::fs::File::open(path).unwrap();
-    let mut contents = String::new();
-    f.read_to_string(&mut contents).unwrap();
-    contents
-}
-
-#[test]
-fn de() {
-    let json_str = read_json("./benches/example.json");
-    // RefValue -> Value
-    let ref_value: RefValue = serde_json::from_str(json_str.as_str()).unwrap();
-    let ref value_wrapper: RefValueWrapper = ref_value.into();
-    let value: Value = value_wrapper.into();
-
-    // Value
-    let json: Value = serde_json::from_str(json_str.as_str()).unwrap();
-    assert_eq!(value, json);
-}
-
-#[test]
-fn ser() {
-    let json_str = read_json("./benches/example.json");
-    let ref_value: RefValue = serde_json::from_str(json_str.as_str()).unwrap();
-    let ref_value_str = serde_json::to_string(&ref_value).unwrap();
-
-    let json: Value = serde_json::from_str(json_str.as_str()).unwrap();
-    let json_str = serde_json::to_string(&json).unwrap();
-    assert_eq!(ref_value_str, json_str);
-}

tests/tokenizer.rs

@@ -1,194 +0,0 @@
-extern crate jsonpath_lib as jsonpath;
-
-use jsonpath::parser::tokenizer::{Tokenizer, Token, TokenError, PreloadedTokenizer};
-
-fn collect_token(input: &str) -> (Vec<Token>, Option<TokenError>) {
-    let mut tokenizer = Tokenizer::new(input);
-    let mut vec = vec![];
-    loop {
-        match tokenizer.next_token() {
-            Ok(t) => vec.push(t),
-            Err(e) => return (vec, Some(e)),
-        }
-    }
-}
-
-fn run(input: &str, expected: (Vec<Token>, Option<TokenError>)) {
-    let (vec, err) = collect_token(input.clone());
-    assert_eq!((vec, err), expected, "\"{}\"", input);
-}
-
-#[test]
-fn peek() {
-    let mut tokenizer = PreloadedTokenizer::new("$.a");
-    match tokenizer.next_token() {
-        Ok(t) => assert_eq!(Token::Absolute(0), t),
-        _ => panic!()
-    }
-
-    match tokenizer.peek_token() {
-        Ok(t) => assert_eq!(&Token::Dot(1), t),
-        _ => panic!()
-    }
-
-    match tokenizer.peek_token() {
-        Ok(t) => assert_eq!(&Token::Dot(1), t),
-        _ => panic!()
-    }
-
-    match tokenizer.next_token() {
-        Ok(t) => assert_eq!(Token::Dot(1), t),
-        _ => panic!()
-    }
-}
-
-#[test]
-fn token() {
-    run("$.01.a",
-        (
-            vec![
-                Token::Absolute(0),
-                Token::Dot(1),
-                Token::Key(2, "01".to_string()),
-                Token::Dot(4),
-                Token::Key(5, "a".to_string())
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("$.   []",
-        (
-            vec![
-                Token::Absolute(0),
-                Token::Dot(1),
-                Token::Whitespace(2, 2),
-                Token::OpenArray(5),
-                Token::CloseArray(6)
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("$..",
-        (
-            vec![
-                Token::Absolute(0),
-                Token::Dot(1),
-                Token::Dot(2),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("$..ab",
-        (
-            vec![
-                Token::Absolute(0),
-                Token::Dot(1),
-                Token::Dot(2),
-                Token::Key(3, "ab".to_string())
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("$..가 [",
-        (
-            vec![
-                Token::Absolute(0),
-                Token::Dot(1),
-                Token::Dot(2),
-                Token::Key(3, "가".to_string()),
-                Token::Whitespace(6, 0),
-                Token::OpenArray(7),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("[-1, 2 ]",
-        (
-            vec![
-                Token::OpenArray(0),
-                Token::Key(1, "-1".to_string()),
-                Token::Comma(3),
-                Token::Whitespace(4, 0),
-                Token::Key(5, "2".to_string()),
-                Token::Whitespace(6, 0),
-                Token::CloseArray(7),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("[ 1 2 , 3 \"abc\" : -10 ]",
-        (
-            vec![
-                Token::OpenArray(0),
-                Token::Whitespace(1, 0),
-                Token::Key(2, "1".to_string()),
-                Token::Whitespace(3, 0),
-                Token::Key(4, "2".to_string()),
-                Token::Whitespace(5, 0),
-                Token::Comma(6),
-                Token::Whitespace(7, 0),
-                Token::Key(8, "3".to_string()),
-                Token::Whitespace(9, 0),
-                Token::DoubleQuoted(10, "abc".to_string()),
-                Token::Whitespace(15, 0),
-                Token::Split(16),
-                Token::Whitespace(17, 0),
-                Token::Key(18, "-10".to_string()),
-                Token::Whitespace(21, 0),
-                Token::CloseArray(22),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("?(@.a가 <41.01)",
-        (
-            vec![
-                Token::Question(0),
-                Token::OpenParenthesis(1),
-                Token::At(2),
-                Token::Dot(3),
-                Token::Key(4, "a가".to_string()),
-                Token::Whitespace(8, 0),
-                Token::Little(9),
-                Token::Key(10, "41".to_string()),
-                Token::Dot(12),
-                Token::Key(13, "01".to_string()),
-                Token::CloseParenthesis(15),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("?(@.a <4a.01)",
-        (
-            vec![
-                Token::Question(0),
-                Token::OpenParenthesis(1),
-                Token::At(2),
-                Token::Dot(3),
-                Token::Key(4, "a".to_string()),
-                Token::Whitespace(5, 0),
-                Token::Little(6),
-                Token::Key(7, "4a".to_string()),
-                Token::Dot(9),
-                Token::Key(10, "01".to_string()),
-                Token::CloseParenthesis(12),
-            ]
-            , Some(TokenError::Eof)
-        ));
-
-    run("?($.c>@.d)", (
-        vec![
-            Token::Question(0),
-            Token::OpenParenthesis(1),
-            Token::Absolute(2),
-            Token::Dot(3),
-            Token::Key(4, "c".to_string()),
-            Token::Greater(5),
-            Token::At(6),
-            Token::Dot(7),
-            Token::Key(8, "d".to_string()),
-            Token::CloseParenthesis(9)
-        ]
-        , Some(TokenError::Eof)
-    ));
-}

wasm/.gitignore

@@ -7,4 +7,5 @@ nodejs_pkg
 all_pkg
 wasm-pack.log
 .idea/*
-.vscode
+.vscode
+tests/node_modules

wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonpath-wasm"
-version = "0.1.2"
+version = "0.2.4"
 authors = ["Changseok Han <freestrings@gmail.com>"]
 description = "It is Webassembly version of jsonpath_lib that is JsonPath engine written in Rust - Demo: https://freestrings.github.io/jsonpath"
 keywords = ["jsonpath", "json", "webassembly", "parsing", "rust"]
@@ -14,21 +14,22 @@ crate-type = ["cdylib", "rlib"]
 default = ["console_error_panic_hook", "wee_alloc"]
 
 [dependencies]
-cfg-if = "0.1.2"
+cfg-if = "0.1"
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
-console_error_panic_hook = { version = "0.1.1", optional = true }
-wee_alloc = { version = "0.4.2", optional = true }
+console_error_panic_hook = { version = "0.1", optional = true }
+wee_alloc = { version = "0.4", optional = true }
 
 jsonpath_lib = { path = "../" }
+serde = "1.0"
 serde_json = { version = "1.0", features = ["preserve_order"] }
 lazy_static = "1.3.0"
 web-sys = { version = "0.3", features = ['console'] }
+js-sys = "0.3"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-js-sys = "0.3"
 
 [profile.release]
 opt-level = "s"

wasm/README.md

@@ -6,13 +6,22 @@ It is Webassembly version of [jsonpath_lib](https://github.com/freestrings/jsonp
 
 ## APIs
 
-* [jsonpath.Selector](#jsonpathselector)
-* [jsonpath.select(json: string|object, jsonpath: string)](#jsonpathselectjson-stringobject-jsonpath-string)
-* [jsonpath.compile(jsonpath: string)](#jsonpathcompilejsonpath-string)
-* [jsonpath.selector(json: string|object)](#jsonpathselectorjson-stringobject)
-* [Other Examples](https://github.com/freestrings/jsonpath/wiki/Javascript-examples)
+<details><summary><b>npm package</b></summary>
 
-### jsonpath.Selector
+```javascript
+// browser
+import * as jsonpath from "jsonpath-wasm";
+// NodeJs
+const jsonpath = require('jsonpath-wasm');
+```
+
+</details>
+
+<details><summary><b>Javascript - jsonpath.Selector class</b></summary>
+
+`wasm-bindgen` 리턴 타입 제약 때문에 빌더 패턴은 지원하지 않는다.
+
+It does not support `builder-pattern` due to the `return type` restriction of `wasm-bindgen`.
 
 ```javascript
 let jsonObj = {
@@ -28,28 +37,89 @@ let jsonObj = {
     ]
 };
 
-let selector = new jsonpath.Selector().value(jsonObj);
+let ret = [
+    {"name": "친구3", "age": 30},
+    {"name": "친구1", "age": 20}
+];
+
+let selector = new jsonpath.Selector();
+selector.path('$..friends[0]');
+selector.value(jsonObj);
+
+let retObj = selector.select();
+
+console.log(JSON.stringify(ret) == JSON.stringify(retObj));
+
+// => true
+```
+
+</details>
+
+<details><summary><b>Javascript - jsonpath.SelectorMut class</b></summary>
+
+빌더 패턴 제약은 `Selector class`와 동일하다.
+
+```javascript
+let jsonObj = {
+    'school': {
+        'friends': [
+            {'name': '친구1', 'age': 20},
+            {'name': '친구2', 'age': 20},
+        ],
+    },
+    'friends': [
+        {'name': '친구3', 'age': 30},
+        {'name': '친구4'},
+    ],
+};
+
+let selector = new jsonpath.SelectorMut();
+selector.path('$..[?(@.age == 20)]');
 
 {
-    let jsonObj = selector.path('$..[?(@.age >= 30)]').selectTo();
-    let resultObj = [{"name": "친구3", "age": 30}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
+    selector.value(jsonObj);
+    selector.deleteValue();
+
+    let resultObj = {
+        'school': {'friends': [null, null]},
+        'friends': [
+            {'name': '친구3', 'age': 30},
+            {'name': '친구4'},
+        ],
+    };
+    console.log(JSON.stringify(selector.take()) !== JSON.stringify(resultObj));
+    
+    // => true
 }
 
 {
-    let jsonObj = selector.path('$..[?(@.age == 20)]').selectTo();
-    let resultObj = [{"name": "친구1", "age": 20}, {"name": "친구2", "age": 20}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
-}
+    selector.value(jsonObj);
+    selector.replaceWith((v) => {
+        v.age = v.age * 2;
+        return v;
+    });
 
-{
-    let jsonObj = selector.value({"friends": [ {"name": "친구5", "age": 20} ]}).selectTo();
-    let resultObj = [{"name": "친구5", "age": 20}];
-    console.log(JSON.stringify(jsonObj) === JSON.stringify(resultObj));
+    let resultObj = {
+        'school': {
+            'friends': [
+                {'name': '친구1', 'age': 40},
+                {'name': '친구2', 'age': 40},
+            ],
+        },
+        'friends': [
+            {'name': '친구3', 'age': 30},
+            {'name': '친구4'},
+        ],
+    };
+    console.log(JSON.stringify(selector.take()) !== JSON.stringify(resultObj));
+    
+    // => true
 }
 ```
 
-### jsonpath.select(json: string|object, jsonpath: string)
+</details>
+
+<details><summary><b>Javascript - jsonpath.select(json: string|object, jsonpath: string)</b></summary>
 
 ```javascript
 let jsonObj = {
@@ -82,7 +152,9 @@ console.log(
 // => true, true
 ```
 
-### jsonpath.compile(jsonpath: string)
+</details>
+
+<details><summary><b>Javascript - jsonpath.compile(jsonpath: string)</b></summary>
 
 ```javascript
 let template = jsonpath.compile('$..friends[0]');
@@ -140,8 +212,10 @@ console.log(
 
 // => true, true
 ```
+    
+</details>
 
-### jsonpath.selector(json: string|object)
+<details><summary><b>Javascript - jsonpath.selector(json: string|object)</b></summary>
 
 ```javascript
 let jsonObj = {
@@ -181,3 +255,77 @@ console.log(
 
 // => true, true
 ```
+
+</details>
+
+<details><summary><b>Javascript - jsonpath.deleteValue(json: string|object, path: string)</b></summary>
+
+```javascript
+let jsonObj = {
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+    ]
+};
+
+let _1 = jsonpath.deleteValue(jsonObj, '$..friends[0]');
+let result = jsonpath.deleteValue(_1, '$..friends[1]');
+
+console.log(JSON.stringify(result) !== JSON.stringify({
+    "school": { "friends": [null, null]},
+    "friends": [null, null]
+}));
+
+// => true
+
+```
+
+</details>
+
+<details><summary><b>Javascript - jsonpath.replaceWith(json: string|object, path: string, fun: function(json: object) => json: object</b></summary>
+
+```javascript
+let jsonObj = {
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 20},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 30},
+        {"name": "친구4"}
+    ]
+};
+
+let result = jsonpath.replaceWith(jsonObj, '$..friends[0]', (v) => {
+    v.age = v.age * 2;
+    return v;
+});
+
+console.log(JSON.stringify(result) === JSON.stringify({
+    "school": {
+        "friends": [
+            {"name": "친구1", "age": 40},
+            {"name": "친구2", "age": 20}
+        ]
+    },
+    "friends": [
+        {"name": "친구3", "age": 60},
+        {"name": "친구4"}
+    ]
+}));
+
+// => true
+
+```
+
+</details>
+
+[Javascript - Other Examples](https://github.com/freestrings/jsonpath/wiki/Javascript-examples)