@storecraft/database-sql-base 1.0.10 → 1.0.11

package/src/con.products.js

@@ -10,11 +10,13 @@ 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'
 
 
 /**
@@ -27,7 +29,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 +63,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 +98,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 +177,7 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
+  // @ts-ignore
   return (id_or_handle, options) => {
 
     const expand = options?.expand ?? ['*'];
@@ -186,12 +197,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 +215,7 @@ const get = (driver) => {
  * @returns {db_col["getBulk"]}
  */
 const getBulk = (driver) => {
+  // @ts-ignore
   return async (ids, options) => {
 
     const expand = options?.expand ?? ['*'];
@@ -221,7 +235,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 +248,8 @@ const getBulk = (driver) => {
       )
     )
     // .compile()
-    .execute();
+    .execute()
+    .then(sanitize_array);
 
     return ids.map(
       id => r.find(s => s.id===id || s?.handle===id)
@@ -331,11 +347,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 +364,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 +384,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

@@ -46,9 +46,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'],
@@ -100,8 +97,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 +112,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 +120,10 @@ export const quicksearch = (driver) => {
         )
     )
     
-    /** @type {import('@storecraft/core/api').QuickSearchResult} */
-    const items = await sts.executeTakeFirst();
+    
+    const items = (/** @type {import('@storecraft/core/api').QuickSearchResult} */(
+      await sts.executeTakeFirst())
+    );
 
     const sanitized = Object.fromEntries(
       Object.entries(items).filter(

package/src/con.shared.js

@@ -1,3 +1,4 @@
+// @ts-ignore
 import { ExpressionWrapper, InsertQueryBuilder, Kysely, Transaction } from 'kysely'
 import { jsonArrayFrom, stringArrayFrom } from './con.helpers.json.js'
 import { SQL } from '../index.js';
@@ -271,7 +272,7 @@ export const delete_media_of = delete_entity_values_of_by_entity_id_or_handle('e
  * 
  * @param {Kysely<Database>} trx 
  * @param {T} table_name 
- * @param {import('kysely').InsertObject<Database, T>} item values of the entity
+ * @param {import('kysely').InsertObject<Database, T> & {id: string, handle: string}} item values of the entity
  * 
  */
 export const regular_upsert_me = async (trx, table_name, item) => {
@@ -280,8 +281,10 @@ export const regular_upsert_me = async (trx, table_name, item) => {
   await trx.deleteFrom(table_name).where(
     eb => eb.or(
       [
-        item.id && eb('id', '=', item.id),
-        item.handle && eb('handle', '=', item.handle),
+        // @ts-ignore
+        item?.id && eb('id', '=', item.id),
+        // @ts-ignore
+        item?.handle && eb('handle', '=', item.handle),
       ].filter(Boolean)
     )
   ).execute();
@@ -345,20 +348,6 @@ export const with_media = (eb, id_or_handle, sql_type) => {
   ).as('media');
 }
 
-/**
- * helper to select base attributes
- * @param {import('kysely').ExpressionBuilder<Database>} eb 
- * @param {keyof Database} table 
- * @return {import('kysely').SelectQueryBuilder<Database, table>}
- */
-const select_base_from = (eb, table) => {
-  return [ 
-    'active', 'attributes', 'created_at', 'updated_at',
-    'description', 'handle', 'id'
-  ].map(k => `${table}.${k}`).reduce(
-    (p, c) => p.select(c), eb.selectFrom(table)
-  );
-}
 
 /**
  * select as json array collections of a product
@@ -369,7 +358,14 @@ const select_base_from = (eb, table) => {
  */
 export const products_with_collections = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'collections')
+    eb.selectFrom('collections')
+      .select('collections.active')
+      .select('collections.attributes')
+      .select('collections.created_at')
+      .select('collections.updated_at')
+      .select('collections.description')
+      .select('collections.handle')
+      .select('collections.id')
       .select('collections.title')
       .select('collections.published')
       .select(eb => [
@@ -393,7 +389,14 @@ export const products_with_collections = (eb, product_id_or_handle, sql_type) =>
  */
 export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'discounts')
+    eb.selectFrom('discounts')
+      .select('discounts.active')
+      .select('discounts.attributes')
+      .select('discounts.created_at')
+      .select('discounts.updated_at')
+      .select('discounts.description')
+      .select('discounts.handle')
+      .select('discounts.id')
       .select('discounts.title')
       .select('discounts.published')
       .select('discounts.application')
@@ -420,7 +423,14 @@ export const products_with_discounts = (eb, product_id_or_handle, sql_type) => {
  */
 export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+      .select('products.active')
+      .select('products.attributes')
+      .select('products.created_at')
+      .select('products.updated_at')
+      .select('products.description')
+      .select('products.handle')
+      .select('products.id')
       .select('products.compare_at_price')
       .select('products.parent_handle')
       .select('products.parent_id')
@@ -451,7 +461,14 @@ export const products_with_variants = (eb, product_id_or_handle, sql_type) => {
  */
 export const products_with_related_products = (eb, product_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+      .select('products.active')
+      .select('products.attributes')
+      .select('products.created_at')
+      .select('products.updated_at')
+      .select('products.description')
+      .select('products.handle')
+      .select('products.id')
       .select('products.compare_at_price')
       .select('products.parent_handle')
       .select('products.parent_id')
@@ -483,10 +500,17 @@ export const products_with_related_products = (eb, product_id_or_handle, sql_typ
  */
 export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'collections')
-    .select('collections.title')
-    .select('collections.published')
-    .select(eb => [
+    eb.selectFrom('collections')
+      .select('collections.active')
+      .select('collections.attributes')
+      .select('collections.created_at')
+      .select('collections.updated_at')
+      .select('collections.description')
+      .select('collections.handle')
+      .select('collections.id')
+      .select('collections.title')
+      .select('collections.published')
+      .select(eb => [
       with_tags(eb, eb.ref('collections.id'), sql_type),
       with_media(eb, eb.ref('collections.id'), sql_type),
     ])
@@ -507,7 +531,14 @@ export const storefront_with_collections = (eb, sf_id_or_handle, sql_type) => {
  */
 export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'products')
+    eb.selectFrom('products')
+    .select('products.active')
+    .select('products.attributes')
+    .select('products.created_at')
+    .select('products.updated_at')
+    .select('products.description')
+    .select('products.handle')
+    .select('products.id')
     .select('products.title')
     .select('products.compare_at_price')
     .select('products.parent_handle')
@@ -538,7 +569,14 @@ export const storefront_with_products = (eb, sf_id_or_handle, sql_type) => {
  */
 export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'discounts')
+    eb.selectFrom('discounts')
+    .select('discounts.active')
+    .select('discounts.attributes')
+    .select('discounts.created_at')
+    .select('discounts.updated_at')
+    .select('discounts.description')
+    .select('discounts.handle')
+    .select('discounts.id')
     .select('discounts.application')
     .select('discounts.info')
     .select('discounts.priority')
@@ -565,7 +603,14 @@ export const storefront_with_discounts = (eb, sf_id_or_handle, sql_type) => {
  */
 export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'posts')
+    eb.selectFrom('posts')
+    .select('posts.active')
+    .select('posts.attributes')
+    .select('posts.created_at')
+    .select('posts.updated_at')
+    .select('posts.description')
+    .select('posts.handle')
+    .select('posts.id')
     .select('posts.text')
     .select('posts.title')
     .select(eb => [
@@ -589,7 +634,14 @@ export const storefront_with_posts = (eb, sf_id_or_handle, sql_type) => {
  */
 export const storefront_with_shipping = (eb, sf_id_or_handle, sql_type) => {
   return jsonArrayFrom(
-    select_base_from(eb, 'shipping_methods')
+    eb.selectFrom('shipping_methods')
+    .select('shipping_methods.active')
+    .select('shipping_methods.attributes')
+    .select('shipping_methods.created_at')
+    .select('shipping_methods.updated_at')
+    .select('shipping_methods.description')
+    .select('shipping_methods.handle')
+    .select('shipping_methods.id')
     .select('shipping_methods.price')
     .select('shipping_methods.title')
     .select(eb => [

package/src/con.shipping.js

@@ -4,8 +4,8 @@ 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'
 
 /**
@@ -54,17 +54,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 +117,19 @@ const list = (driver) => {
       .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))
+      .orderBy(query_to_sort(query, 'shipping_methods'))
       .limit(query.limitToLast ?? query.limit ?? 10)
       .execute();
 
     if(query.limitToLast) items.reverse();
-
+    
     return sanitize_array(items);
   }
 }

package/src/con.storefronts.js

@@ -8,8 +8,9 @@ import { delete_entity_values_of_by_entity_id_or_handle,
   storefront_with_products, storefront_with_shipping, 
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
-  count_regular} from './con.shared.js'
-import { sanitize_array } from './utils.funcs.js'
+  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'
 
 /**
@@ -97,6 +98,7 @@ const upsert = (driver) => {
  * @returns {db_col["get"]}
  */
 const get = (driver) => {
+  // @ts-ignore
   return (id_or_handle, options) => {
     const expand = options?.expand ?? ['*'];
     const expand_all = expand.includes('*');
@@ -112,6 +114,7 @@ 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),
       expand_collections && storefront_with_collections(eb, id_or_handle, driver.dialectType),
       expand_products && storefront_with_products(eb, id_or_handle, driver.dialectType),
       expand_discounts && storefront_with_discounts(eb, id_or_handle, driver.dialectType),
@@ -120,7 +123,8 @@ const get = (driver) => {
     ]
     .filter(Boolean))
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -162,6 +166,7 @@ const remove = (driver) => {
  * @returns {db_col["list"]}
  */
 const list = (driver) => {
+  // @ts-ignore
   return async (query) => {
     const expand = query?.expand ?? ['*'];
     const expand_all = expand.includes('*');
@@ -177,6 +182,7 @@ const list = (driver) => {
       .select(eb => [
           with_media(eb, eb.ref('storefronts.id'), driver.dialectType),
           with_tags(eb, eb.ref('storefronts.id'), driver.dialectType),
+          with_search(eb, eb.ref('storefronts.id'), driver.dialectType),
           expand_collections && storefront_with_collections(eb, eb.ref('storefronts.id'), driver.dialectType),
           expand_products && storefront_with_products(eb, eb.ref('storefronts.id'), driver.dialectType),
           expand_discounts && storefront_with_discounts(eb, eb.ref('storefronts.id'), driver.dialectType),
@@ -189,7 +195,7 @@ 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();
 

package/src/con.tags.js

@@ -1,7 +1,7 @@
 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'
 
 /**
@@ -48,7 +48,8 @@ const get = (driver) => {
     .selectFrom(table_name)
     .selectAll()
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -94,7 +95,7 @@ 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();
 

package/src/con.templates.js

@@ -2,7 +2,7 @@ import { Kysely } from 'kysely'
 import { SQL } from '../index.js'
 import { count_regular, delete_me, delete_search_of, insert_search_of, 
   regular_upsert_me, safe_trx, 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 { base64 } from '@storecraft/core/crypto';
 
@@ -71,7 +71,8 @@ const get = (driver) => {
     .selectFrom(table_name)
     .selectAll()
     .where(where_id_or_handle_table(id_or_handle))
-    .executeTakeFirst();
+    .executeTakeFirst()
+    .then(sanitize);
   }
 }
 
@@ -119,7 +120,7 @@ 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();
 

package/src/utils.funcs.js

@@ -19,14 +19,13 @@ export const delete_keys = (...keys) => {
   }
 }
 
+
+
 /**
  * Sanitize null/undefined valued keys
- * 
- * 
- * @template {Record<string, any>} T
- * 
- * 
+ * @template T
  * @param {T} o 
+ * @return {import("./utils.types.js").ReplaceValuesOfKeys<T, 'active' | 'confirmed_mail', boolean>}
  */
 export const sanitize = o => {
   for (const key in o) {
@@ -37,12 +36,19 @@ export const sanitize = o => {
       continue;
     }
     if(key==='active') {
+      // @ts-ignore
+      o[key] = Boolean(value);
+    }
+    else if(key==='confirmed_mail') {
+      // @ts-ignore
       o[key] = Boolean(value);
     }
     else if(key==='price') {
+      // @ts-ignore
       o[key] = parseFloat(value);
     }
     else if(key==='compare_at_price') {
+      // @ts-ignore
       o[key] = parseFloat(value);
     }
     else if(typeof value === 'object') {
@@ -50,6 +56,7 @@ export const sanitize = o => {
     }
   }
 
+  // @ts-ignore
   return o;
 }
 
@@ -62,10 +69,11 @@ export const sanitize = o => {
  * @param {T[]} arr 
  */
 export const sanitize_array = arr => {
+  const xx = []
   for(const p of arr) {
-    sanitize(p);
+    xx.push(sanitize(p));
   }
-  return arr;
+  return xx;
 }
 
 /**