@lenne.tech/nest-server 11.1.1 → 11.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "11.1.1",
+  "version": "11.1.3",
   "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",

package/src/core/common/args/pagination.args.ts

@@ -12,8 +12,9 @@ export class PaginationArgs extends CoreInput {
    */
   @UnifiedField({
     description: 'Limit specifies the maximum number of elements found that are to be returned',
+    gqlType: Int,
     isOptional: true,
-    type: Int,
+    type: Number,
   })
   limit?: number = undefined;
 
@@ -22,8 +23,8 @@ export class PaginationArgs extends CoreInput {
    */
   @UnifiedField({
     description: 'Alias for skip',
+    gqlType: Int,
     isOptional: true,
-    type: Int,
   })
   offset?: number = undefined;
 
@@ -32,8 +33,8 @@ export class PaginationArgs extends CoreInput {
    */
   @UnifiedField({
     description: 'Skip specifies how many found elements should be skipped on return',
+    gqlType: Int,
     isOptional: true,
-    type: Int,
   })
   skip?: number = undefined;
 
@@ -52,8 +53,8 @@ export class PaginationArgs extends CoreInput {
    */
   @UnifiedField({
     description: 'Alias for limit',
+    gqlType: Int,
     isOptional: true,
-    type: () => Int,
   })
   take?: number = undefined;
 

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

@@ -41,6 +41,10 @@ export interface UnifiedFieldOptions {
   example?: any;
   /** Options for graphql */
   gqlOptions?: FieldOptions;
+  /** Type if Swagger & Gql types arent compatible */
+  gqlType?: GraphQLScalarType | (new (...args: any[]) => any) | Record<number | string, number | string>;
+  /** If the property is Any (skips all Validation) */
+  isAny?: boolean;
   /** Default: false */
   isOptional?: boolean;
   /** Restricted roles */
@@ -148,8 +152,8 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
 
     // Type function for gql
     const gqlTypeFn = isArrayField
-      ? () => [opts.enum?.enum || resolvedTypeFn()]
-      : () => opts.enum?.enum || resolvedTypeFn();
+      ? () => [opts.enum?.enum || opts.gqlType || resolvedTypeFn()]
+      : () => opts.enum?.enum || opts.gqlType || resolvedTypeFn();
 
     // Gql decorator
     Field(gqlTypeFn, gqlOpts)(target, propertyKey);
@@ -202,10 +206,10 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
       IsNotEmpty()(target, propertyKey);
     }
 
-    // Custom or builtin validator
+    // Completely skip validation if its any
     if (opts.validator) {
       opts.validator(valOpts).forEach(d => d(target, propertyKey));
-    } else {
+    } else if (!opts.isAny) {
       const validator = getBuiltInValidator(baseType, valOpts, isArrayField, target);
       if (validator) {
         validator(target, propertyKey);
@@ -217,10 +221,12 @@ export function UnifiedField(opts: UnifiedFieldOptions = {}): PropertyDecorator
       IsEnum(opts.enum.enum, opts.enum.options)(target, propertyKey);
     }
 
+    if (!opts.isAny) {
     // Check if it's a primitive, if not apply transform
-    if (!isPrimitive(baseType) && !opts.enum && !isGraphQLScalar(baseType)) {
-      Type(() => baseType)(target, propertyKey);
-      ValidateNested({ each: isArrayField })(target, propertyKey);
+      if (!isPrimitive(baseType) && !opts.enum && !isGraphQLScalar(baseType)) {
+        Type(() => baseType)(target, propertyKey);
+        ValidateNested({ each: isArrayField })(target, propertyKey);
+      }
     }
 
     // Roles

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

@@ -319,6 +319,11 @@ export async function check(
  * Check if input is a valid Date format and return a new Date
  */
 export function checkAndGetDate(input: any): Date {
+  // Get timestamp from string
+  if (typeof input === 'string' && /^\d+$/.test(input)) {
+    input = parseInt(input, 10);
+  }
+
   // Create date from value
   const date = new Date(input);
 

package/src/core/common/inputs/single-filter.input.ts

@@ -78,9 +78,10 @@ export class SingleFilterInput extends CoreInput {
 
   @UnifiedField({
     description: 'Value of the property',
+    gqlType: JSON,
+    isAny: true,
     isOptional: true,
     roles: RoleEnum.S_EVERYONE,
-    type: () => JSON,
   })
   value: any = undefined;
 }

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

@@ -36,6 +36,38 @@ export abstract class CorePersistenceModel extends CoreModel {
     return new Types.ObjectId(this.id);
   }
 
+  /**
+   * Getter for created date as Unix timestamp
+   */
+  @UnifiedField({
+    description: 'Created date (Unix timestamp)',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+    swaggerApiOptions: { example: 1740037703939, format: 'int64', type: Number },
+  })
+  get createdTs(): number {
+    if (this.createdAt instanceof Date) {
+      return this.createdAt.getTime();
+    }
+    return this.createdAt;
+  }
+
+  /**
+   * Getter for updated date as Unix timestamp
+   */
+  @UnifiedField({
+    description: 'Updated date (Unix timestamp)',
+    isOptional: true,
+    roles: RoleEnum.S_EVERYONE,
+    swaggerApiOptions: { example: 1740037703939, format: 'int64', type: Date },
+  })
+  get updatedTs(): number {
+    if (this.updatedAt instanceof Date) {
+      return this.updatedAt.getTime();
+    }
+    return this.updatedAt;
+  }
+
   // ===========================================================================
   // Properties
   // ===========================================================================
@@ -53,7 +85,7 @@ export abstract class CorePersistenceModel extends CoreModel {
   /**
    * Created date, is set automatically by mongoose
    */
-  @Prop({ onCreate: () => new Date() })
+  @Prop()
   @UnifiedField({
     description: 'Created date',
     isOptional: true,
@@ -63,18 +95,10 @@ 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
    */
-  @Prop({ onUpdate: () => new Date() })
+  @Prop()
   @UnifiedField({
     description: 'Updated date',
     isOptional: true,
@@ -84,14 +108,6 @@ 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
   // ===========================================================================
@@ -103,9 +119,6 @@ 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/core/modules/health-check/core-health-check-result.model.ts

@@ -31,9 +31,10 @@ export abstract class CoreHealthCheckResult extends CoreModel {
    */
   @UnifiedField({
     description: 'The info object contains information of each health indicator which is of status “up”',
+    gqlType: JSON,
     isOptional: true,
     roles: RoleEnum.S_EVERYONE,
-    type: () => JSON,
+    type: () => Object,
   })
   info: JSON = undefined;
 
@@ -42,9 +43,10 @@ export abstract class CoreHealthCheckResult extends CoreModel {
    */
   @UnifiedField({
     description: 'The error object contains information of each health indicator which is of status “down”',
+    gqlType: JSON,
     isOptional: true,
     roles: RoleEnum.S_EVERYONE,
-    type: () => JSON,
+    type: () => Object,
   })
   error: JSON = undefined;
 
@@ -53,9 +55,10 @@ export abstract class CoreHealthCheckResult extends CoreModel {
    */
   @UnifiedField({
     description: 'The details object contains information of every health indicator',
+    gqlType: JSON,
     isOptional: true,
     roles: RoleEnum.S_EVERYONE,
-    type: () => JSON,
+    type: () => Object,
   })
   details: JSON = undefined;
 }

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

@@ -116,8 +116,6 @@ 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