Merge pull request #151 from OP-Engineering/oscar/refactor-api

Refactor API into a simpler one

cpp/libsql/bridge.cpp

@@ -253,8 +253,10 @@ void opsqlite_libsql_bind_statement(libsql_stmt_t statement,
     JSVariant value = values->at(ii);
     int status;
 
-    if (std::holds_alternative<bool>(value) ||
-        std::holds_alternative<int>(value)) {
+    if (std::holds_alternative<bool>(value)) {
+      status = libsql_bind_int(statement, index,
+                       static_cast<int>(std::get<bool>(value)), &err);
+    } else if (std::holds_alternative<int>(value)) {
       status = libsql_bind_int(statement, index, std::get<int>(value), &err);
     } else if (std::holds_alternative<long long>(value)) {
       status =
@@ -494,7 +496,6 @@ BridgeResult opsqlite_libsql_execute(std::string const &name,
         break;
 
       case LIBSQL_TEXT:
-
         status = libsql_get_string(row, col, &text_value, &err);
         out_row.emplace_back(text_value);
         break;

example/ios/Podfile.lock

@@ -1393,7 +1393,7 @@ SPEC CHECKSUMS:
   GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   hermes-engine: 6eae7edb2f563ee41d7c1f91f4f2e57c26d8a5c3
-  op-sqlite: 92d182e19a4b923e2ae6760896dc578dbf8ef953
+  op-sqlite: d567632567b87bedda1f718e4ce6c081457c2f42
   RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df
   RCTDeprecation: 3ca8b6c36bfb302e1895b72cfe7db0de0c92cd47
   RCTRequired: 9fc183af555fd0c89a366c34c1ae70b7e03b1dc5

example/package.json

@@ -20,7 +20,7 @@
     "chance": "^1.1.9",
     "clsx": "^2.0.0",
     "events": "^3.3.0",
-    "mocha": "^10.1.0",
+    "mocha": "^10.7.3",
     "nativewind": "^2.0.11",
     "react": "18.2.0",
     "react-native": "0.74.0",

example/src/App.tsx

@@ -22,8 +22,8 @@ export default function App() {
   const [results, setResults] = useState<any>([]);
   useEffect(() => {
     runTests(
-      dbSetupTests,
       queriesTests,
+      dbSetupTests,
       blobTests,
       registerHooksTests,
       preparedStatementsTests,

example/src/tests/MochaRNAdapter.ts

@@ -1,18 +1,18 @@
 import 'mocha';
 import type * as MochaTypes from 'mocha';
 
-export let rootSuite = new Mocha.Suite('') as MochaTypes.Suite;
-rootSuite.timeout(10 * 1000);
-// rootSuite.timeout(60 * 60 * 1000);
+const TIMEOUT = 10 * 1000;
 
-let mochaContext = rootSuite;
+export const rootSuite = new Mocha.Suite('') as MochaTypes.Suite;
+rootSuite.timeout(TIMEOUT);
+let suite = new Mocha.Suite('') as MochaTypes.Suite;
 let only = false;
 
 export const clearTests = () => {
+  suite.suites = [];
+  suite.tests = [];
   rootSuite.suites = [];
   rootSuite.tests = [];
-  rootSuite = new Mocha.Suite('') as MochaTypes.Suite;
-  mochaContext = rootSuite;
   only = false;
 };
 
@@ -22,7 +22,7 @@ export const it = (
 ): void => {
   if (!only) {
     const test = new Mocha.Test(name, f);
-    mochaContext.addTest(test);
+    suite.addTest(test);
   }
 };
 
@@ -32,33 +32,29 @@ export const itOnly = (
 ): void => {
   clearTests();
   const test = new Mocha.Test(name, f);
-  mochaContext.addTest(test);
+  suite.addTest(test);
+  rootSuite.addSuite(suite);
   only = true;
 };
 
 export const describe = (name: string, f: () => void): void => {
-  const prevMochaContext = mochaContext;
-  mochaContext = new Mocha.Suite(
-    name,
-    prevMochaContext.ctx,
-  ) as MochaTypes.Suite;
-  prevMochaContext.addSuite(mochaContext);
+  suite = new Mocha.Suite(name) as MochaTypes.Suite;
+  rootSuite.addSuite(suite);
   f();
-  mochaContext = prevMochaContext;
 };
 
 export const beforeEach = (f: () => void): void => {
-  mochaContext.beforeEach(f);
+  suite.beforeEach(f);
 };
 
 export const afterEach = (f: () => void): void => {
-  mochaContext.afterEach(f);
+  suite.afterEach(f);
 };
 
 export const beforeAll = (f: any) => {
-  mochaContext.beforeAll(f);
+  suite.beforeAll(f);
 };
 
 export const afterAll = (f: any) => {
-  mochaContext.afterAll(f);
+  suite.afterAll(f);
 };

example/src/tests/MochaSetup.ts

@@ -51,6 +51,7 @@ export async function runTests(...registrators: Array<() => void>) {
     registrators.forEach(register => {
       register();
     });
+
     runner.run();
   });
   return promise;

example/src/tests/blob.spec.ts

@@ -7,37 +7,36 @@ let expect = chai.expect;
 let db: DB;
 
 export function blobTests() {
-  beforeEach(async () => {
-    try {
+  describe('Blobs', () => {
+    beforeEach(async () => {
+      try {
+        if (db) {
+          db.close();
+          db.delete();
+        }
+
+        db = open({
+          name: 'blobs',
+          encryptionKey: 'test',
+        });
+
+        await db.execute('DROP TABLE IF EXISTS BlobTable;');
+        await db.execute(
+          'CREATE TABLE BlobTable ( id INT PRIMARY KEY, content BLOB) STRICT;',
+        );
+      } catch (e) {
+        console.warn('error on before each', e);
+      }
+    });
+
+    afterAll(() => {
       if (db) {
         db.close();
         db.delete();
+        // @ts-ignore
+        db = null;
       }
-
-      db = open({
-        name: 'blobs',
-        encryptionKey: 'test',
-      });
-
-      await db.execute('DROP TABLE IF EXISTS BlobTable;');
-      await db.execute(
-        'CREATE TABLE BlobTable ( id INT PRIMARY KEY, content BLOB) STRICT;',
-      );
-    } catch (e) {
-      console.warn('error on before each', e);
-    }
-  });
-
-  afterAll(() => {
-    if (db) {
-      db.close();
-      db.delete();
-      // @ts-ignore
-      db = null;
-    }
-  });
-
-  describe('Blobs', () => {
+    });
     it('ArrayBuffer', async () => {
       const uint8 = new Uint8Array(2);
       uint8[0] = 42;
@@ -49,7 +48,7 @@ export function blobTests() {
 
       const result = await db.execute('SELECT content FROM BlobTable');
 
-      const finalUint8 = new Uint8Array(result.rows!._array[0].content);
+      const finalUint8 = new Uint8Array(result.rows?.[0].content);
       expect(finalUint8[0]).to.equal(42);
     });
 
@@ -64,7 +63,7 @@ export function blobTests() {
 
       const result = await db.execute('SELECT content FROM BlobTable');
 
-      const finalUint8 = new Uint8Array(result.rows!._array[0].content);
+      const finalUint8 = new Uint8Array(result.rows?.[0].content);
       expect(finalUint8[0]).to.equal(42);
     });
 
@@ -79,7 +78,7 @@ export function blobTests() {
 
       const result = await db.execute('SELECT content FROM BlobTable');
 
-      const finalUint8 = new Uint8Array(result.rows!._array[0].content);
+      const finalUint8 = new Uint8Array(result.rows?.[0].content);
       expect(finalUint8[0]).to.equal(42);
     });
 
@@ -96,7 +95,7 @@ export function blobTests() {
 
       const result = await db.execute('SELECT content FROM BlobTable');
 
-      const finalUint8 = new Uint8Array(result.rows!._array[0].content);
+      const finalUint8 = new Uint8Array(result.rows?.[0].content);
       expect(finalUint8[0]).to.equal(46);
     });
 
@@ -113,7 +112,7 @@ export function blobTests() {
 
       const result = await db.execute('SELECT content FROM BlobTable');
 
-      const finalUint8 = new Uint8Array(result.rows!._array[0].content);
+      const finalUint8 = new Uint8Array(result.rows?.[0].content);
       expect(finalUint8[0]).to.equal(52);
     });
   });

example/src/tests/dbsetup.spec.ts

@@ -45,7 +45,7 @@ export function dbSetupTests() {
 
       const res = await db.execute('select sqlite_version();');
 
-      expect(res.rows?._array[0]['sqlite_version()']).to.equal(expectedVersion);
+      expect(res.rows?.[0]['sqlite_version()']).to.equal(expectedVersion);
       db.close();
     });
 

example/src/tests/hooks.spec.ts

@@ -15,34 +15,33 @@ const chance = new Chance();
 let db: DB;
 
 export function registerHooksTests() {
-  beforeEach(async () => {
-    try {
+  describe('Hooks', () => {
+    beforeEach(async () => {
+      try {
+        if (db) {
+          db.close();
+          db.delete();
+        }
+
+        db = open(DB_CONFIG);
+
+        await db.execute('DROP TABLE IF EXISTS User;');
+        await db.execute(
+          'CREATE TABLE User ( id INT PRIMARY KEY, name TEXT NOT NULL, age INT, networth REAL) STRICT;',
+        );
+      } catch (e) {
+        console.warn('error on before each', e);
+      }
+    });
+
+    afterAll(() => {
       if (db) {
         db.close();
         db.delete();
+        // @ts-ignore
+        db = null;
       }
-
-      db = open(DB_CONFIG);
-
-      await db.execute('DROP TABLE IF EXISTS User;');
-      await db.execute(
-        'CREATE TABLE User ( id INT PRIMARY KEY, name TEXT NOT NULL, age INT, networth REAL) STRICT;',
-      );
-    } catch (e) {
-      console.warn('error on before each', e);
-    }
-  });
-
-  afterAll(() => {
-    if (db) {
-      db.close();
-      db.delete();
-      // @ts-ignore
-      db = null;
-    }
-  });
-
-  describe('Hooks', () => {
+    });
     // libsql does not support hooks
     if (isLibsql()) {
       return;