@storecraft/database-mongodb 1.0.19 → 1.0.21

package/src/con.notifications.js

@@ -1,26 +1,24 @@
 /**
  * @import { db_notifications as db_col } from '@storecraft/core/database'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, get_regular, list_regular, 
-  remove_regular, upsert_regular } from './con.shared.js'
+import { 
+  count_regular, get_regular, list_regular, 
+  remove_regular, 
+} from './con.shared.js'
 import { to_objid } from './utils.funcs.js';
 import { add_search_terms_relation_on } from './utils.relations.js';
 import { union } from '@storecraft/core/api/utils.func.js';
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<db_col["$type_get"]>}
  */
 const col = (d) => d.collection('notifications');
 
 /**
  * @param {MongoDB} driver 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -29,11 +27,8 @@ const upsert = (driver) => {
   }
 }
 
-
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["upsertBulk"]}
  */
 const upsertBulk = (driver) => {
@@ -84,8 +79,6 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
  */
 export const impl = (driver) => {

package/src/con.orders.js

@@ -1,16 +1,15 @@
 /**
  * @import { db_orders as db_col } from '@storecraft/core/database'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, get_regular, list_regular, 
-  remove_regular, upsert_regular } from './con.shared.js'
+import { 
+  count_regular, get_regular, list_regular, 
+  remove_regular, upsert_regular 
+} from './con.shared.js'
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<db_col["$type_get"]>}
  */
 const col = (d) => d.collection('orders');
@@ -44,8 +43,6 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
  */
 export const impl = (driver) => {

package/src/con.posts.js

@@ -2,7 +2,6 @@
  * @import { db_posts as db_col } from '@storecraft/core/database'
  * @import { WithRelations } from './utils.types.js'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
 import { count_regular, get_regular, list_regular } from './con.shared.js'
@@ -14,23 +13,14 @@ import {
   update_entry_on_all_connection_of_relation 
 } from './utils.relations.js';
 
-
-/**
- * @typedef {import('@storecraft/core/database').db_posts} db_col
- */
-
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<WithRelations<db_col["$type_get"]>>}
  */
 const col = (d) => d.collection('posts');
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -49,7 +39,6 @@ const upsert = (driver) => {
           ////
           // STOREFRONTS --> POSTS RELATION
           ////
-
           await update_entry_on_all_connection_of_relation(
             driver, 'storefronts', 'posts', objid, data, session
           );
@@ -82,8 +71,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -137,8 +124,6 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
  */
 export const impl = (driver) => {

package/src/con.products.js

@@ -2,9 +2,8 @@
  * @import { db_products as db_col, RegularGetOptions } from '@storecraft/core/database'
  * @import { ProductType, VariantType } from '@storecraft/core/api'
  * @import { WithRelations } from './utils.types.js'
- * @import { Filter, AnyBulkWriteOperation } from 'mongodb'
+ * @import { AnyBulkWriteOperation } from 'mongodb'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
 import { 
@@ -38,16 +37,12 @@ import {
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<WithRelations<db_col["$type_get"]>>}
  */
 const col = (d) => d.collection('products');
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -206,15 +201,12 @@ const upsert = (driver) => {
  
 
 /**
- * 
  * @param {MongoDB} driver 
  */
 const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -307,108 +299,8 @@ const list = (driver) => list_regular(driver, col(driver));
 const count = (driver) => count_regular(driver, col(driver));
 
 
-/**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
- * @param {MongoDB} driver 
- * @returns {db_col["list_all_product_collections"]}
- */
-const list_product_collections = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['collections']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-    
-    return sanitize_array(item?.collections ?? []);
-  }
-}
-
-/**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
- * 
- * 
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_product_variants"]}
- */
-const list_product_variants = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['variants']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    if(item && ('variants' in item)) {
-      
-      return sanitize_array(item?.variants ?? []);
-    }
-
-    return [];
-  }
-}
-
-/**
- * For now and because each product is related to very few
- * collections, I will not expose the query api, and use aggregate
- * instead.
- * 
- * 
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_related_products"]}
- */
-const list_related_products = (driver) => {
-  return async (product) => {
-    /** @type {import('@storecraft/core/database').RegularGetOptions} */
-    const options = {
-      expand: ['related_products']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.related_products ?? []);
-  }
-}
-
-
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_all_product_discounts"]}
- */
-const list_product_discounts = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['discounts']
-    };
-
-    // We have collections embedded in products, so let's use it
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.discounts ?? []);
-  }
-}
-
 /**
  * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["add_product_to_collection"]}
  */
 const add_product_to_collection = (driver) => {
   return async (product_id_or_handle, collection_handle_or_id) => {
@@ -437,9 +329,6 @@ const add_product_to_collection = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["remove_product_from_collection"]}
  */
 const remove_product_from_collection = (driver) => {
   return async (product_id_or_handle, collection_handle_or_id) => {
@@ -466,52 +355,56 @@ const remove_product_from_collection = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["changeStockOfBy"]}
  */
 const changeStockOfBy = (driver) => {
   return async (product_ids_or_handles, deltas) => {
 
-    /** 
-     * @type {AnyBulkWriteOperation<WithRelations<ProductType | VariantType>>[]}
-     */
-    let ops = []
-
-    product_ids_or_handles.forEach(
-      (id, ix) => {
-        ops.push(
-          {
-            updateOne: {
-              filter: handle_or_id(id),
-              update: {
-                $inc: { qty: Math.round(deltas[ix]) }
+    try {
+      /** 
+       * @type {AnyBulkWriteOperation<WithRelations<ProductType | VariantType>>[]}
+       */
+      let ops = []
+  
+      product_ids_or_handles.forEach(
+        (id, ix) => {
+          ops.push(
+            {
+              updateOne: {
+                filter: handle_or_id(id),
+                update: {
+                  $inc: { qty: Math.round(deltas[ix]) }
+                }
               }
             }
-          }
-        );
-
-        ops.push(
-          {
-            updateOne: {
-              filter: handle_or_id(id),
-              update: {
-                $max: { qty: 0 }
+          );
+  
+          ops.push(
+            {
+              updateOne: {
+                filter: handle_or_id(id),
+                update: {
+                  $max: { qty: 0 }
+                }
               }
             }
-          }
-        );
-
-      }
-    );
-
-    if(!ops.length)
-      return;
-
-    await driver.resources.products._col.bulkWrite(
-      ops
-    );
+          );
+  
+        }
+      );
+  
+      if(!ops.length)
+        return;
+  
+      await driver.resources.products._col.bulkWrite(
+        ops
+      );
+    } catch(e) {
+      console.log(e);
+      return false;
+    }
 
+    return true;
   }
 }
 
@@ -560,12 +453,6 @@ export const impl = (driver) => {
     upsert: upsert(driver),
     remove: remove(driver),
     list: list(driver),
-    add_product_to_collection: add_product_to_collection(driver),
-    remove_product_from_collection: remove_product_from_collection(driver),
-    list_all_product_collections: list_product_collections(driver),
-    list_all_product_variants: list_product_variants(driver),
-    list_all_related_products: list_related_products(driver),
-    list_all_product_discounts: list_product_discounts(driver),
     list_used_products_tags: list_used_products_tags(driver),
     count: count(driver)
   }

package/src/con.search.js

@@ -2,11 +2,9 @@
  * @import { search as db_col, db_driver } from '@storecraft/core/database'
  * @import { QuickSearchResource, QuickSearchResult } from '@storecraft/core/api'
  */
-
 import { MongoDB } from '../index.js'
 import { query_to_mongo } from './utils.query.js';
 
-
 /**
  * @type {(keyof db_driver["resources"])[]}
  */
@@ -46,9 +44,7 @@ const prefix_to_resource = {
 }
 
 /**
- * 
  * @param {string} id 
- * 
  * @returns {keyof db_driver["resources"]}
  */
 export const id_to_resource = id => {
@@ -65,8 +61,6 @@ export const id_to_resource = id => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["quicksearch"]}
  */
 export const quicksearch = (driver) => {
@@ -151,10 +145,8 @@ export const quicksearch = (driver) => {
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col}
- * */
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.shared.js

@@ -1,27 +1,28 @@
 /**
- * @import { db_crud, RegularGetOptions } from '@storecraft/core/database'
- * @import { ApiQuery, BaseType, Cursor, ExpandQuery, QuickSearchResource, QuickSearchResult, Tuple, withOptionalID } from '@storecraft/core/api'
- * @import { VQL } from '@storecraft/core/vql'
+ * @import { db_crud, withConcreteId, withConcreteIdAndHandle } from '@storecraft/core/database'
+ * @import { 
+ *  BaseType, ExpandQuery, withOptionalID 
+ * } from '@storecraft/core/api'
  * @import { WithRelations } from './utils.types.js'
  * @import { WithId } from 'mongodb'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { handle_or_id, isUndef, sanitize_array, 
-  sanitize_one, to_objid } from './utils.funcs.js'
+import { 
+  handle_or_id, isUndef, sanitize_array, 
+  sanitize_one, to_objid 
+} from './utils.funcs.js'
 import { query_to_mongo } from './utils.query.js'
 import { report_document_media } from './con.images.js'
 import { add_search_terms_relation_on } from './utils.relations.js'
 
 
 /**
- * @template {BaseType} T
- * @template {BaseType} G
- * 
+ * @description Upsert function for MongoDB
+ * @template {Partial<withConcreteIdAndHandle<{}>>} T
+ * @template {Partial<withConcreteIdAndHandle<{}>>} G
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
  * @returns {db_crud<T, G>["upsert"]}
  */
 export const upsert_regular = (driver, col) => {
@@ -72,20 +73,6 @@ export const upsert_regular = (driver, col) => {
 
           );
 
-          // const res = await col.replaceOne(
-          //   // @ts-ignore
-          //   { 
-          //     $or: [
-          //       data.id && { _id: to_objid(data.id) },
-          //       data.handle && { handle: data.handle }
-          //     ].filter(Boolean)
-          //   }, 
-          //   data,
-          //   { 
-          //     session, upsert: true 
-          //   }
-          // );
-
           ////
           // REPORT IMAGES USAGE
           ////
@@ -105,7 +92,7 @@ export const upsert_regular = (driver, col) => {
 }
 
 /**
- * Extract relations names from item
+ * @description Extract relations names from item
  * @template {WithRelations<{}>} T
  * @param {T} item
  */
@@ -114,10 +101,8 @@ export const get_relations_names = item => {
 }
 
 /**
- * Expand relations in-place
- * 
+ * @description Expand relations in-place
  * @template {any} T
- * 
  * @param {WithRelations<T>[]} items
  * @param {ExpandQuery<T>} [expand_query] 
  */
@@ -224,7 +209,7 @@ export const get_regular = (driver, col) => {
 }
 
 /**
- * get bulk of items, ordered, if something is missing, `undefined`
+ * @description get bulk of items, ordered, if something is missing, `undefined`
  * should be instead
  * @template {withOptionalID} T
  * @template {withOptionalID} G
@@ -234,11 +219,10 @@ export const get_regular = (driver, col) => {
  */
 export const get_bulk = (driver, col) => {
   return async (ids, options) => {
-    const objids = ids.map(handle_or_id)
-                      .map(v => ('_id' in v) ? v._id : undefined)
-                      .filter(Boolean);
-
-
+    const objids = ids
+    .map(handle_or_id)
+    .map(v => ('_id' in v) ? v._id : undefined)
+    .filter(Boolean);
 
     const res = /** @type {(WithRelations<WithId<G>>)[]} */ (
       await col.find(
@@ -264,7 +248,6 @@ export const get_bulk = (driver, col) => {
       )
     );
     
-    
     const sanitized = /** @type {G[]} */(
       /** @type {unknown} */(
         sanitize_array(res)
@@ -273,7 +256,9 @@ export const get_bulk = (driver, col) => {
 
     // now let's order them
     return ids.map(
-      id => sanitized.find(s => s.id===id || s?.['handle']===id)
+      id => sanitized.find(
+        s => s.id===id || s?.['handle']===id
+      )
     );
     
   }
@@ -282,12 +267,8 @@ export const get_bulk = (driver, col) => {
 
 /**
  * @template T, G
- * 
- * 
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
- * 
  * @returns {db_crud<T, G>["remove"]}
  */
 export const remove_regular = (driver, col) => {
@@ -321,7 +302,8 @@ export const list_regular = (driver, col) => {
 
     /** @type {WithRelations<WithId<G>>[]} */
     const items = await col.find(
-      filter,  {
+      filter, 
+      {
         sort, 
         limit: reverse_sign==-1 ? query.limitToLast : query.limit,
         projection: expand_to_mongo_projection(query?.expand)
@@ -349,12 +331,8 @@ export const list_regular = (driver, col) => {
 /**
  * @template {any} T
  * @template {any} G
- * 
- * 
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
- * 
  * @returns {db_crud<T, G>["count"]}
  */
 export const count_regular = (driver, col) => {

package/src/con.shipping.js

@@ -2,7 +2,6 @@
  * @import { db_shipping as db_col } from '@storecraft/core/database'
  * @import { WithRelations } from './utils.types.js'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
 import { count_regular, get_regular, list_regular } from './con.shared.js'
@@ -22,8 +21,6 @@ const col = (d) => d.collection('shipping_methods');
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -79,8 +76,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -136,8 +131,6 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
  */
 export const impl = (driver) => {

package/src/con.storefronts.js

@@ -5,12 +5,13 @@
  * @import { StorefrontType } from '@storecraft/core/api'
  * @import { WithRelations } from './utils.types.js'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, expand, get_regular, list_regular, 
-  remove_regular } from './con.shared.js'
-import { sanitize_array, sanitize_recursively, to_objid } from './utils.funcs.js'
+import { 
+  count_regular, expand, get_regular, list_regular, 
+  remove_regular 
+} from './con.shared.js'
+import { sanitize_recursively, to_objid } from './utils.funcs.js'
 import { 
   add_search_terms_relation_on, create_explicit_relation, save_me 
 } from './utils.relations.js';
@@ -24,8 +25,6 @@ const col = (d) => d.collection('storefronts');
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @return {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -223,10 +222,8 @@ const get_default_auto_generated_storefront = (driver) => {
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
- * */
+ */
 export const impl = (driver) => {
 
   return {