@storecraft/database-turso 1.0.15 → 1.0.17

package/index.js

@@ -29,8 +29,8 @@ export class Turso extends SQL {
         dialect_type: 'SQLITE',
         dialect: new LibsqlDialect(
           {
+            prefers_batch_over_transactions: true,
             ...config,
-            prefers_batch_over_transactions: config.prefers_batch_over_transactions ?? true
           }
         ),
       }

package/kysely.turso.dialect.js

@@ -26,8 +26,12 @@ export class LibsqlDialect {
     return this.#config;
   }
 
-  createAdapter() { return new kysely.SqliteAdapter(); }
-  createQueryCompiler() { return new kysely.SqliteQueryCompiler(); }
+  createAdapter() { 
+    return new kysely.SqliteAdapter(); 
+  }
+  createQueryCompiler() { 
+    return new kysely.SqliteQueryCompiler(); 
+  }
   createDriver() {
 
     if (this.#config?.url===undefined) {
@@ -173,9 +177,7 @@ export class LibsqlConnection {
   } 
 
   /**
-   * 
    * @param {kysely.CompiledQuery} compiledQuery 
-   * 
    * @returns {Promise<QueryResult>}
    */
   async executeQuery(compiledQuery) {
@@ -193,6 +195,7 @@ export class LibsqlConnection {
   }
 
   async beginTransaction() {
+    // console.log('beginTransaction')
     if(this.config.prefers_batch_over_transactions) {
       this.isBatch = true;
       this.batch = [];

package/migrate.js

@@ -1,5 +1,123 @@
-export { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+import { SQL } from "@storecraft/database-sql-base";
+import { AggregateDialect } from "@storecraft/database-sql-base/kysely.aggregate.dialect.js";
+import { get_migrations, prepare_and_bind } from "@storecraft/database-sql-base/migrate.js";
+import { Kysely, Migrator } from "kysely";
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from "node:url";
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
+/**
+ * 
+ * @param {SQL} db_driver 
+ * @param {boolean} [destroy_db_upon_completion=true] 
+ */
+export async function migrateToLatest(
+  db_driver, destroy_db_upon_completion=true
+) {
+  const db = db_driver?.client;
 
+  if(!db)
+    throw new Error('No Kysely client found !!!');
 
+  console.log(
+    'Resolving migrations. This may take 2 minutes ...'
+  );
+
+  const migrations = await get_migrations(db_driver.dialectType);
+
+  if(!migrations)
+    throw new Error('No migrations found !!!');
+
+  const sorted = Object
+  .entries(migrations)
+  .sort((a, b) => a[0].localeCompare(b[0]));
+
+  /** @type {Record<string, import("kysely").Migration>} */
+  const rewritten_migrations = {};
+
+  for (const [name, migration] of sorted) {
+    // console.log(`Executing virtual migration "${name}" ...`);
+    const up_agg_dialect = new AggregateDialect(
+      { dialect: db_driver.config.dialect, }
+    );
+    const up_agg_kysely = new Kysely(
+      { dialect: up_agg_dialect }
+    );
+    const down_agg_dialect = new AggregateDialect(
+      { dialect: db_driver.config.dialect, }
+    );
+    const down_agg_kysely = new Kysely(
+      { dialect: down_agg_dialect }
+    );
+    
+    await migration.up(up_agg_kysely);
+    await migration.down(down_agg_kysely);
+
+    // now get the queries
+    const queries_up = up_agg_dialect.queries;
+    const queries_down = down_agg_dialect.queries;
+    
+    // turso dialect supports transactions and also batch
+    // we take adavantage of this
+    rewritten_migrations[name] = {
+      up: async (db) => {
+        await db.transaction().execute(
+          async (trx) => {
+            for (const query of queries_up) {
+              await trx.executeQuery(query)
+            }
+          }
+        );
+      },
+      down: async (db) => {
+        await db.transaction().execute(
+          async (trx) => {
+            for (const query of queries_down) {
+              await trx.executeQuery(query)
+            }
+          }
+        );
+      }
+    }
+  }
+
+  const migrator = new Migrator(
+    {
+      db,
+      provider: {
+        getMigrations: async () => {
+          return rewritten_migrations;
+        }
+      }
+    }
+  );
+
+  const { error, results } = await migrator.migrateToLatest();
+
+  results?.forEach(
+    (it) => {
+      if (it.status === 'Success') {
+        console.log(
+          `migration "${it.migrationName}" was executed successfully`
+        );
+      } else if (it.status === 'Error') {
+        console.error(
+          `failed to execute migration "${it.migrationName}"`
+        );
+      }
+    }
+  );
+
+  if (error) {
+    console.error('failed to migrate')
+    console.error(JSON.stringify(error, null, 2))
+    process.exit(1)
+  }
+
+  if(destroy_db_upon_completion)
+    await db.destroy();
+}
+  

package/migrate_old.js

@@ -0,0 +1,5 @@
+export { migrateToLatest } from '@storecraft/database-sql-base/migrate.js';
+
+
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-turso",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "`Storecraft` database driver for `Turso` (cloud sqlite)",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",

package/tests/runner.test.js

@@ -11,7 +11,9 @@ export const create_app = async () => {
     {
       auth_admins_emails: ['admin@sc.com'],
       auth_secret_access_token: 'auth_secret_access_token',
-      auth_secret_refresh_token: 'auth_secret_refresh_token'
+      auth_secret_refresh_token: 'auth_secret_refresh_token',
+      auth_secret_confirm_email_token: 'auth_secret_confirm_email_token',
+      auth_secret_forgot_password_token: 'auth_secret_forgot_password_token',
     }
   )
   .withPlatform(new NodePlatform())

package/tests/sandbox.js

@@ -9,7 +9,9 @@ export const test = async () => {
     {
       auth_admins_emails: ['admin@sc.com'],
       auth_secret_access_token: 'auth_secret_access_token',
-      auth_secret_refresh_token: 'auth_secret_refresh_token'
+      auth_secret_refresh_token: 'auth_secret_refresh_token',
+      auth_secret_confirm_email_token: 'auth_secret_confirm_email_token',
+      auth_secret_forgot_password_token: 'auth_secret_forgot_password_token',
     }
   )
   .withPlatform(new NodePlatform())

package/kysely.turso.utils.js

@@ -1,33 +0,0 @@
-
-/**
- * 
- * @param {string} stmt 
- * @param {any[] | Record<string, any>} params 
- */
-export const prepare_and_bind = (stmt='', params=[]) => {
-  const params_object = Array.isArray(params) ? 
-      params.reduce((a, v, idx) => ({ ...a, [idx+1]: v}), {}) : 
-      params; 
-
-  let current = 0;
-  let result = ''
-  let index_run = 1;
-  for (let m of stmt.matchAll(/\?[0-9]*/g)) {
-    result += stmt.slice(current, m.index);
-  
-    const match_string = m[0];
-    let index_access = match_string.length > 1 ? 
-          Number(match_string.slice(1)) : 
-          index_run;
-  
-    result += "'" + params_object[index_access] + "'";
-  
-    current = m.index + m[0].length;
-    index_run+=1;
-  }
-  
-  result += stmt.slice(current);
-
-  return result;
-}
-