@storecraft/database-sql-base 1.0.14 → 1.0.15

package/migrate.js

@@ -23,7 +23,7 @@ export async function migrateToLatest(db_driver, destroy_db_upon_completion=true
   if(!db_driver?.client)
     throw new Error('No Kysely client found !!!');
 
-  console.log('Resolving migrations')
+  console.log('Resolving migrations. This may take 2 minutes ...')
 
   let db = db_driver.client;
 
@@ -63,7 +63,7 @@ export async function migrateToLatest(db_driver, destroy_db_upon_completion=true
 
   if (error) {
     console.error('failed to migrate')
-    console.error(error)
+    console.error(JSON.stringify(error, null, 2))
     process.exit(1)
   }
 

package/migrations.shared/00001_seed_email_templates.js

@@ -1,10 +1,10 @@
+/**
+ * @import { Database } from '../types.sql.tables.js'
+ */
 import { Kysely } from 'kysely'
 import { upsert } from '../src/con.templates.js'
 import { templates } from '@storecraft/core/assets/seed-templates.js';
 
-/**
- * @typedef {import('../types.sql.tables.js').Database} Database
- */
 
 /**
  * 

package/migrations.shared/00003_alter_auth_users.js

@@ -9,15 +9,18 @@ import { Kysely } from 'kysely'
  */
 export async function up(db) {
 
-  await db.schema
-  .alterTable('auth_users')
-  .addColumn('firstname', 'text')
-  .execute();
-
-  await db.schema
-  .alterTable('auth_users')
-  .addColumn('lastname', 'text')
-  .execute();
+  try {
+    await db.schema
+    .alterTable('auth_users')
+    .addColumn('firstname', 'text')
+    .execute();
+  
+    await db.schema
+    .alterTable('auth_users')
+    .addColumn('lastname', 'text')
+    .execute();
+  } catch (e) {
+  }
 }
 
 /**
@@ -25,13 +28,16 @@ export async function up(db) {
  * @param {Kysely<Database>} db 
  */
 export async function down(db) {
-  await db.schema
-  .alterTable('auth_users')
-  .dropColumn('firstname')
-  .execute();
-
-  await db.schema
-  .alterTable('auth_users')
-  .dropColumn('lastname')
-  .execute();
+  try {
+    await db.schema
+    .alterTable('auth_users')
+    .dropColumn('firstname')
+    .execute();
+  
+    await db.schema
+    .alterTable('auth_users')
+    .dropColumn('lastname')
+    .execute();
+  } catch (e) {
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",

package/src/con.templates.js

@@ -18,12 +18,23 @@ export const table_name = 'templates'
  * otherwise, just return the original value.
  * @param {string} val 
  */
-const decode_if_base64 = val => {
+const encode_base64_if_needed = val => {
+  if(val.startsWith('base64_'))
+    return val;
+
+  return 'base64_' + base64.encode(val);
+}
+
+/**
+ * @description if `base64_` prefixed then decode the postfix and return it,
+ * otherwise, just return the original value.
+ * @param {string} val 
+ */
+const decode_base64_if_needed = val => {
   if(!val.startsWith('base64_'))
     return val;
 
-  const b64 = val.split('base64_').at(1) ?? '';
-  return base64.decode(b64);
+  return base64.decode(val.split('base64_').at(-1) ?? '');
 }
 
 /**
@@ -45,8 +56,8 @@ export const upsert = (client) => {
             active: item.active ? 1 : 0,
             title: item.title,
             handle: item.handle,
-            template_html: decode_if_base64(item.template_html),
-            template_text: decode_if_base64(item.template_text),
+            template_html: encode_base64_if_needed(item.template_html),
+            template_text: encode_base64_if_needed(item.template_text),
             reference_example_input: JSON.stringify(item.reference_example_input ?? {})
           });
         }
@@ -78,7 +89,17 @@ const get = (driver) => {
     )
     .where(where_id_or_handle_table(id_or_handle))
     .executeTakeFirst()
-    .then(sanitize);
+    .then(sanitize)
+    .then(
+      (item) => {
+        if(!item) return null;
+
+        item.template_html = decode_base64_if_needed(item.template_html);
+        item.template_text = decode_base64_if_needed(item.template_text);
+
+        return item;
+      }
+    )
   }
 }
 
@@ -134,7 +155,18 @@ const list = (driver) => {
       )
       .orderBy(query_to_sort(query, table_name))
       .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      .execute()
+      .then(
+        (items) => {
+          return items.map(
+            (item) => {
+              item.template_html = decode_base64_if_needed(item.template_html);
+              item.template_text = decode_base64_if_needed(item.template_text);
+              return item;
+            }
+          )
+        }
+      );
 
     if(query.limitToLast) items.reverse();