@storecraft/database-mongodb 1.0.19 → 1.0.21

package/README.md

@@ -91,7 +91,8 @@ So, you can instantiate with empty config
 
 ## Testing Locally (I recommend to use `Atlas`)
 
-1. First start a `mongo-db` server
+1. Start a `mongo-db` server with `docker`
+
 First, make sure you have `docker` installed,
 Then, run
 

package/index.js

@@ -1,8 +1,6 @@
 /**
  * @import { Config } from './types.public.js'
- * @import { MongoClientOptions } from 'mongodb'
  * @import { db_driver } from '@storecraft/core/database'
- * @import { BaseType } from '@storecraft/core/api'
  * @import { ENV } from '@storecraft/core'
  */
 import { App } from '@storecraft/core';
@@ -24,7 +22,6 @@ import { impl as search } from './src/con.search.js';
 export { migrateToLatest } from './migrate.js';
 export { MongoVectorStore } from './vector-store/index.js';
 
-
 /**
  * @implements {db_driver}
  */
@@ -36,34 +33,22 @@ export class MongoDB {
     url: 'MONGODB_URL',
   });
 
-  /** 
-   * 
-   * @type {boolean} 
-   */ 
+  /** @type {boolean} */ 
   #is_ready;
 
-  /** 
-   * 
-   * @type {App<any, any, any>} 
-   */ 
+  /** @type {App<any, any, any>} */ 
   #app;
 
-  /** 
-   * 
-   * @type {MongoClient} 
-   */ 
+  /** @type {MongoClient} */ 
   #mongo_client;
 
-  /** 
-   * 
-   * @type {Config} 
-   */ 
+  /** @type {Config} */ 
   #config;
 
   /**
-   * 
    * @param {Config} [config] config, if undefined, 
-   * env variables `MONGODB_URL` will be used for uri upon init later
+   * env variables `MONGODB_URL` will be used for 
+   * uri upon init later
    */
   constructor(config) {
     this.#is_ready = false;
@@ -81,18 +66,20 @@ export class MongoDB {
     };
   }
 
-  /**
-   * @type {db_driver["init"]}
-   */
+  /** @type {db_driver["init"]} */
   init(app) {
     if(this.isReady)
       return this;
+
     const c = this.#config;
+
     c.db_name ??= app.platform.env[MongoDB.EnvConfig.db_name];
     c.url ??= app.platform.env[MongoDB.EnvConfig.url] ?? 'main';
 
     if(!this.config.db_name || !this.config.url) {
-      throw new Error('MongoVectorStore::client() - missing url or db_name');
+      throw new Error(
+        'MongoVectorStore::client() - missing url or db_name'
+      );
     }
     
     this.#app = app;
@@ -120,6 +107,7 @@ export class MongoDB {
 
   async disconnect() {
     await this.mongo_client.close(true);
+
     return true;
   }
 
@@ -131,7 +119,6 @@ export class MongoDB {
   }
 
   /**
-   * 
    * @description database name
    */
   get name () {
@@ -139,7 +126,6 @@ export class MongoDB {
   }
 
   /**
-   * 
    * @description Get the `storecraft` app
    */
   get app() { 
@@ -147,12 +133,13 @@ export class MongoDB {
   }
 
   /**
-   * 
    * @description Get the native `mongodb` client
    */
   get mongo_client() {
     if(!this.config.db_name || !this.config.url) {
-      throw new Error('MongoVectorStore::client() - missing url or db_name');
+      throw new Error(
+        'MongoVectorStore::client() - missing url or db_name'
+      );
     }
       
     this.#mongo_client = this.#mongo_client ?? new MongoClient(
@@ -167,7 +154,6 @@ export class MongoDB {
   }
 
   /**
-   * 
    * @description Get the config object
    */
   get config() { 
@@ -175,13 +161,8 @@ export class MongoDB {
   }
 
   /**
-   * 
-   * @template {BaseType} T
-   * 
-   * 
+   * @template T
    * @param {string} name 
-   * 
-   * 
    * @returns {Collection<T>}
    */
   collection(name) {

package/migrate.js

@@ -7,7 +7,6 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 /**
- * 
  * @param {MongoDB} driver 
  * @param {boolean} [destroy_db_upon_completion=true] 
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-mongodb",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Storecraft database driver for mongodb on node / bun / deno platform",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",

package/src/con.auth_users.js

@@ -1,22 +1,18 @@
 /**
  * @import { db_auth_users as db_col } from '@storecraft/core/database'
- * @import { AuthUserType } from '@storecraft/core/api'
  */
-
 import { MongoDB } from '../index.js'
 import { Collection } from 'mongodb'
 import { 
   handle_or_id,
-  objid_or_else_filter, sanitize_one, to_objid_safe 
+  objid_or_else_filter, sanitize_one 
 } from './utils.funcs.js'
 import { 
-  count_regular, get_regular, list_regular, upsert_regular 
+  count_regular, list_regular, upsert_regular 
 } from './con.shared.js'
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<db_col["$type_get"]>}
  */
 const col = (d) => d.collection('auth_users');
@@ -29,8 +25,6 @@ const upsert = (driver) => upsert_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["getByEmail"]}
  */
 const get = (driver) => {
@@ -46,8 +40,6 @@ const get = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["getByEmail"]}
  */
 const getByEmail = (driver) => {
@@ -99,8 +91,6 @@ const remove = (driver) => {
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["removeByEmail"]}
  */
 const removeByEmail = (driver) => {
@@ -125,10 +115,8 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
- * */
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.collections.js

@@ -4,7 +4,6 @@
  * @import { WithRelations } from './utils.types.js'
  * @import { Filter } from 'mongodb'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
 import { count_regular, expand, get_regular, list_regular } from './con.shared.js'
@@ -18,7 +17,6 @@ import {
   update_entry_on_all_connection_of_relation 
 } from './utils.relations.js'
 
-
 const transactionOptions = {
   readPreference: 'primary',
   readConcern: { level: 'local' },
@@ -94,8 +92,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -221,10 +217,7 @@ const count_collection_products = (driver) => {
       filter: filter_query, sort, reverse_sign 
     } = query_to_mongo(query);
 
-    /**
-     * @type {Filter<WithRelations<ProductType | VariantType>>
-     * }
-     */
+    /** @type {Filter<WithRelations<ProductType | VariantType>>} */
     const filter = {
       $and: [
         { '_relations.search': `col:${handle_or_id}` },
@@ -277,10 +270,8 @@ const list_used_products_tags = (driver) => {
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
- * */
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.customers.js

@@ -4,17 +4,17 @@
  * @import { WithRelations } from './utils.types.js'
  * @import { Filter } from 'mongodb'
  */
-
 import { Collection, ObjectId } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, get_regular, list_regular, 
-  upsert_regular } from './con.shared.js'
+import { 
+  count_regular, get_regular, list_regular, 
+  upsert_regular 
+} from './con.shared.js'
 import { handle_or_id, isDef, sanitize_array, to_objid } from './utils.funcs.js'
 import { query_to_mongo } from './utils.query.js';
 
 /**
  * @param {MongoDB} d 
- * 
  * @returns {Collection<db_col["$type_get"]>}
  */
 const col = (d) => d.collection('customers');
@@ -31,8 +31,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["getByEmail"]}
  */
 const getByEmail = (driver) => {
@@ -44,10 +42,7 @@ const getByEmail = (driver) => {
 }
 
 /**
- * 
  * @param {string} email_or_id 
- * 
- * 
  * @returns { {_id:ObjectId} | {email: string}}
  */
 export const email_or_id = (email_or_id) => {
@@ -109,14 +104,14 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["list_customer_orders"]}
  */
 const list_customer_orders = (driver) => {
-  return async (customer_id, query) => {
+  return async (customer_id_or_email, query) => {
 
-    const { filter: filter_query, sort, reverse_sign } = query_to_mongo(query);
+    const { 
+      filter: filter_query, sort, reverse_sign 
+    } = query_to_mongo(query);
 
     // console.log('query', query)
     // console.log('filter', JSON.stringify(filter_query, null, 2))
@@ -126,7 +121,7 @@ const list_customer_orders = (driver) => {
     /** @type {Filter<WithRelations<OrderData>>} */
     const filter = {
       $and: [
-        {'_relations.search': `customer:${customer_id}` },
+        {'_relations.search': `customer:${customer_id_or_email}` },
       ]
     };
 
@@ -175,10 +170,8 @@ const count_customer_orders = (driver) => {
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
- * */
+ */
 export const impl = (driver) => {
 
   return {

package/src/con.discounts.js

@@ -4,7 +4,6 @@
  * @import { WithRelations } from './utils.types.js'
  * @import { Filter } from 'mongodb'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
 import { 
@@ -13,7 +12,7 @@ import {
 import { 
   handle_or_id, isDef, sanitize_array, to_objid 
 } from './utils.funcs.js'
-import { discount_to_mongo_conjunctions } from './con.discounts.utils.js'
+import { discount_to_mongo_conjunctions, is_order_discount } from './con.discounts.utils.js'
 import { query_to_mongo } from './utils.query.js'
 import { report_document_media } from './con.images.js'
 import { enums } from '@storecraft/core/api'
@@ -30,8 +29,6 @@ import {
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<db_col["$type_get"]>}
  */
 const col = (d) => d.collection('discounts');
@@ -39,8 +36,6 @@ const col = (d) => d.collection('discounts');
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["upsert"]}
  */
 const upsert = (driver) => {
@@ -82,7 +77,11 @@ const upsert = (driver) => {
           );
           
           // now filter and update for products
-          if(data.active && data.application.id===enums.DiscountApplicationEnum.Auto.id) {
+          if(
+            data.active && 
+            data.application.id===enums.DiscountApplicationEnum.Auto.id &&
+            !is_order_discount(data)
+          ) {
             const conjunctions = discount_to_mongo_conjunctions(data);
             await driver.resources.products._col.updateMany(
               conjunctions.length ? { $and: conjunctions } : {},
@@ -143,8 +142,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -327,8 +324,6 @@ const count_discount_products = (driver) => {
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
  */
 export const impl = (driver) => {

package/src/con.discounts.utils.js

@@ -1,21 +1,24 @@
 /**
  * @import { 
- *  DiscountType, FilterValue_p_in_price_range, FilterValue_p_not_in_collections, 
- *  FilterValue_p_in_collections, FilterValue_p_not_in_tags, FilterValue_p_in_tags, 
- *  FilterValue_p_in_products, FilterValue_p_not_in_products 
+ *  DiscountType, Filter_p_in_price_range, Filter_p_not_in_collections, 
+ *  Filter_p_in_collections, Filter_p_not_in_tags, Filter_p_in_tags, 
+ *  Filter_p_in_products, Filter_p_not_in_products 
  * } from '@storecraft/core/api'
  */
-
 import { enums } from "@storecraft/core/api";
 import { to_objid_safe } from "./utils.funcs.js";
 
 /** @param {DiscountType} d */
-const is_order_discount = d => {
-  return (d.info.details.meta.id===enums.DiscountMetaEnum.order.id);
+export const is_order_discount = d => {
+  return (
+    (d.info.details.type===enums.DiscountMetaEnum.order.type) ||
+    // @ts-ignore
+    (d.info.details.meta?.type===enums.DiscountMetaEnum.order.type)
+  );
 }
 
 /** @param {DiscountType} d */
-const is_automatic_discount = d => {
+export const is_automatic_discount = d => {
   return (d.application.id===enums.DiscountApplicationEnum.Auto.id);
 }
 
@@ -40,7 +43,7 @@ export const discount_to_mongo_conjunctions = d => {
   const filters = d.info.filters;
 
   for(const filter of filters) {
-    const op = filter.meta.op;
+    const op = filter.op ?? filter.meta.op;
 
     switch (op) {
       case enums.FilterMetaEnum.p_all.op:
@@ -48,58 +51,64 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_in_products.op:
         {
-          const cast = /** @type {FilterValue_p_in_products} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_products} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { handle: { $in: cast.map(it => it.handle) } }
+            { handle: { $in: value.map(it => it.handle) } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_products.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_products} */(
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_products} */ (
+            filter
           );
+
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { handle: { $nin: cast.map(it => it.handle) } }
+            { handle: { $nin: value.map(it => it.handle) } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_in_tags.op:
         {
-          const cast = /** @type {FilterValue_p_in_tags} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_tags} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
           
           conjunctions.push(
-            { tags: { $in: cast } }
+            { tags: { $in: value } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_not_in_tags.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_tags} */(
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_tags} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
 
           conjunctions.push(
-            { tags: { $nin: cast } }
+            { tags: { $nin: value } }
           );
         }
         break;
       case enums.FilterMetaEnum.p_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_in_collections} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_in_collections} */ (
+            filter
           );
-
+          const value = filter_cast?.value ?? [];
+          
           conjunctions.push(
             { 
               '_relations.collections.ids': { 
-                $in: cast.map(c => to_objid_safe(c.id)).filter(Boolean) 
+                $in: value.map(c => to_objid_safe(c.id)).filter(Boolean) 
               } 
             }
           );
@@ -107,14 +116,15 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_not_in_collections.op:
         {
-          const cast = /** @type {FilterValue_p_not_in_collections} */ (
-            filter.value ?? []
+          const filter_cast = /** @type {Filter_p_not_in_collections} */ (
+            filter
           );
+          const value = filter_cast?.value ?? [];
 
           conjunctions.push(
             { 
               '_relations.collections.ids': { 
-                $nin: cast.map(c => to_objid_safe(c.id)).filter(Boolean) 
+                $nin: value.map(c => to_objid_safe(c.id)).filter(Boolean) 
               } 
             }
           );
@@ -122,16 +132,19 @@ export const discount_to_mongo_conjunctions = d => {
         break;
       case enums.FilterMetaEnum.p_in_price_range.op:
         {
-          const cast = /** @type {FilterValue_p_in_price_range} */ (
+          const filter_cast = /** @type {Filter_p_in_price_range} */ (
+            filter
+          );
+          const value = /** @type {Filter_p_in_price_range["value"]} */ (
             {
               from: 0,
               to: Number.POSITIVE_INFINITY,
-              ...(filter?.value ?? {})
+              ...(filter_cast?.value ?? {})
             }
           );
 
-          const from = extract_abs_number(cast.from);
-          const to = extract_abs_number(cast.to);
+          const from = extract_abs_number(value.from);
+          const to = extract_abs_number(value.to);
 
           const conj = { price: { $and: [] } };
 

package/src/con.images.js

@@ -1,13 +1,14 @@
 /**
  * @import { db_images as db_col } from '@storecraft/core/database'
  * @import { ImageType } from '@storecraft/core/api'
- * @import { Filter, AnyBulkWriteOperation } from 'mongodb'
+ * @import { AnyBulkWriteOperation } from 'mongodb'
  */
-
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, get_regular, list_regular, 
-  upsert_regular } from './con.shared.js'
+import { 
+  count_regular, get_regular, list_regular, 
+  upsert_regular 
+} from './con.shared.js'
 import { handle_or_id, to_objid } from './utils.funcs.js';
 import { func } from '@storecraft/core/api';
 import { ID } from '@storecraft/core/api/utils.func.js';
@@ -34,8 +35,6 @@ const get = (driver) => get_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["remove"]}
  */
 const remove = (driver) => {
@@ -85,12 +84,8 @@ const remove = (driver) => {
 }
 
 /**
- * report media usages
- * 
- * 
+ * @description report media usages
  * @param {MongoDB} driver 
- * 
- * 
  * @returns {db_col["report_document_media"]}
  */
 export const report_document_media = (driver) => {
@@ -99,15 +94,14 @@ export const report_document_media = (driver) => {
       return;
 
     const add_to_search_index = func.union(
-      data['title'], func.to_tokens(data['title'])
+      data['title'], 
+      func.to_tokens(data['title'])
     );
 
     const dates = func.apply_dates({});
     
     /** 
      * @param {string} url 
-     * 
-     * 
      * @returns {AnyBulkWriteOperation<ImageType>}
      */
     const url_to_update = url => {
@@ -156,10 +150,8 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /** 
  * @param {MongoDB} driver
- * 
- * 
  * @return {db_col & { _col: ReturnType<col>}}
- * */
+ */
 export const impl = (driver) => {
 
   return {