@storecraft/database-mongodb 1.0.15 → 1.0.16

package/src/con.search.js

@@ -74,10 +74,12 @@ export const quicksearch = (driver) => {
 
     const { filter, sort, reverse_sign } = query_to_mongo(query);
     const expand = query.expand ?? ['*']; 
-    const tables_filtered = tables.filter(t => expand.includes('*') || expand.includes(t));
+    const tables_filtered = tables.filter(
+      t => expand.includes('*') || expand.includes(t)
+    );
 
     if(tables_filtered.length==0)
-        return {};
+      return {};
 
     const pipeline = [
       {
@@ -101,8 +103,6 @@ export const quicksearch = (driver) => {
     ];
 
     const db = driver.mongo_client.db(driver.name);
-    
-    
     const items = /** @type {QuickSearchResource[]} */ (
       await db.collection(tables_filtered[0]).aggregate(
         [

package/src/con.shared.js

@@ -2,7 +2,7 @@
  * @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 { WithRelations } from './utils.relations.js'
+ * @import { WithRelations } from './utils.types.js'
  * @import { WithId } from 'mongodb'
  */
 
@@ -43,17 +43,49 @@ export const upsert_regular = (driver, col) => {
             ]
           );
 
-          const res = await col.replaceOne(
+          // if(!data.handle) {
+          //   throw new Error('Handle is required');
+          // }
+
+          await col.deleteMany(
             // @ts-ignore
+            {
+              $or: [
+                data.id && { _id: to_objid(data.id) },
+                data.handle && { handle: data.handle }
+              ].filter(Boolean)
+            },
+            {
+              session
+            }
+          );
+
+          await col.insertOne(
+            // @ts-ignore
+            {
+              ...data,
+              _id: data.id ? to_objid(data.id) : undefined,
+            },
             { 
-              _id: to_objid(data.id) 
-            }, 
-            data,
-            { 
-              session, upsert: true 
+              session,
             }
+
           );
 
+          // 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
           ////
@@ -74,11 +106,7 @@ export const upsert_regular = (driver, col) => {
 
 /**
  * Extract relations names from item
- * 
- * 
- * @template {import('./utils.relations.js').WithRelations<{}>} T
- * 
- * 
+ * @template {WithRelations<{}>} T
  * @param {T} item
  */
 export const get_relations_names = item => {
@@ -165,10 +193,8 @@ export const expand_to_mongo_projection = (expand) => {
 
 /**
  * @template T, G
- * 
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
  * @returns {db_crud<T, G>["get"]}
  */
 export const get_regular = (driver, col) => {
@@ -184,25 +210,26 @@ export const get_regular = (driver, col) => {
     );
 
     // try to expand relations
-    expand([res], options?.expand);
+    expand(
+      [res], 
+      /** @type {ExpandQuery<WithId<G>>} */(
+        options?.expand
+      )
+    );
 
-    return sanitize_one(res);
+    return /** @type {G} */(
+      sanitize_one(res)
+    );
   }
 }
 
 /**
  * get bulk of items, ordered, if something is missing, `undefined`
  * should be instead
- * 
- * 
  * @template {withOptionalID} T
  * @template {withOptionalID} G
- * 
- * 
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
- * 
  * @returns {db_crud<T, G>["getBulk"]}
  */
 export const get_bulk = (driver, col) => {
@@ -213,27 +240,40 @@ export const get_bulk = (driver, col) => {
 
 
 
-    const res = await col.find(
-      // @ts-ignore
-      { 
-        $or: [
-          {
-            _id: { $in: objids } 
-          },
-          {
-            handle: { $in: ids } 
-          }
-        ]
-      }
-    ).toArray();
+    const res = /** @type {(WithRelations<WithId<G>>)[]} */ (
+      await col.find(
+        // @ts-ignore
+        { 
+          $or: [
+            {
+              _id: { $in: objids } 
+            },
+            {
+              handle: { $in: ids } 
+            }
+          ]
+        }
+      ).toArray()
+    );
 
     // try to expand relations
-    expand(res, options?.expand);
-    const sanitized = sanitize_array(res);
-// console.log('res', sanitized)
+    expand(
+      res, 
+      /** @type {ExpandQuery<WithId<G>>} */ (
+        options?.expand
+      )
+    );
+    
+    
+    const sanitized = /** @type {G[]} */(
+      /** @type {unknown} */(
+        sanitize_array(res)
+      )
+    );
+
     // 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)
     );
     
   }
@@ -264,12 +304,8 @@ export const remove_regular = (driver, col) => {
 /**
  * @template T
  * @template G
- * 
- * 
  * @param {MongoDB} driver 
  * @param {Collection<G>} col 
- * 
- * 
  * @returns {db_crud<T, G>["list"]}
  */
 export const list_regular = (driver, col) => {
@@ -295,13 +331,18 @@ export const list_regular = (driver, col) => {
     if(reverse_sign==-1) items.reverse();
 
     // try expand relations, that were asked
-    const items_expended = expand(items, query?.expand);
+    const items_expended = expand(
+      items, 
+      /** @type {ExpandQuery<WithId<G>>} */ (
+        query?.expand
+      )
+    );
     
     const sanitized = sanitize_array(items_expended);
 
     // console.log('sanitized', sanitized)
 
-    return sanitized;
+    return /** @type {G[]} */(sanitized);
   }
 }
 
@@ -323,7 +364,6 @@ export const count_regular = (driver, col) => {
 
     // console.log('query', query);
     // console.log('filter', JSON.stringify(filter, null, 2));
-
     const count = await col.countDocuments(
       filter
     );

package/src/con.shipping.js

@@ -1,6 +1,6 @@
 /**
  * @import { db_shipping as db_col } from '@storecraft/core/database'
- * @import { WithRelations } from './utils.relations.js'
+ * @import { WithRelations } from './utils.types.js'
  */
 
 import { Collection } from 'mongodb'
@@ -16,8 +16,6 @@ import {
 
 /**
  * @param {MongoDB} d 
- * 
- * 
  * @returns {Collection<WithRelations<db_col["$type_get"]>>}
  */
 const col = (d) => d.collection('shipping_methods');

package/src/con.storefronts.js

@@ -2,14 +2,15 @@
  * @import { 
  *  db_storefronts as db_col, RegularGetOptions 
  * } from '@storecraft/core/database'
- * @import { WithRelations } from './utils.relations.js'
+ * @import { StorefrontType } from '@storecraft/core/api'
+ * @import { WithRelations } from './utils.types.js'
  */
 
 import { Collection } from 'mongodb'
 import { MongoDB } from '../index.js'
-import { count_regular, get_regular, list_regular, 
+import { count_regular, expand, get_regular, list_regular, 
   remove_regular } from './con.shared.js'
-import { sanitize_array, to_objid } from './utils.funcs.js'
+import { sanitize_array, sanitize_recursively, to_objid } from './utils.funcs.js'
 import { 
   add_search_terms_relation_on, create_explicit_relation, save_me 
 } from './utils.relations.js';
@@ -17,7 +18,6 @@ import { report_document_media } from './con.images.js';
 
 /**
  * @param {MongoDB} d 
- * 
  * @returns {Collection<WithRelations<db_col["$type_get"]>>}
  */
 const col = (d) => d.collection('storefronts');
@@ -106,95 +106,118 @@ const count = (driver) => count_regular(driver, col(driver));
 
 /**
  * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_storefront_products"]}
- */
-const list_storefront_products = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['products']
-    };
-
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.products ?? []);
-  }
-}
-
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_storefront_collections"]}
- */
-const list_storefront_collections = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['collections']
-    };
-
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.collections ?? []);
-  }
-}
-
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_storefront_discounts"]}
- */
-const list_storefront_discounts = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['discounts']
-    };
-
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.discounts ?? []);
-  }
-}
-
-/**
- * @param {MongoDB} driver 
- * 
- * @returns {db_col["list_storefront_shipping_methods"]}
+ * @returns {db_col["get_default_auto_generated_storefront"]}
  */
-const list_storefront_shipping_methods = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['shipping_methods']
-    };
-
-    const item = await get_regular(driver, col(driver))(product, options);
-
-    return sanitize_array(item?.shipping_methods ?? []);
-  }
-}
+const get_default_auto_generated_storefront = (driver) => {
+  return async () => {
+    /** @type {Partial<StorefrontType>[]} */
+    const items = await driver.db.aggregate(
+      [
+        { $documents: [{}] },
+        {
+          $lookup: {
+            from: "products",
+            pipeline: [
+              { $match: { active: true } },
+              { $sort: { updated_at: -1} },
+              { $limit: 10 },
+            ],
+            as: "products"
+          }
+        },
+        {
+          $lookup: {
+            from: "collections",
+            pipeline: [
+              { $match: { active: true } },
+              { $sort: { updated_at: -1} },
+            ],
+            as: "collections"
+          }
+        },
+        {
+          $lookup: {
+            from: "discounts",
+            pipeline: [
+              { $match: { active: true } },
+              { $sort: { updated_at: -1} },
+            ],
+            as: "discounts"
+          }
+        },
+        {
+          $lookup: {
+            from: "shipping_methods",
+            pipeline: [
+              { $match: { active: true } },
+              { $sort: { updated_at: -1} },
+            ],
+            as: "shipping_methods"
+          }
+        },
+        {
+          $lookup: {
+            from: "posts",
+            pipeline: [
+              { $match: { active: true } },
+              { $sort: { updated_at: -1} },
+              { $limit: 5 },
+            ],
+            as: "posts"
+          }
+        },
+        {
+          $lookup: {
+            from: "products",
+            pipeline: [
+              { $match: { active: true, tags: { $exists: true } } },
+              { $project: { tags: 1 }}
+            ],
+            as: "all_used_products_tags"
+          }
+        },
+
+      ]
+    ).toArray();
+
+    const pre_all_tags = /** @type {{tags?: string[]}[]} */(
+      items[0].all_used_products_tags ?? []
+    );
+    const all_used_products_tags = pre_all_tags.reduce(
+      (p, c) => {
+        (c?.tags ?? []).forEach(
+          (tag) => p.add(tag)
+        );
+        return p;
+      }, 
+      /** @type {Set<string>} */ (new Set())
+    );
+
+    /** @type {StorefrontType} */
+    let sf = {
+      ...items[0],
+      active: true,
+      created_at: new Date().toISOString(),
+      handle: 'default-auto-generated-storefront',
+      id: 'default',
+      title: 'Default Auto Generated Storefront',
+      description: 'Default Auto Generated Storefront',
+      all_used_products_tags: Array.from(all_used_products_tags)
+    }
 
-/**
- * @param {MongoDB} driver 
- * 
- * 
- * @returns {db_col["list_storefront_posts"]}
- */
-const list_storefront_posts = (driver) => {
-  return async (product) => {
-    /** @type {RegularGetOptions} */
-    const options = {
-      expand: ['posts']
-    };
+    expand(
+      sf.products,
+      [
+        'discounts', 'collections', 
+        'related_products', 'variants'
+      ],
+    );
 
-    const item = await get_regular(driver, col(driver))(product, options);
+    sanitize_recursively(
+      sf
+    );
 
-    return sanitize_array(item?.posts ?? []);
+    return sf;
   }
 }
 
@@ -213,10 +236,6 @@ export const impl = (driver) => {
     remove: remove(driver),
     list: list(driver),
     count: count(driver),
-    list_storefront_products: list_storefront_products(driver),
-    list_storefront_collections: list_storefront_collections(driver),
-    list_storefront_discounts: list_storefront_discounts(driver),
-    list_storefront_shipping_methods: list_storefront_shipping_methods(driver),
-    list_storefront_posts: list_storefront_posts(driver),
+    get_default_auto_generated_storefront: get_default_auto_generated_storefront(driver),
   }
 }

package/src/utils.funcs.js

@@ -1,3 +1,7 @@
+/**
+ * @import { WithRelations } from './utils.types.js';
+ * @import { Filter } from 'mongodb';
+ */
 import { ObjectId } from 'mongodb';
 
 /** @param {any} v */
@@ -14,11 +18,7 @@ export const delete_keys = (...keys) => {
 
   /**
    * @template T
-   * 
-   * 
    * @param {T} o
-   * 
-   * 
    * @returns {T}
    */
   return (o) => {
@@ -30,16 +30,9 @@ export const delete_keys = (...keys) => {
 
 /**
  * Sanitize hidden properties in-place
- * 
- * 
  * @template {object} T
- * 
- * 
  * @param {T} o 
- * 
- * 
  * @return {Omit<T, '_id' | '_relations'>}
- * 
  */
 export const sanitize_hidden = o => {
   if(!isDef(o))
@@ -53,27 +46,26 @@ export const sanitize_hidden = o => {
 }
 
 /**
- * 
- * @template T
- * 
- * 
+ * Sanitize hidden properties in-place recursively
+ * @template {object} T
  * @param {T} o 
- * 
- * 
- * @returns {T}
+ * @return {Omit<T, '_id' | '_relations'>}
  */
-export const delete_id = o => {
-  return delete_keys('_id')(o)
+export const sanitize_recursively = o => {
+  for(const k of Object.keys(o)) {
+    if(k.startsWith('_')) {
+      delete o[k];
+    } else if(typeof o[k] === 'object') {
+      sanitize_recursively(o[k]);
+    }
+  }
+  return o;
 }
 
 /**
- * 
  * Sanitize the mongo document before sending to client
- * 
  * @template T
- * 
- * 
- * @param {T} o 
+ * @param {WithRelations<T>} o 
  */
 export const sanitize_one = o => {
   return sanitize_hidden(o)
@@ -81,30 +73,31 @@ export const sanitize_one = o => {
 
 /**
  * Sanitize the mongo document before sending to client
- * 
  * @template T
- * 
- * 
- * @param {T[]} o 
- * 
+ * @param {WithRelations<T>[]} o 
  */
 export const sanitize_array = o => {
   return o?.map(sanitize_hidden);
 }
 
 /**
- * 
+ * @template T
+ * @param {T} o 
+ * @returns {T}
+ */
+export const delete_id = o => {
+  return delete_keys('_id')(o)
+}
+
+/**
  * @param {string} id 
- * 
  */
 export const to_objid = id => {
   return new ObjectId(id.split('_').at(-1))
 }
 
 /**
- * 
  * @param {string} id 
- * 
  */
 export const to_objid_safe = id => {
   try {
@@ -116,27 +109,20 @@ export const to_objid_safe = id => {
 }
 
 /**
+ * Create a `filter` for `object-id` or `handle`
  * @template {{handle?: string}} G
- * 
- * 
  * @param {string} handle_or_id 
- * 
- * 
- * @returns {import('mongodb').Filter<G>}
+ * @returns {Filter<G>}
  */
 export const handle_or_id = (handle_or_id) => {
-  return objid_or_else_filter(handle_or_id);
+  return objid_or_else_filter(handle_or_id, 'handle');
 }
 
 
 /**
  * @template {{handle?: string}} G
- * 
- * 
  * @param {string} id_or_else 
- * 
- * 
- * @returns {import('mongodb').Filter<G>}
+ * @returns {Filter<G>}
  */
 export const objid_or_else_filter = (id_or_else, else_key='handle') => {
   try {

package/src/utils.relations.js

@@ -1,7 +1,7 @@
 /**
  * @import { ID } from '@storecraft/core/database'
  * @import { BaseType } from '@storecraft/core/api'
- * @import { WithRelations } from './utils.relations.js'
+ * @import { Relation, WithRelations } from './utils.types.js'
  * @import { Filter } from 'mongodb'
  */
 
@@ -10,20 +10,6 @@ import { isDef, isUndef, to_objid } from './utils.funcs.js';
 import { MongoDB } from '../index.js';
 import { zeroed_relations } from './con.shared.js';
 
-/**
- * @template {any} T
- * 
- * @typedef {Object} Relation
- * @property {ObjectId[]} [ids]
- * @property {Record<ID, T>} [entries]
- */
-
-/**
- * @template {any} T
- * 
- * @typedef {T & { _relations? : Record<string, Relation<any>> }} WithRelations
- */
-
 /**
  * 
  * On upsert Create a relation on a given field that represents a relation.
@@ -259,12 +245,13 @@ export const update_specific_connection_of_relation = (
  * @param {ObjectId} entry_objid the proper `ObjectId` of the entry
  * @param {ClientSession} [session] client `session` for atomicity purposes
  * @param {string[]} [search_terms_to_remove=[]] Extra `search` terms to remove
+ * @param {string[]} [tags_to_remove=[]] Extra `tags` terms to remove
  * from all the connections
  * 
  */
 export const remove_entry_from_all_connection_of_relation = (
   driver, collection, relation_name, entry_objid, session,
-  search_terms_to_remove=[]
+  search_terms_to_remove=[], tags_to_remove=[]
 ) => {
   return driver.collection(collection).updateMany(
     { 
@@ -273,7 +260,8 @@ export const remove_entry_from_all_connection_of_relation = (
     { 
       $pull: {
         [`_relations.${relation_name}.ids`] : entry_objid,
-        '_relations.search': { $in : search_terms_to_remove }
+        '_relations.search': { $in : search_terms_to_remove },
+        'tags': { $in : tags_to_remove },
       },
       $unset: { 
         [`_relations.${relation_name}.entries.${entry_objid.toString()}`]: ''