@nest-omni/core 4.1.2-9 → 4.1.3-0

package/common/abstract.entity.js

@@ -43,7 +43,7 @@ class AbstractEntity extends AbstractBaseEntity {
 }
 exports.AbstractEntity = AbstractEntity;
 __decorate([
-    (0, typeorm_1.PrimaryColumn)(),
+    (0, typeorm_1.PrimaryGeneratedColumn)('increment'),
     (0, decorators_1.NumberFieldOptional)({ swagger: false }),
     __metadata("design:type", Number)
 ], AbstractEntity.prototype, "id", void 0);

package/common/boilerplate.polyfill.d.ts

@@ -16,6 +16,10 @@ declare global {
     }
 }
 declare module 'typeorm' {
+    interface Repository<Entity extends ObjectLiteral> {
+        saveWithPk(this: Repository<Entity>, entity: Entity | Entity[]): Promise<Entity | Entity[]>;
+        getPrimaryKeyFields(this: Repository<Entity>): string[];
+    }
     interface SelectQueryBuilder<Entity> {
         searchByString(q: string, columnNames: string[], options?: {
             formStart: boolean;

package/common/boilerplate.polyfill.js

@@ -25,6 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("source-map-support/register");
 const lodash_1 = require("lodash");
 const typeorm_1 = require("typeorm");
+const typeorm_2 = require("typeorm");
 const page_dto_1 = require("./dto/page.dto");
 const page_meta_dto_1 = require("./dto/page-meta.dto");
 const providers_1 = require("../providers");
@@ -43,11 +44,11 @@ Array.prototype.getByLanguage = function (languageCode) {
 Array.prototype.toPageDto = function (pageMetaDto, options) {
     return new page_dto_1.PageDto(this.toDtos(options), pageMetaDto);
 };
-typeorm_1.SelectQueryBuilder.prototype.searchByString = function (q, columnNames, options) {
+typeorm_2.SelectQueryBuilder.prototype.searchByString = function (q, columnNames, options) {
     if (!q) {
         return this;
     }
-    this.andWhere(new typeorm_1.Brackets((qb) => {
+    this.andWhere(new typeorm_2.Brackets((qb) => {
         for (const item of columnNames) {
             qb.orWhere(`${item} ILIKE :q`);
         }
@@ -60,7 +61,7 @@ typeorm_1.SelectQueryBuilder.prototype.searchByString = function (q, columnNames
     }
     return this;
 };
-typeorm_1.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, options) {
+typeorm_2.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, options) {
     return __awaiter(this, void 0, void 0, function* () {
         if (!(options === null || options === void 0 ? void 0 : options.takeAll)) {
             this.skip(pageOptionsDto.skip).take(pageOptionsDto.pageSize);
@@ -77,7 +78,7 @@ typeorm_1.SelectQueryBuilder.prototype.paginate = function (pageOptionsDto, opti
         return [entities, pageMetaDto];
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto, options) {
+typeorm_2.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const [entities, pageMetaDto] = yield this.paginate(pageOptionsDto, {
             skipCount: options === null || options === void 0 ? void 0 : options.skipCount,
@@ -90,7 +91,7 @@ typeorm_1.SelectQueryBuilder.prototype.paginateAndMap = function (pageOptionsDto
         return transformedEntities.toPageDto(pageMetaDto, options === null || options === void 0 ? void 0 : options.dtoOptions);
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFieldName = 'tenantId') {
+typeorm_2.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFieldName = 'tenantId') {
     var _a;
     if (!tenantId) {
         tenantId = providers_1.ContextProvider.getTenantId();
@@ -106,7 +107,7 @@ typeorm_1.SelectQueryBuilder.prototype.withTenant = function (tenantId, tenantFi
     }
     return this;
 };
-typeorm_1.SelectQueryBuilder.prototype.iterate = function (options) {
+typeorm_2.SelectQueryBuilder.prototype.iterate = function (options) {
     return __asyncGenerator(this, arguments, function* () {
         const batchSize = (options === null || options === void 0 ? void 0 : options.batchSize) || 100;
         let offset = 0;
@@ -124,7 +125,7 @@ typeorm_1.SelectQueryBuilder.prototype.iterate = function (options) {
         }
     });
 };
-typeorm_1.SelectQueryBuilder.prototype.eachBatch = function (callback, options) {
+typeorm_2.SelectQueryBuilder.prototype.eachBatch = function (callback, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const batchSize = (options === null || options === void 0 ? void 0 : options.batchSize) || 100;
         const mode = (options === null || options === void 0 ? void 0 : options.mode) || 'batch';
@@ -150,3 +151,126 @@ typeorm_1.SelectQueryBuilder.prototype.eachBatch = function (callback, options)
         }
     });
 };
+const insertWithPk = function (entity) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (!this.metadata) {
+            throw new Error('Repository metadata is not available. Make sure the repository is properly initialized.');
+        }
+        const tableName = this.metadata.tableName;
+        const columns = this.metadata.columns;
+        const columnNames = [];
+        const columnValues = [];
+        const valuePlaceholders = [];
+        for (const column of columns) {
+            const propertyName = column.propertyName;
+            const value = entity[propertyName];
+            if (value === undefined) {
+                continue;
+            }
+            const columnName = column.databaseName;
+            if (columnName) {
+                columnNames.push(columnName);
+                columnValues.push(value);
+                valuePlaceholders.push(`$${columnValues.length}`);
+            }
+        }
+        const connection = this.manager.connection;
+        const databaseType = connection.options.type;
+        try {
+            let result;
+            if (['postgres', 'sqlite'].includes(databaseType)) {
+                const sql = `INSERT INTO ${tableName} (${columnNames.join(', ')}) VALUES (${valuePlaceholders.join(', ')}) RETURNING *`;
+                const queryResult = yield this.query(sql, columnValues);
+                result = queryResult;
+            }
+            else if (['mysql', 'mariadb'].includes(databaseType)) {
+                const insertSql = `INSERT INTO ${tableName} (${columnNames.join(', ')}) VALUES (${valuePlaceholders.join(', ')})`;
+                yield this.query(insertSql, columnValues);
+                const pkFields = this.getPrimaryKeyFields();
+                const whereConditions = pkFields.map(pkField => {
+                    const column = columns.find(col => col.propertyName === pkField);
+                    const dbName = (column === null || column === void 0 ? void 0 : column.databaseName) || pkField;
+                    return `${dbName} = ?`;
+                });
+                const pkValues = pkFields.map(pkField => entity[pkField]);
+                const selectSql = `SELECT * FROM ${tableName} WHERE ${whereConditions.join(' AND ')}`;
+                const queryResult = yield this.query(selectSql, pkValues);
+                result = queryResult;
+            }
+            else {
+                const sql = `INSERT INTO ${tableName} (${columnNames.join(', ')}) VALUES (${valuePlaceholders.join(', ')})`;
+                yield this.query(sql, columnValues);
+                return entity;
+            }
+            if (result && result.length > 0) {
+                return result[0];
+            }
+            else {
+                console.warn(`Native SQL insert completed but no result returned for ${tableName}, falling back to regular save`);
+                return yield this.save(entity);
+            }
+        }
+        catch (error) {
+            console.warn(`Native SQL insert failed for ${tableName}, falling back to regular save:`, error);
+            return yield this.save(entity);
+        }
+    });
+};
+typeorm_1.Repository.prototype.getPrimaryKeyFields = function () {
+    if (!this.metadata) {
+        throw new Error('Repository metadata is not available. Make sure the repository is properly initialized.');
+    }
+    const primaryKeys = this.metadata.primaryColumns;
+    if (!primaryKeys || primaryKeys.length === 0) {
+        throw new Error(`Entity ${this.metadata.targetName} does not have any primary key columns defined.`);
+    }
+    return primaryKeys.map(column => column.propertyName);
+};
+typeorm_1.Repository.prototype.saveWithPk = function (entity) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const isArray = Array.isArray(entity);
+        const entities = isArray ? entity : [entity];
+        if (entities.length === 0) {
+            return isArray ? [] : null;
+        }
+        const pkFields = this.getPrimaryKeyFields();
+        const results = yield Promise.all(entities.map((singleEntity) => __awaiter(this, void 0, void 0, function* () {
+            const hasPkValues = pkFields.every(pkField => {
+                const value = singleEntity[pkField];
+                return value !== undefined && value !== null && value !== '';
+            });
+            if (hasPkValues) {
+                try {
+                    const existingEntity = yield this.findOne({
+                        where: pkFields.reduce((acc, pkField) => {
+                            acc[pkField] = singleEntity[pkField];
+                            return acc;
+                        }, {})
+                    });
+                    if (existingEntity) {
+                        yield this.update(pkFields.reduce((acc, pkField) => {
+                            acc[pkField] = singleEntity[pkField];
+                            return acc;
+                        }, {}), singleEntity);
+                        return yield this.findOne({
+                            where: pkFields.reduce((acc, pkField) => {
+                                acc[pkField] = singleEntity[pkField];
+                                return acc;
+                            }, {})
+                        });
+                    }
+                    else {
+                        return yield insertWithPk.call(this, singleEntity);
+                    }
+                }
+                catch (error) {
+                    return yield insertWithPk.call(this, singleEntity);
+                }
+            }
+            else {
+                return yield this.save(singleEntity);
+            }
+        })));
+        return isArray ? results : results[0];
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "4.1.2-9",
+  "version": "4.1.3-0",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",