@smartsoft001/mongo 2.126.0 → 2.128.0

package/index.cjs

@@ -30,23 +30,21 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 
 // packages/shared/mongo/src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   MongoConfig: () => MongoConfig,
   MongoItemRepository: () => MongoItemRepository,
   MongoModule: () => MongoModule
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 
 // packages/shared/models/src/lib/symbols.ts
-var SYMBOL_MODEL = Symbol.for("smartsoft:model");
-var SYMBOL_FIELD = Symbol.for("smartsoft:field");
+var SYMBOL_FIELD = /* @__PURE__ */ Symbol.for("smartsoft:field");
 
 // packages/shared/models/src/lib/decorators/model/model.decorator.ts
 var import_reflect_metadata = require("reflect-metadata");
@@ -70,11 +68,9 @@ var ObjectService = class {
    * @return - new type object
    */
   static createByType(data, type) {
-    if (!data)
-      return data;
+    if (!data) return data;
     try {
-      if (data instanceof type)
-        return data;
+      if (data instanceof type) return data;
     } catch (e) {
       console.warn(e);
     }
@@ -90,8 +86,7 @@ var ObjectService = class {
    * @return - object without type
    */
   static removeTypes(obj) {
-    if (!obj)
-      return obj;
+    if (!obj) return obj;
     const result = {};
     Object.keys(obj).forEach((key) => {
       if (obj[key] && obj[key].constructor && !(obj[key] instanceof Date)) {
@@ -116,8 +111,7 @@ var import_md5 = __toESM(require("md5"));
 
 // packages/shared/models/src/lib/utils.ts
 function getModelFieldKeys(type) {
-  if (!type["__fields"])
-    return [];
+  if (!type["__fields"]) return [];
   return Object.keys(type["__fields"]);
 }
 function getModelFieldOptions(instance, fieldKey) {
@@ -162,8 +156,7 @@ function getMongoUrl(config) {
   let url;
   if (config.username && config.password)
     url = `mongodb://${config.username}:${config.password}@${config.host}:${config.port}`;
-  else
-    url = `mongodb://${config.host}:${config.port}`;
+  else url = `mongodb://${config.host}:${config.port}`;
   url = url + "?authSource=" + config.database;
   if (config.host.indexOf("ondigitalocean.com") > -1) {
     url = url.replace("mongodb://", "mongodb+srv://");
@@ -178,6 +171,7 @@ var MongoUnitOfWork = class extends IUnitOfWork {
     super();
     this.config = config;
   }
+  config;
   async scope(definition) {
     const client = await import_mongodb.MongoClient.connect(this.getUrl());
     const session = client.startSession();
@@ -200,8 +194,7 @@ var MongoUnitOfWork = class extends IUnitOfWork {
       await session.endSession();
       await client.close();
     }
-    if (error)
-      throw error;
+    if (error) throw error;
   }
   getUrl() {
     return getMongoUrl(this.config);
@@ -220,6 +213,7 @@ var MongoAttachmentRepository = class extends IAttachmentRepository {
     super();
     this.config = config;
   }
+  config;
   async upload(data, options) {
     const client = await import_mongodb2.MongoClient.connect(this.getUrl());
     return await new Promise((res, rej) => {
@@ -231,11 +225,10 @@ var MongoAttachmentRepository = class extends IAttachmentRepository {
         data.id,
         data.fileName,
         {
-          contentType: data.mimeType
+          metadata: { contentType: data.mimeType }
         }
       );
-      if (options?.streamCallback)
-        options.streamCallback(writeStream);
+      if (options?.streamCallback) options.streamCallback(writeStream);
       data.stream.pipe(writeStream);
       writeStream.on("error", (error) => {
         rej(error);
@@ -254,11 +247,12 @@ var MongoAttachmentRepository = class extends IAttachmentRepository {
     const items = await bucket.find({
       _id: id
     }).toArray();
-    if (!items || items.length === 0)
-      return null;
+    if (!items || items.length === 0) return null;
     return {
       fileName: items[0].filename,
-      contentType: items[0].contentType,
+      // mongodb 7 removed the deprecated top-level contentType - files written
+      // by older driver versions still carry it, so fall back to it
+      contentType: items[0].metadata?.["contentType"] ?? items[0].contentType,
       length: items[0].length
     };
   }
@@ -297,6 +291,7 @@ var MongoItemRepository = class extends IItemRepository {
     super();
     this.config = config;
   }
+  config;
   async create(item, user, repoOptions) {
     await this.collectionContext(async (collection) => {
       try {
@@ -612,8 +607,7 @@ var MongoItemRepository = class extends IItemRepository {
     return result;
   }
   getModelToResult(item) {
-    if (!item)
-      return null;
+    if (!item) return null;
     const result = ObjectService.removeTypes(item);
     result["id"] = result._id;
     delete result._id;
@@ -643,8 +637,7 @@ var MongoItemRepository = class extends IItemRepository {
     }
   }
   generateSearch(criteria) {
-    if (!criteria["$search"])
-      return;
+    if (!criteria["$search"]) return;
     if (this.config.type) {
       const modelFields = getModelFieldsWithOptions(
         new this.config.type()
@@ -659,8 +652,7 @@ var MongoItemRepository = class extends IItemRepository {
           };
           searchArray.push(res);
         });
-        if (!criteria["$or"])
-          criteria["$or"] = searchArray;
+        if (!criteria["$or"]) criteria["$or"] = searchArray;
         else if (criteria["$or"] && !criteria["$and"]) {
           criteria["$and"] = [{ $or: criteria["$or"] }, { $or: searchArray }];
           delete criteria["$or"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartsoft001/mongo",
-  "version": "2.126.0",
+  "version": "2.128.0",
   "description": "Utils to mongo",
   "repository": {
     "type": "git",
@@ -18,14 +18,14 @@
   },
   "homepage": "https://github.com/emiljuchnikowski/smartsoft#readme",
   "dependencies": {
-    "@angular/core": "21.2.1",
-    "@jest/globals": "30.2.0",
+    "@angular/core": "22.1.3",
+    "@jest/globals": "30.4.1",
     "@nestjs/common": "^11.1.5",
-    "flatted": "3.4.2",
+    "flatted": "3.4.4",
     "guid-typescript": "^1.0.9",
     "lodash": "4.18.1",
     "md5": "^2.3.0",
-    "mongodb": "^5.9.2",
+    "mongodb": "^7.5.0",
     "reflect-metadata": "^0.2.1",
     "rxjs": "^7.8.1",
     "tslib": "^2.3.0"