diff --git a/build.sh b/build.sh index 7b34869..c5b7d88 100755 --- a/build.sh +++ b/build.sh @@ -45,16 +45,18 @@ if [ "$1" = "all" ]; then __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 echo echo -__msg "nodejs" +__msg "nodejs test" cd "${NODEJS}" && npm test echo diff --git a/nodejs/README.md b/nodejs/README.md index b05868d..0fe61df 100644 --- a/nodejs/README.md +++ b/nodejs/README.md @@ -11,6 +11,7 @@ Pre-built 바이너리는 제공하진 않고 소스를 컴파일해서 설치 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 +> Supported node version is under v12.0 ## APIs diff --git a/nodejs/build.sh b/nodejs/build.sh index ba8846b..236d890 100755 --- a/nodejs/build.sh +++ b/nodejs/build.sh @@ -7,5 +7,4 @@ if ! [ -x "$(command -v rustc)" ]; then export PATH="$HOME/.cargo/bin:$PATH" source "$HOME/.cargo/env" fi - -neon build --release \ No newline at end of file +check-node-version --node '<12.0' && neon build --release \ No newline at end of file diff --git a/nodejs/native/Cargo.toml b/nodejs/native/Cargo.toml index e8571e7..28b1339 100644 --- a/nodejs/native/Cargo.toml +++ b/nodejs/native/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "jsonpath4nodejs" -version = "0.1.1" +version = "0.1.2" authors = ["Changseok Han "] description = "jsonpath_lib bindings for nodejs" keywords = ["library", "jsonpath", "json", "nodejs"] @@ -14,7 +14,7 @@ exclude = ["artifacts.json", "index.node"] neon-build = "0.2.0" [dependencies] -jsonpath_lib = "0.1.9" +jsonpath_lib = "0.1.12" neon = "0.2.0" neon-serde = "0.1.1" serde_json = { version = "1.0", features = ["preserve_order"] } diff --git a/nodejs/package-lock.json b/nodejs/package-lock.json index c59e430..eb3587c 100644 --- a/nodejs/package-lock.json +++ b/nodejs/package-lock.json @@ -106,6 +106,54 @@ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz", "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=" }, + "check-node-version": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/check-node-version/-/check-node-version-4.0.1.tgz", + "integrity": "sha512-pWV+uuJJoOGbODDC6+DPUYeprv1CUg/jr1SGKpgkANstGN22f9T0Vn40mdv6hvRZ25KMH/IjkVc0LZH5ms+qEg==", + "requires": { + "chalk": "^2.3.0", + "map-values": "^1.0.1", + "minimist": "^1.2.0", + "object-filter": "^1.0.2", + "run-parallel": "^1.1.4", + "semver": "^5.7.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -617,6 +665,11 @@ "p-defer": "^1.0.0" } }, + "map-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-values/-/map-values-1.0.1.tgz", + "integrity": "sha1-douOecAJvytk/ugG4ip7HEGQyZA=" + }, "mem": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", @@ -795,6 +848,11 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, + "object-filter": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object-filter/-/object-filter-1.0.2.tgz", + "integrity": "sha1-rwt5f/6+r4pSxmN87b6IFs/sG8g=" + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -988,6 +1046,11 @@ "is-promise": "^2.1.0" } }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==" + }, "rx-lite": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", diff --git a/nodejs/package.json b/nodejs/package.json index 4b9684f..c4be664 100644 --- a/nodejs/package.json +++ b/nodejs/package.json @@ -14,6 +14,7 @@ ], "main": "lib/index.js", "dependencies": { + "check-node-version": "*", "neon-cli": "^0.2.0" }, "scripts": {