@smartsoft001/crud-shell-nestjs 2.127.0 → 2.128.0

package/index.js

@@ -5,8 +5,7 @@ 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;
 };
 var __decorateParam = (index, decorator) => (target, key) => decorator(target, key, index);
@@ -23,8 +22,8 @@ import { Guid as Guid2 } from "guid-typescript";
 import { Memoize } from "lodash-decorators";
 
 // packages/shared/models/src/lib/symbols.ts
-var SYMBOL_MODEL = Symbol.for("smartsoft:model");
-var SYMBOL_FIELD = Symbol.for("smartsoft:field");
+var SYMBOL_MODEL = /* @__PURE__ */ Symbol.for("smartsoft:model");
+var SYMBOL_FIELD = /* @__PURE__ */ Symbol.for("smartsoft:field");
 
 // packages/shared/models/src/lib/decorators/model/model.decorator.ts
 import "reflect-metadata";
@@ -56,11 +55,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);
     }
@@ -76,8 +73,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)) {
@@ -121,8 +117,7 @@ var PasswordService = class _PasswordService {
 
 // 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) {
@@ -138,8 +133,7 @@ function getModelFieldsWithOptions(instance) {
   });
 }
 function isModel(instance) {
-  if (!instance || !instance.constructor)
-    return false;
+  if (!instance || !instance.constructor) return false;
   return Reflect.hasMetadata(SYMBOL_MODEL, instance.constructor);
 }
 function getInvalidFields(instance, mode, permissions) {
@@ -160,8 +154,7 @@ function getInvalidFields(instance, mode, permissions) {
   return result;
 }
 function castModel(instance, mode, permissions) {
-  if (!isModel(instance))
-    return;
+  if (!isModel(instance)) return;
   const fieldsWithOptions = getModelFieldsWithOptions(instance);
   Object.keys(instance).filter((key) => key !== "id").forEach((key) => {
     const fieldWidthOptions = fieldsWithOptions.find((f) => f.key === key);
@@ -208,6 +201,9 @@ var CrudService = class {
     this.repository = repository;
     this.attachmentRepository = attachmentRepository;
   }
+  permissionService;
+  repository;
+  attachmentRepository;
   _logger = new Logger(CrudService.name, { timestamp: true });
   async create(data, user) {
     data.id = Guid2.raw();
@@ -345,8 +341,7 @@ var CrudService = class {
       data.id = GuidService.create();
     }
     this.attachmentRepository.upload(data, options);
-    if (oldId)
-      await this.attachmentRepository.delete(data.id);
+    if (oldId) await this.attachmentRepository.delete(data.id);
     return data.id;
   }
   getAttachmentInfo(id) {
@@ -374,8 +369,7 @@ var CrudService = class {
     }
   }
   checkValidUpdatePartial(item, permissions) {
-    if (!isModel(item))
-      return;
+    if (!isModel(item)) return;
     const keys = Object.keys(item);
     const array = getInvalidFields(item, "update", permissions)?.filter(
       (invalidField) => keys.some((key) => key === invalidField)
@@ -416,8 +410,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://");
@@ -432,6 +425,7 @@ var MongoUnitOfWork = class extends IUnitOfWork {
     super();
     this.config = config;
   }
+  config;
   async scope(definition) {
     const client = await MongoClient.connect(this.getUrl());
     const session = client.startSession();
@@ -454,8 +448,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);
@@ -474,6 +467,7 @@ var MongoAttachmentRepository = class extends IAttachmentRepository {
     super();
     this.config = config;
   }
+  config;
   async upload(data, options) {
     const client = await MongoClient2.connect(this.getUrl());
     return await new Promise((res, rej) => {
@@ -485,11 +479,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);
@@ -508,11 +501,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
     };
   }
@@ -553,6 +547,7 @@ var MongoItemRepository = class extends IItemRepository {
     super();
     this.config = config;
   }
+  config;
   async create(item, user, repoOptions) {
     await this.collectionContext(async (collection) => {
       try {
@@ -868,8 +863,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;
@@ -899,8 +893,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()
@@ -915,8 +908,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"];
@@ -1003,6 +995,7 @@ var JwtStrategy = class extends PassportStrategy(Strategy) {
     });
     this.config = config;
   }
+  config;
   async validate(payload) {
     return {
       ...payload,
@@ -1021,6 +1014,7 @@ var PermissionService = class {
   constructor(config) {
     this.config = config;
   }
+  config;
   /**
    * Validates if the user has the required permissions for a given type.
    * @param {PermissionType} type - The type of permission to validate.
@@ -1028,13 +1022,10 @@ var PermissionService = class {
    * @throws {DomainForbiddenError} If the user does not have the required permissions.
    */
   valid(type, user) {
-    if (!this.config.permissions)
-      return;
+    if (!this.config.permissions) return;
     const typeConfig = this.config.permissions[type];
-    if (!typeConfig)
-      return;
-    if (!user.permissions)
-      throw new DomainForbiddenError(`Context forbidden`);
+    if (!typeConfig) return;
+    if (!user.permissions) throw new DomainForbiddenError(`Context forbidden`);
     if (!typeConfig.some((tc) => user.permissions.some((up) => tc === up)))
       throw new DomainForbiddenError(`Context forbidden`);
   }
@@ -1172,8 +1163,7 @@ import { Readable } from "stream";
 import * as querystring from "querystring";
 var iso8601 = /^\d{4}(-(0[1-9]|1[0-2])(-(0[1-9]|[12][0-9]|3[01]))?)?(T([01][0-9]|2[0-3]):[0-5]\d(:[0-5]\d(\.\d+)?)?(Z|[+-]\d{2}:\d{2}))?$/;
 function fieldsToMongo(fields) {
-  if (!fields)
-    return null;
+  if (!fields) return null;
   const hash = {};
   fields.split(",").forEach(function(field) {
     hash[field.trim()] = 1;
@@ -1184,8 +1174,7 @@ function convertRegex(val) {
   return val.toString().replace(/\*/g, "[*]");
 }
 function omitFieldsToMongo(omitFields) {
-  if (!omitFields)
-    return null;
+  if (!omitFields) return null;
   const hash = {};
   omitFields.split(",").forEach(function(omitField) {
     hash[omitField.trim()] = 0;
@@ -1193,21 +1182,18 @@ function omitFieldsToMongo(omitFields) {
   return hash;
 }
 function sortToMongo(sort) {
-  if (!sort)
-    return null;
+  if (!sort) return null;
   const hash = {};
   let c;
   sort.split(",").forEach(function(field) {
     c = field.charAt(0);
-    if (c === "-")
-      field = field.substr(1);
+    if (c === "-") field = field.substr(1);
     hash[field.trim()] = c === "-" ? -1 : 1;
   });
   return hash;
 }
 function typedValue(value) {
-  if (value[0] === "!")
-    value = value.substr(1);
+  if (value[0] === "!") value = value.substr(1);
   const regex = value.match(/^\/(.*)\/(i?)$/);
   const quotedString = value.match(/(["'])(?:\\\1|.)*?\1/);
   if (regex) {
@@ -1238,13 +1224,11 @@ function comparisonToMongo(key, value) {
   const parts = join.match(/^(!?[^><~!=:]+)(?:=?([><]=?|~?=|!?=|:.+=)(.+))?$/);
   let op;
   const hash = {};
-  if (!parts)
-    return null;
+  if (!parts) return null;
   key = parts[1];
   op = parts[2];
   if (!op) {
-    if (key[0] !== "!")
-      value = { $exists: true };
+    if (key[0] !== "!") value = { $exists: true };
     else {
       key = key.substr(1);
       value = { $exists: false };
@@ -1252,8 +1236,7 @@ function comparisonToMongo(key, value) {
   } else if (op === "=" && parts[3] === "!") {
     value = { $exists: false };
   } else if (op === "=" || op === "!=") {
-    if (op === "=" && parts[3][0] === "!")
-      op = "!=";
+    if (op === "=" && parts[3][0] === "!") op = "!=";
     const array = typedValues(parts[3]);
     if (array.length > 1) {
       value = {};
@@ -1278,14 +1261,10 @@ function comparisonToMongo(key, value) {
     value[op] = array.length === 1 ? array[0] : array;
   } else {
     value = typedValue(parts[3]);
-    if (op === ">")
-      value = { $gt: value };
-    else if (op === ">=")
-      value = { $gte: value };
-    else if (op === "<")
-      value = { $lt: value };
-    else if (op === "<=")
-      value = { $lte: value };
+    if (op === ">") value = { $gt: value };
+    else if (op === ">=") value = { $gte: value };
+    else if (op === "<") value = { $lt: value };
+    else if (op === "<=") value = { $lte: value };
     else if (op === "~=")
       value = {
         $regex: value ? convertRegex(value) : "",
@@ -1299,8 +1278,7 @@ function comparisonToMongo(key, value) {
 function hasOrdinalKeys(obj) {
   let c = 0;
   for (const key in obj) {
-    if (Number(key) !== c++)
-      return false;
+    if (Number(key) !== c++) return false;
   }
   return true;
 }
@@ -1337,12 +1315,9 @@ function queryCriteriaToMongo(query, options = null) {
 function queryOptionsToMongo(query, options) {
   const hash = {}, fields = fieldsToMongo(query[options.keywords.fields]), omitFields = omitFieldsToMongo(query[options.keywords.omit]), sort = sortToMongo(query[options.keywords.sort]), maxLimit = options.maxLimit || 9007199254740992;
   let limit = options.maxLimit || 0;
-  if (fields)
-    hash.fields = fields;
-  if (omitFields)
-    hash.fields = omitFields;
-  if (sort)
-    hash.sort = sort;
+  if (fields) hash.fields = fields;
+  if (omitFields) hash.fields = omitFields;
+  if (sort) hash.sort = sort;
   if (query[options.keywords.offset])
     hash.skip = Number(query[options.keywords.offset]);
   if (query[options.keywords.limit])
@@ -1379,10 +1354,8 @@ function q2m(query = null, options = null) {
     options.ignore = typeof options.ignore === "string" ? [options.ignore] : options.ignore;
   }
   options.ignore = options.ignore.concat(ignoreKeywords);
-  if (!options.parser)
-    options.parser = querystring;
-  if (typeof query === "string")
-    query = options.parser.parse(query);
+  if (!options.parser) options.parser = querystring;
+  if (typeof query === "string") query = options.parser.parse(query);
   return {
     criteria: queryCriteriaToMongo(query, options),
     options: queryOptionsToMongo(query, options),
@@ -1391,8 +1364,7 @@ function q2m(query = null, options = null) {
       const limit = Math.min(this.options.limit || 0, totalCount);
       const links = {};
       const last = {};
-      if (!limit)
-        return null;
+      if (!limit) return null;
       options = options || {};
       if (offset > 0) {
         query[options.keywords.offset] = Math.max(offset - limit, 0);
@@ -1443,6 +1415,7 @@ var CrudController = class {
   constructor(service) {
     this.service = service;
   }
+  service;
   static getLink(req) {
     return req.protocol + "://" + req.headers.host + req.url;
   }
@@ -1629,8 +1602,7 @@ var CrudController = class {
           if (!fields.some((f) => f === baseKey + key))
             fields.push(baseKey + key);
         } else {
-          if (!fields.some((f) => f === key))
-            fields.push(key);
+          if (!fields.some((f) => f === key)) fields.push(key);
         }
       });
     };
@@ -1730,6 +1702,7 @@ var CrudGateway = class {
   constructor(service) {
     this.service = service;
   }
+  service;
   _clientsSubscriptions;
   handleFilter(data, client) {
     const event = "changes";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smartsoft001/crud-shell-nestjs",
-  "version": "2.127.0",
+  "version": "2.128.0",
   "description": "Utils to crud",
   "repository": {
     "type": "git",
@@ -17,9 +17,9 @@
     "url": "https://github.com/emiljuchnikowski/smartsoft/issues"
   },
   "peerDependencies": {
-    "@smartsoft001/crud-shell-app-services": "2.127.0",
+    "@smartsoft001/crud-shell-app-services": "2.128.0",
     "@smartsoft001/crud-shell-dto": "*",
-    "@smartsoft001/domain-core": "2.127.0"
+    "@smartsoft001/domain-core": "2.128.0"
   },
   "homepage": "https://github.com/emiljuchnikowski/smartsoft#readme"
 }