@elsikora/nestjs-crud-config 5.0.0-dev.3 → 5.0.0-dev.4

package/dist/modules/config/data/entity/entity.js

@@ -28,6 +28,8 @@ function createConfigDataEntity(options) {
             createdAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                // Without it TypeORM gives MySQL create and update date columns datetime(6), which no CURRENT_TIMESTAMP default fits
+                precision: null,
                 type: timestampColumnType,
             },
             description: {
@@ -53,6 +55,8 @@ function createConfigDataEntity(options) {
             updatedAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                onUpdate: "CURRENT_TIMESTAMP",
+                precision: null,
                 type: timestampColumnType,
             },
             value: {

package/dist/modules/config/migration/entity/entity.js

@@ -25,6 +25,8 @@ function createConfigMigrationEntity(options) {
             createdAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                // Without it TypeORM gives MySQL create and update date columns datetime(6), which no CURRENT_TIMESTAMP default fits
+                precision: null,
                 type: timestampColumnType,
             },
             executedAt: {
@@ -53,6 +55,8 @@ function createConfigMigrationEntity(options) {
             updatedAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                onUpdate: "CURRENT_TIMESTAMP",
+                precision: null,
                 type: timestampColumnType,
             },
         },

package/dist/modules/config/section/entity/entity.js

@@ -25,6 +25,8 @@ function createConfigSectionEntity(options) {
             createdAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                // Without it TypeORM gives MySQL create and update date columns datetime(6), which no CURRENT_TIMESTAMP default fits
+                precision: null,
                 type: timestampColumnType,
             },
             description: {
@@ -40,6 +42,8 @@ function createConfigSectionEntity(options) {
             updatedAt: {
                 default: () => "CURRENT_TIMESTAMP",
                 nullable: false,
+                onUpdate: "CURRENT_TIMESTAMP",
+                precision: null,
                 type: timestampColumnType,
             },
         },

package/dist/shared/interface/utility/create-dynamic-entity/options.interface.d.ts

@@ -3,6 +3,10 @@ import { ColumnOptions } from 'typeorm';
 export interface ICreateDynamicEntityOptions {
     classDecorators?: Array<ClassDecorator>;
     columns: Record<string, ColumnOptions>;
+    /**
+     * Property decorators, applied before the column. A TypeORM column decorator among them, such as `CreateDateColumn`,
+     * sets the column's mode, and the property's `columns` options are merged into it, its own options winning.
+     */
     decorators?: Record<string, Array<PropertyDecorator>>;
     indexes?: Array<{
         columns: Array<string>;

package/dist/shared/utility/create-dynamic/entity.utility.d.ts

@@ -3,7 +3,9 @@ import { ICreateDynamicEntityOptions } from '../../interface/index.js';
 import { TDynamicEntity } from '../../type/index.js';
 /**
  * Creates a dynamic entity class with TypeORM decorators
- * This approach allows full customization of table names and properties at runtime
+ * This approach allows full customization of table names and properties at runtime.
+ * A TypeORM column decorator in `decorators`, such as `CreateDateColumn`, sets the column's mode; the property's
+ * `columns` options are merged into it instead of registering a plain column that TypeORM would keep first.
  * @see {@link https://elsikora.com/docs/nestjs-crud-config/api-reference/utilities/create-dynamic-entity-class | API Reference - createDynamicEntityClass}
  * @param {ICreateDynamicEntityOptions} options Configuration options for the dynamic entity
  * @returns {TDynamicEntity<unknown>} Dynamically created entity class with all decorators applied

package/dist/shared/utility/create-dynamic/entity.utility.js

@@ -1,8 +1,10 @@
-import { Entity, Unique, Index, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn } from 'typeorm';
+import { Entity, Unique, Index, PrimaryGeneratedColumn, getMetadataArgsStorage, Column, ManyToOne, JoinColumn } from 'typeorm';
 
 /**
  * Creates a dynamic entity class with TypeORM decorators
- * This approach allows full customization of table names and properties at runtime
+ * This approach allows full customization of table names and properties at runtime.
+ * A TypeORM column decorator in `decorators`, such as `CreateDateColumn`, sets the column's mode; the property's
+ * `columns` options are merged into it instead of registering a plain column that TypeORM would keep first.
  * @see {@link https://elsikora.com/docs/nestjs-crud-config/api-reference/utilities/create-dynamic-entity-class | API Reference - createDynamicEntityClass}
  * @param {ICreateDynamicEntityOptions} options Configuration options for the dynamic entity
  * @returns {TDynamicEntity<unknown>} Dynamically created entity class with all decorators applied
@@ -32,14 +34,27 @@ function createDynamicEntityClass(options) {
         }
     }
     for (const [propertyKey, columnOptions] of Object.entries(columns)) {
-        // eslint-disable-next-line @elsikora/typescript/no-unsafe-argument
-        Column(columnOptions)(DynamicEntity.prototype, propertyKey);
         if (decorators[propertyKey]) {
             for (const decorator of decorators[propertyKey]) {
                 // eslint-disable-next-line @elsikora/typescript/no-unsafe-argument
                 decorator(DynamicEntity.prototype, propertyKey);
             }
         }
+        // TypeORM keeps the first column registered for a property, so a column decorator such as CreateDateColumn sets the
+        // mode and the column options are merged into it instead of registering a plain column ahead of it
+        const storedColumns = getMetadataArgsStorage().columns;
+        const decoratedIndex = storedColumns.findIndex((column) => column.target === DynamicEntity && column.propertyName === propertyKey);
+        const decoratedColumn = storedColumns[decoratedIndex];
+        if (decoratedColumn) {
+            storedColumns[decoratedIndex] = {
+                ...decoratedColumn,
+                options: { ...columnOptions, ...decoratedColumn.options },
+            };
+        }
+        else {
+            // eslint-disable-next-line @elsikora/typescript/no-unsafe-argument
+            Column(columnOptions)(DynamicEntity.prototype, propertyKey);
+        }
     }
     for (const [propertyKey, relationOptions] of Object.entries(relations)) {
         const extendedOptions = relationOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "@elsikora/nestjs-crud-config",
- "version": "5.0.0-dev.3",
+ "version": "5.0.0-dev.4",
  "description": "NestJS application configuration via database storage",
  "homepage": "https://github.com/ElsiKora/NestJS-Crud-Config#readme",
  "bugs": {