@lenne.tech/nest-server 11.1.0 → 11.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "11.1.0",
+  "version": "11.1.1",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",
@@ -22,8 +22,8 @@
     "docs:ci": "ts-node ./scripts/init-server.ts && npm run docs:bootstrap && compodoc -p tsconfig.json",
     "format": "prettier --write 'src/**/*.ts'",
     "format:staged": "pretty-quick --staged",
-    "lint": "eslint '{src,apps,libs,test}/**/*.{ts,js}' --cache",
-    "lint:fix": "eslint '{src,apps,libs,test}/**/*.{ts,js}' --fix --cache",
+    "lint": "eslint '{src,apps,libs,tests}/**/*.{ts,js}' --cache",
+    "lint:fix": "eslint '{src,apps,libs,tests}/**/*.{ts,js}' --fix --cache",
     "prestart:prod": "npm run build",
     "reinit": "rimraf package-lock.json && rimraf node_modules && npm i && npm run lint && npm run test:e2e && npm run test:ci && npm run build",
     "reinit:clean": "rimraf package-lock.json && rimraf node_modules && npm cache clean --force && npm i && npm run test:e2e && npm run build",

package/src/core/common/decorators/unified-field.decorator.ts

@@ -1,5 +1,5 @@
 import { Field, FieldOptions } from '@nestjs/graphql';
-import { ApiProperty, ApiPropertyOptional, ApiPropertyOptions } from '@nestjs/swagger';
+import { ApiProperty, ApiPropertyOptions } from '@nestjs/swagger';
 import { EnumAllowedTypes } from '@nestjs/swagger/dist/interfaces/schema-object-metadata.interface';
 import { Type } from 'class-transformer';
 import {
@@ -78,6 +78,10 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
       throw new Error(`Array field '${String(propertyKey)}' of '${String(target)}' must have an explicit type`);
     }
 
+    if (opts.enum && userType) {
+      throw new Error(`Can't set both enum and type of ${String(propertyKey)} in ${target.constructor.name}`);
+    }
+
     const resolvedTypeFn = (): any => {
         if (opts.enum?.enum) {
           return opts.enum.enum; // Ensure enums are handled directly
@@ -150,9 +154,31 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
     // Gql decorator
     Field(gqlTypeFn, gqlOpts)(target, propertyKey);
 
-    const ApiDec = opts.isOptional ? ApiPropertyOptional : ApiProperty;
+    // Trims keys with 'undefined' properties.
+    function trimUndefined<T>(obj: T): Partial<T> {
+      if (typeof obj !== 'object' || obj === null) {
+        return obj;
+      }
+      const result: any = Array.isArray(obj) ? [] : {};
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+          const value = (obj as any)[key];
+
+          if (typeof value === 'object' && value !== null) {
+            const cleaned = trimUndefined(value);
+            if (Array.isArray(cleaned) ? cleaned.length > 0 : Object.keys(cleaned).length > 0) {
+              result[key] = cleaned;
+            }
+          } else if (value !== undefined) {
+            result[key] = value;
+          }
+        }
+      }
+
+      return result;
+    }
 
-    ApiDec({
+    ApiProperty(trimUndefined({
       deprecated: swaggerOpts.deprecated,
       description: swaggerOpts.description,
       enum: swaggerOpts.enum,
@@ -162,7 +188,7 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
       nullable: swaggerOpts.nullable,
       pattern: swaggerOpts.pattern,
       type: () => resolvedTypeFn(),
-    })(target, propertyKey);
+    }))(target, propertyKey);
 
     // Conditional validation
     if (opts.validateIf) {

package/src/core/common/helpers/service.helper.ts

@@ -5,7 +5,6 @@ import { sha256 } from 'js-sha256';
 import _ = require('lodash');
 import { Types } from 'mongoose';
 
-import { getTranslatablePropertyKeys } from '../decorators/translatable.decorator';
 import { RoleEnum } from '../enums/role.enum';
 import { PrepareInputOptions } from '../interfaces/prepare-input-options.interface';
 import { PrepareOutputOptions } from '../interfaces/prepare-output-options.interface';
@@ -276,16 +275,7 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
 
   // Add translated values of current selected language if _translations object exists
   if (config.targetModel && config.language && typeof output === 'object' && '_translations' in output) {
-    const translation = output._translations?.[options.language];
-
-    if (typeof translation === 'object') {
-      const keys = getTranslatablePropertyKeys(config.targetModel);
-      for (const key of keys) {
-        if (translation[key] != null) {
-          output[key] = translation[key];
-        }
-      }
-    }
+    applyTranslationsRecursively(output, config.language);
   }
 
   // Return prepared output
@@ -346,3 +336,39 @@ export function prepareServiceOptions(
   // Return (cloned and) prepared service options
   return serviceOptions;
 }
+
+function applyTranslationsRecursively(obj: any, language: string, visited: WeakSet<object> = new WeakSet()) {
+  if (typeof obj !== 'object' || obj === null) {
+    return;
+  }
+  if (visited.has(obj)) {
+    return;
+  } // Cycle detected -> cancel
+
+  visited.add(obj);
+
+  // If _translations exists
+  if ('_translations' in obj && typeof obj._translations === 'object') {
+    const translation = obj._translations?.[language];
+    if (typeof translation === 'object') {
+      for (const key in translation) {
+        if (translation[key] != null) {
+          obj[key] = translation[key];
+        }
+      }
+    }
+  }
+
+  // Recursive over all properties
+  for (const key of Object.keys(obj)) {
+    const value = obj[key];
+
+    if (Array.isArray(value)) {
+      for (const item of value) {
+        applyTranslationsRecursively(item, language, visited);
+      }
+    } else if (typeof value === 'object' && value !== null) {
+      applyTranslationsRecursively(value, language, visited);
+    }
+  }
+}

package/src/core/common/models/core-persistence.model.ts

@@ -63,6 +63,14 @@ export abstract class CorePersistenceModel extends CoreModel {
   })
   createdAt: Date = undefined;
 
+  @Prop({ onCreate: () => Date.now() })
+  @UnifiedField({
+    description: 'Created date (Unix timestamp)',
+    roles: RoleEnum.S_EVERYONE,
+    swaggerApiOptions: { example: 1740037703939, format: 'int64', type: Date },
+  })
+  createdTs: number = undefined;
+
   /**
    * Updated date is set automatically by mongoose
    */
@@ -76,6 +84,14 @@ export abstract class CorePersistenceModel extends CoreModel {
   })
   updatedAt: Date = undefined;
 
+  @Prop({ onUpdate: () => Date.now() })
+  @UnifiedField({
+    description: 'Updated date (Unix timestamp)',
+    roles: RoleEnum.S_EVERYONE,
+    swaggerApiOptions: { example: 1740037703939, format: 'int64', type: Date },
+  })
+  updatedTs: number = undefined;
+
   // ===========================================================================
   // Methods
   // ===========================================================================
@@ -87,6 +103,9 @@ export abstract class CorePersistenceModel extends CoreModel {
     super.init();
     this.createdAt = this.createdAt === undefined ? new Date() : this.createdAt;
     this.updatedAt = this.updatedAt === undefined ? this.createdAt : this.updatedAt;
+
+    this.createdTs = this.createdTs === undefined ? Date.now() : this.createdTs;
+    this.updatedTs = this.updatedTs === undefined ? this.createdTs : this.updatedTs;
     return this;
   }
 

package/src/server/modules/user/user.model.ts

@@ -116,6 +116,8 @@ export class User extends CoreUserModel implements PersistenceModel {
       this.createdBy = null;
       this.updatedAt = null;
       this.updatedBy = null;
+      this.createdTs = null;
+      this.updatedAt = null;
     }
 
     // Return prepared user