Merge 'Rename JavaScript package to ' from Pekka Enberg

Reviewed-by: Nikita Sivukhin (@sivukhin)

Closes #2508

README.md

@@ -11,7 +11,7 @@
   <a title="Build Status" target="_blank" href="https://github.com/tursodatabase/turso/actions/workflows/rust.yml"><img src="https://img.shields.io/github/actions/workflow/status/tursodatabase/turso/rust.yml?style=flat-square"></a>
   <a title="Releases" target="_blank" href="https://github.com/tursodatabase/turso/releases"><img src="https://img.shields.io/github/release/tursodatabase/turso?style=flat-square&color=9CF"></a>
   <a title="Rust" target="_blank" href="https://crates.io/crates/turso"><img alt="PyPI" src="https://img.shields.io/crates/v/turso"></a>
-  <a title="JavaScript" target="_blank" href="https://www.npmjs.com/package/@tursodatabase/turso"><img alt="PyPI" src="https://img.shields.io/npm/v/@tursodatabase/turso"></a>
+  <a title="JavaScript" target="_blank" href="https://www.npmjs.com/package/@tursodatabase/database"><img alt="PyPI" src="https://img.shields.io/npm/v/@tursodatabase/database"></a>
   <a title="Python" target="_blank" href="https://pypi.org/project/pyturso/"><img alt="PyPI" src="https://img.shields.io/pypi/v/pyturso"></a>
   <a title="MIT" target="_blank" href="https://github.com/tursodatabase/turso/blob/main/LICENSE.md"><img src="http://img.shields.io/badge/license-MIT-orange.svg?style=flat-square"></a>
   <br>
@@ -165,13 +165,13 @@ let res = conn.query("SELECT * FROM users", ()).await?;
 <br>
 
 ```console
-npm i @tursodatabase/turso
+npm i @tursodatabase/database
 ```
 
 Example usage:
 
 ```js
-import { Database } from '@tursodatabase/turso';
+import { Database } from '@tursodatabase/database';
 
 const db = new Database('sqlite.db');
 const stmt = db.prepare('SELECT * FROM users');

bindings/javascript/README.md

@@ -1,4 +1,4 @@
-# @tursodatabase/turso
+# @tursodatabase/database
 
 The next evolution of SQLite: A high-performance, SQLite-compatible database library for Node.js
 
@@ -15,7 +15,7 @@ The next evolution of SQLite: A high-performance, SQLite-compatible database lib
 ## Installation
 
 ```bash
-npm install @tursodatabase/turso
+npm install @tursodatabase/database
 ```
 
 ## Quick Start
@@ -23,7 +23,7 @@ npm install @tursodatabase/turso
 ### In-Memory Database
 
 ```javascript
-import Database from '@tursodatabase/turso';
+import Database from '@tursodatabase/database';
 
 // Create an in-memory database
 const db = new Database(':memory:');
@@ -48,7 +48,7 @@ console.log(users);
 ### File-Based Database
 
 ```javascript
-import Database from '@tursodatabase/turso';
+import Database from '@tursodatabase/database';
 
 // Create or open a database file
 const db = new Database('my-database.db');

bindings/javascript/browser.js

@@ -1 +1 @@
-export * from '@tursodatabase/turso-wasm32-wasi'
+export * from '@tursodatabase/database-wasm32-wasi'

bindings/javascript/examples/drizzle/example.js

@@ -1,6 +1,6 @@
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { sql } from "drizzle-orm";
-import { Database } from '@tursodatabase/turso';
+import { Database } from '@tursodatabase/database';
 
 const sqlite = new Database('sqlite.db');
 const db = drizzle({ client: sqlite });

bindings/javascript/examples/drizzle/package.json

@@ -10,7 +10,7 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "@tursodatabase/turso": "../..",
+    "@tursodatabase/database": "../..",
     "better-sqlite3": "^12.2.0",
     "drizzle-orm": "^0.44.3"
   }

bindings/javascript/index.js

@@ -79,7 +79,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-android-arm64')
+        return require('@tursodatabase/database-android-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -90,7 +90,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-android-arm-eabi')
+        return require('@tursodatabase/database-android-arm-eabi')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -105,7 +105,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-win32-x64-msvc')
+        return require('@tursodatabase/database-win32-x64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -116,7 +116,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-win32-ia32-msvc')
+        return require('@tursodatabase/database-win32-ia32-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -127,7 +127,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-win32-arm64-msvc')
+        return require('@tursodatabase/database-win32-arm64-msvc')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -141,7 +141,7 @@ function requireNative() {
       loadErrors.push(e)
     }
     try {
-      return require('@tursodatabase/turso-darwin-universal')
+      return require('@tursodatabase/database-darwin-universal')
     } catch (e) {
       loadErrors.push(e)
     }
@@ -152,7 +152,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-darwin-x64')
+        return require('@tursodatabase/database-darwin-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -163,7 +163,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-darwin-arm64')
+        return require('@tursodatabase/database-darwin-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -178,7 +178,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-freebsd-x64')
+        return require('@tursodatabase/database-freebsd-x64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -189,7 +189,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-freebsd-arm64')
+        return require('@tursodatabase/database-freebsd-arm64')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -205,7 +205,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-x64-musl')
+          return require('@tursodatabase/database-linux-x64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -216,7 +216,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-x64-gnu')
+          return require('@tursodatabase/database-linux-x64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -229,7 +229,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-arm64-musl')
+          return require('@tursodatabase/database-linux-arm64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -240,7 +240,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-arm64-gnu')
+          return require('@tursodatabase/database-linux-arm64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -253,7 +253,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-arm-musleabihf')
+          return require('@tursodatabase/database-linux-arm-musleabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -264,7 +264,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-arm-gnueabihf')
+          return require('@tursodatabase/database-linux-arm-gnueabihf')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -277,7 +277,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-riscv64-musl')
+          return require('@tursodatabase/database-linux-riscv64-musl')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -288,7 +288,7 @@ function requireNative() {
           loadErrors.push(e)
         }
         try {
-          return require('@tursodatabase/turso-linux-riscv64-gnu')
+          return require('@tursodatabase/database-linux-riscv64-gnu')
         } catch (e) {
           loadErrors.push(e)
         }
@@ -300,7 +300,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-linux-ppc64-gnu')
+        return require('@tursodatabase/database-linux-ppc64-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -311,7 +311,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-linux-s390x-gnu')
+        return require('@tursodatabase/database-linux-s390x-gnu')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -326,7 +326,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-linux-arm64-ohos')
+        return require('@tursodatabase/database-linux-arm64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -337,7 +337,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-linux-x64-ohos')
+        return require('@tursodatabase/database-linux-x64-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -348,7 +348,7 @@ function requireNative() {
         loadErrors.push(e)
       }
       try {
-        return require('@tursodatabase/turso-linux-arm-ohos')
+        return require('@tursodatabase/database-linux-arm-ohos')
       } catch (e) {
         loadErrors.push(e)
       }
@@ -372,7 +372,7 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
   }
   if (!nativeBinding) {
     try {
-      nativeBinding = require('@tursodatabase/turso-wasm32-wasi')
+      nativeBinding = require('@tursodatabase/database-wasm32-wasi')
     } catch (err) {
       if (process.env.NAPI_RS_FORCE_WASI) {
         loadErrors.push(err)

bindings/javascript/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "@tursodatabase/turso",
+  "name": "@tursodatabase/database",
   "version": "0.1.4-pre.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "@tursodatabase/turso",
+      "name": "@tursodatabase/database",
       "version": "0.1.4-pre.4",
       "license": "MIT",
       "devDependencies": {
@@ -4748,4 +4748,4 @@
       }
     }
   }
-}
+}

bindings/javascript/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@tursodatabase/turso",
+  "name": "@tursodatabase/database",
   "version": "0.1.4-pre.4",
   "repository": {
     "type": "git",
@@ -59,4 +59,4 @@
       "node": "./index.js"
     }
   }
-}
+}

bindings/javascript/perf/package-lock.json

@@ -6,26 +6,27 @@
     "": {
       "name": "turso-perf",
       "dependencies": {
-        "@tursodatabase/turso": "..",
+        "@tursodatabase/database": "..",
         "better-sqlite3": "^9.5.0",
         "mitata": "^0.1.11"
       }
     },
     "..": {
-      "name": "@tursodatabase/turso",
-      "version": "0.1.3",
+      "name": "@tursodatabase/database",
+      "version": "0.1.4-pre.4",
       "license": "MIT",
       "devDependencies": {
         "@napi-rs/cli": "^3.0.4",
         "@napi-rs/wasm-runtime": "^1.0.1",
         "ava": "^6.0.1",
-        "better-sqlite3": "^11.9.1"
+        "better-sqlite3": "^11.9.1",
+        "typescript": "^5.9.2"
       },
       "engines": {
         "node": ">= 10"
       }
     },
-    "node_modules/@tursodatabase/turso": {
+    "node_modules/@tursodatabase/database": {
       "resolved": "..",
       "link": true
     },

bindings/javascript/perf/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "better-sqlite3": "^9.5.0",
-    "@tursodatabase/turso": "..",
+    "@tursodatabase/database": "..",
     "mitata": "^0.1.11"
   }
 }

bindings/javascript/perf/perf-turso.js

@@ -1,6 +1,6 @@
 import { run, bench, group, baseline } from 'mitata';
 
-import Database from '@tursodatabase/turso';
+import Database from '@tursodatabase/database';
 
 const db = new Database(':memory:');
 

bindings/javascript/turso.wasi.cjs

@@ -39,9 +39,9 @@ if (__nodeFs.existsSync(__wasmDebugFilePath)) {
   __wasmFilePath = __wasmDebugFilePath
 } else if (!__nodeFs.existsSync(__wasmFilePath)) {
   try {
-    __wasmFilePath = __nodePath.resolve('@tursodatabase/turso-wasm32-wasi')
+    __wasmFilePath = __nodePath.resolve('@tursodatabase/database-wasm32-wasi')
   } catch {
-    throw new Error('Cannot find turso.wasm32-wasi.wasm file, and @tursodatabase/turso-wasm32-wasi package is not installed.')
+    throw new Error('Cannot find turso.wasm32-wasi.wasm file, and @tursodatabase/database-wasm32-wasi package is not installed.')
   }
 }
 

bindings/javascript/yarn.lock

@@ -1068,9 +1068,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tursodatabase/turso@workspace:.":
+"@tursodatabase/database@workspace:.":
   version: 0.0.0-use.local
-  resolution: "@tursodatabase/turso@workspace:."
+  resolution: "@tursodatabase/database@workspace:."
   dependencies:
     "@napi-rs/cli": "npm:^3.0.4"
     "@napi-rs/wasm-runtime": "npm:^1.0.1"

docs/manual.md

@@ -322,13 +322,13 @@ Turso supports a JavaScript API, both with native and WebAssembly package option
 Installing the native package:
 
 ```console
-npm i @tursodatabase/turso
+npm i @tursodatabase/database
 ```
 
 Installing the WebAssembly package:
 
 ```console
-npm i @tursodatabase/turso --cpu wasm32
+npm i @tursodatabase/database --cpu wasm32
 ```
 
 ### API reference
@@ -337,11 +337,11 @@ See [JavaScript API reference](docs/javascript-api-reference.md) for more inform
 
 ### Getting Started
 
-To use Turso from JavaScript application, you need to import `Database` type from the `@tursodatabase/turso` package.
+To use Turso from JavaScript application, you need to import `Database` type from the `@tursodatabase/database` package.
 You can the prepare a statement with `Database.prepare` method and execute the SQL statement with `Statement.get()` method.
 
 ```
-import Database from '@tursodatabase/turso';
+import Database from '@tursodatabase/database';
 
 const db = new Database('turso.db');
 const row = db.prepare('SELECT 1').get();

testing/javascript/__test__/async.test.js

@@ -484,7 +484,7 @@ const connect = async (path, options = {}) => {
   }
   const provider = process.env.PROVIDER;
   if (provider === "turso") {
-    const { Database, SqliteError } = await import("@tursodatabase/turso");
+    const { Database, SqliteError } = await import("@tursodatabase/database");
     const db = new Database(path, options);
     return [db, path, SqliteError];
   }

testing/javascript/__test__/sync.test.js

@@ -516,7 +516,7 @@ const connect = async (path, options = {}) => {
   }
   const provider = process.env.PROVIDER;
   if (provider === "turso") {
-    const { Database, SqliteError }= await import("@tursodatabase/turso/sync");
+    const { Database, SqliteError }= await import("@tursodatabase/database/sync");
     const db = new Database(path, options);
     return [db, path, provider, SqliteError];
   }

testing/javascript/package-lock.json

@@ -6,8 +6,8 @@
     "": {
       "name": "turso-integration-tests",
       "dependencies": {
+        "@tursodatabase/database": "../../bindings/javascript",
         "@tursodatabase/serverless": "../../packages/turso-serverless",
-        "@tursodatabase/turso": "../../bindings/javascript",
         "better-sqlite3": "^11.9.1",
         "libsql": "^0.5.17"
       },
@@ -16,15 +16,14 @@
       }
     },
     "../../bindings/javascript": {
-      "name": "@tursodatabase/turso",
-      "version": "0.1.4-pre.2",
+      "name": "@tursodatabase/database",
+      "version": "0.1.4-pre.4",
       "license": "MIT",
       "devDependencies": {
         "@napi-rs/cli": "^3.0.4",
         "@napi-rs/wasm-runtime": "^1.0.1",
         "ava": "^6.0.1",
         "better-sqlite3": "^11.9.1",
-        "tsc": "^2.0.4",
         "typescript": "^5.9.2"
       },
       "engines": {
@@ -202,12 +201,12 @@
         "node": ">= 8"
       }
     },
-    "node_modules/@tursodatabase/serverless": {
-      "resolved": "../../packages/turso-serverless",
+    "node_modules/@tursodatabase/database": {
+      "resolved": "../../bindings/javascript",
       "link": true
     },
-    "node_modules/@tursodatabase/turso": {
-      "resolved": "../../bindings/javascript",
+    "node_modules/@tursodatabase/serverless": {
+      "resolved": "../../packages/turso-serverless",
       "link": true
     },
     "node_modules/acorn": {

testing/javascript/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@tursodatabase/serverless": "../../packages/turso-serverless",
-    "@tursodatabase/turso": "../../bindings/javascript",
+    "@tursodatabase/database": "../../bindings/javascript",
     "better-sqlite3": "^11.9.1",
     "libsql": "^0.5.17"
   }