diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 56b6a25..40d9ada 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -1,7 +1,7 @@ name: CI env: DEBUG: napi:* - APP_NAME: package-template + APP_NAME: scylladb MACOSX_DEPLOYMENT_TARGET: "10.13" CARGO_INCREMENTAL: "1" permissions: diff --git a/npm/android-arm-eabi/package.json b/npm/android-arm-eabi/package.json index 6518540..1d77fa8 100644 --- a/npm/android-arm-eabi/package.json +++ b/npm/android-arm-eabi/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm" ], - "main": "package-template.android-arm-eabi.node", + "main": "scylladb.android-arm-eabi.node", "files": [ - "package-template.android-arm-eabi.node" + "scylladb.android-arm-eabi.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index 2b80603..c2829f2 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm64" ], - "main": "package-template.android-arm64.node", + "main": "scylladb.android-arm64.node", "files": [ - "package-template.android-arm64.node" + "scylladb.android-arm64.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 0629e92..01dde2f 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm64" ], - "main": "package-template.darwin-arm64.node", + "main": "scylladb.darwin-arm64.node", "files": [ - "package-template.darwin-arm64.node" + "scylladb.darwin-arm64.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index db624b9..7c57e1e 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -4,11 +4,11 @@ "cpu": [ "x64" ], - "main": "package-template.darwin-x64.node", + "main": "scylladb.darwin-x64.node", "files": [ - "package-template.darwin-x64.node" + "scylladb.darwin-x64.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/freebsd-x64/package.json b/npm/freebsd-x64/package.json index c4e0fb3..1508c1c 100644 --- a/npm/freebsd-x64/package.json +++ b/npm/freebsd-x64/package.json @@ -4,11 +4,11 @@ "cpu": [ "x64" ], - "main": "package-template.freebsd-x64.node", + "main": "scylladb.freebsd-x64.node", "files": [ - "package-template.freebsd-x64.node" + "scylladb.freebsd-x64.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/linux-arm-gnueabihf/package.json b/npm/linux-arm-gnueabihf/package.json index 9c72acd..4a83e1c 100644 --- a/npm/linux-arm-gnueabihf/package.json +++ b/npm/linux-arm-gnueabihf/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm" ], - "main": "package-template.linux-arm-gnueabihf.node", + "main": "scylladb.linux-arm-gnueabihf.node", "files": [ - "package-template.linux-arm-gnueabihf.node" + "scylladb.linux-arm-gnueabihf.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json index 1cb5522..1479c40 100644 --- a/npm/linux-arm64-gnu/package.json +++ b/npm/linux-arm64-gnu/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm64" ], - "main": "package-template.linux-arm64-gnu.node", + "main": "scylladb.linux-arm64-gnu.node", "files": [ - "package-template.linux-arm64-gnu.node" + "scylladb.linux-arm64-gnu.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/linux-arm64-musl/package.json b/npm/linux-arm64-musl/package.json index 6c6a8fb..16ed718 100644 --- a/npm/linux-arm64-musl/package.json +++ b/npm/linux-arm64-musl/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm64" ], - "main": "package-template.linux-arm64-musl.node", + "main": "scylladb.linux-arm64-musl.node", "files": [ - "package-template.linux-arm64-musl.node" + "scylladb.linux-arm64-musl.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index 2e7ab4f..d3ec213 100644 --- a/npm/linux-x64-gnu/package.json +++ b/npm/linux-x64-gnu/package.json @@ -4,11 +4,11 @@ "cpu": [ "x64" ], - "main": "package-template.linux-x64-gnu.node", + "main": "scylladb.linux-x64-gnu.node", "files": [ - "package-template.linux-x64-gnu.node" + "scylladb.linux-x64-gnu.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 2353b17..5c59877 100644 --- a/npm/linux-x64-musl/package.json +++ b/npm/linux-x64-musl/package.json @@ -4,11 +4,11 @@ "cpu": [ "x64" ], - "main": "package-template.linux-x64-musl.node", + "main": "scylladb.linux-x64-musl.node", "files": [ - "package-template.linux-x64-musl.node" + "scylladb.linux-x64-musl.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/wasm32-wasi/package.json b/npm/wasm32-wasi/package.json index fba220a..e825f02 100644 --- a/npm/wasm32-wasi/package.json +++ b/npm/wasm32-wasi/package.json @@ -4,15 +4,15 @@ "cpu": [ "wasm32" ], - "main": "package-template.wasi.cjs", + "main": "scylladb.wasi.cjs", "files": [ - "package-template.wasm32-wasi.wasm", - "package-template.wasi.cjs", - "package-template.wasi-browser.js", + "scylladb.wasm32-wasi.wasm", + "scylladb.wasi.cjs", + "scylladb.wasi-browser.js", "wasi-worker.mjs", "wasi-worker-browser.mjs" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -21,6 +21,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">=14.0.0" @@ -30,10 +35,10 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, - "browser": "package-template.wasi-browser.js", + "browser": "scylladb.wasi-browser.js", "dependencies": { "@napi-rs/wasm-runtime": "^0.2.5" } diff --git a/npm/win32-arm64-msvc/package.json b/npm/win32-arm64-msvc/package.json index 550b6e9..5f9ba4c 100644 --- a/npm/win32-arm64-msvc/package.json +++ b/npm/win32-arm64-msvc/package.json @@ -4,11 +4,11 @@ "cpu": [ "arm64" ], - "main": "package-template.win32-arm64-msvc.node", + "main": "scylladb.win32-arm64-msvc.node", "files": [ - "package-template.win32-arm64-msvc.node" + "scylladb.win32-arm64-msvc.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/win32-ia32-msvc/package.json b/npm/win32-ia32-msvc/package.json index bfc46cb..4b0baa7 100644 --- a/npm/win32-ia32-msvc/package.json +++ b/npm/win32-ia32-msvc/package.json @@ -4,11 +4,11 @@ "cpu": [ "ia32" ], - "main": "package-template.win32-ia32-msvc.node", + "main": "scylladb.win32-ia32-msvc.node", "files": [ - "package-template.win32-ia32-msvc.node" + "scylladb.win32-ia32-msvc.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index e38b6e7..7a0816d 100644 --- a/npm/win32-x64-msvc/package.json +++ b/npm/win32-x64-msvc/package.json @@ -4,11 +4,11 @@ "cpu": [ "x64" ], - "main": "package-template.win32-x64-msvc.node", + "main": "scylladb.win32-x64-msvc.node", "files": [ - "package-template.win32-x64-msvc.node" + "scylladb.win32-x64-msvc.node" ], - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "keywords": [ "napi-rs", "NAPI", @@ -17,6 +17,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "license": "MIT", "engines": { "node": ">= 10" @@ -26,7 +31,7 @@ "access": "public" }, "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "os": [ diff --git a/package.json b/package.json index 8def4f6..cfebea9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { "name": "@lambda-group/scylladb", "version": "1.1.1", - "description": "Template project for writing node package with napi-rs", + "description": "๐Ÿš€ JavaScript driver for ScyllaDB, harnessing Rust's power through napi-rs for top performance. Pre-release stage. ๐Ÿงช๐Ÿ”ง", "main": "index.js", "types": "index.d.ts", "browser": "browser.js", "repository": { - "url": "git+ssh://git@github.com/napi-rs/package-template-pnpm.git", + "url": "git+https://github.com/Daniel-Boll/scylla-javascript-driver.git", "type": "git" }, "license": "MIT", @@ -18,6 +18,11 @@ "node-addon", "node-addon-api" ], + "author": { + "name": "Daniel Boll", + "email": "danielboll.dev@proton.me", + "url": "https://daniel-boll.me" + }, "files": [ "index.d.ts", "index.js", diff --git a/src/helpers/query_parameter.rs b/src/helpers/query_parameter.rs index 1a3af00..2039dc1 100644 --- a/src/helpers/query_parameter.rs +++ b/src/helpers/query_parameter.rs @@ -1,7 +1,7 @@ use scylla::serialize::{ - RowWriter, SerializationError, row::{RowSerializationContext, SerializeRow}, value::SerializeCql, + RowWriter, SerializationError, }; use super::{cql_value_bridge::ParameterWithMapType, to_cql_value::ToCqlValue}; diff --git a/src/helpers/query_results.rs b/src/helpers/query_results.rs index dfef807..58a4e22 100644 --- a/src/helpers/query_results.rs +++ b/src/helpers/query_results.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use napi::bindgen_prelude::{BigInt, Either9, Either10, Either11}; +use napi::bindgen_prelude::{BigInt, Either10, Either11, Either9}; use scylla::frame::response::result::{ColumnType, CqlValue}; use crate::types::{decimal::Decimal, duration::Duration, uuid::Uuid}; diff --git a/src/session/scylla_session.rs b/src/session/scylla_session.rs index e6e135c..26f2cbb 100644 --- a/src/session/scylla_session.rs +++ b/src/session/scylla_session.rs @@ -6,8 +6,8 @@ use crate::query::scylla_prepared_statement::PreparedStatement; use crate::query::scylla_query::Query; use crate::types::tracing::TracingReturn; use crate::types::uuid::Uuid; -use napi::Either; use napi::bindgen_prelude::Either3; +use napi::Either; use scylla::statement::query::Query as ScyllaQuery; use super::metrics; diff --git a/src/types/tracing.rs b/src/types/tracing.rs index 84b49f2..8a14aa7 100644 --- a/src/types/tracing.rs +++ b/src/types/tracing.rs @@ -15,7 +15,7 @@ impl Serialize for CqlTimestampWrapper { where S: serde::Serializer, { - serializer.serialize_i64(self.0.0) + serializer.serialize_i64(self.0 .0) } } @@ -88,4 +88,4 @@ impl From for TracingEvent { } pub type TracingReturn = - HashMap>, serde_json::Value>>; \ No newline at end of file + HashMap>, serde_json::Value>>;