@storecraft/database-sql-base 1.0.21 → 1.0.23

package/migrate.js

@@ -101,44 +101,12 @@ export async function migrateToLatest(db_driver, release_db_upon_completion=true
   if (error) {
     console.error('failed to migrate')
     console.error(JSON.stringify(error, null, 2))
+    console.error(JSON.stringify(results, null, 2))
     process.exit(1)
   }
 
+  console.log('Resolving migrations COMPLETE.')
+
   if(release_db_upon_completion)
     await db.destroy();
 }
-
-
-/**
- * @description Just for education and debugging, do not use !!!
- * @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;
-}
-
-

package/migrations.shared/00003_alter_auth_users.js

@@ -9,6 +9,12 @@ import { Kysely } from 'kysely'
  */
 export async function up(db) {
 
+  // console.log(
+  //   db.schema.alterTable('auth_users')
+  //   .addColumn('firstname', 'text')
+  //   .compile()
+  // )
+
   await db.schema
   .alterTable('auth_users')
   .addColumn('firstname', 'text')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@storecraft/core": "^1.0.0",
-    "kysely": "^0.27.2"
+    "kysely": "^0.28.1"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.9",

package/src/con.customers.js

@@ -195,7 +195,7 @@ const list_customer_orders = (driver) => {
  * @returns {db_col["count_customer_orders"]}
  */
 const count_customer_orders = (driver) => {
-  return async (id, query) => {
+  return async (customer_id_or_email, query) => {
 
     const result = await driver.client
       .selectFrom('orders')
@@ -208,8 +208,8 @@ const count_customer_orders = (driver) => {
             query_to_eb(eb, query, table_name),
             eb.or(
               [
-                eb('_customer_id', '=', id),
-                eb('_customer_email', '=', id),
+                eb('_customer_id', '=', customer_id_or_email),
+                eb('_customer_email', '=', customer_id_or_email),
               ]
             )
           ].filter(Boolean)

package/src/con.discounts.js

@@ -135,7 +135,7 @@ const upsert = (driver) => {
             application: JSON.stringify(item.application),
             info: JSON.stringify(item.info),
             _application_id: item.application.id,
-            _discount_type_id: item.info.details.meta.id
+            _discount_type_id: item?.info?.details?.meta?.id ?? -1,
           });
         }
       );

package/src/con.discounts.utils.js

@@ -1,8 +1,8 @@
 /**
  * @import { 
- *  DiscountType, FilterValue_p_in_price_range, FilterValue_p_not_in_collections, 
- *  FilterValue_p_in_collections, FilterValue_p_not_in_tags, FilterValue_p_in_tags, 
- *  FilterValue_p_in_products, FilterValue_p_not_in_products 
+ *  DiscountType, Filter_p_in_price_range, Filter_p_not_in_collections, 
+ *  Filter_p_in_collections, Filter_p_not_in_tags, Filter_p_in_tags, 
+ *  Filter_p_in_products, Filter_p_not_in_products 
  * } from '@storecraft/core/api'
  * @import { Database } from '../types.sql.tables.js'
  * @import { ExpressionBuilder, BinaryOperator } from 'kysely'
@@ -11,7 +11,11 @@ import { enums } from "@storecraft/core/api";
 
 /** @param {DiscountType} d */
 const is_order_discount = d => {
-  return (d.info.details.meta.id===enums.DiscountMetaEnum.order.id);
+  return (
+    (d.info.details.type===enums.DiscountMetaEnum.order.type) ||
+    // @ts-ignore
+    (d.info.details.meta?.type===enums.DiscountMetaEnum.order.type)
+  );
 }
 
 /** @param {DiscountType} d */
@@ -67,7 +71,7 @@ export const discount_to_conjunctions = (eb, d) => {
   const filters = d.info.filters;
 
   for(const filter of filters) {
-    const op = filter.meta.op;
+    const op = filter.op ?? filter.meta.op;
 
     switch (op) {
       case enums.FilterMetaEnum.p_all.op:
@@ -75,60 +79,60 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_products.op:
         {
-          
-          const cast = /** @type {FilterValue_p_in_products} */ (
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_in_products} */ (
+            filter
           );
-
+          const value = cast_filter?.value ?? [];
           conjunctions.push(
             eb(
               'products.handle', 'in', 
-              cast.map(item => item.handle).filter(Boolean)
+              value.map(item => item.handle).filter(Boolean)
             )
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_products.op:
         {
-          
-          const cast = /** @type {FilterValue_p_not_in_products} */ (
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_not_in_products} */ (
+            filter
           );
+          const value = cast_filter?.value ?? [];
 
           conjunctions.push(
             eb(
               'products.handle', 'not in', 
-              cast.map(item => item.handle).filter(Boolean)
+              value.map(item => item.handle).filter(Boolean)
             )
           );
         }
         break;
       case enums.FilterMetaEnum.p_in_tags.op:
         {
-          
-          const cast = /** @type {FilterValue_p_in_tags} */(
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_in_tags} */ (
+            filter
           );
-          
+          const value = cast_filter?.value ?? [];
+
           conjunctions.push(
             eb_in(
               eb, 'entity_to_tags_projections',
-              cast
+              value
             )
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_tags.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_tags} */ (
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_not_in_tags} */ (
+            filter
           );
+          const value = cast_filter?.value ?? [];
 
           conjunctions.push(
             eb.not(
               eb_in(
                 eb, 'entity_to_tags_projections',
-                cast
+                value
               )
             )
           );
@@ -136,30 +140,32 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_in_collections} */ (
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_in_collections} */ (
+            filter
           );
+          const value = cast_filter?.value ?? [];
 
           // PROBLEM: we only have ids, but use handles in the filters
           conjunctions.push(
             eb_in(
               eb, 'products_to_collections',
-              cast.map(c => c.id)
+              value.map(c => c.id)
             )
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_collections} */ (
-            Array.isArray(filter?.value) ? filter.value : []
+          const cast_filter = /** @type {Filter_p_not_in_collections} */ (
+            filter
           );
+          const value = cast_filter?.value ?? [];
 
           conjunctions.push(
             eb.not(
               eb_in(
                 eb, 'products_to_collections',
-                cast.map(c => c.id)
+                value.map(c => c.id)
               )
             )
           );
@@ -167,16 +173,17 @@ export const discount_to_conjunctions = (eb, d) => {
         break;
       case enums.FilterMetaEnum.p_in_price_range.op:
         {
-          const cast = /** @type {FilterValue_p_in_price_range} */ (
-            {
-              from: 0,
-              to: Number.POSITIVE_INFINITY,
-              ...(filter?.value ?? {}),
-            }
+          const cast_filter = /** @type {Filter_p_in_price_range} */ (
+            filter
           );
-
-          const from = extract_abs_number(cast.from);
-          const to = extract_abs_number(cast.to);
+          const value = /** @type {Filter_p_in_price_range["value"]} */({
+            from: 0,
+            to: Number.POSITIVE_INFINITY,
+            ...(cast_filter?.value ?? {}),
+          });
+
+          const from = extract_abs_number(value.from);
+          const to = extract_abs_number(value.to);
 
           const conj = { price: { $and: [] } };
 

package/src/con.notifications.js

@@ -2,9 +2,11 @@
  * @import { db_notifications as db_col } from '@storecraft/core/database'
  */
 import { SQL } from '../index.js'
-import { count_regular, delete_me, delete_search_of, 
+import { 
+  count_regular, delete_me, delete_search_of, 
   insert_search_of, regular_upsert_me, where_id_or_handle_table, 
-  with_search } from './con.shared.js'
+  with_search 
+} from './con.shared.js'
 import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 

package/src/con.products.js

@@ -75,6 +75,8 @@ const upsert = (driver) => {
           d.info.filters, item
         )
       );
+
+      
       
       item.tags = union(
         [
@@ -420,73 +422,6 @@ const list = (driver) => {
   }
 }
 
-/**
- * @param {SQL} driver 
- * @returns {db_col["list_all_product_collections"]}
- */
-const list_product_collections = (driver) => {
-  return async (product_id_or_handle) => {
-    // we don't expect many collections per products,
-    // therefore we use the simple `get` method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['collections'] }
-    );
-    return item?.collections ?? []
-  }
-}
-
-/**
- * @param {SQL} driver 
- * @returns {db_col["list_all_product_discounts"]}
- */
-const list_product_discounts = (driver) => {
-  return async (product_id_or_handle) => {
-    // we don't expect many discounts per products,
-    // therefore we use the simple `get` method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['discounts'] }
-    );
-    return item?.discounts ?? []
-  }
-}
-
-/**
- * @param {SQL} driver 
- * 
- * @returns {db_col["list_all_product_variants"]}
- */
-const list_product_variants = (driver) => {
-  return async (product_id_or_handle) => {
-    // we don't expect many discounts per products,
-    // therefore we use the simple `get` method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['variants'] }
-    );
-
-    if(item && (`variants` in item))
-      return item.variants ?? [];
-
-    return [];
-  }
-}
-
-/**
- * @param {SQL} driver 
- * 
- * @returns {db_col["list_all_related_products"]}
- */
-const list_related_products = (driver) => {
-  return async (product_id_or_handle) => {
-    // we don't expect many discounts per products,
-    // therefore we use the simple `get` method instead of a query
-    const item = await get(driver)(
-      product_id_or_handle, { expand: ['related_products'] }
-    );
-
-    return item?.related_products ?? [];
-  }
-}
-
 /**
  * @param {SQL} driver 
  * @returns {db_col["list_used_products_tags"]}
@@ -520,33 +455,36 @@ const list_used_products_tags = (driver) => {
  */
 const changeStockOfBy = (driver) => {
   return async (product_ids_or_handles, deltas) => {
-
-    await driver.client.transaction().execute(
-      async (trx) => {
-        for(let ix=0; ix < product_ids_or_handles.length; ix++ ) {
-          const id = product_ids_or_handles[ix];
-          const delta = deltas[ix];
-
-          await trx
-          .updateTable('products')
-          .set(
-            eb => (
-              {
-                qty: eb('qty', '+', delta)
-              }
+    try {
+      await driver.client.transaction().execute(
+        async (trx) => {
+          for(let ix=0; ix < product_ids_or_handles.length; ix++ ) {
+            const id = product_ids_or_handles[ix];
+            const delta = deltas[ix];
+  
+            await trx
+            .updateTable('products')
+            .set(
+              eb => (
+                {
+                  qty: eb('qty', '+', delta)
+                }
+              )
             )
-          )
-          .where(
-            where_id_or_handle_table(id)
-          )
-          .execute()
-
+            .where(
+              where_id_or_handle_table(id)
+            )
+            .execute()
+          }
         }
-      }
-    );
+      );
+    } catch(e) {
+      console.log(e);
+      return false;
+    }
 
+    return true;
   }
-  
 }
 
 
@@ -564,10 +502,6 @@ export const impl = (driver) => {
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
-    list_all_product_collections: list_product_collections(driver),
-    list_all_product_discounts: list_product_discounts(driver),
-    list_all_product_variants: list_product_variants(driver),
-    list_all_related_products: list_related_products(driver),
     list_used_products_tags: list_used_products_tags(driver),
     count: count_regular(driver, table_name),
   }

package/src/utils.query.js

@@ -3,6 +3,7 @@
  * @import { VQL } from '@storecraft/core/vql'
  * @import { Database } from '../types.sql.tables.js'
  * @import { BinaryOperator, ExpressionBuilder } from 'kysely'
+ * @import {DirectedOrderByStringReference, QueryableTables} from './utils.types.js'
  */
 
 import { parse } from "@storecraft/core/vql";
@@ -18,7 +19,8 @@ import { parse } from "@storecraft/core/vql";
  * @param {ExpressionBuilder<Database>} eb 
  * @param {Cursor} c 
  * @param {'>' | '>=' | '<' | '<='} relation 
- * @param {(x: [k: string, v: any]) => [k: string, v: any]} transformer Your chance to change key and value
+ * @param {(x: [k: string, v: any]) => [k: string, v: any]} transformer 
+ * Your chance to change key and value
  */
 export const query_cursor_to_eb = (eb, c, relation, transformer=(x)=>x) => {
 
@@ -94,11 +96,20 @@ export const query_vql_node_to_eb = (eb, node, table_name) => {
           [
             eb.or(
               [
-                eb(`entity_to_search_terms.entity_id`, '=', eb.ref(`${table_name}.id`)),
-                eb(`entity_to_search_terms.entity_handle`, '=', eb.ref(`${table_name}.handle`)),
+                eb(
+                  `entity_to_search_terms.entity_id`, '=', 
+                  eb.ref(`${table_name}.id`)
+                ),
+                eb(
+                  `entity_to_search_terms.entity_handle`, '=', 
+                  eb.ref(`${table_name}.handle`)
+                ),
               ]
             ),
-            eb(`entity_to_search_terms.value`, 'like', node.value.toLowerCase())
+            eb(
+              `entity_to_search_terms.value`, 'like', 
+              node.value.toLowerCase()
+            )
           ]
         )
       )
@@ -129,7 +140,9 @@ export const query_vql_node_to_eb = (eb, node, table_name) => {
  * @param {QueryableTables} table_name 
  */
 export const query_vql_to_eb = (eb, root, table_name) => {
-  return root ? query_vql_node_to_eb(eb, root, table_name) : undefined;
+  return root ? 
+    query_vql_node_to_eb(eb, root, table_name) : 
+    undefined;
 }
 
 
@@ -169,15 +182,31 @@ export const query_to_eb = (eb, q={}, table_name) => {
 
   // compute index clauses
   if(q.startAt) {
-    clauses.push(query_cursor_to_eb(eb, q.startAt, asc ? '>=' : '<=', transformer));
+    clauses.push(
+      query_cursor_to_eb(
+        eb, q.startAt, asc ? '>=' : '<=', transformer
+      )
+    );
   } else if(q.startAfter) {
-    clauses.push(query_cursor_to_eb(eb, q.startAfter, asc ? '>' : '<', transformer));
+    clauses.push(
+      query_cursor_to_eb(
+        eb, q.startAfter, asc ? '>' : '<', transformer
+      )
+    );
   }
 
   if(q.endAt) {
-    clauses.push(query_cursor_to_eb(eb, q.endAt, asc ? '<=' : '>=', transformer));
+    clauses.push(
+      query_cursor_to_eb(
+        eb, q.endAt, asc ? '<=' : '>=', transformer
+      )
+    );
   } else if(q.endBefore) {
-    clauses.push(query_cursor_to_eb(eb, q.endBefore, asc ? '<' : '>', transformer));
+    clauses.push(
+      query_cursor_to_eb(
+        eb, q.endBefore, asc ? '<' : '>', transformer
+      )
+    );
   }
 
   // compute VQL clauses 
@@ -187,7 +216,10 @@ export const query_to_eb = (eb, q={}, table_name) => {
     }
   } catch(e) {}
 
-  const vql_clause = query_vql_to_eb(eb, q.vqlParsed, table_name)
+  const vql_clause = query_vql_to_eb(
+    eb, q.vqlParsed, table_name
+  );
+
   vql_clause && clauses.push(vql_clause);
 
   return eb.and(clauses);
@@ -198,12 +230,6 @@ const SIGN = {
   '-1': 'desc'
 }
 
-// export type DirectedOrderByStringReference<DB, TB extends keyof DB, O> = `${StringReference<DB, TB> | (keyof O & string)} ${OrderByDirection}`;
-
-/**
- * @import {DirectedOrderByStringReference, QueryableTables} from './utils.types.js'
- */
-// OE extends OrderByExpression<DB, TB, O>
 /**
  * Convert an API Query into mongo dialect, also sanitize.
  * @template {Record<string, any>} [Type=Record<string, any>]
@@ -227,5 +253,9 @@ export const query_to_sort = (q={}, table) => {
   )
   // it's too complicated to map each ket to table column.
   // kysely was designed to do this in place
-  return (/** @type {DirectedOrderByStringReference<Database, Table, Database[Table]>[]} */ (sort));
+  return (
+    /** @type {DirectedOrderByStringReference<Database, Table, Database[Table]>[]} */ (
+      sort
+    )
+  );
 }

package/utils.js

@@ -0,0 +1,33 @@
+/**
+ * @description Just for education and debugging, do not use !!!
+ * @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;
+}
+
+