feat(psl, query-engine, schema-engine): add cuid(2) support, fix uuid(7)

Cargo.toml

@@ -54,7 +54,10 @@ chrono = { version = "0.4.38", features = ["serde"] }
 derive_more = "0.99.17"
 user-facing-errors = { path = "./libs/user-facing-errors" }
 uuid = { version = "1", features = ["serde", "v4", "v7", "js"] }
-cuid = { version = "1.3.3" }
+cuid = { git = "https://github.com/prisma/cuid-rust", branch = "v1.3.3-wasm32-unknown-unknown" }
+getrandom = { version = "0.2" }
+# cuid = { path = "../cuid-rust/crates/cuid" }
+
 indoc = "2.0.1"
 indexmap = { version = "2.2.2", features = ["serde"] }
 itertools = "0.12"
@@ -65,7 +68,6 @@ napi = { version = "2.16.13", default-features = false, features = [
   "serde-json",
 ] }
 napi-derive = "2.16.12"
-js-sys = { version = "0.3" }
 pin-project = "1"
 rand = { version = "0.8" }
 regex = { version = "1", features = ["std"] }
@@ -74,6 +76,11 @@ serde-wasm-bindgen = { version = "0.5" }
 tracing = { version = "0.1" }
 tracing-futures = "0.2"
 tsify = { version = "0.4.5" }
+
+# version for `[email protected]`, see:
+# https://github.com/rustwasm/wasm-bindgen/pull/4072/
+js-sys = { version = "0.3.70" } 
+
 wasm-bindgen = { version = "0.2.93" }
 wasm-bindgen-futures = { version = "0.4" }
 wasm-rs-dbg = { version = "0.1.2", default-features = false, features = ["console-error"] }

quaint/Cargo.toml

@@ -98,6 +98,7 @@ sqlformat = { version = "0.2.3", optional = true }
 uuid.workspace = true
 crosstarget-utils = { path = "../libs/crosstarget-utils" }
 concat-idents = "1.1.5"
+getrandom = { workspace = true, optional = true }
 
 [dev-dependencies]
 once_cell = "1.3"
@@ -110,9 +111,8 @@ quaint-test-setup = { path = "quaint-test-setup" }
 tokio = { version = "1", features = ["macros", "time"] }
 expect-test = "1"
 
-[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom]
-version = "0.2"
-features = ["js"]
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { workspace = true, features = ["js"] }
 
 [dependencies.ws_stream_tungstenite]
 version = "0.14.0"

query-engine/connectors/mongodb-query-connector/Cargo.toml

@@ -21,7 +21,6 @@ tracing-futures.workspace = true
 uuid.workspace = true
 indexmap.workspace = true
 prisma-metrics.path = "../../../libs/metrics"
-cuid.workspace = true
 derive_more.workspace = true
 
 [dependencies.query-structure]

query-engine/query-structure/Cargo.toml

@@ -10,15 +10,14 @@ prisma-value = { path = "../../libs/prisma-value" }
 bigdecimal = "0.3"
 thiserror = "1.0"
 
-getrandom = { version = "0.2" }
+getrandom = { workspace = true, optional = true }
 uuid = { workspace = true, optional = true }
 cuid = { workspace = true, optional = true }
 nanoid = { version = "0.4.0", optional = true }
 chrono.workspace = true
 
-[target.'cfg(target_arch = "wasm32")'.dependencies.getrandom]
-version = "0.2"
-features = ["js"]
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+getrandom = { workspace = true, features = ["js"] }
 
 [features]
 # Support for generating default UUID, CUID, nanoid and datetime values.

query-engine/query-structure/src/default_value.rs

@@ -285,7 +285,7 @@ impl ValueGeneratorFn {
     #[cfg(feature = "default_generators")]
     fn generate_cuid(version: u8) -> PrismaValue {
         PrismaValue::String(match version {
-            1 => cuid::cuid1().unwrap(),
+            1 => cuid::cuid1(),
             2 => cuid::cuid2(),
             _ => panic!("Unknown `cuid` version: {}", version),
         })