@storecraft/database-sql-base 1.0.23 → 1.0.24

package/package.json

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

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();
-
-    if(query.limitToLast) items.reverse();
+      .limit(query.limitToLast ?? query.limit ?? 10),
+      query, 'orders'
+    ).execute();
+      // .orderBy(query_to_sort(query, 'orders'))
+      // .execute();
+
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

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')
@@ -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

@@ -8,9 +8,10 @@
  * @import { ExpressionBuilder, BinaryOperator } from 'kysely'
  */
 import { enums } from "@storecraft/core/api";
+import { assert } from "console";
 
 /** @param {DiscountType} d */
-const is_order_discount = d => {
+export const is_order_discount = d => {
   return (
     (d.info.details.type===enums.DiscountMetaEnum.order.type) ||
     // @ts-ignore
@@ -19,7 +20,7 @@ const is_order_discount = d => {
 }
 
 /** @param {DiscountType} d */
-const is_automatic_discount = d => {
+export const is_automatic_discount = d => {
   return (d.application.id===enums.DiscountApplicationEnum.Auto.id);
 }
 
@@ -53,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 
@@ -65,7 +66,10 @@ 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;

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);
   }

package/src/con.notifications.js

@@ -8,7 +8,7 @@ import {
   with_search 
 } from './con.shared.js'
 import { sanitize_array } from './utils.funcs.js'
-import { query_to_eb, query_to_sort } from './utils.query.js'
+import { withQuery } from './utils.query.js'
 
 export const table_name = 'notifications'
 
@@ -117,22 +117,29 @@ 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_search(eb, eb.ref('notifications.id'), driver.dialectType),
-      ].filter(Boolean))
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'notifications'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
-
-    if(query.limitToLast) items.reverse();
+      .select(
+        eb => [
+          with_search(eb, eb.ref('notifications.id'), driver.dialectType),
+        ].filter(Boolean)
+      ),
+      query, table_name
+    ).execute();
+
+      // .where(
+      //   (eb) => {
+      //     return query_to_eb(eb, query, table_name);
+      //   }
+      // )
+      // .orderBy(query_to_sort(query, 'notifications'))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
+
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

package/src/con.orders.js

@@ -9,7 +9,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 { withQuery } from './utils.query.js'
 
 export const table_name = 'orders'
 
@@ -129,31 +129,38 @@ 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(
         [
           'active', 'address', 'attributes', 'contact', 'coupons', 'created_at', 
           'updated_at', 'description', 'handle', 'id', 'line_items', 'notes', 
-          'payment_gateway', 'pricing', 'shipping_method', 'status', 'validation'
+          'payment_gateway', 'pricing', 'shipping_method', 'status', 'validation', 
         ]
       )
-      .select(eb => [
-        with_media(eb, eb.ref('orders.id'), driver.dialectType),
-        with_tags(eb, eb.ref('orders.id'), driver.dialectType),
-        with_search(eb, eb.ref('orders.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();
-
-    if(query.limitToLast) items.reverse();
+      .select(
+        eb => [
+          with_media(eb, eb.ref('orders.id'), driver.dialectType),
+          with_tags(eb, eb.ref('orders.id'), driver.dialectType),
+          with_search(eb, eb.ref('orders.id'), driver.dialectType),
+        ].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();
 
     return sanitize_array(items);
   }

package/src/con.posts.js

@@ -1,17 +1,17 @@
 /**
  * @import { db_posts as db_col } from '@storecraft/core/database'
  */
-
 import { SQL } from '../index.js'
-import { stringArrayFrom } from './con.helpers.json.js'
 import { report_document_media } from './con.images.js'
-import { count_regular, delete_entity_values_by_value_or_reporter_and_context, 
+import { 
+  count_regular, delete_entity_values_by_value_or_reporter_and_context, 
   delete_me, delete_media_of, delete_search_of, delete_tags_of, 
   insert_media_of, insert_search_of, insert_tags_of, 
   regular_upsert_me, where_id_or_handle_table, 
-  with_media,  with_search,  with_tags} from './con.shared.js'
+  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 { withQuery, withSort } from './utils.query.js'
 
 export const table_name = 'posts'
 
@@ -60,12 +60,13 @@ const get = (driver) => {
     const result = await driver.client
       .selectFrom(table_name)
       .selectAll()
-      .select(eb => [
-        with_media(eb, id_or_handle, driver.dialectType),
-        with_tags(eb, id_or_handle, driver.dialectType),
-        with_search(eb, id_or_handle, driver.dialectType),
-      ]
-      .filter(Boolean))
+      .select(
+        eb => [
+          with_media(eb, id_or_handle, driver.dialectType),
+          with_tags(eb, id_or_handle, driver.dialectType),
+          with_search(eb, id_or_handle, driver.dialectType),
+        ].filter(Boolean)
+      )
       .where(where_id_or_handle_table(id_or_handle))
       .executeTakeFirst();
 
@@ -113,25 +114,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('posts.id'), driver.dialectType),
-        with_tags(eb, eb.ref('posts.id'), driver.dialectType),
-        with_search(eb, eb.ref('posts.id'), driver.dialectType),
-      ].filter(Boolean))
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'posts'))
-      // .orderBy()
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
-
-    if(query.limitToLast) items.reverse();
+      .select(
+        eb => [
+          with_media(eb, eb.ref('posts.id'), driver.dialectType),
+          with_tags(eb, eb.ref('posts.id'), driver.dialectType),
+          with_search(eb, eb.ref('posts.id'), driver.dialectType),
+        ].filter(Boolean)
+      ),
+      query, table_name
+    )
+    .execute();
+    // console.log({items})
+
+    if(query.limitToLast) 
+      items.reverse();
     
     return sanitize_array(items);
   }