nicot 1.2.13 → 1.3.0

package/dist/index.cjs

@@ -612,6 +612,7 @@ __export(index_exports, {
   NotCreatable: () => NotCreatable,
   NotInResult: () => NotInResult,
   NotQueryable: () => NotQueryable,
+  NotUpsertable: () => NotUpsertable,
   NotWritable: () => NotWritable,
   OmitPipe: () => OmitPipe,
   OptionalDataPipe: () => OptionalDataPipe,
@@ -652,6 +653,8 @@ __export(index_exports, {
   TimeBase: () => TimeBase,
   TransactionalTypeOrmInterceptor: () => TransactionalTypeOrmInterceptor,
   TransactionalTypeOrmModule: () => TransactionalTypeOrmModule,
+  UpsertColumn: () => UpsertColumn,
+  UpsertableEntity: () => UpsertableEntity,
   UuidColumn: () => UuidColumn,
   applyQueryMatchBoolean: () => applyQueryMatchBoolean,
   applyQueryMatchBooleanMySQL: () => applyQueryMatchBooleanMySQL,
@@ -719,6 +722,7 @@ var import_class_validator2 = require("class-validator");
 
 // src/utility/metadata.ts
 var import_typed_reflector = require("typed-reflector");
+var import_lodash = __toESM(require("lodash"));
 var Metadata = new import_typed_reflector.MetadataSetter();
 var reflector = new import_typed_reflector.Reflector();
 function getSpecificFields(obj, type, filter = () => true) {
@@ -731,11 +735,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 import_lodash.default.difference(res, getSpecificFields(obj, "entityVersioningDate"));
+  }
+  return res;
 }
 
 // src/decorators/access.ts
@@ -751,8 +755,12 @@ var NotCreatable = () => (0, import_nesties2.MergePropertyDecorators)([
 var NotChangeable = () => (0, import_nesties2.MergePropertyDecorators)([
   Metadata.set("notChangeable", true, "notChangeableFields")
 ]);
+var NotUpsertable = () => (0, import_nesties2.MergePropertyDecorators)([
+  (0, import_class_validator2.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
 var import_swagger2 = require("@nestjs/swagger");
@@ -1434,6 +1442,24 @@ var BindingValue = (bindingKey = DefaultBindingKey) => (obj, key, des) => {
   )(obj, key);
 };
 
+// src/decorators/upsert.ts
+var import_typeorm3 = require("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;
+  }
+  (0, import_typeorm3.Unique)([.../* @__PURE__ */ new Set([...bindingColumns, ...upsertColumns])])(cls);
+};
+
 // src/dto/cursor-pagination.ts
 var CursorPaginationDto = class {
 };
@@ -1507,10 +1533,10 @@ function CursorPaginationReturnMessageDto(type) {
 }
 
 // src/crud-base.ts
-var import_typeorm7 = require("typeorm");
+var import_typeorm8 = require("typeorm");
 
 // src/bases/time-base.ts
-var import_typeorm3 = require("typeorm");
+var import_typeorm4 = require("typeorm");
 
 // src/bases/page-settings.ts
 var import_class_validator5 = require("class-validator");
@@ -1565,6 +1591,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;
@@ -1587,28 +1614,40 @@ 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([
-  (0, import_typeorm3.CreateDateColumn)({ select: false }),
+  (0, import_typeorm4.CreateDateColumn)({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "createTime", 2);
 __decorateClass([
-  (0, import_typeorm3.UpdateDateColumn)({ select: false }),
+  (0, import_typeorm4.UpdateDateColumn)({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "updateTime", 2);
 __decorateClass([
-  (0, import_typeorm3.DeleteDateColumn)({ select: false }),
+  (0, import_typeorm4.DeleteDateColumn)({ select: false }),
   NotColumn(),
-  NotInResult({ entityVersioningDate: true }),
+  NotInResult(),
+  EntityVersioningDate(),
   Reflect.metadata("design:type", Date)
 ], TimeBase.prototype, "deleteTime", 2);
 
 // src/bases/id-base.ts
-var import_typeorm4 = require("typeorm");
+var import_typeorm5 = require("typeorm");
 var import_class_validator6 = require("class-validator");
 var import_nesties7 = require("nesties");
 function IdBase(idOptions = {}) {
@@ -1628,7 +1667,7 @@ function IdBase(idOptions = {}) {
       columnExtras: { nullable: false, primary: true }
     }),
     Reflect.metadata("design:type", Number),
-    (0, import_typeorm4.Generated)("increment"),
+    (0, import_typeorm5.Generated)("increment"),
     QueryEqual(),
     Metadata.set(
       "notRequiredButHasDefault",
@@ -1664,7 +1703,8 @@ function StringIdBase(idOptions) {
     ...idOptions.uuid ? [UuidColumn({ ...columnOptions, generated: true }), NotWritable()] : [
       StringColumn(idOptions.length || 255, columnOptions),
       (0, import_class_validator6.IsNotEmpty)(),
-      NotChangeable()
+      NotChangeable(),
+      UpsertColumn()
     ]
   ];
   const dec = (0, import_nesties7.MergePropertyDecorators)(decs);
@@ -1675,14 +1715,14 @@ function StringIdBase(idOptions) {
 // src/crud-base.ts
 var import_common2 = require("@nestjs/common");
 var import_StringUtils = require("typeorm/util/StringUtils");
-var import_lodash3 = __toESM(require("lodash"));
+var import_lodash4 = __toESM(require("lodash"));
 var import_nesties8 = require("nesties");
 
 // src/utility/get-typeorm-relations.ts
-var import_typeorm5 = require("typeorm");
-var import_lodash = __toESM(require("lodash"));
+var import_typeorm6 = require("typeorm");
+var import_lodash2 = __toESM(require("lodash"));
 function getTypeormRelations(cl) {
-  const relations = (0, import_typeorm5.getMetadataArgsStorage)().relations.filter(
+  const relations = (0, import_typeorm6.getMetadataArgsStorage)().relations.filter(
     (r) => r.target === cl
   );
   const typeormRelations = relations.map((relation) => {
@@ -1721,7 +1761,7 @@ function getTypeormRelations(cl) {
       };
     }
   );
-  return import_lodash.default.uniqBy(
+  return import_lodash2.default.uniqBy(
     [...typeormRelations, ...computedRelations],
     // Merge typeorm relations and computed relations
     (r) => r.propertyName
@@ -1729,8 +1769,8 @@ function getTypeormRelations(cl) {
 }
 
 // src/utility/cursor-pagination-utils.ts
-var import_typeorm6 = require("typeorm");
-var import_lodash2 = __toESM(require("lodash"));
+var import_typeorm7 = require("typeorm");
+var import_lodash3 = __toESM(require("lodash"));
 var import_superjson = __toESM(require("superjson"));
 
 // src/utility/filter-relations.ts
@@ -1898,7 +1938,7 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
     );
     if (keys.length) {
       const staircasedKeys = keys.map(
-        (key, i) => import_lodash2.default.range(i + 1).map((j) => keys[j])
+        (key, i) => import_lodash3.default.range(i + 1).map((j) => keys[j])
       );
       const cursorKey = (key) => `_cursor_${key.replace(/\./g, "__").replace(/"/g, "")}`;
       const expressionMatrix = staircasedKeys.map(
@@ -1948,8 +1988,8 @@ async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor
       ).filter((s) => !s.includes("__never__"));
       if (expressionMatrix.length) {
         qb.andWhere(
-          new import_typeorm6.Brackets((sqb) => {
-            const levelToBrackets = (level) => new import_typeorm6.Brackets((qb2) => {
+          new import_typeorm7.Brackets((sqb) => {
+            const levelToBrackets = (level) => new import_typeorm7.Brackets((qb2) => {
               level.forEach((expr, i) => {
                 if (i === 0) {
                   qb2.where(expr);
@@ -2202,22 +2242,30 @@ 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 = import_lodash3.default.chunk(entIds, 65535);
+        const entIdChunks = import_lodash4.default.chunk(entIds, 65535);
         const existingEnts = (await Promise.all(
           entIdChunks.map(
             (chunk) => repo.find({
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
               // @ts-ignore
               where: {
-                id: (0, import_typeorm7.In)(chunk)
+                id: (0, import_typeorm8.In)(chunk)
               },
               select: this.crudOptions.createOrUpdate ? void 0 : ["id", "deleteTime"],
               withDeleted: true
@@ -2281,7 +2329,7 @@ var CrudBase = class {
         await beforeCreate(repo);
       }
       try {
-        const entChunksToSave = import_lodash3.default.chunk(
+        const entChunksToSave = import_lodash4.default.chunk(
           entsToSave,
           Math.floor(
             65535 / Math.max(1, Object.keys(entsToSave[0] || {}).length)
@@ -2314,14 +2362,13 @@ var CrudBase = class {
     let ent = new this.entityClass();
     Object.assign(
       ent,
-      (0, import_lodash3.omit)(_ent, ...this._typeormRelations.map((r) => r.propertyName))
+      (0, import_lodash4.omit)(_ent, ...this._typeormRelations.map((r) => r.propertyName))
     );
     const invalidReason = ent.isValidInCreate();
     if (invalidReason) {
       throw new import_nesties8.BlankReturnMessageDto(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 },
@@ -2420,12 +2467,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);
@@ -2467,6 +2526,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);
@@ -2559,6 +2619,116 @@ var CrudBase = class {
     }
     return new import_nesties8.BlankReturnMessageDto(200, "success");
   }
+  async upsert(_ent) {
+    const bindingEnt = await this.getBindingPartialEntity();
+    if (!_ent) {
+      throw new import_nesties8.BlankReturnMessageDto(400, "Invalid entity").toException();
+    }
+    const ent = new this.entityClass();
+    Object.assign(
+      ent,
+      (0, import_lodash4.omit)(_ent, ...this._typeormRelations.map((r) => r.propertyName))
+    );
+    const invalidReason = ent.isValidInUpsert();
+    if (invalidReason) {
+      throw new import_nesties8.BlankReturnMessageDto(400, invalidReason).toException();
+    }
+    const upsertColumns = getSpecificFields(this.entityClass, "upsertColumn");
+    const conditions = {
+      ...import_lodash4.default.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 import_nesties8.BlankReturnMessageDto(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 import_nesties8.BlankReturnMessageDto(
+              500,
+              "Internal error"
+            ).toException();
+          }
+        }
+        return saved;
+      });
+      await savedEnt.afterUpsert?.();
+      this.cleanEntityNotInResultFields(savedEnt);
+      return new this.entityReturnMessageDto(200, "success", savedEnt);
+    } catch (e) {
+      if (e instanceof import_common2.HttpException) {
+        throw e;
+      }
+      this.log.error(
+        `Failed to upsert entity ${JSON.stringify(ent)}: ${e.toString()}`
+      );
+      throw new import_nesties8.BlankReturnMessageDto(500, "Internal error").toException();
+    }
+  }
   async delete(id, cond = {}) {
     const bindingEnt = await this.getBindingPartialEntity();
     let result;
@@ -2587,11 +2757,11 @@ var CrudBase = class {
       const newEnt = new this.entityClass();
       Object.assign(
         newEnt,
-        (0, import_lodash3.omit)(ent, ...this._typeormRelations.map((r) => r.propertyName))
+        (0, import_lodash4.omit)(ent, ...this._typeormRelations.map((r) => r.propertyName))
       );
       return newEnt;
     });
-    const invalidResults = import_lodash3.default.compact(
+    const invalidResults = import_lodash4.default.compact(
       await Promise.all(
         ents.map(async (ent) => {
           const reason = ent.isValidInCreate();
@@ -2764,10 +2934,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 import_nesties8.BlankReturnMessageDto(200, "success") : new import_nesties8.GenericReturnMessageDto(200, "success", res);
   }
   async _loadFullTextIndex() {
@@ -2821,7 +2991,7 @@ function CrudService(entityClass, crudOptions = {}) {
 var import_common3 = require("@nestjs/common");
 var import_nesties10 = require("nesties");
 var import_swagger6 = require("@nestjs/swagger");
-var import_lodash5 = __toESM(require("lodash"));
+var import_lodash6 = __toESM(require("lodash"));
 var import_nesties11 = require("nesties");
 
 // src/bases/base-restful-controller.ts
@@ -2830,6 +3000,7 @@ var RestfulMethods = [
   "findAll",
   "create",
   "update",
+  "upsert",
   "delete",
   "import"
 ];
@@ -2864,6 +3035,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);
   }
@@ -2895,7 +3069,7 @@ var PickTypeExpose = (cl, keys) => {
 
 // src/utility/patch-column-in-get.ts
 var import_nesties9 = require("nesties");
-var import_lodash4 = __toESM(require("lodash"));
+var import_lodash5 = __toESM(require("lodash"));
 var import_constants = require("@nestjs/swagger/dist/constants");
 var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
   const omit2 = new Set(fieldsToOmit);
@@ -2921,7 +3095,7 @@ var PatchColumnsInGet = (cl, originalCl = cl, fieldsToOmit = []) => {
       field
     );
   }
-  const queryableFieldsRemaining = import_lodash4.default.difference(
+  const queryableFieldsRemaining = import_lodash5.default.difference(
     getSpecificFields(useCl, "queryCondition"),
     mutateFields
   );
@@ -2982,7 +3156,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        fieldsToOmit: import_lodash5.default.uniq([...this.options.fieldsToOmit || [], ...fields])
+        fieldsToOmit: import_lodash6.default.uniq([...this.options.fieldsToOmit || [], ...fields])
       },
       this.__resolveVisited
     );
@@ -2992,7 +3166,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        writeFieldsToOmit: import_lodash5.default.uniq([
+        writeFieldsToOmit: import_lodash6.default.uniq([
           ...this.options.writeFieldsToOmit || [],
           ...fields
         ])
@@ -3005,7 +3179,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        createFieldsToOmit: import_lodash5.default.uniq([
+        createFieldsToOmit: import_lodash6.default.uniq([
           ...this.options.createFieldsToOmit || [],
           ...fields
         ])
@@ -3018,7 +3192,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        updateFieldsToOmit: import_lodash5.default.uniq([
+        updateFieldsToOmit: import_lodash6.default.uniq([
           ...this.options.updateFieldsToOmit || [],
           ...fields
         ])
@@ -3026,12 +3200,25 @@ var _RestfulFactory = class _RestfulFactory {
       this.__resolveVisited
     );
   }
+  omitUpsert(...fields) {
+    return new _RestfulFactory(
+      this.entityClass,
+      {
+        ...this.options,
+        upsertFieldsToOmit: import_lodash6.default.uniq([
+          ...this.options.upsertFieldsToOmit || [],
+          ...fields
+        ])
+      },
+      this.__resolveVisited
+    );
+  }
   omitFindAll(...fields) {
     return new _RestfulFactory(
       this.entityClass,
       {
         ...this.options,
-        findAllFieldsToOmit: import_lodash5.default.uniq([
+        findAllFieldsToOmit: import_lodash6.default.uniq([
           ...this.options.findAllFieldsToOmit || [],
           ...fields
         ])
@@ -3044,7 +3231,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.entityClass,
       {
         ...this.options,
-        outputFieldsToOmit: import_lodash5.default.uniq([
+        outputFieldsToOmit: import_lodash6.default.uniq([
           ...this.options.outputFieldsToOmit || [],
           ...fields
         ])
@@ -3106,7 +3293,7 @@ var _RestfulFactory = class _RestfulFactory {
     return this.options.entityClassName || this.entityClass.name;
   }
   get fieldsToOmit() {
-    return import_lodash5.default.uniq([
+    return import_lodash6.default.uniq([
       ...getSpecificFields(this.entityClass, "notColumn"),
       ...this.options.fieldsToOmit || [],
       ...getTypeormRelations(this.entityClass).map(
@@ -3115,7 +3302,7 @@ var _RestfulFactory = class _RestfulFactory {
     ]);
   }
   get fieldsInCreateToOmit() {
-    return import_lodash5.default.uniq([
+    return import_lodash6.default.uniq([
       ...this.fieldsToOmit,
       ...this.options.writeFieldsToOmit || [],
       ...this.options.createFieldsToOmit || [],
@@ -3130,7 +3317,7 @@ var _RestfulFactory = class _RestfulFactory {
     );
   }
   get fieldsInUpdateToOmit() {
-    return import_lodash5.default.uniq([
+    return import_lodash6.default.uniq([
       ...this.fieldsToOmit,
       ...this.options.writeFieldsToOmit || [],
       ...this.options.updateFieldsToOmit || [],
@@ -3144,21 +3331,36 @@ var _RestfulFactory = class _RestfulFactory {
       `Update${this.entityClassName}Dto`
     );
   }
+  get fieldsInUpsertToOmit() {
+    return import_lodash6.default.uniq([
+      ...this.fieldsToOmit,
+      ...this.options.writeFieldsToOmit || [],
+      ...this.options.upsertFieldsToOmit || [],
+      ...getSpecificFields(this.entityClass, "notWritable"),
+      ...getSpecificFields(this.entityClass, "notUpsertable")
+    ]);
+  }
+  get upsertDto() {
+    return (0, import_nesties11.RenameClass)(
+      OmitTypeExclude(this.entityClass, this.fieldsInUpsertToOmit),
+      `Upsert${this.entityClassName}Dto`
+    );
+  }
   get importDto() {
     return ImportDataDto(this.createDto);
   }
   get fieldsInGetToOmit() {
-    return import_lodash5.default.uniq([
+    return import_lodash6.default.uniq([
       ...this.fieldsToOmit,
       ...getSpecificFields(this.entityClass, "notQueryable"),
-      ...import_lodash5.default.difference(
+      ...import_lodash6.default.difference(
         getSpecificFields(this.entityClass, "requireGetMutator"),
         getSpecificFields(this.entityClass, "getMutator")
       )
     ]);
   }
   get queryableFields() {
-    return import_lodash5.default.difference(
+    return import_lodash6.default.difference(
       [
         ...getSpecificFields(this.entityClass, "queryCondition"),
         "pageCount",
@@ -3236,7 +3438,7 @@ var _RestfulFactory = class _RestfulFactory {
         const relationFactory = new _RestfulFactory(
           relation.propertyClass,
           {
-            entityClassName: `${this.entityClassName}${this.options.relations ? (0, import_lodash5.upperFirst)(relation.propertyName) : relation.propertyClass.name}`,
+            entityClassName: `${this.entityClassName}${this.options.relations ? (0, import_lodash6.upperFirst)(relation.propertyName) : relation.propertyClass.name}`,
             relations: this.options.relations && getNextLevelRelations(
               this.options.relations.map(extractRelationName),
               relation.propertyName
@@ -3290,6 +3492,21 @@ var _RestfulFactory = class _RestfulFactory {
       `${this.entityClassName}CreateResultDto`
     );
   }
+  get entityUpsertResultDto() {
+    return (0, import_nesties11.RenameClass)(
+      (0, import_swagger6.OmitType)(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 (0, import_nesties10.ReturnMessageDto)(this.entityResultDto);
   }
@@ -3325,7 +3542,7 @@ var _RestfulFactory = class _RestfulFactory {
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Create a new ${this.entityClassName}`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiBody)({ type: this.createDto }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityCreateReturnMessageDto }),
@@ -3335,12 +3552,36 @@ var _RestfulFactory = class _RestfulFactory {
   createParam() {
     return (0, import_common3.Body)((0, import_nesties10.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 (0, import_nesties10.MergeMethodDecorators)([
+      this.usePrefix(import_common3.Put, extras.prefix),
+      (0, import_common3.HttpCode)(200),
+      (0, import_swagger6.ApiOperation)({
+        summary: `Upsert a ${this.entityClassName}`,
+        ...import_lodash6.default.omit(extras, "prefix")
+      }),
+      (0, import_swagger6.ApiBody)({ type: this.upsertDto }),
+      (0, import_swagger6.ApiOkResponse)({ type: this.entityUpsertResultDto }),
+      (0, import_nesties10.ApiError)(400, `The ${this.entityClassName} is not valid`)
+    ]);
+  }
+  upsertParam() {
+    return (0, import_common3.Body)((0, import_nesties10.DataPipe)(), OmitPipe(this.fieldsInUpsertToOmit));
+  }
   findOne(extras = {}) {
     return (0, import_nesties10.MergeMethodDecorators)([
       this.usePrefix(import_common3.Get, extras.prefix, ":id"),
       (0, import_swagger6.ApiOperation)({
         summary: `Find a ${this.entityClassName} by id`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityReturnMessageDto }),
@@ -3362,7 +3603,7 @@ var _RestfulFactory = class _RestfulFactory {
       this.usePrefix(import_common3.Get, extras.prefix),
       (0, import_swagger6.ApiOperation)({
         summary: `Find all ${this.entityClassName}`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityArrayReturnMessageDto })
     ]);
@@ -3372,14 +3613,14 @@ var _RestfulFactory = class _RestfulFactory {
       this.usePrefix(import_common3.Get, extras.prefix),
       (0, import_swagger6.ApiOperation)({
         summary: `Find all ${this.entityClassName}`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiOkResponse)({ type: this.entityCursorPaginationReturnMessageDto })
     ]);
   }
   getMutatorColumns() {
     const mutatorColumns = getSpecificFields(this.entityClass, "getMutator");
-    return import_lodash5.default.difference(mutatorColumns, this.fieldsInGetToOmit);
+    return import_lodash6.default.difference(mutatorColumns, this.fieldsInGetToOmit);
   }
   findAllParam() {
     const mutatorColumns = this.getMutatorColumns();
@@ -3399,7 +3640,7 @@ var _RestfulFactory = class _RestfulFactory {
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Update a ${this.entityClassName} by id`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_swagger6.ApiBody)({ type: this.updateDto }),
@@ -3421,7 +3662,7 @@ var _RestfulFactory = class _RestfulFactory {
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Delete a ${this.entityClassName} by id`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiParam)({ name: "id", type: this.idType, required: true }),
       (0, import_nesties10.ApiBlankResponse)(),
@@ -3438,7 +3679,7 @@ var _RestfulFactory = class _RestfulFactory {
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
         summary: `Import ${this.entityClassName}`,
-        ...import_lodash5.default.omit(extras, "prefix")
+        ...import_lodash6.default.omit(extras, "prefix")
       }),
       (0, import_swagger6.ApiBody)({ type: this.importDto }),
       (0, import_swagger6.ApiOkResponse)({ type: this.importReturnMessageDto }),
@@ -3450,8 +3691,8 @@ var _RestfulFactory = class _RestfulFactory {
       this.usePrefix(import_common3.Post, options.prefix, ":id", operationName),
       (0, import_common3.HttpCode)(200),
       (0, import_swagger6.ApiOperation)({
-        summary: `${(0, import_lodash5.upperFirst)(operationName)} a ${this.entityClassName} by id`,
-        ...import_lodash5.default.omit(options, "prefix", "returnType")
+        summary: `${(0, import_lodash6.upperFirst)(operationName)} a ${this.entityClassName} by id`,
+        ...import_lodash6.default.omit(options, "prefix", "returnType")
       }),
       options.returnType ? (0, import_nesties10.ApiTypeResponse)(options.returnType) : (0, import_nesties10.ApiBlankResponse)(),
       (0, import_nesties10.ApiError)(
@@ -3475,6 +3716,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;
@@ -3508,6 +3750,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()],
@@ -3574,9 +3821,14 @@ var _RestfulFactory = class _RestfulFactory {
     return (0, import_nesties11.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,
+      ...import_lodash6.default.pick(this.options, keysToMigrate),
       ...options
     });
   }
@@ -3596,6 +3848,12 @@ __decorateClass([
 __decorateClass([
   (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "updateDto", 1);
+__decorateClass([
+  (0, import_nfkit.Memorize)()
+], _RestfulFactory.prototype, "fieldsInUpsertToOmit", 1);
+__decorateClass([
+  (0, import_nfkit.Memorize)()
+], _RestfulFactory.prototype, "upsertDto", 1);
 __decorateClass([
   (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "importDto", 1);
@@ -3617,6 +3875,9 @@ __decorateClass([
 __decorateClass([
   (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityCreateResultDto", 1);
+__decorateClass([
+  (0, import_nfkit.Memorize)()
+], _RestfulFactory.prototype, "entityUpsertResultDto", 1);
 __decorateClass([
   (0, import_nfkit.Memorize)()
 ], _RestfulFactory.prototype, "entityReturnMessageDto", 1);
@@ -3703,8 +3964,8 @@ var applyQueryMatchBooleanMySQL = createQueryCondition(
 );
 
 // src/transactional-typeorm.module.ts
-var import_typeorm8 = __toESM(require_typeorm());
-var import_typeorm9 = require("typeorm");
+var import_typeorm9 = __toESM(require_typeorm());
+var import_typeorm10 = require("typeorm");
 var import_common5 = require("@nestjs/common");
 var import_nesties12 = require("nesties");
 var import_core = require("@nestjs/core");
@@ -3756,7 +4017,7 @@ var import_rxjs = require("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;
@@ -3767,7 +4028,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) => {
@@ -3810,18 +4071,18 @@ var TransactionalTypeOrmInterceptor = (dataSource) => {
   });
   Reflect.defineMetadata(
     "design:paramtypes",
-    [import_typeorm9.EntityManager],
+    [import_typeorm10.EntityManager],
     interceptorClass
   );
   (0, import_common5.Inject)(token)(interceptorClass.prototype, void 0, 0);
   (0, import_common5.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) => (0, import_nesties12.createProvider)(
   {
     provide: getTransactionalEntityManagerToken(dataSource),
-    inject: [(0, import_typeorm8.getEntityManagerToken)(dataSource), import_core.REQUEST],
+    inject: [(0, import_typeorm9.getEntityManagerToken)(dataSource), import_core.REQUEST],
     scope: import_common5.Scope.REQUEST
   },
   (entityManager, request) => {
@@ -3838,12 +4099,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) => (0, import_nesties12.createProvider)(
   {
     provide: getTransactionalRepositoryToken(entity, dataSource),
-    inject: [(0, import_typeorm8.getEntityManagerToken)(dataSource), import_core.REQUEST],
+    inject: [(0, import_typeorm9.getEntityManagerToken)(dataSource), import_core.REQUEST],
     scope: import_common5.Scope.REQUEST
   },
   (entityManager, req) => {
@@ -3872,7 +4133,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,
@@ -3925,6 +4186,7 @@ TransactionalTypeOrmModule = __decorateClass([
   NotCreatable,
   NotInResult,
   NotQueryable,
+  NotUpsertable,
   NotWritable,
   OmitPipe,
   OptionalDataPipe,
@@ -3965,6 +4227,8 @@ TransactionalTypeOrmModule = __decorateClass([
   TimeBase,
   TransactionalTypeOrmInterceptor,
   TransactionalTypeOrmModule,
+  UpsertColumn,
+  UpsertableEntity,
   UuidColumn,
   applyQueryMatchBoolean,
   applyQueryMatchBooleanMySQL,