Merge pull request #1 from LucaCappelletti94/extension-uuid-crate

Moving uuid crate based version

Author: LucaCappelletti94

.github/workflows/test.yml

@@ -155,6 +155,35 @@ jobs:
         cd extensions/sqlite-vec
         wasm-pack test --node
 
+  test_sqlite_wasm_uuid4:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+    - name: Test
+      run: |
+        cd extensions/uuid4
+        wasm-pack test --chrome --headless
+
+  test_sqlite_wasm_uuid7:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install wasm-pack
+      run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+    - name: Test
+      run: |
+        cd extensions/uuid7
+        wasm-pack test --chrome --headless
+
+
   test_sqlite_wasm_vfs:
     strategy:
       matrix:

.vscode/settings.json

@@ -1,4 +1,9 @@
 {
   "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
-  "rust-analyzer.cargo.features": ["bindgen"]
+  "rust-analyzer.cargo.features": [
+    "bindgen"
+  ],
+  "chat.tools.terminal.autoApprove": {
+    "wasm-pack": true
+  }
 }

CHANGELOG.md

@@ -5,8 +5,7 @@
 
 ### Added
 
-* Added support for the SQLite `uuid4` extension, enabled via the `uuid4` feature flag.
-* Added support for the Postgres18 `uuid7` extension, enabled via the `uuid7` feature flag, ported from PostgreSQL implementation.
+* Integrated the [`uuid`](https://docs.rs/uuid/latest/uuid/) rust crate to provide functionality to generate UUIDs in the `uuid4` and `uuid7` extensions inside SQLite.
 
 ### Fixed
 

Cargo.toml

@@ -1,7 +1,6 @@
 [package]
 name = "sqlite-wasm-rs"
 links = "wsqlite3"
-version = "0.5.2"
 authors = ["Spxg <unsafe@outlook.es>"]
 repository = "https://github.com/Spxg/sqlite-wasm-rs"
 description = "`wasm32-unknown-unknown` bindings to the libsqlite3 library."
@@ -10,29 +9,27 @@ keywords = ["sqlite", "sqlite-wasm", "wasm", "webassembly", "javascript"]
 readme.workspace = true
 edition.workspace = true
 license.workspace = true
+version.workspace = true
 rust-version.workspace = true
 include.workspace = true
 
 [dependencies]
 rsqlite-vfs = "0.1.0"
-wasm-bindgen = { version = "0.2.104", default-features = false }
+wasm-bindgen.workspace = true
 js-sys = { version = "0.3.81", default-features = false }
 
 [features]
 # SQLite3MultipleCiphers
 # <https://github.com/utelle/SQLite3MultipleCiphers>
 # <https://utelle.github.io/SQLite3MultipleCiphers>
 sqlite3mc = []
-# Link the uuid extension to the library.
-uuid4 = []
-uuid7 = []
 
 [build-dependencies]
 cc = "1.2.27"
 bindgen = { version = "0.72", optional = true }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.54"
+wasm-bindgen-test.workspace = true
 
 [package.metadata.docs.rs]
 targets = ["wasm32-unknown-unknown"]
@@ -45,30 +42,40 @@ members = [
   "crates/sqlite-wasm-libc",
   "crates/sqlite-wasm-vfs",
   "extensions/sqlite-vec",
+  "extensions/uuid4",
+  "extensions/uuid7",
   "examples/implement-a-vfs",
   "examples/nodejs",
   "examples/use-prebuild-lib",
 ]
 
 [workspace.package]
 readme = "README.md"
+version = "0.5.2"
 edition = "2021"
 license = "MIT"
 rust-version = "1.82.0"
 include = [
-    'src/**/*.rs',
-    'build.rs',
-    'sqlite3/**/*.c',
-    'sqlite3/**/*.h',
-    'sqlite3mc/**/*.c',
-    'sqlite3mc/**/*.h',
-    'shim/**/*.h',
-    'shim/**/*.c',
-    'Cargo.toml',
-    '/README.md',
-    'LICENSE',
+  'src/**/*.rs',
+  'build.rs',
+  'sqlite3/**/*.c',
+  'sqlite3/**/*.h',
+  'sqlite3mc/**/*.c',
+  'sqlite3mc/**/*.h',
+  'shim/**/*.h',
+  'shim/**/*.c',
+  'Cargo.toml',
+  '/README.md',
+  'LICENSE',
 ]
 
+[workspace.dependencies]
+sqlite-wasm-rs = { path = "./", version = "0.5.2" }
+wasm-bindgen = { version = "0.2.104", default-features = false }
+wasm-bindgen-test = "0.3.54"
+rusqlite = "0.38.0"
+uuid = { version = "1.20.0", features = ["v4", "v7", "js"] }
+
 [patch.crates-io]
 rsqlite-vfs = { path = "./crates/rsqlite-vfs" }
 sqlite-wasm-rs = { path = "./" }

README.md

@@ -92,6 +92,22 @@ See [ADDING_EXTENSIONS.md](docs/ADDING_EXTENSIONS.md) for instructions on how to
 
 Contributions are welcome!
 
+## Testing
+
+To run tests for the workspace or specific extensions, use `wasm-pack test --headless --firefox`. 
+
+Extensions (like `extensions/uuid4` or `extensions/uuid7`) are configured to run within a browser environment.
+
+```bash
+# Test uuid4 extension
+cd extensions/uuid4
+wasm-pack test --headless --firefox
+
+# Test uuid7 extension
+cd extensions/uuid7
+wasm-pack test --headless --firefox
+```
+
 ## Related Project
 
 * [`diesel`](https://github.com/diesel-rs/diesel): A safe, extensible ORM and Query Builder for Rust.

build.rs

@@ -189,7 +189,6 @@ fn bindgen(output: &std::path::PathBuf) {
     bindings.write_to_file(output).unwrap();
 }
 
-#[allow(clippy::vec_init_then_push)]
 fn compile() {
     const C_SOURCE: [&str; 36] = [
         // string
@@ -258,23 +257,5 @@ fn compile() {
     #[cfg(feature = "sqlite3mc")]
     cc.flags(SQLITE3_MC_FEATURED);
 
-    // Extensions
-    // Define a list of extensions with their feature flag and source file.
-    // (feature_name, source_file)
-    #[allow(unused_mut)]
-    let mut extensions: Vec<(&str, &str)> = Vec::new();
-
-    #[cfg(feature = "uuid4")]
-    extensions.push(("uuid4", "sqlite3/ext/uuid4.c"));
-
-    #[cfg(feature = "uuid7")]
-    extensions.push(("uuid7", "sqlite3/ext/uuid7.c"));
-
-    for (_feature, source) in &extensions {
-        cc.file(source);
-        // Ensure extensions can find sqlite3ext.h
-        cc.include("sqlite3");
-    }
-
     cc.compile("wsqlite3");
 }

examples/nodejs/Cargo.toml

@@ -6,7 +6,12 @@ edition = "2021"
 [dependencies]
 wasm-bindgen = "0.2.104"
 sqlite-wasm-rs = { path = "../.." }
+sqlite-wasm-uuid4 = { path = "../../extensions/uuid4" }
+sqlite-wasm-uuid7 = { path = "../../extensions/uuid7" }
 wasm-bindgen-futures = "0.4.54"
+uuid = { version = "1.20.0", features = ["js"] }
+getrandom = { version = "0.2", features = ["js"] }
+console_error_panic_hook = "0.1.7"
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "rlib"]

examples/nodejs/index.js

@@ -0,0 +1,6 @@
+if (!globalThis.crypto) {
+    globalThis.crypto = require("node:crypto").webcrypto;
+}
+
+const wasm = require('./pkg/nodejs.js');
+// wasm.main(); // main is executed automatically due to #[wasm_bindgen(start)]