Merge 'JavaScript binding improvements' from Pekka Enberg

Closes #1204

bindings/javascript/__test__/better-sqlite3.spec.mjs

@@ -0,0 +1,30 @@
+import test from "ava";
+
+import Database from "better-sqlite3";
+
+test("Open in-memory database", async (t) => {
+    const [db] = await connect(":memory:");
+    t.is(db.memory, true);
+});
+
+
+test("Statement.get() returns data", async (t) => {
+    const [db] = await connect(":memory:");
+    const stmt = db.prepare("SELECT 1");
+    const result = stmt.get();
+    t.is(result["1"], 1);
+    const result2 = stmt.get();
+    t.is(result2["1"], 1);
+});
+
+test("Statement.get() returns undefined when no data", async (t) => {
+    const [db] = await connect(":memory:");
+    const stmt = db.prepare("SELECT 1 WHERE 1 = 2");
+    const result = stmt.get();
+    t.is(result, undefined);
+});
+
+const connect = async (path) => {
+    const db = new Database(path);
+    return [db];
+};

bindings/javascript/__test__/index.spec.mjs

@@ -1,20 +0,0 @@
-import test from "ava";
-
-import { Database } from "../index.js"; 
-
-test.serial("Open in-memory database", async (t) => {
-    const [db] = await connect(":memory:");
-    t.is(db.memory, true);
-});
-
-test.serial("Statement.get()", async (t) => {
-    const [db] = await connect(":memory:");
-    const stmt = db.prepare("SELECT 1");
-    const result = stmt.get();
-    t.is(result["1"], 1);
-});
-
-const connect = async (path) => {
-    const db = new Database(path);
-    return [db];
-};

bindings/javascript/__test__/limbo.spec.mjs

@@ -0,0 +1,30 @@
+import test from "ava";
+
+import { Database } from "../index.js"; 
+
+test("Open in-memory database", async (t) => {
+    const [db] = await connect(":memory:");
+    t.is(db.memory, true);
+});
+
+
+test("Statement.get() returns data", async (t) => {
+    const [db] = await connect(":memory:");
+    const stmt = db.prepare("SELECT 1");
+    const result = stmt.get();
+    t.is(result["1"], 1);
+    const result2 = stmt.get();
+    t.is(result2["1"], 1);
+});
+
+test("Statement.get() returns null when no data", async (t) => {
+    const [db] = await connect(":memory:");
+    const stmt = db.prepare("SELECT 1 WHERE 1 = 2");
+    const result = stmt.get();
+    t.is(result, undefined);
+});
+
+const connect = async (path) => {
+    const db = new Database(path);
+    return [db];
+};

bindings/javascript/package.json

@@ -18,7 +18,8 @@
   "license": "MIT",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
-    "ava": "^6.0.1"
+    "ava": "^6.0.1",
+    "better-sqlite3": "^11.9.1"
   },
   "ava": {
     "timeout": "3m"

bindings/javascript/src/lib.rs

@@ -4,7 +4,7 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use napi::{Env, JsObject, JsUnknown, Result as NapiResult};
+use napi::{Env, JsUnknown, Result as NapiResult};
 use napi_derive::napi;
 
 #[napi(js_name = "Database")]
@@ -69,24 +69,24 @@ impl Statement {
     }
 
     #[napi]
-    pub fn get(&self, env: Env) -> NapiResult<JsObject> {
+    pub fn get(&self, env: Env) -> NapiResult<JsUnknown> {
         let mut stmt = self.inner.borrow_mut();
+        stmt.reset();
         match stmt.step() {
             Ok(limbo_core::StepResult::Row) => {
                 let row = stmt.row().unwrap();
                 let mut obj = env.create_object()?;
-
                 for (idx, value) in row.get_values().iter().enumerate() {
-                    let key = (idx + 1).to_string();
+                    let key = stmt.get_column_name(idx);
                     let js_value = to_js_value(&env, value);
                     obj.set_named_property(&key, js_value)?;
                 }
-                Ok(obj)
+                Ok(obj.into_unknown())
             }
+            Ok(limbo_core::StepResult::Done) => Ok(env.get_undefined().unwrap().into_unknown()),
             Ok(limbo_core::StepResult::IO)
-            | Ok(limbo_core::StepResult::Done)
             | Ok(limbo_core::StepResult::Interrupt)
-            | Ok(limbo_core::StepResult::Busy) => Ok(env.create_object()?),
+            | Ok(limbo_core::StepResult::Busy) => todo!(),
             Err(e) => Err(napi::Error::from_reason(format!("Database error: {:?}", e))),
         }
     }