@storecraft/database-sql-base 1.0.10 → 1.0.12

package/src/con.images.js

@@ -1,9 +1,14 @@
+/**
+ * @import { db_images as db_col } from '@storecraft/core/database'
+ * @import { Database } from '../types.sql.tables.js'
+ */
+
 import { func } from '@storecraft/core/api'
 import { SQL } from '../index.js'
 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_array } from './utils.funcs.js'
+import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 import { Transaction } from 'kysely'
 import { ID } from '@storecraft/core/api/utils.func.js'
@@ -11,9 +16,6 @@ import {
   image_url_to_handle, image_url_to_name 
 } from '@storecraft/core/api/con.images.logic.js'
 
-/**
- * @typedef {import('@storecraft/core/database').db_images} db_col
- */
 export const table_name = 'images'
 
 /**
@@ -58,7 +60,8 @@ const get = (driver) => {
     .selectFrom(table_name)
     .selectAll()
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -105,7 +108,7 @@ const remove = (driver) => {
  */
 export const report_document_media = (driver) => {
   /**
-   * @param {Transaction<import('../index.js').Database>} [transaction]
+   * @param {Transaction<Database>} [transaction]
    */
   return async (item, transaction) => {
     if(!(item?.media?.length))
@@ -113,7 +116,7 @@ export const report_document_media = (driver) => {
   
     /**
      * 
-   * @param {Transaction<import('../index.js').Database>} trx
+   * @param {Transaction<Database>} trx
      */
     const doit = async (trx) => {
       const dates = func.apply_dates({});
@@ -193,7 +196,6 @@ export const report_document_media = (driver) => {
  */
 const list = (driver) => {
   return async (query) => {
-
     const items = await driver.client
       .selectFrom(table_name)
       .selectAll()
@@ -202,7 +204,7 @@ const list = (driver) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'images')) // ts complains because `usage` field is absent
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.notifications.js

@@ -1,3 +1,6 @@
+/**
+ * @import { db_notifications as db_col } from '@storecraft/core/database'
+ */
 import { SQL } from '../index.js'
 import { count_regular, delete_me, delete_search_of, 
   insert_search_of, regular_upsert_me, where_id_or_handle_table, 
@@ -5,9 +8,6 @@ import { count_regular, delete_me, delete_search_of,
 import { sanitize_array } from './utils.funcs.js'
 import { query_to_eb, query_to_sort } from './utils.query.js'
 
-/**
- * @typedef {import('@storecraft/core/database').db_notifications} db_col
- */
 export const table_name = 'notifications'
 
 /**
@@ -25,6 +25,7 @@ const upsert = (driver) => {
             item.id, item.id, table_name
             );
           await regular_upsert_me(trx, table_name, {
+            handle: null,
             created_at: item.created_at,
             updated_at: item.updated_at,
             message: item.message,
@@ -121,7 +122,7 @@ const list = (driver) => {
           return query_to_eb(eb, query, table_name);
         }
       )
-      .orderBy(query_to_sort(query))
+      .orderBy(query_to_sort(query, 'notifications'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.orders.js

@@ -1,15 +1,16 @@
+/**
+ * @import { db_orders as db_col } from '@storecraft/core/database'
+ */
+
 import { SQL } from '../index.js'
 import { report_document_media } from './con.images.js'
 import { count_regular, 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_tags} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.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'
 
-/**
- * @typedef {import('@storecraft/core/database').db_orders} db_col
- */
 export const table_name = 'orders'
 
 /**
@@ -82,10 +83,12 @@ const get = (driver) => {
     .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();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -138,13 +141,14 @@ const list = (driver) => {
       .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))
+      .orderBy(query_to_sort(query, table_name))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 

package/src/con.posts.js

@@ -1,16 +1,18 @@
+/**
+ * @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, 
   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_tags} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.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'
 
-/**
- * @typedef {import('@storecraft/core/database').db_posts} db_col
- */
 export const table_name = 'posts'
 
 /**
@@ -54,17 +56,20 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
-  return (id_or_handle, options) => {
-    return driver.client
-    .selectFrom(table_name)
-    .selectAll()
-    .select(eb => [
-      with_media(eb, id_or_handle, driver.dialectType),
-      with_tags(eb, id_or_handle, driver.dialectType),
-    ]
-    .filter(Boolean))
-    .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+  return async (id_or_handle, options) => {
+    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))
+      .where(where_id_or_handle_table(id_or_handle))
+      .executeTakeFirst();
+
+    return sanitize(result);
   }
 }
 
@@ -114,18 +119,20 @@ const list = (driver) => {
       .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))
+      .orderBy(query_to_sort(query, 'posts'))
+      // .orderBy()
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
     if(query.limitToLast) items.reverse();
-
+    
     return sanitize_array(items);
   }
 }

package/src/con.products.js

@@ -1,3 +1,9 @@
+/**
+ * @import { ProductType, VariantType } from '@storecraft/core/api'
+ * @import { db_products as db_col } from '@storecraft/core/database'
+ * @import { Database } from '../types.sql.tables.js'
+ */
+
 import { enums } from '@storecraft/core/api'
 import { SQL } from '../index.js'
 import { delete_entity_values_of_by_entity_id_or_handle, delete_me, delete_media_of, 
@@ -10,16 +16,15 @@ import { delete_entity_values_of_by_entity_id_or_handle, delete_me, delete_media
   products_with_discounts,
   products_with_variants,
   count_regular,
-  products_with_related_products} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  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 { Transaction } from 'kysely'
 import { report_document_media } from './con.images.js'
+import { union } from '@storecraft/core/api/utils.func.js'
 
 
-/**
- * @typedef {import('@storecraft/core/database').db_products} db_col
- */
 export const table_name = 'products'
 
 /**
@@ -27,7 +32,7 @@ export const table_name = 'products'
  * @param {db_col["$type_upsert"]} item 
  */
 const is_variant = item => {
-  if(item && ('variant_hint' in 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;
   }
 
@@ -61,7 +66,15 @@ const upsert = (driver) => {
 
       const eligible_discounts = discounts.filter(
         d => driver.app.api.pricing.test_product_filters_against_product(d.info.filters, item)
-      );      
+      );
+
+      search_terms = union(
+        [
+          search_terms, 
+          eligible_discounts.map(d => `discount:${d.handle}`),
+          eligible_discounts.map(d => `discount:${d.id}`),
+        ]
+      );
 
       const t = await driver.client.transaction().execute(
         async (trx) => {
@@ -88,13 +101,13 @@ const upsert = (driver) => {
             qty: item.qty,
             variants_options: 'variants_options' in item ? JSON.stringify(item.variants_options) : undefined,
             // no variants yet
-            parent_handle: 'parent_handle' in item ? item.parent_handle : undefined,
-            parent_id: 'parent_id' in item ? item.parent_id : undefined,
-            variant_hint: 'variant_hint' in item ? JSON.stringify(item.variant_hint) : undefined,
+            parent_handle: ('parent_handle' in item) ? item.parent_handle : undefined,
+            parent_id: ('parent_id' in item) ? item.parent_id : undefined,
+            variant_hint: ('variant_hint' in item) ? JSON.stringify(item.variant_hint) : undefined,
           });
 
           // PRODUCTS => VARIANTS
-          if(item && 'variant_hint' in item && is_variant(item)) {
+          if(item && ('variant_hint' in item) && is_variant(item)) {
             // remove previous
             await delete_entity_values_by_value_or_reporter('products_to_variants')(
               trx, item.id, item.handle
@@ -167,6 +180,7 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
+  // @ts-ignore
   return (id_or_handle, options) => {
 
     const expand = options?.expand ?? ['*'];
@@ -186,12 +200,14 @@ const get = (driver) => {
         expand_collections && products_with_collections(eb, id_or_handle, dtype),
         expand_discounts && products_with_discounts(eb, id_or_handle, dtype),
         expand_variants && products_with_variants(eb, id_or_handle, dtype),
-        expand_related_products && products_with_related_products(eb, id_or_handle, dtype)
+        expand_related_products && products_with_related_products(eb, id_or_handle, dtype),
+        with_search(eb, id_or_handle, dtype)
       ].filter(Boolean)
     )
     .where(where_id_or_handle_table(id_or_handle))
     // .compile()
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -202,6 +218,7 @@ const get = (driver) => {
  * @returns {db_col["getBulk"]}
  */
 const getBulk = (driver) => {
+  // @ts-ignore
   return async (ids, options) => {
 
     const expand = options?.expand ?? ['*'];
@@ -221,7 +238,8 @@ const getBulk = (driver) => {
         expand_collections && products_with_collections(eb, eb.ref('products.id'), dtype),
         expand_discounts && products_with_discounts(eb, eb.ref('products.id'), dtype),
         expand_variants && products_with_variants(eb, eb.ref('products.id'), dtype),
-        expand_related_products && products_with_related_products(eb, eb.ref('products.id'), dtype)
+        expand_related_products && products_with_related_products(eb, eb.ref('products.id'), dtype),
+        with_search(eb, eb.ref('products.id'), dtype)
       ].filter(Boolean)
     )
     .where(
@@ -233,7 +251,8 @@ const getBulk = (driver) => {
       )
     )
     // .compile()
-    .execute();
+    .execute()
+    .then(sanitize_array);
 
     return ids.map(
       id => r.find(s => s.id===id || s?.handle===id)
@@ -247,10 +266,8 @@ const getBulk = (driver) => {
  */
 const remove_internal = (driver) => {
   /**
-   * @param {import('@storecraft/core/api').ProductType | 
-   *  import('@storecraft/core/api').VariantType
-   * } product
-   * @param {Transaction<import('../index.js').Database>} trx
+   * @param {ProductType | VariantType} product
+   * @param {Transaction<Database>} trx
    */
   return async (product, trx) => {
     // entities
@@ -331,11 +348,13 @@ const remove = (driver) => {
  * @returns {db_col["list"]}
  */
 const list = (driver) => {
+  // @ts-ignore
   return async (query) => {
 
     const expand = query.expand ?? ['*'];
     const expand_collections = expand.includes('*') || expand.includes('collections');
     const expand_discounts = expand.includes('*') || expand.includes('discounts');
+    // @ts-ignore
     const expand_variants = expand.includes('*') || expand.includes('variants');
     const expand_related_products = expand.includes('*') || expand.includes('related_products');
 
@@ -346,10 +365,19 @@ const list = (driver) => {
       eb => [
         with_tags(eb, eb.ref('products.id'), driver.dialectType),
         with_media(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_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)
+        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_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(
@@ -357,14 +385,14 @@ const list = (driver) => {
         return query_to_eb(eb, query, table_name);
       }
     )
-    .orderBy(query_to_sort(query))
+    .orderBy(query_to_sort(query, table_name))
     .limit(query.limitToLast ?? query.limit ?? 10)
     .execute();
 
-  if(query.limitToLast) items.reverse();
+    if(query.limitToLast) items.reverse();
     // .compile();
         // console.log(items)
-    
+
     return sanitize_array(items);
   }
 }

package/src/con.search.js

@@ -1,15 +1,14 @@
-import { SQL } from '../index.js'
-import { jsonArrayFrom } from './con.helpers.json.js';
-import { query_to_eb, query_to_sort } from './utils.query.js';
-
 /**
- * @typedef {import('@storecraft/core/database').search} db_col
+ * @import { QuickSearchResult } from '@storecraft/core/api'
+ * @import { search as db_col, db_driver } from '@storecraft/core/database'
  */
 
-
+import { SQL } from '../index.js'
+import { jsonArrayFrom } from './con.helpers.json.js';
+import { query_to_eb, query_to_sort } from './utils.query.js';
 
 /**
- * @type {(keyof import('@storecraft/core/database').db_driver["resources"])[]}
+ * @type {(keyof db_driver["resources"])[]}
  */
 const tables = [
   'tags',
@@ -27,7 +26,7 @@ const tables = [
 ]
 
 /**
- * @type {Record<string, keyof import('@storecraft/core/database').db_driver["resources"]>}
+ * @type {Record<string, keyof db_driver["resources"]>}
  */
 const prefix_to_resource = {
   'au': 'auth_users',
@@ -46,9 +45,6 @@ const prefix_to_resource = {
   
 }
 
-/**
- * @type {Record<keyof import('@storecraft/core/database').db_driver["resources"], string[]>}
- */
 const resource_to_props = {
   'auth_users': ['id', 'handle'],
   'collections': ['id', 'handle'],
@@ -68,7 +64,7 @@ const resource_to_props = {
  * 
  * @param {string} id 
  * 
- * @returns {keyof import('@storecraft/core/database').db_driver["resources"]}
+ * @returns {keyof db_driver["resources"]}
  */
 export const id_to_resource = id => {
   let result = undefined;
@@ -100,8 +96,12 @@ export const quicksearch = (driver) => {
         .entries(resource_to_props)
         .filter(t => all || expand.includes(t[0]))
         .map(
+          /**
+           * @param {any} param0 
+           */
           ([table_name, props]) => {
             // console.log(table_name, props)
+            props
             return jsonArrayFrom(
               eb
               .selectFrom(table_name)
@@ -111,7 +111,7 @@ export const quicksearch = (driver) => {
                   return query_to_eb(eb, query, table_name);
                 }
               )
-              .orderBy(query_to_sort(query))
+              .orderBy(query_to_sort(query, table_name))
               .limit(query.limit ?? 5),
               driver.dialectType
             ).as(table_name)
@@ -119,8 +119,10 @@ export const quicksearch = (driver) => {
         )
     )
     
-    /** @type {import('@storecraft/core/api').QuickSearchResult} */
-    const items = await sts.executeTakeFirst();
+    
+    const items = (/** @type {QuickSearchResult} */(
+      await sts.executeTakeFirst())
+    );
 
     const sanitized = Object.fromEntries(
       Object.entries(items).filter(