@lenne.tech/nest-server 11.10.6 → 11.11.1

package/package.json

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

package/src/core/common/models/pagination-info.model.ts

@@ -0,0 +1,101 @@
+import { ObjectType } from '@nestjs/graphql';
+
+import { UnifiedField } from '../decorators/unified-field.decorator';
+
+/**
+ * Pagination information for paginated queries
+ *
+ * Provides metadata about the current page, total pages, and navigation flags
+ * to facilitate frontend pagination UI implementation.
+ */
+@ObjectType({ description: 'Pagination information for paginated queries' })
+export class PaginationInfo {
+  /**
+   * Total number of items across all pages
+   */
+  @UnifiedField({
+    description: 'Total number of items across all pages',
+  })
+  totalCount: number;
+
+  /**
+   * Total number of pages
+   */
+  @UnifiedField({
+    description: 'Total number of pages',
+  })
+  pageCount: number;
+
+  /**
+   * Current page number (1-based)
+   */
+  @UnifiedField({
+    description: 'Current page number (1-based)',
+  })
+  currentPage: number;
+
+  /**
+   * Number of items per page
+   */
+  @UnifiedField({
+    description: 'Number of items per page',
+  })
+  perPage: number;
+
+  /**
+   * Indicates if there is a next page
+   */
+  @UnifiedField({
+    description: 'Indicates if there is a next page',
+  })
+  hasNextPage: boolean;
+
+  /**
+   * Indicates if there is a previous page
+   */
+  @UnifiedField({
+    description: 'Indicates if there is a previous page',
+  })
+  hasPreviousPage: boolean;
+
+  /**
+   * Create PaginationInfo from query parameters and total count
+   */
+  static create(options: {
+    limit?: number;
+    offset?: number;
+    skip?: number;
+    take?: number;
+    totalCount: number;
+  }): PaginationInfo {
+    const { totalCount } = options;
+    const skip = options.skip ?? options.offset ?? 0;
+    const perPage = options.take ?? options.limit ?? 0;
+
+    // Handle edge case: no limit specified (return all items as single page)
+    if (perPage === 0) {
+      return {
+        currentPage: totalCount > 0 ? 1 : 0,
+        hasNextPage: false,
+        hasPreviousPage: false,
+        pageCount: totalCount > 0 ? 1 : 0,
+        perPage: 0,
+        totalCount,
+      };
+    }
+
+    const pageCount = Math.ceil(totalCount / perPage);
+    const currentPage = totalCount === 0 ? 0 : Math.floor(skip / perPage) + 1;
+    const hasNextPage = currentPage < pageCount;
+    const hasPreviousPage = currentPage > 1;
+
+    return {
+      currentPage,
+      hasNextPage,
+      hasPreviousPage,
+      pageCount,
+      perPage,
+      totalCount,
+    };
+  }
+}

package/src/core/common/services/crud.service.ts

@@ -15,6 +15,7 @@ import { convertFilterArgsToQuery } from '../helpers/filter.helper';
 import { mergePlain, prepareServiceOptionsForCreate } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
+import { PaginationInfo } from '../models/pagination-info.model';
 import { PlainObject } from '../types/plain-object.type';
 import { ConfigService } from './config.service';
 import { ModuleService } from './module.service';
@@ -218,7 +219,11 @@ export abstract class CrudService<
   async findAndCount(
     filter?: FilterArgs | { filterQuery?: QueryFilter<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions,
-  ): Promise<{ items: Model[]; totalCount: number }> {
+  ): Promise<{
+    items: Model[];
+    pagination: PaginationInfo;
+    totalCount: number;
+  }> {
     // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
     // and should not be processed as FilterArgs
     if (!(filter instanceof FilterArgs) && serviceOptions?.inputType === FilterArgs) {
@@ -284,6 +289,17 @@ export abstract class CrudService<
           (await this.mainDbModel.aggregate(aggregation, collation ? { collation } : {}).exec())[0] || {};
         dbResult.totalCount = dbResult.totalCount?.[0]?.total || 0;
         dbResult.items = dbResult.items?.map((item) => this.mainDbModel.hydrate(item)) || [];
+
+        // Calculate pagination info
+        const queryOptions = filterQuery.queryOptions || {};
+        dbResult.pagination = PaginationInfo.create({
+          limit: queryOptions.limit,
+          offset: queryOptions.offset,
+          skip: queryOptions.skip,
+          take: queryOptions.take,
+          totalCount: dbResult.totalCount,
+        });
+
         return dbResult;
       },
       { input: filter, outputPath: 'items', serviceOptions },
@@ -297,7 +313,7 @@ export abstract class CrudService<
   async findAndCountForce(
     filter?: FilterArgs | { filterQuery?: QueryFilter<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
-  ): Promise<{ items: Model[]; totalCount: number }> {
+  ): Promise<{ items: Model[]; pagination: PaginationInfo; totalCount: number; }> {
     serviceOptions.raw = true;
     return this.findAndCount(filter, serviceOptions);
   }
@@ -309,7 +325,7 @@ export abstract class CrudService<
   async findAndCountRaw(
     filter?: FilterArgs | { filterQuery?: QueryFilter<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions: ServiceOptions = {},
-  ): Promise<{ items: Model[]; totalCount: number }> {
+  ): Promise<{ items: Model[]; pagination: PaginationInfo; totalCount: number; }> {
     serviceOptions = serviceOptions || {};
     serviceOptions.raw = true;
     return this.findAndCountForce(filter, serviceOptions);

package/src/core/modules/better-auth/core-better-auth-api.middleware.ts

@@ -244,9 +244,12 @@ export class CoreBetterAuthApiMiddleware implements NestMiddleware {
         }
       }
 
-      // Clean up the used challenge mapping after verification (success or failure)
-      if (challengeIdToDelete && this.challengeService) {
+      // Clean up the used challenge mapping only after SUCCESSFUL verification
+      // On failure, keep the challenge so the user can retry with a different passkey
+      if (challengeIdToDelete && this.challengeService && response.ok) {
         await this.challengeService.deleteChallengeMapping(challengeIdToDelete);
+      } else if (challengeIdToDelete && !response.ok) {
+        this.logger.debug(`Keeping challenge mapping after failed verification (status=${response.status}) for retry`);
       }
 
       // Convert Web Standard Response to Express response using shared helper

package/src/index.ts

@@ -62,6 +62,7 @@ export * from './core/common/interfaces/service-options.interface';
 export * from './core/common/middlewares/to-lower-case.middleware';
 export * from './core/common/models/core-model.model';
 export * from './core/common/models/core-persistence.model';
+export * from './core/common/models/pagination-info.model';
 export * from './core/common/pipes/check-input.pipe';
 export * from './core/common/pipes/map-and-validate.pipe';
 export * from './core/common/plugins/complexity.plugin';

package/src/server/modules/user/outputs/find-and-count-users-result.output.ts

@@ -3,6 +3,7 @@ import { ObjectType } from '@nestjs/graphql';
 import { Restricted } from '../../../../core/common/decorators/restricted.decorator';
 import { UnifiedField } from '../../../../core/common/decorators/unified-field.decorator';
 import { RoleEnum } from '../../../../core/common/enums/role.enum';
+import { PaginationInfo } from '../../../../core/common/models/pagination-info.model';
 import { User } from '../user.model';
 
 @ObjectType({ description: 'Result of find and count' })
@@ -21,4 +22,11 @@ export class FindAndCountUsersResult {
     isOptional: false,
   })
   totalCount: number;
+
+  @UnifiedField({
+    description: 'Pagination information',
+    isOptional: true,
+    type: () => PaginationInfo,
+  })
+  pagination?: PaginationInfo;
 }