@storecraft/database-sql-base 1.0.23 → 1.0.24

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'
@@ -38,8 +38,15 @@ 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;
@@ -383,40 +390,51 @@ 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),
-
-        expand_discounts && 
-        products_with_discounts(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_variants && 
-        products_with_variants(eb, eb.ref('products.id'), driver.dialectType),
+          expand_discounts && 
+          products_with_discounts(
+            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_variants && 
+          products_with_variants(
+            eb, eb.ref('products.id'), driver.dialectType
+          ),
 
-    if(query.limitToLast) items.reverse();
-    // .compile();
-        // console.log(items)
+          expand_related_products && 
+          products_with_related_products(
+            eb, eb.ref('products.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.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"])[]}
@@ -85,6 +85,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 +100,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 +117,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;

package/src/con.shared.js

@@ -46,9 +46,9 @@ export const safe_trx = (k) => {
 
 
 /**
+ * @template {keyof Database} [T=(keyof Database)]  
  * @param {SQL} driver 
- * @param {QueryableTables} table_name 
- * 
+ * @param {T} table_name 
  * @returns {db_crud["count"]}
  */
 export const count_regular = (driver, table_name) => {
@@ -71,7 +71,6 @@ export const count_regular = (driver, table_name) => {
 }
 
 /**
- * 
  * @param {string} id_or_handle
  */
 export const where_id_or_handle_entity = (id_or_handle) => {
@@ -87,7 +86,6 @@ export const where_id_or_handle_entity = (id_or_handle) => {
 }
 
 /**
- * 
  * @param {string} id_or_handle
  */
 export const where_id_or_handle_table = (id_or_handle) => {
@@ -148,7 +146,9 @@ export const delete_entity_values_by_value_or_reporter_and_context = (
    */
   return (trx, value, reporter, context) => {
 
-    return trx.deleteFrom(entity_table_name).where(
+    return trx
+    .deleteFrom(entity_table_name)
+    .where(
       eb => eb.or(
         [
           value && eb('value', '=', value),
@@ -196,7 +196,9 @@ export const delete_entity_values_of_by_entity_id_or_handle_and_context = (
    * @param {string} [context=undefined] the context (another segment technique)
    */
   return (trx, entity_id, entity_handle=undefined, context=undefined) => {
-    return trx.deleteFrom(entity_table_name).where(
+    return trx
+    .deleteFrom(entity_table_name)
+    .where(
       eb => eb.or(
         [
           entity_id && eb('entity_id', '=', entity_id),
@@ -316,18 +318,18 @@ export const delete_media_of = delete_entity_values_of_by_entity_id_or_handle_an
 
 
 /**
- * @template {keyof Database} T
- * 
+ * @template {keyof Database} [T=(keyof Database)]
  * @param {Kysely<Database>} trx 
  * @param {T} table_name 
  * @param {InsertObject<Database, T> & {id: string, handle: string}} item values of the entity
- * 
  */
 export const regular_upsert_me = async (trx, table_name, item) => {
 
   // TODO: maybe use only `id`
-  await trx.deleteFrom(table_name).where(
-    eb => eb.or(
+  await trx
+  .deleteFrom(table_name)
+  .where(
+    (eb) => eb.or(
       [
         // @ts-ignore
         item?.id && eb('id', '=', item.id),
@@ -337,7 +339,10 @@ export const regular_upsert_me = async (trx, table_name, item) => {
     )
   ).execute();
 
-  return await trx.insertInto(table_name).values(item).executeTakeFirst()
+  return await trx
+  .insertInto(table_name)
+  .values(item)
+  .executeTakeFirst()
 }
 
 
@@ -725,26 +730,3 @@ export const select_values_of_entity_by_entity_id_or_handle =
   )
   .orderBy(`${entity_junction_table}.id`);
 }
-
-// /**
-//  * select the entity ids which are constrained by value or reporter
-//  * 
-//  * @param {ExpressionBuilder<Database>} eb 
-//  * @param {EntityTableKeys} entity_junction_table 
-//  * @param {string | ExpressionWrapper<Database>} value 
-//  * @param {string | ExpressionWrapper<Database>} [reporter] 
-//  */
-// export const select_entity_ids_by_value_or_reporter = 
-// (eb, entity_junction_table, value, reporter=undefined) => {
-//   return eb
-//     .selectFrom(entity_junction_table)
-//     .select(`${entity_junction_table}.entity_id`)
-//     .where(eb2 => eb2.or(
-//         [
-//           eb2(`${entity_junction_table}.value`, '=', value ?? reporter),
-//           eb2(`${entity_junction_table}.reporter`, '=', reporter ?? value),
-//         ]
-//       )
-//     )
-//     .orderBy(`${entity_junction_table}.entity_id`);
-// }

package/src/con.shipping.js

@@ -9,7 +9,7 @@ import { count_regular, delete_entity_values_by_value_or_reporter_and_context,
   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 = 'shipping_methods'
 
@@ -111,24 +111,31 @@ 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('shipping_methods.id'), driver.dialectType),
-        with_tags(eb, eb.ref('shipping_methods.id'), driver.dialectType),
-        with_search(eb, eb.ref('shipping_methods.id'), driver.dialectType),
-      ].filter(Boolean))
-      .where(
-        (eb) => {
-          return query_to_eb(eb, query, table_name);
-        }
-      )
-      .orderBy(query_to_sort(query, 'shipping_methods'))
-      .limit(query.limitToLast ?? query.limit ?? 10)
-      .execute();
+      .select(
+        eb => [
+          with_media(eb, eb.ref('shipping_methods.id'), driver.dialectType),
+          with_tags(eb, eb.ref('shipping_methods.id'), driver.dialectType),
+          with_search(eb, eb.ref('shipping_methods.id'), driver.dialectType),
+        ].filter(Boolean)
+      ),
+      query, table_name
+    ).execute();
+
+      // .where(
+      //   (eb) => {
+      //     return query_to_eb(eb, query, table_name);
+      //   }
+      // )
+      // .orderBy(query_to_sort(query, 'shipping_methods'))
+      // .limit(query.limitToLast ?? query.limit ?? 10)
+      // .execute();
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
     
     return sanitize_array(items);
   }

package/src/con.storefronts.js

@@ -20,7 +20,7 @@ import { delete_entity_values_of_by_entity_id_or_handle_and_context,
   products_with_variants,
   products_with_related_products} 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 = 'storefronts'
 
@@ -193,7 +193,8 @@ const list = (driver) => {
     const expand_shipping = expand_all || expand.includes('shipping_methods');
     const expand_posts = expand_all || expand.includes('posts');
 
-    const items = await driver.client
+    const items = await withQuery(
+      driver.client
       .selectFrom(table_name)
       .selectAll()
       .select(eb => [
@@ -216,17 +217,22 @@ const list = (driver) => {
             eb, eb.ref('storefronts.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();
+      ),
+      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();
+    if(query.limitToLast) 
+      items.reverse();
 
     return sanitize_array(items);
   }
@@ -268,7 +274,7 @@ const get_default_auto_generated_storefront = (driver) => {
             ]
           )
           .where('active', '=', 1)
-          .orderBy(['updated_at desc']),
+          .orderBy('updated_at', 'desc'),
           driver.dialectType
         ).as('collections'),
   
@@ -287,7 +293,7 @@ const get_default_auto_generated_storefront = (driver) => {
             ]
           )
           .where('active', '=', 1)
-          .orderBy(['updated_at desc'])
+          .orderBy('updated_at', 'desc')
           .limit(10),
           dialectType
         ).as('products'),
@@ -303,7 +309,7 @@ const get_default_auto_generated_storefront = (driver) => {
             ]
           )
           .where('active', '=', 1)
-          .orderBy(['updated_at desc']),
+          .orderBy('updated_at', 'desc'),
           dialectType
         ).as('discounts'),
   
@@ -318,7 +324,7 @@ const get_default_auto_generated_storefront = (driver) => {
             ]
           )
           .where('active', '=', 1)
-          .orderBy(['updated_at desc']),
+          .orderBy('updated_at', 'desc'),
           dialectType
         ).as('shipping_methods'),
   
@@ -333,7 +339,7 @@ const get_default_auto_generated_storefront = (driver) => {
             ]
           )
           .where('active', '=', 1)
-          .orderBy(['updated_at desc'])
+          .orderBy('updated_at', 'desc')
           .limit(3),
           dialectType
         ).as('posts'),

package/src/con.tags.js

@@ -8,7 +8,7 @@ import {
   with_media, 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'
 
 export const table_name = 'tags'
 
@@ -97,22 +97,30 @@ 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('tags.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();
+      .select(
+        eb => [
+          with_search(eb, eb.ref('tags.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();
 
-    if(query.limitToLast) items.reverse();
     return sanitize_array(items);
   }
 }

package/src/con.templates.js

@@ -8,7 +8,7 @@ import { count_regular, delete_me, delete_search_of, insert_search_of,
   regular_upsert_me, safe_trx, where_id_or_handle_table, 
   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 { base64 } from '@storecraft/core/crypto';
 
 export const table_name = 'templates'
@@ -137,36 +137,33 @@ 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('templates.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()
-      .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);
-              item.template_subject = decode_base64_if_needed(item.template_subject);
-              return item;
-            }
-          )
-        }
-      );
+      ),
+      query, table_name
+    )
+    .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);
+            item.template_subject = decode_base64_if_needed(item.template_subject);
+            return item;
+          }
+        )
+      }
+    );
 
-    if(query.limitToLast) items.reverse();
+    if(query.limitToLast) 
+      items.reverse();
     
     return sanitize_array(items);
   }