@storecraft/database-sql-base 1.2.5 → 1.3.0

package/package.json

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

package/src/con.collections.js

@@ -10,7 +10,11 @@ import {
   regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, 
   count_regular,
-  with_search
+  with_search,
+  products_with_collections,
+  products_with_discounts,
+  products_with_variants,
+  products_with_related_products
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, withQuery, withSort } from './utils.query.js'
@@ -145,6 +149,17 @@ const list = (driver) => {
 const list_collection_products = (driver) => {
   return async (handle_or_id, 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');
+
     const items = await withSort(
       driver.client
       .selectFrom('products')
@@ -158,7 +173,27 @@ const list_collection_products = (driver) => {
         eb => [
           with_media(eb, eb.ref('products.id'), driver.dialectType),
           with_tags(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(
         (eb) => eb.and(

package/src/con.customers.js

@@ -155,6 +155,8 @@ const list = (driver) => {
 const list_customer_orders = (driver) => {
   return async (id, query) => {
 
+    console.dir({ id, query }, { depth: 5 });
+
     const items = await withSort(
       driver.client
       .selectFrom('orders')
@@ -166,7 +168,7 @@ const list_customer_orders = (driver) => {
       .where(
         (eb) => eb.and(
           [
-            query_to_eb(eb, query, table_name),
+            query_to_eb(eb, query, 'orders'),
             eb.or(
               [
                 eb('_customer_id', '=', id),

package/src/con.discounts.js

@@ -14,6 +14,10 @@ import {
   delete_tags_of, insert_media_of, insert_search_of, 
   insert_tags_of, regular_upsert_me, where_id_or_handle_table, 
   with_media, with_tags, count_regular, with_search,
+  products_with_collections,
+  products_with_discounts,
+  products_with_variants,
+  products_with_related_products,
 } from './con.shared.js'
 import { sanitize, sanitize_array } from './utils.funcs.js'
 import { query_to_eb, withQuery, withSort } from './utils.query.js'
@@ -276,6 +280,17 @@ const list = (driver) => {
 const list_discount_products = (driver) => {
   return async (handle_or_id, 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');
+
     const items = await withSort(
       driver.client
       .selectFrom('products')
@@ -288,7 +303,27 @@ const list_discount_products = (driver) => {
       .select(eb => [
         with_media(eb, eb.ref('products.id'), driver.dialectType),
         with_tags(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(
         (eb) => eb.and(
           [

package/src/con.products.js

@@ -240,8 +240,6 @@ const get = (driver) => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["getBulk"]}
  */
 const getBulk = (driver) => {
@@ -372,8 +370,6 @@ const remove = (driver) => {
 
 /**
  * @param {SQL} driver 
- * 
- * 
  * @returns {db_col["list"]}
  */
 const list = (driver) => {