@storecraft/database-sql-base 1.0.22 → 1.0.24

package/migrate.js

@@ -101,9 +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();
 }

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.22",
+  "version": "1.0.24",
   "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.auth_users.js

@@ -7,7 +7,7 @@ import {
   count_regular, delete_me, insert_search_of, insert_tags_of, 
   regular_upsert_me, where_id_or_handle_table, with_media, with_tags
 } from './con.shared.js'
-import { query_to_eb, query_to_sort } from './utils.query.js';
+import { withQuery } from './utils.query.js';
 import { remove as remove_customer_and_auth_user } from './con.customers.js';
 
 
@@ -126,22 +126,26 @@ const removeByEmail = (driver) => {
 const list = (driver) => {
   return async (query) => {
 
-    const items = await driver.client.selectFrom(table_name)
+    const items = await withQuery(
+      driver.client.selectFrom(table_name)
       .selectAll()
       .select(eb => [
         with_tags(eb, eb.ref('auth_users.id'), driver.dialectType),
         with_media(eb, eb.ref('auth_users.id'), driver.dialectType),
-      ])
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'auth_users'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
-
-    if(query.limitToLast) items.reverse();
+      ]),
+      query, table_name
+      // .where(
+      //   (eb) => {
+      //     return query_to_eb(eb, query, table_name);
+      //   }
+      // )
+      // .orderBy(query_to_sort(query, 'auth_users'))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+    )
+    .execute();
+
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

package/src/con.collections.js

@@ -13,7 +13,7 @@ import {
   with_search
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
-import { query_to_eb, query_to_sort } from './utils.query.js'
+import { query_to_eb, withQuery, withSort } from './utils.query.js'
 
 export const table_name = 'collections'
 
@@ -120,22 +120,26 @@ const remove = (driver) => {
 const list = (driver) => {
   return async (query) => {
 
-    const items = await driver.client
+    const items = await withQuery(
+      driver.client
       .selectFrom(table_name)
       .selectAll()
       .select(eb => [
         with_tags(eb, eb.ref('collections.id'), driver.dialectType),
         with_media(eb, eb.ref('collections.id'), driver.dialectType),
         with_search(eb, eb.ref('collections.id'), driver.dialectType),
-      ])
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'collections'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      ]),
+      query, table_name
+    ).execute();
+
+      // .where(
+      //   (eb) => {
+      //     return query_to_eb(eb, query, table_name);
+      //   }
+      // )
+      // .orderBy(query_to_sort(query, 'collections'))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
 
     if(query.limitToLast) items.reverse();
 
@@ -150,7 +154,8 @@ const list = (driver) => {
 const list_collection_products = (driver) => {
   return async (handle_or_id, query={}) => {
 
-    const items = await driver.client
+    const items = await withSort(
+      driver.client
       .selectFrom('products')
       .innerJoin(
         'products_to_collections', 
@@ -177,14 +182,17 @@ const list_collection_products = (driver) => {
           ].filter(Boolean)
         )
       )
-      .orderBy(query_to_sort(query, 'products'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      .limit(query.limitToLast ?? query.limit ?? 10),
+      query, 'products'
+    ).execute()
+      // .orderBy(query_to_sort(query, 'products'))
+      // .execute();
 
       // .compile();
       // console.log(items[0])
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

package/src/con.customers.js

@@ -8,7 +8,7 @@ import { count_regular, delete_me, delete_media_of, delete_search_of,
   insert_tags_of, regular_upsert_me, where_id_or_handle_table, 
   with_media, with_search, with_tags} from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
-import { query_to_eb, query_to_sort } from './utils.query.js'
+import { query_to_eb, withQuery, withSort } from './utils.query.js'
 
 export const table_name = 'customers'
 
@@ -130,22 +130,25 @@ export const remove = (driver) => {
 const list = (driver) => {
   return async (query) => {
 
-    const items = await driver.client
+    const items = await withQuery(
+      driver.client
       .selectFrom(table_name)
       .selectAll()
       .select(eb => [
         with_media(eb, eb.ref('customers.id'), driver.dialectType),
         with_tags(eb, eb.ref('customers.id'), driver.dialectType),
         with_search(eb, eb.ref('customers.id'), driver.dialectType),
-      ].filter(Boolean))
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, table_name))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      ].filter(Boolean)), 
+      query, table_name
+  ).execute();
+  
+    // .where(
+    //   (eb) => {
+    //     return query_to_eb(eb, query, table_name);
+    //   }
+  // .orderBy(query_to_sort(query, table_name))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
 
     if(query.limitToLast) items.reverse();
 
@@ -160,7 +163,8 @@ const list = (driver) => {
 const list_customer_orders = (driver) => {
   return async (id, query) => {
 
-    const items = await driver.client
+    const items = await withSort(
+      driver.client
       .selectFrom('orders')
       .selectAll()
       .select(eb => [
@@ -180,11 +184,14 @@ const list_customer_orders = (driver) => {
           ].filter(Boolean)
         )
       )
-      .orderBy(query_to_sort(query, 'orders'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      .limit(query.limitToLast ?? query.limit ?? 10),
+      query, 'orders'
+    ).execute();
+      // .orderBy(query_to_sort(query, 'orders'))
+      // .execute();
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }
@@ -195,7 +202,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 +215,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

@@ -7,7 +7,7 @@ import {
   helper_compute_product_extra_tags_because_of_discount_side_effect_for_db
  } from '@storecraft/core/database'
 import { SQL } from '../index.js'
-import { discount_to_conjunctions } from './con.discounts.utils.js'
+import { discount_to_conjunctions, is_order_discount } from './con.discounts.utils.js'
 import { 
   delete_entity_values_by_value_or_reporter_and_context, 
   delete_me, delete_media_of, delete_search_of, 
@@ -16,7 +16,7 @@ import {
   with_media, with_tags, count_regular, with_search,
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
-import { query_to_eb, query_to_sort } from './utils.query.js'
+import { query_to_eb, withQuery, withSort } from './utils.query.js'
 import { report_document_media } from './con.images.js'
 
 export const table_name = 'discounts'
@@ -59,7 +59,13 @@ const upsert = (driver) => {
               trx, extra_tag);
           }
   
-          if(item.active && item.application.id===enums.DiscountApplicationEnum.Auto.id) {
+          // make connections into `products_to_discounts`, only applicable for
+          // `product` discounts and automatic discounts
+          if(
+            item.active && 
+            item.application.id===enums.DiscountApplicationEnum.Auto.id &&
+            !is_order_discount(item)
+          ) {
             // make connections
             await trx
             .insertInto('products_to_discounts')
@@ -135,7 +141,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,
           });
         }
       );
@@ -243,24 +249,24 @@ const remove = (driver) => {
 const list = (driver) => {
   return async (query) => {
 
-    const items = await driver.client
+    const items = await withQuery(
+      driver.client
       .selectFrom(table_name)
       .selectAll()
       .select(eb => [
         with_media(eb, eb.ref('discounts.id'), driver.dialectType),
         with_tags(eb, eb.ref('discounts.id'), driver.dialectType),
         with_search(eb, eb.ref('discounts.id'), driver.dialectType),
-      ].filter(Boolean))
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, table_name))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      ].filter(Boolean)),
+      query, table_name
+    ).execute();
+
+      // .orderBy(query_to_sort(query, table_name))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }
@@ -273,7 +279,8 @@ const list = (driver) => {
 const list_discount_products = (driver) => {
   return async (handle_or_id, query={}) => {
 
-    const items = await driver.client
+    const items = await withSort(
+      driver.client
       .selectFrom('products')
       .innerJoin(
         'products_to_discounts', 
@@ -298,11 +305,15 @@ const list_discount_products = (driver) => {
           ].filter(Boolean)        
         )
       )
-      .orderBy(query_to_sort(query, 'products'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      .limit(query.limitToLast ?? query.limit ?? 10),
+      query, 'products'
+    ).execute();
+
+      // .orderBy(query_to_sort(query, 'products'))
+      // .execute();
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

package/src/con.discounts.utils.js

@@ -1,21 +1,26 @@
 /**
  * @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'
  */
 import { enums } from "@storecraft/core/api";
+import { assert } from "console";
 
 /** @param {DiscountType} d */
-const is_order_discount = d => {
-  return (d.info.details.meta.id===enums.DiscountMetaEnum.order.id);
+export const is_order_discount = d => {
+  return (
+    (d.info.details.type===enums.DiscountMetaEnum.order.type) ||
+    // @ts-ignore
+    (d.info.details.meta?.type===enums.DiscountMetaEnum.order.type)
+  );
 }
 
 /** @param {DiscountType} d */
-const is_automatic_discount = d => {
+export const is_automatic_discount = d => {
   return (d.application.id===enums.DiscountApplicationEnum.Auto.id);
 }
 
@@ -49,7 +54,7 @@ const eb_in = (eb, table, value) => {
 }
 
 /**
- * create a mongodb conjunctions clauses from discount, intended
+ * @description create a filter conjunctions clauses from discount
  * for filtering.
  * @param {ExpressionBuilder<Database, 'products'>} eb 
  * @param {DiscountType} d 
@@ -61,13 +66,16 @@ export const discount_to_conjunctions = (eb, d) => {
     d.active && d?.info?.filters?.length
   );
 
-  if(!is_good) return [];
+  assert(
+    is_good,
+    `discount_to_conjunctions: discount is not a product discount`
+  );
 
   const conjunctions = [];
   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 +83,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 +144,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 +177,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.images.js

@@ -9,7 +9,7 @@ import { count_regular, delete_me, delete_search_of,
   insert_search_of, regular_upsert_me, where_id_or_handle_table 
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
-import { query_to_eb, query_to_sort } from './utils.query.js'
+import { withQuery } from './utils.query.js'
 import { Transaction } from 'kysely'
 import { ID } from '@storecraft/core/api/utils.func.js'
 import { 
@@ -196,19 +196,24 @@ export const report_document_media = (driver) => {
  */
 const list = (driver) => {
   return async (query) => {
-    const items = await driver.client
+    const items = await withQuery(
+      driver.client
       .selectFrom(table_name)
-      .selectAll()
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'images')) // ts complains because `usage` field is absent
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
-
-    if(query.limitToLast) items.reverse();
+      .selectAll(),
+      query, table_name
+    ).execute()
+
+      // .where(
+      //   (eb) => {
+      //     return query_to_eb(eb, query, table_name);
+      //   }
+      // )
+      // .orderBy(query_to_sort(query, 'images')) // ts complains because `usage` field is absent
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
+
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }