nicot 1.2.13 → 1.3.0

package/dist/index.mjs

@@ -633,6 +633,7 @@ import { IsOptional } from "class-validator";
 
 // src/utility/metadata.ts
 import { MetadataSetter, Reflector } from "typed-reflector";
+import _ from "lodash";
 var Metadata = new MetadataSetter();
 var reflector = new Reflector();
 function getSpecificFields(obj, type, filter = () => true) {
@@ -645,11 +646,11 @@ function getSpecificFields(obj, type, filter = () => true) {
   });
 }
 function getNotInResultFields(obj, keepEntityVersioningDates = false) {
-  return getSpecificFields(
-    obj,
-    "notInResult",
-    (meta) => !keepEntityVersioningDates || !meta.entityVersioningDate
-  );
+  const res = getSpecificFields(obj, "notInResult");
+  if (keepEntityVersioningDates) {
+    return _.difference(res, getSpecificFields(obj, "entityVersioningDate"));
+  }
+  return res;
 }
 
 // src/decorators/access.ts
@@ -665,8 +666,12 @@ var NotCreatable = () => MergePropertyDecorators([
 var NotChangeable = () => MergePropertyDecorators([
   Metadata.set("notChangeable", true, "notChangeableFields")
 ]);
+var NotUpsertable = () => MergePropertyDecorators([
+  IsOptional(),
+  Metadata.set("notUpsertable", true, "notUpsertableFields")
+]);
 var NotQueryable = () => Metadata.set("notQueryable", true, "notQueryableFields");
-var NotInResult = (options = {}) => Metadata.set("notInResult", options, "notInResultFields");
+var NotInResult = () => Metadata.set("notInResult", true, "notInResultFields");
 
 // src/decorators/property.ts
 import { ApiProperty as ApiProperty2 } from "@nestjs/swagger";
@@ -1360,6 +1365,24 @@ var BindingValue = (bindingKey = DefaultBindingKey) => (obj, key, des) => {
   )(obj, key);
 };
 
+// src/decorators/upsert.ts
+import { Unique } from "typeorm";
+var UpsertColumn = () => Metadata.set("upsertColumn", true, "upsertColumnFields");
+var UpsertableEntity = () => (cls) => {
+  const upsertColumns = getSpecificFields(cls, "upsertColumn");
+  const bindingColumns = getSpecificFields(cls, "bindingColumn");
+  if (!upsertColumns.length && !bindingColumns.length) {
+    throw new Error(
+      `UpsertableEntity ${cls.name} must have at least one UpsertColumn or BindingColumn defined.`
+    );
+  }
+  Metadata.set("upsertableEntity", true)(cls);
+  if (!bindingColumns.length && upsertColumns.length === 1 && upsertColumns[0] === "id") {
+    return;
+  }
+  Unique([.../* @__PURE__ */ new Set([...bindingColumns, ...upsertColumns])])(cls);
+};
+
 // src/dto/cursor-pagination.ts
 var CursorPaginationDto = class {
 };
@@ -1497,6 +1520,7 @@ __decorateClass([
 ], PageSettingsDto.prototype, "recordsPerPage", 2);
 
 // src/bases/time-base.ts
+var EntityVersioningDate = () => Metadata.set("entityVersioningDate", true, "entityVersioningDateFields");
 var TimeBase = class extends PageSettingsDto {
   isValidInCreate() {
     return;
@@ -1519,23 +1543,35 @@ var TimeBase = class extends PageSettingsDto {
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   async beforeUpdate() {
   }
+  isValidInUpsert() {
+    return;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  async beforeUpsert() {
+  }
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  async afterUpsert() {
+  }
 };
 __decorateClass([
   CreateDateColumn({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "createTime", 2);
 __decorateClass([
   UpdateDateColumn({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "updateTime", 2);
 __decorateClass([
   DeleteDateColumn({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "deleteTime", 2);
 
@@ -1596,7 +1632,8 @@ function StringIdBase(idOptions) {
     ...idOptions.uuid ? [UuidColumn({ ...columnOptions, generated: true }), NotWritable()] : [
       StringColumn(idOptions.length || 255, columnOptions),
       IsNotEmpty2(),
-      NotChangeable()
+      NotChangeable(),
+      UpsertColumn()
     ]
   ];
   const dec = MergePropertyDecorators4(decs);
@@ -1605,9 +1642,9 @@ function StringIdBase(idOptions) {
 }
 
 // src/crud-base.ts
-import { ConsoleLogger } from "@nestjs/common";
+import { ConsoleLogger, HttpException } from "@nestjs/common";
 import { camelCase } from "typeorm/util/StringUtils";
-import _3, { omit } from "lodash";
+import _4, { omit } from "lodash";
 import {
   BlankReturnMessageDto as BlankReturnMessageDto2,
   GenericReturnMessageDto,
@@ -1617,7 +1654,7 @@ import {
 
 // src/utility/get-typeorm-relations.ts
 import { getMetadataArgsStorage } from "typeorm";
-import _ from "lodash";
+import _2 from "lodash";
 function getTypeormRelations(cl) {
   const relations = getMetadataArgsStorage().relations.filter(
     (r) => r.target === cl
@@ -1658,7 +1695,7 @@ function getTypeormRelations(cl) {
       };
     }
   );
-  return _.uniqBy(
+  return _2.uniqBy(
     [...typeormRelations, ...computedRelations],
     // Merge typeorm relations and computed relations
     (r) => r.propertyName
@@ -1667,7 +1704,7 @@ function getTypeormRelations(cl) {
 
 // src/utility/cursor-pagination-utils.ts
 import { Brackets as Brackets2 } from "typeorm";
-import _2 from "lodash";
+import _3 from "lodash";
 import SJSON from "superjson";
 
 // src/utility/filter-relations.ts
@@ -1835,7 +1872,7 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
     );
     if (keys.length) {
       const staircasedKeys = keys.map(
-        (key, i) => _2.range(i + 1).map((j) => keys[j])
+        (key, i) => _3.range(i + 1).map((j) => keys[j])
       );
       const cursorKey = (key) => `_cursor_${key.replace(/\./g, "__").replace(/"/g, "")}`;
       const expressionMatrix = staircasedKeys.map(
@@ -2139,15 +2176,23 @@ var CrudBase = class {
     this._restoreBindings(snap);
     return res;
   }
+  async _mayBeTransaction(cb, manager = this.repo.manager) {
+    const hasActiveTx = !!manager.queryRunner?.isTransactionActive;
+    const getRepo = (m) => m.getRepository(this.entityClass);
+    if (hasActiveTx) {
+      return cb(manager, getRepo(manager));
+    } else {
+      return manager.transaction(async (tdb) => await cb(tdb, getRepo(tdb)));
+    }
+  }
   async _batchCreate(ents, beforeCreate, skipErrors = false) {
     const entsWithId = ents.filter((ent) => ent.id != null);
-    return this.repo.manager.transaction(async (mdb) => {
+    return this._mayBeTransaction(async (mdb, repo) => {
       let skipped = [];
-      const repo = mdb.getRepository(this.entityClass);
       let entsToSave = ents;
       if (entsWithId.length) {
         const entIds = entsWithId.map((ent) => ent.id);
-        const entIdChunks = _3.chunk(entIds, 65535);
+        const entIdChunks = _4.chunk(entIds, 65535);
         const existingEnts = (await Promise.all(
           entIdChunks.map(
             (chunk) => repo.find({
@@ -2218,7 +2263,7 @@ var CrudBase = class {
         await beforeCreate(repo);
       }
       try {
-        const entChunksToSave = _3.chunk(
+        const entChunksToSave = _4.chunk(
           entsToSave,
           Math.floor(
             65535 / Math.max(1, Object.keys(entsToSave[0] || {}).length)
@@ -2257,8 +2302,7 @@ var CrudBase = class {
     if (invalidReason) {
       throw new BlankReturnMessageDto2(400, invalidReason).toException();
     }
-    const savedEnt = await this.repo.manager.transaction(async (mdb) => {
-      const repo = mdb.getRepository(this.entityClass);
+    const savedEnt = await this._mayBeTransaction(async (mdb, repo) => {
       if (ent.id != null) {
         const existingEnt = await repo.findOne({
           where: { id: ent.id },
@@ -2357,12 +2401,24 @@ var CrudBase = class {
       });
     }
   }
+  _applyQueryKeepEntityVersioningDates(qb) {
+    if (this.crudOptions.keepEntityVersioningDates) {
+      const versioningDateFields = getSpecificFields(
+        this.entityClass,
+        "entityVersioningDate"
+      );
+      for (const field of versioningDateFields) {
+        qb.addSelect(`${this.entityAliasName}.${field}`);
+      }
+    }
+  }
   async findOne(id, extraQuery = () => {
   }) {
     const bindingEnt = await this.getBindingPartialEntity();
     const query = this.queryBuilder().where(`${this.entityAliasName}.id = :id`, { id }).take(1);
     this._applyQueryRelations(query);
     this._applyQueryFromBinding(bindingEnt, query);
+    this._applyQueryKeepEntityVersioningDates(query);
     this.extraGetQuery(query);
     extraQuery(query);
     query.take(1);
@@ -2404,6 +2460,7 @@ var CrudBase = class {
     this._applyQueryRelations(query);
     this._applyQueryFilters(query, newEnt);
     this._applyQueryFromBinding(bindingEnt, query);
+    this._applyQueryKeepEntityVersioningDates(query);
     const pageSettings = newEnt instanceof PageSettingsDto ? newEnt : Object.assign(new PageSettingsDto(), newEnt);
     this.extraGetQuery(query);
     extraQuery(query);
@@ -2496,6 +2553,116 @@ var CrudBase = class {
     }
     return new BlankReturnMessageDto2(200, "success");
   }
+  async upsert(_ent) {
+    const bindingEnt = await this.getBindingPartialEntity();
+    if (!_ent) {
+      throw new BlankReturnMessageDto2(400, "Invalid entity").toException();
+    }
+    const ent = new this.entityClass();
+    Object.assign(
+      ent,
+      omit(_ent, ...this._typeormRelations.map((r) => r.propertyName))
+    );
+    const invalidReason = ent.isValidInUpsert();
+    if (invalidReason) {
+      throw new BlankReturnMessageDto2(400, invalidReason).toException();
+    }
+    const upsertColumns = getSpecificFields(this.entityClass, "upsertColumn");
+    const conditions = {
+      ..._4.pick(ent, upsertColumns),
+      ...bindingEnt
+    };
+    const conditionKeys = [
+      .../* @__PURE__ */ new Set([
+        ...getSpecificFields(this.entityClass, "bindingColumn"),
+        ...upsertColumns
+      ])
+    ];
+    Object.assign(ent, conditions);
+    let deleteColumnProperty = "";
+    if (!this.crudOptions.hardDelete) {
+      const deleteColumn = this.repo.manager.connection.getMetadata(
+        this.entityClass
+      ).deleteDateColumn;
+      if (deleteColumn) {
+        ent[deleteColumn.propertyName] = null;
+        deleteColumnProperty = deleteColumn.propertyName;
+      }
+    }
+    await ent.beforeUpsert?.();
+    try {
+      const savedEnt = await this._mayBeTransaction(async (mdb, repo) => {
+        const res = await repo.upsert(ent, {
+          conflictPaths: conditionKeys
+        });
+        const insertedId = res.identifiers[0]?.id;
+        const fetchSaved = () => {
+          const qb = repo.createQueryBuilder(this.entityAliasName);
+          if (insertedId != null) {
+            qb.where(`${this.entityAliasName}.id = :id`, { id: insertedId });
+          } else {
+            conditionKeys.forEach((key, i) => {
+              const paramKey = `_cond_${key}`;
+              qb[i === 0 ? "where" : "andWhere"](
+                `${this.entityAliasName}.${key} = :${paramKey}`,
+                {
+                  [paramKey]: conditions[key]
+                }
+              );
+            });
+          }
+          qb.take(1);
+          if (deleteColumnProperty) {
+            if (!this.crudOptions.keepEntityVersioningDates) {
+              qb.addSelect(`${this.entityAliasName}.${deleteColumnProperty}`);
+            }
+            qb.withDeleted();
+          }
+          this._applyQueryKeepEntityVersioningDates(qb);
+          if (this.crudOptions.upsertIncludeRelations) {
+            this._applyQueryRelations(qb);
+          }
+          return qb.getOne();
+        };
+        let saved = await fetchSaved();
+        if (!saved) {
+          this.log.error(
+            `Failed to upsert entity ${JSON.stringify(
+              ent
+            )}: cannot find saved entity after upsert.`
+          );
+          throw new BlankReturnMessageDto2(500, "Internal error").toException();
+        }
+        if (deleteColumnProperty && saved[deleteColumnProperty]) {
+          await repo.restore(insertedId ? { id: insertedId } : conditions);
+          saved = await fetchSaved();
+          if (!saved || saved[deleteColumnProperty]) {
+            this.log.error(
+              `Failed to upsert entity ${JSON.stringify(
+                ent
+              )}: cannot restore soft-deleted entity after upsert.`
+            );
+            throw new BlankReturnMessageDto2(
+              500,
+              "Internal error"
+            ).toException();
+          }
+        }
+        return saved;
+      });
+      await savedEnt.afterUpsert?.();
+      this.cleanEntityNotInResultFields(savedEnt);
+      return new this.entityReturnMessageDto(200, "success", savedEnt);
+    } catch (e) {
+      if (e instanceof HttpException) {
+        throw e;
+      }
+      this.log.error(
+        `Failed to upsert entity ${JSON.stringify(ent)}: ${e.toString()}`
+      );
+      throw new BlankReturnMessageDto2(500, "Internal error").toException();
+    }
+  }
   async delete(id, cond = {}) {
     const bindingEnt = await this.getBindingPartialEntity();
     let result;
@@ -2528,7 +2695,7 @@ var CrudBase = class {
       );
       return newEnt;
     });
-    const invalidResults = _3.compact(
+    const invalidResults = _4.compact(
       await Promise.all(
         ents.map(async (ent) => {
           const reason = ent.isValidInCreate();
@@ -2701,10 +2868,10 @@ var CrudBase = class {
       await flush();
       return result;
     };
-    const hasActiveTx = !!this.repo.manager.queryRunner?.isTransactionActive;
-    const res = await (options.repo ? op(options.repo) : hasActiveTx ? op(this.repo) : this.repo.manager.transaction(
-      (tdb) => op(tdb.getRepository(this.entityClass))
-    ));
+    const res = await this._mayBeTransaction(
+      (tdb, repo) => op(repo),
+      options.repo?.manager || this.repo.manager
+    );
     return res == null ? new BlankReturnMessageDto2(200, "success") : new GenericReturnMessageDto(200, "success", res);
   }
   async _loadFullTextIndex() {
@@ -2764,6 +2931,7 @@ import {
   ParseIntPipe,
   Patch,
   Post,
+  Put,
   Query
 } from "@nestjs/common";
 import {
@@ -2786,7 +2954,7 @@ import {
   OmitType as OmitType2,
   PartialType
 } from "@nestjs/swagger";
-import _5, { upperFirst } from "lodash";
+import _6, { upperFirst } from "lodash";
 import { RenameClass } from "nesties";
 
 // src/bases/base-restful-controller.ts
@@ -2795,6 +2963,7 @@ var RestfulMethods = [
   "findAll",
   "create",
   "update",
+  "upsert",
   "delete",
   "import"
 ];
@@ -2829,6 +2998,9 @@ var BaseRestfulController = class {
   update(id, dto) {
     return this._service.update(id, dto);
   }
+  upsert(dto) {
+    return this._service.upsert(dto);
+  }
   delete(id) {
     return this._service.delete(id);
   }
@@ -2860,7 +3032,7 @@ var PickTypeExpose = (cl, keys) => {
 
 // src/utility/patch-column-in-get.ts
 import { getApiProperty } from "nesties";
-import _4 from "lodash";
+import _5 from "lodash";
 import { DECORATORS } from "@nestjs/swagger/dist/constants";
 var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
   const omit2 = new Set(fieldsToOmit);
@@ -2886,7 +3058,7 @@ var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
       field
     );
   }
-  const queryableFieldsRemaining = _4.difference(
+  const queryableFieldsRemaining = _5.difference(
     getSpecificFields(useCl, "queryCondition"),
     mutateFields
   );
@@ -2947,7 +3119,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        fieldsToOmit: _5.uniq([...this.options.fieldsToOmit || [], ...fields])
+        fieldsToOmit: _6.uniq([...this.options.fieldsToOmit || [], ...fields])
       },
       this.__resolveVisited
     );
@@ -2957,7 +3129,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        writeFieldsToOmit: _5.uniq([
+        writeFieldsToOmit: _6.uniq([
           ...this.options.writeFieldsToOmit || [],
           ...fields
         ])
@@ -2970,7 +3142,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        createFieldsToOmit: _5.uniq([
+        createFieldsToOmit: _6.uniq([
           ...this.options.createFieldsToOmit || [],
           ...fields
         ])
@@ -2983,7 +3155,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        updateFieldsToOmit: _5.uniq([
+        updateFieldsToOmit: _6.uniq([
           ...this.options.updateFieldsToOmit || [],
           ...fields
         ])
@@ -2991,12 +3163,25 @@ var _RestfulFactory = class _RestfulFactory {
       this.__resolveVisited
     );
   }
+  omitUpsert(...fields) {
+    return new _RestfulFactory(
+      this.entityClass,
+      {
+        ...this.options,
+        upsertFieldsToOmit: _6.uniq([
+          ...this.options.upsertFieldsToOmit || [],
+          ...fields
+        ])
+      },
+      this.__resolveVisited
+    );
+  }
   omitFindAll(...fields) {
     return new _RestfulFactory(
       this.entityClass,
       {
         ...this.options,
-        findAllFieldsToOmit: _5.uniq([
+        findAllFieldsToOmit: _6.uniq([
           ...this.options.findAllFieldsToOmit || [],
           ...fields
         ])
@@ -3009,7 +3194,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        outputFieldsToOmit: _5.uniq([
+        outputFieldsToOmit: _6.uniq([
           ...this.options.outputFieldsToOmit || [],
           ...fields
         ])
@@ -3071,7 +3256,7 @@ var _RestfulFactory = class _RestfulFactory {
     return this.options.entityClassName || this.entityClass.name;
   }
   get fieldsToOmit() {
-    return _5.uniq([
+    return _6.uniq([
       ...getSpecificFields(this.entityClass, "notColumn"),
       ...this.options.fieldsToOmit || [],
       ...getTypeormRelations(this.entityClass).map(
@@ -3080,7 +3265,7 @@ var _RestfulFactory = class _RestfulFactory {
     ]);
   }
   get fieldsInCreateToOmit() {
-    return _5.uniq([
+    return _6.uniq([
       ...this.fieldsToOmit,
       ...this.options.writeFieldsToOmit || [],
       ...this.options.createFieldsToOmit || [],
@@ -3095,7 +3280,7 @@ var _RestfulFactory = class _RestfulFactory {
     );
   }
   get fieldsInUpdateToOmit() {
-    return _5.uniq([
+    return _6.uniq([
       ...this.fieldsToOmit,
       ...this.options.writeFieldsToOmit || [],
       ...this.options.updateFieldsToOmit || [],
@@ -3109,21 +3294,36 @@ var _RestfulFactory = class _RestfulFactory {
       `Update${this.entityClassName}Dto`
     );
   }
+  get fieldsInUpsertToOmit() {
+    return _6.uniq([
+      ...this.fieldsToOmit,
+      ...this.options.writeFieldsToOmit || [],
+      ...this.options.upsertFieldsToOmit || [],
+      ...getSpecificFields(this.entityClass, "notWritable"),
+      ...getSpecificFields(this.entityClass, "notUpsertable")
+    ]);
+  }
+  get upsertDto() {
+    return RenameClass(
+      OmitTypeExclude(this.entityClass, this.fieldsInUpsertToOmit),
+      `Upsert${this.entityClassName}Dto`
+    );
+  }
   get importDto() {
     return ImportDataDto(this.createDto);
   }
   get fieldsInGetToOmit() {
-    return _5.uniq([
+    return _6.uniq([
       ...this.fieldsToOmit,
       ...getSpecificFields(this.entityClass, "notQueryable"),
-      ..._5.difference(
+      ..._6.difference(
         getSpecificFields(this.entityClass, "requireGetMutator"),
         getSpecificFields(this.entityClass, "getMutator")
       )
     ]);
   }
   get queryableFields() {
-    return _5.difference(
+    return _6.difference(
       [
         ...getSpecificFields(this.entityClass, "queryCondition"),
         "pageCount",
@@ -3255,6 +3455,21 @@ var _RestfulFactory = class _RestfulFactory {
       `${this.entityClassName}CreateResultDto`
     );
   }
+  get entityUpsertResultDto() {
+    return RenameClass(
+      OmitType2(this.entityResultDto, [
+        ...this.options.upsertIncludeRelations ? [] : getTypeormRelations(this.entityClass).map(
+          (r) => r.propertyName
+        ),
+        ...getSpecificFields(
+          this.entityClass,
+          "notColumn",
+          (m) => m.hideInUpsert
+        )
+      ]),
+      `${this.entityClassName}UpsertResultDto`
+    );
+  }
   get entityReturnMessageDto() {
     return ReturnMessageDto2(this.entityResultDto);
   }
@@ -3290,7 +3505,7 @@ var _RestfulFactory = class _RestfulFactory {
       HttpCode(200),
       ApiOperation({
         summary: `Create a new ${this.entityClassName}`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiBody({ type: this.createDto }),
       ApiOkResponse({ type: this.entityCreateReturnMessageDto }),
@@ -3300,12 +3515,36 @@ var _RestfulFactory = class _RestfulFactory {
   createParam() {
     return Body(DataPipe(), OmitPipe(this.fieldsInCreateToOmit));
   }
+  isUpsertable() {
+    return !!reflector.get("upsertableEntity", this.entityClass);
+  }
+  upsert(extras = {}) {
+    if (!this.isUpsertable()) {
+      throw new Error(
+        `Entity ${this.entityClass.name} is not upsertable. Please define at least one UpsertColumn or BindingColumn, and set @UpsertableEntity() decorator.`
+      );
+    }
+    return MergeMethodDecorators([
+      this.usePrefix(Put, extras.prefix),
+      HttpCode(200),
+      ApiOperation({
+        summary: `Upsert a ${this.entityClassName}`,
+        ..._6.omit(extras, "prefix")
+      }),
+      ApiBody({ type: this.upsertDto }),
+      ApiOkResponse({ type: this.entityUpsertResultDto }),
+      ApiError(400, `The ${this.entityClassName} is not valid`)
+    ]);
+  }
+  upsertParam() {
+    return Body(DataPipe(), OmitPipe(this.fieldsInUpsertToOmit));
+  }
   findOne(extras = {}) {
     return MergeMethodDecorators([
       this.usePrefix(Get, extras.prefix, ":id"),
       ApiOperation({
         summary: `Find a ${this.entityClassName} by id`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiParam({ name: "id", type: this.idType, required: true }),
       ApiOkResponse({ type: this.entityReturnMessageDto }),
@@ -3327,7 +3566,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.usePrefix(Get, extras.prefix),
       ApiOperation({
         summary: `Find all ${this.entityClassName}`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiOkResponse({ type: this.entityArrayReturnMessageDto })
     ]);
@@ -3337,14 +3576,14 @@ var _RestfulFactory = class _RestfulFactory {
       this.usePrefix(Get, extras.prefix),
       ApiOperation({
         summary: `Find all ${this.entityClassName}`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiOkResponse({ type: this.entityCursorPaginationReturnMessageDto })
     ]);
   }
   getMutatorColumns() {
     const mutatorColumns = getSpecificFields(this.entityClass, "getMutator");
-    return _5.difference(mutatorColumns, this.fieldsInGetToOmit);
+    return _6.difference(mutatorColumns, this.fieldsInGetToOmit);
   }
   findAllParam() {
     const mutatorColumns = this.getMutatorColumns();
@@ -3364,7 +3603,7 @@ var _RestfulFactory = class _RestfulFactory {
       HttpCode(200),
       ApiOperation({
         summary: `Update a ${this.entityClassName} by id`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiParam({ name: "id", type: this.idType, required: true }),
       ApiBody({ type: this.updateDto }),
@@ -3386,7 +3625,7 @@ var _RestfulFactory = class _RestfulFactory {
       HttpCode(200),
       ApiOperation({
         summary: `Delete a ${this.entityClassName} by id`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiParam({ name: "id", type: this.idType, required: true }),
       ApiBlankResponse(),
@@ -3403,7 +3642,7 @@ var _RestfulFactory = class _RestfulFactory {
       HttpCode(200),
       ApiOperation({
         summary: `Import ${this.entityClassName}`,
-        ..._5.omit(extras, "prefix")
+        ..._6.omit(extras, "prefix")
       }),
       ApiBody({ type: this.importDto }),
       ApiOkResponse({ type: this.importReturnMessageDto }),
@@ -3416,7 +3655,7 @@ var _RestfulFactory = class _RestfulFactory {
       HttpCode(200),
       ApiOperation({
         summary: `${upperFirst(operationName)} a ${this.entityClassName} by id`,
-        ..._5.omit(options, "prefix", "returnType")
+        ..._6.omit(options, "prefix", "returnType")
       }),
       options.returnType ? ApiTypeResponse(options.returnType) : ApiBlankResponse(),
       ApiError(
@@ -3440,6 +3679,7 @@ var _RestfulFactory = class _RestfulFactory {
       (m) => routeOptions?.routes?.[m]?.enabled === true
     );
     const validMethods = RestfulMethods.filter((m) => {
+      if (m === "upsert" && !this.isUpsertable()) return false;
       const value = routeOptions?.routes?.[m]?.enabled;
       if (value === false) return false;
       if (value === true) return true;
@@ -3473,6 +3713,11 @@ var _RestfulFactory = class _RestfulFactory {
         paramDecorators: () => [this.idParam(), this.updateParam()],
         methodDecorators: () => [this.update()]
       },
+      upsert: {
+        paramTypes: [this.upsertDto],
+        paramDecorators: () => [this.upsertParam()],
+        methodDecorators: () => [this.upsert()]
+      },
       delete: {
         paramTypes: [this.idType],
         paramDecorators: () => [this.idParam()],
@@ -3539,9 +3784,14 @@ var _RestfulFactory = class _RestfulFactory {
     return RenameClass(cl, `${this.entityClassName}Controller`);
   }
   crudService(options = {}) {
+    const keysToMigrate = [
+      "relations",
+      "outputFieldsToOmit",
+      "upsertIncludeRelations",
+      "keepEntityVersioningDates"
+    ];
     return CrudService(this.entityClass, {
-      relations: this.options.relations,
-      outputFieldsToOmit: this.options.outputFieldsToOmit,
+      ..._6.pick(this.options, keysToMigrate),
       ...options
     });
   }
@@ -3561,6 +3811,12 @@ __decorateClass([
 __decorateClass([
   Memorize()
 ], _RestfulFactory.prototype, "updateDto", 1);
+__decorateClass([
+  Memorize()
+], _RestfulFactory.prototype, "fieldsInUpsertToOmit", 1);
+__decorateClass([
+  Memorize()
+], _RestfulFactory.prototype, "upsertDto", 1);
 __decorateClass([
   Memorize()
 ], _RestfulFactory.prototype, "importDto", 1);
@@ -3582,6 +3838,9 @@ __decorateClass([
 __decorateClass([
   Memorize()
 ], _RestfulFactory.prototype, "entityCreateResultDto", 1);
+__decorateClass([
+  Memorize()
+], _RestfulFactory.prototype, "entityUpsertResultDto", 1);
 __decorateClass([
   Memorize()
 ], _RestfulFactory.prototype, "entityReturnMessageDto", 1);
@@ -3668,8 +3927,8 @@ var applyQueryMatchBooleanMySQL = createQueryCondition(
 );
 
 // src/transactional-typeorm.module.ts
-var import_typeorm8 = __toESM(require_typeorm());
-import { EntityManager } from "typeorm";
+var import_typeorm9 = __toESM(require_typeorm());
+import { EntityManager as EntityManager2 } from "typeorm";
 import {
   Inject as Inject2,
   Injectable,
@@ -3726,7 +3985,7 @@ import { Observable } from "rxjs";
 var requestWeakMap = /* @__PURE__ */ new WeakMap();
 var normalizeDataSourceToken = (token) => typeof token === "string" ? token : token.name || token.toString();
 var TransactionalTypeOrmInterceptor = (dataSource) => {
-  const token = (0, import_typeorm8.getEntityManagerToken)(dataSource);
+  const token = (0, import_typeorm9.getEntityManagerToken)(dataSource);
   const interceptorClass = class SpecificTransactionalTypeOrmInterceptor {
     constructor(entityManager) {
       this.entityManager = entityManager;
@@ -3737,7 +3996,7 @@ var TransactionalTypeOrmInterceptor = (dataSource) => {
         let innerSub = null;
         let finished = false;
         let abort;
-        const aborted = new Promise((_6, reject) => {
+        const aborted = new Promise((_7, reject) => {
           abort = reject;
         });
         const run = this.entityManager.transaction(async (txEm) => {
@@ -3780,18 +4039,18 @@ var TransactionalTypeOrmInterceptor = (dataSource) => {
   });
   Reflect.defineMetadata(
     "design:paramtypes",
-    [EntityManager],
+    [EntityManager2],
     interceptorClass
   );
   Inject2(token)(interceptorClass.prototype, void 0, 0);
   Injectable()(interceptorClass);
   return interceptorClass;
 };
-var getTransactionalEntityManagerToken = (dataSource) => `Transactional${normalizeDataSourceToken((0, import_typeorm8.getEntityManagerToken)(dataSource))}`;
+var getTransactionalEntityManagerToken = (dataSource) => `Transactional${normalizeDataSourceToken((0, import_typeorm9.getEntityManagerToken)(dataSource))}`;
 var getTransactionalEntityManagerProvider = (dataSource) => createProvider(
   {
     provide: getTransactionalEntityManagerToken(dataSource),
-    inject: [(0, import_typeorm8.getEntityManagerToken)(dataSource), REQUEST],
+    inject: [(0, import_typeorm9.getEntityManagerToken)(dataSource), REQUEST],
     scope: Scope.REQUEST
   },
   (entityManager, request) => {
@@ -3808,12 +4067,12 @@ var InjectTransactionalEntityManager = createInjectFromTokenFactory(
   getTransactionalEntityManagerToken
 );
 var getTransactionalRepositoryToken = (entity, dataSource) => `Transactional${normalizeDataSourceToken(
-  (0, import_typeorm8.getEntityManagerToken)(dataSource)
+  (0, import_typeorm9.getEntityManagerToken)(dataSource)
 )}Repository_${entity.name || entity.toString()}`;
 var getTransactionalRepositoryProvider = (entity, dataSource) => createProvider(
   {
     provide: getTransactionalRepositoryToken(entity, dataSource),
-    inject: [(0, import_typeorm8.getEntityManagerToken)(dataSource), REQUEST],
+    inject: [(0, import_typeorm9.getEntityManagerToken)(dataSource), REQUEST],
     scope: Scope.REQUEST
   },
   (entityManager, req) => {
@@ -3842,7 +4101,7 @@ var TransactionalTypeOrmModule = class {
         (entity) => getTransactionalRepositoryProvider(entity, dataSource)
       )
     ];
-    const moduleImports = entityArray.length ? [import_typeorm8.TypeOrmModule.forFeature(entityArray, dataSource)] : [];
+    const moduleImports = entityArray.length ? [import_typeorm9.TypeOrmModule.forFeature(entityArray, dataSource)] : [];
     const moduleExports = [...providers, ...moduleImports];
     return {
       module: TransactionalTypeOrmModule,
@@ -3894,6 +4153,7 @@ export {
   NotCreatable,
   NotInResult,
   NotQueryable,
+  NotUpsertable,
   NotWritable,
   OmitPipe,
   OptionalDataPipe,
@@ -3934,6 +4194,8 @@ export {
   TimeBase,
   TransactionalTypeOrmInterceptor,
   TransactionalTypeOrmModule,
+  UpsertColumn,
+  UpsertableEntity,
   UuidColumn,
   applyQueryMatchBoolean,
   applyQueryMatchBooleanMySQL,