@storecraft/database-sql-base 1.0.23 → 1.2.5

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,23 +130,18 @@ 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();
+  
     if(query.limitToLast) items.reverse();
 
     return sanitize_array(items);
@@ -160,7 +155,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 +176,12 @@ 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();
 
-    if(query.limitToLast) items.reverse();
+    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,23 +59,30 @@ 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')
             .columns(['entity_handle', 'entity_id', 'value', 'reporter'])
             .expression(eb => 
               eb.selectFrom('products')
-                .select(eb => [
-                    'handle as entity_handle',
-                    'id as entity_id',
-                    eb.val(item.id).as('value'),
-                    eb.val(item.handle).as('reporter')
-                  ]
-                )
-                .where(
-                  eb => eb.and(discount_to_conjunctions(eb, item))
-                )
+              .select(
+                eb => [
+                  'handle as entity_handle',
+                  'id as entity_id',
+                  eb.val(item.id).as('value'),
+                  eb.val(item.handle).as('reporter')
+                ]
+              )
+              .where(
+                eb => eb.and(discount_to_conjunctions(eb, item))
+              )
             ).execute();
 
             for(const extra_search of extra_search_for_products) {
@@ -243,24 +250,20 @@ 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();
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }
@@ -273,7 +276,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 +302,12 @@ 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();
 
-    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,15 @@ 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();
+      .selectAll(),
+      query, table_name
+    ).execute()
 
-    if(query.limitToLast) items.reverse();
+    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,20 @@ 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();
+
+    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,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(
         [
           '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();
+
+    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);
   }

package/src/con.products.js

@@ -21,7 +21,7 @@ import {
   products_with_related_products,
   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 { withQuery } from './utils.query.js'
 import { Transaction } from 'kysely'
 import { report_document_media } from './con.images.js'
 import { union } from '@storecraft/core/api/utils.func.js'
@@ -34,12 +34,18 @@ import {
 export const table_name = 'products'
 
 /**
- * 
  * @param {db_col["$type_upsert"]} item 
  */
 const is_variant = item => {
-  if(item && ('variant_hint' in item) && ('parent_handle' in item)&& ('parent_id' in item)) {
-    return item.parent_handle && item.parent_id && item.variant_hint;
+  if(
+    item && 
+    ('variant_hint' in item) && 
+    ('parent_handle' in item) && 
+    ('parent_id' in item)
+  ) {
+    return item.parent_handle && 
+      item.parent_id && 
+      item.variant_hint;
   }
 
   return false;
@@ -47,8 +53,6 @@ const is_variant = item => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -383,40 +387,42 @@ const list = (driver) => {
     const expand_variants = expand.includes('*') || expand.includes('variants');
     const expand_related_products = expand.includes('*') || expand.includes('related_products');
 
-    const items = await driver.client
-    .selectFrom(table_name)
-    .selectAll()
-    .select(
-      eb => [
-        with_tags(eb, eb.ref('products.id'), driver.dialectType),
-        with_media(eb, eb.ref('products.id'), driver.dialectType),
-        with_search(eb, eb.ref('products.id'), driver.dialectType),
-
-        expand_collections && 
-        products_with_collections(eb, eb.ref('products.id'), driver.dialectType),
+    const items = await withQuery(
+      driver.client
+      .selectFrom(table_name)
+      .selectAll()
+      .select(
+        eb => [
+          with_tags(eb, eb.ref('products.id'), driver.dialectType),
+          with_media(eb, eb.ref('products.id'), driver.dialectType),
+          with_search(eb, eb.ref('products.id'), driver.dialectType),
+
+          expand_collections && 
+          products_with_collections(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
 
-        expand_discounts && 
-        products_with_discounts(eb, eb.ref('products.id'), driver.dialectType),
+          expand_discounts && 
+          products_with_discounts(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
 
-        expand_variants && 
-        products_with_variants(eb, eb.ref('products.id'), driver.dialectType),
+          expand_variants && 
+          products_with_variants(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
 
-        expand_related_products && 
-        products_with_related_products(eb, eb.ref('products.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();
+          expand_related_products && 
+          products_with_related_products(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
+        ].filter(Boolean)
+      ),
+      query, table_name
+    ).execute();
 
-    if(query.limitToLast) items.reverse();
-    // .compile();
-        // console.log(items)
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }

package/src/con.search.js

@@ -5,7 +5,7 @@
 
 import { SQL } from '../index.js'
 import { jsonArrayFrom } from './con.helpers.json.js';
-import { query_to_eb, query_to_sort } from './utils.query.js';
+import { withQuery } from './utils.query.js';
 
 /**
  * @type {(keyof db_driver["resources"])[]}
@@ -22,7 +22,8 @@ const tables = [
   'notifications',
   'discounts',
   'orders',
-  'templates'
+  'templates',
+  'chats'
 ]
 
 /**
@@ -42,7 +43,7 @@ const prefix_to_resource = {
   'tag': 'tags',
   'template': 'templates',
   'post': 'posts',
-  
+  'chat': 'chats',
 }
 
 const resource_to_props = {
@@ -58,6 +59,7 @@ const resource_to_props = {
   'tags': ['id', 'handle'],
   'templates': ['id', 'handle', 'title'],
   'posts': ['id', 'handle', 'title'],
+  'chats': ['id', 'customer_email', 'customer_id'],
 }
 
 /**
@@ -85,6 +87,7 @@ export const quicksearch = (driver) => {
     const db = driver.client;
     const expand = query.expand ?? ['*']; 
     const all = expand.includes('*');
+    query.limit ??= 5;
 
     const sts = db
     .selectNoFrom(
@@ -99,16 +102,12 @@ export const quicksearch = (driver) => {
             // console.log(table_name, props)
             props
             return jsonArrayFrom(
-              eb
-              .selectFrom(table_name)
-              .select(props)
-              .where(
-                (eb) => {
-                  return query_to_eb(eb, query, table_name);
-                }
-              )
-              .orderBy(query_to_sort(query, table_name))
-              .limit(query.limit ?? 5),
+              withQuery(
+                eb
+                .selectFrom(table_name)
+                .select(props),
+                query, table_name
+              ),
               driver.dialectType
             ).as(table_name)
           }
@@ -120,12 +119,15 @@ export const quicksearch = (driver) => {
       await sts.executeTakeFirst())
     );
 
+    
     const sanitized = Object.fromEntries(
       Object.entries(items).filter(
         ([key, value]) => Boolean(value?.length)
       )
     );
-
+    
+    // console.log('items', JSON.stringify(items, null, 2))
+    
     // console.log('sanitized', JSON.stringify(sanitized, null, 2))
 
     return sanitized;