typeorm-paginator - npm Package Compare versions

Comparing version 0.4.0 to 0.5.0

lib/cursor-paginator.d.ts

 import { SelectQueryBuilder, ObjectType } from 'typeorm';
-import { CursorPagination, Cursor, OrderBy, ColumnNameMap, CursorTransformer, Nullable, Take } from './interfaces/paginator';
-export interface CursorPaginatorParams<TEntity> {
-    orderBy: OrderBy<TEntity> | OrderBy<TEntity>[];
-    columnNames?: ColumnNameMap<TEntity> | null;
+import { CursorPagination, Cursor, OrderBy, CursorTransformer, Nullable, Take } from './interfaces/paginator';
+export interface CursorPaginatorParams<TEntity, TColumnNames extends Record<string, string>> {
+    orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[];
+    columnNames?: TColumnNames | null;
     take?: Nullable<Take> | number | null;
@@ -14,9 +14,9 @@ transformer?: CursorTransformer<TEntity> | null;
 }
-export declare class CursorPaginator<TEntity> {
+export declare class CursorPaginator<TEntity, TColumnNames extends Record<string, string>> {
     entity: ObjectType<TEntity>;
-    orders: [keyof TEntity, boolean][];
-    columnNames: ColumnNameMap<TEntity>;
+    orders: [string, boolean][];
+    columnNames: Record<string, string>;
     takeOptions: Take;
     transformer: CursorTransformer<TEntity>;
-    constructor(entity: ObjectType<TEntity>, { orderBy, columnNames, take, transformer, }: CursorPaginatorParams<TEntity>);
+    constructor(entity: ObjectType<TEntity>, { orderBy, columnNames, take, transformer, }: CursorPaginatorParams<TEntity, TColumnNames>);
     paginate(qb: SelectQueryBuilder<TEntity>, params?: CursorPaginatorPaginateParams): Promise<CursorPagination<TEntity>>;
@@ -23,0 +23,0 @@ _applyWhereQuery(qb: SelectQueryBuilder<TEntity>, cursor: Cursor<TEntity>, isNext: boolean): void;

lib/cursor-paginator.js

@@ -10,2 +10,4 @@ "use strict";
 
+var _normalizeOrderBy = require("./utils/normalizeOrderBy");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -32,8 +34,3 @@
 
-    for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {
-      for (const [key, value] of Object.entries(order)) {
-        this.orders.push([key, value]);
-      }
-    }
-
+    this.orders = (0, _normalizeOrderBy.normalizeOrderBy)(orderBy);
     this.columnNames = columnNames !== null && columnNames !== void 0 ? columnNames : {};
@@ -149,2 +146,2 @@ this.takeOptions = typeof take === 'number' ? {
 exports.CursorPaginator = CursorPaginator;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/cursor-paginator.ts"],"names":["CursorPaginator","constructor","entity","orderBy","columnNames","take","transformer","order","Array","isArray","key","value","Object","entries","orders","push","takeOptions","default","min","max","Infinity","Math","Base64Transformer","paginate","qb","params","prevCursor","_applyWhereQuery","parse","andWhere","addOrderBy","alias","hasPrev","nodes","clone","getMany","then","length","slice","reverse","hasNext","stringify","_createCursor","nextCursor","cursor","isNext","metadata","expressionMap","mainAlias","queryPrefix","queryParts","queryParams","asc","columnName","column","findColumnWithPropertyPath","connection","driver","preparePersistentValue","join","node","_"],"mappings":"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","sourcesContent":["import { SelectQueryBuilder, ObjectType } from 'typeorm'\n\nimport { CursorPagination, Cursor, OrderBy, ColumnNameMap, CursorTransformer, Nullable, Take } from './interfaces/paginator'\nimport { Base64Transformer } from './transformers/base64-transformer'\n\n\nexport interface CursorPaginatorParams<TEntity> {\n  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]\n  columnNames?: ColumnNameMap<TEntity> | null\n  take?: Nullable<Take> | number | null\n  transformer?: CursorTransformer<TEntity> | null\n}\n\nexport interface CursorPaginatorPaginateParams {\n  prevCursor?: string | null\n  nextCursor?: string | null\n  take?: number | null\n}\n\nexport class CursorPaginator<TEntity> {\n\n  orders: [keyof TEntity, boolean][] = []\n  columnNames: ColumnNameMap<TEntity>\n  takeOptions: Take\n  transformer: CursorTransformer<TEntity>\n\n  constructor(\n    public entity: ObjectType<TEntity>,\n    {\n      orderBy,\n      columnNames,\n      take,\n      transformer,\n    }: CursorPaginatorParams<TEntity>,\n  ) {\n    for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {\n      for (const [key, value] of Object.entries(order)) {\n        this.orders.push([key as keyof TEntity, value as boolean])\n      }\n    }\n    this.columnNames = columnNames ?? {}\n    this.takeOptions = typeof take === 'number' ? {\n      default: take,\n      min: 0,\n      max: Infinity,\n    } : {\n      default: take?.default ?? 20,\n      min: Math.max(0, take?.min ?? 0), // never negative\n      max: take?.max ?? Infinity,\n    }\n    this.transformer = transformer ?? new Base64Transformer()\n  }\n\n  async paginate(qb: SelectQueryBuilder<TEntity>, params: CursorPaginatorPaginateParams = {}): Promise<CursorPagination<TEntity>> {\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    if (params.prevCursor) {\n      try {\n        this._applyWhereQuery(qb, this.transformer.parse(params.prevCursor), false)\n      } catch {\n        qb.andWhere('1 = 0')\n      }\n      for (const [key, value] of this.orders) {\n        qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'DESC' : 'ASC')\n      }\n\n      let hasPrev = false\n      const nodes = await qb.clone().take(take + 1).getMany().then(nodes => {\n        if (nodes.length > take) {\n          hasPrev = true\n        }\n        return nodes.slice(0, take).reverse()\n      })\n\n      return {\n        nodes,\n        hasPrev,\n        hasNext: true,\n        prevCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[0])) : null,\n        nextCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[nodes.length - 1])) : null,\n      }\n    }\n\n    if (params.nextCursor) {\n      try {\n        this._applyWhereQuery(qb, this.transformer.parse(params.nextCursor), true)\n      } catch {\n        qb.andWhere('1 = 0')\n      }\n    }\n    for (const [key, value] of this.orders) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    let hasNext = false\n    const nodes = await qb.clone().take(take + 1).getMany().then(nodes => {\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return nodes.slice(0, take)\n    })\n\n    return {\n      nodes: nodes.slice(0, take),\n      hasPrev: !!params.nextCursor,\n      hasNext,\n      prevCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[0])) : null,\n      nextCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[nodes.length - 1])) : null,\n    }\n  }\n\n  _applyWhereQuery(qb: SelectQueryBuilder<TEntity>, cursor: Cursor<TEntity>, isNext: boolean) {\n    const metadata = qb.expressionMap.mainAlias!.metadata\n\n    let queryPrefix = ''\n    const queryParts = [] as string[]\n    const queryParams = {} as Record<string, any>\n\n    for (const [key, asc] of this.orders) {\n      const columnName = this.columnNames[key] ?? `${qb.alias}.${key}`\n      queryParts.push(`(${queryPrefix}${columnName} ${!asc !== isNext ? '>' : '<'} :cursor__${key as string})`)\n      queryPrefix = `${queryPrefix}${columnName} = :cursor__${key as string} AND `\n\n      const column = metadata.findColumnWithPropertyPath(key as string)\n      queryParams[`cursor__${key as string}`] = column ? qb.connection.driver.preparePersistentValue(cursor[key], column) : cursor[key]\n    }\n\n    qb.andWhere(`(${queryParts.join(' OR ')})`, queryParams)\n  }\n\n  _createCursor(node: TEntity): Cursor<TEntity> {\n    const cursor = {} as Cursor<TEntity>\n    for (const [key, _] of this.orders) {\n      cursor[key] = node[key]\n    }\n    return cursor\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/cursor-paginator.ts"],"names":["CursorPaginator","constructor","entity","orderBy","columnNames","take","transformer","orders","takeOptions","default","min","max","Infinity","Math","Base64Transformer","paginate","qb","params","prevCursor","_applyWhereQuery","parse","andWhere","key","value","addOrderBy","alias","hasPrev","nodes","clone","getMany","then","length","slice","reverse","hasNext","stringify","_createCursor","nextCursor","cursor","isNext","metadata","expressionMap","mainAlias","queryPrefix","queryParts","queryParams","asc","columnName","push","column","findColumnWithPropertyPath","connection","driver","preparePersistentValue","join","node","_"],"mappings":"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","sourcesContent":["import { SelectQueryBuilder, ObjectType } from 'typeorm'\n\nimport { CursorPagination, Cursor, OrderBy, CursorTransformer, Nullable, Take } from './interfaces/paginator'\nimport { Base64Transformer } from './transformers/base64-transformer'\nimport { normalizeOrderBy } from './utils/normalizeOrderBy'\n\n\nexport interface CursorPaginatorParams<TEntity, TColumnNames extends Record<string, string>> {\n  orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]\n  columnNames?: TColumnNames | null\n  take?: Nullable<Take> | number | null\n  transformer?: CursorTransformer<TEntity> | null\n}\n\nexport interface CursorPaginatorPaginateParams {\n  prevCursor?: string | null\n  nextCursor?: string | null\n  take?: number | null\n}\n\nexport class CursorPaginator<TEntity, TColumnNames extends Record<string, string>> {\n\n  orders: [string, boolean][] = []\n  columnNames: Record<string, string>\n  takeOptions: Take\n  transformer: CursorTransformer<TEntity>\n\n  constructor(\n    public entity: ObjectType<TEntity>,\n    {\n      orderBy,\n      columnNames,\n      take,\n      transformer,\n    }: CursorPaginatorParams<TEntity, TColumnNames>,\n  ) {\n    this.orders = normalizeOrderBy(orderBy)\n    this.columnNames = columnNames ?? {}\n    this.takeOptions = typeof take === 'number' ? {\n      default: take,\n      min: 0,\n      max: Infinity,\n    } : {\n      default: take?.default ?? 20,\n      min: Math.max(0, take?.min ?? 0), // never negative\n      max: take?.max ?? Infinity,\n    }\n    this.transformer = transformer ?? new Base64Transformer()\n  }\n\n  async paginate(qb: SelectQueryBuilder<TEntity>, params: CursorPaginatorPaginateParams = {}): Promise<CursorPagination<TEntity>> {\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    if (params.prevCursor) {\n      try {\n        this._applyWhereQuery(qb, this.transformer.parse(params.prevCursor), false)\n      } catch {\n        qb.andWhere('1 = 0')\n      }\n      for (const [key, value] of this.orders) {\n        qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'DESC' : 'ASC')\n      }\n\n      let hasPrev = false\n      const nodes = await qb.clone().take(take + 1).getMany().then(nodes => {\n        if (nodes.length > take) {\n          hasPrev = true\n        }\n        return nodes.slice(0, take).reverse()\n      })\n\n      return {\n        nodes,\n        hasPrev,\n        hasNext: true,\n        prevCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[0])) : null,\n        nextCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[nodes.length - 1])) : null,\n      }\n    }\n\n    if (params.nextCursor) {\n      try {\n        this._applyWhereQuery(qb, this.transformer.parse(params.nextCursor), true)\n      } catch {\n        qb.andWhere('1 = 0')\n      }\n    }\n    for (const [key, value] of this.orders) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    let hasNext = false\n    const nodes = await qb.clone().take(take + 1).getMany().then(nodes => {\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return nodes.slice(0, take)\n    })\n\n    return {\n      nodes: nodes.slice(0, take),\n      hasPrev: !!params.nextCursor,\n      hasNext,\n      prevCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[0])) : null,\n      nextCursor: nodes.length > 0 ? this.transformer.stringify(this._createCursor(nodes[nodes.length - 1])) : null,\n    }\n  }\n\n  _applyWhereQuery(qb: SelectQueryBuilder<TEntity>, cursor: Cursor<TEntity>, isNext: boolean) {\n    const metadata = qb.expressionMap.mainAlias!.metadata\n\n    let queryPrefix = ''\n    const queryParts = [] as string[]\n    const queryParams = {} as Record<string, any>\n\n    for (const [key, asc] of this.orders) {\n      const columnName = this.columnNames[key] ?? `${qb.alias}.${key}`\n      queryParts.push(`(${queryPrefix}${columnName} ${!asc !== isNext ? '>' : '<'} :cursor__${key})`)\n      queryPrefix = `${queryPrefix}${columnName} = :cursor__${key} AND `\n\n      const column = metadata.findColumnWithPropertyPath(key)\n      queryParams[`cursor__${key}`] = column ? qb.connection.driver.preparePersistentValue(cursor[key as keyof TEntity], column) : cursor[key as keyof TEntity]\n    }\n\n    qb.andWhere(`(${queryParts.join(' OR ')})`, queryParams)\n  }\n\n  _createCursor(node: TEntity): Cursor<TEntity> {\n    const cursor = {} as Cursor<TEntity>\n    for (const [key, _] of this.orders) {\n      cursor[key as keyof TEntity] = node[key as keyof TEntity]\n    }\n    return cursor\n  }\n}\n"]}

lib/interfaces/paginator.d.ts

@@ -12,5 +12,2 @@ export declare type Nullable<T> = {
 };
-export declare type ColumnNameMap<TEntity> = {
-    [TKey in keyof TEntity]?: string;
-};
 export declare type Cursor<TEntity> = {
@@ -17,0 +14,0 @@ [TKey in keyof TEntity]?: any;

lib/page-paginator.d.ts

 import { SelectQueryBuilder, ObjectType } from 'typeorm';
-import { OrderBy, ColumnNameMap, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator';
-export interface PagePaginatorParams<TEntity> {
-    orderBy: OrderBy<TEntity> | OrderBy<TEntity>[];
-    columnNames?: ColumnNameMap<TEntity> | null;
+import { OrderBy, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator';
+export interface PagePaginatorParams<TEntity, TColumnNames extends Record<string, string>> {
+    columnNames?: TColumnNames | null;
     take?: Nullable<Take> | number | null;
+    orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[];
 }
-export interface PagePaginatorPaginateParams<TEntity> {
+export interface PagePaginatorPaginateParams<TEntity, TColumnNames extends Record<string, string>> {
     page?: number | null;
     take?: number | null;
-    orderBy?: OrderBy<TEntity> | OrderBy<TEntity>[];
+    orderBy?: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[];
 }
-export declare class PagePaginator<TEntity> {
+export declare class PagePaginator<TEntity, TColumnNames extends Record<string, string>> {
     entity: ObjectType<TEntity>;
     orderBy: OrderBy<TEntity> | OrderBy<TEntity>[];
-    columnNames: ColumnNameMap<TEntity>;
+    columnNames: Record<string, string>;
     takeOptions: Take;
-    constructor(entity: ObjectType<TEntity>, { orderBy, columnNames, take, }: PagePaginatorParams<TEntity>);
-    paginate(qb: SelectQueryBuilder<TEntity>, params?: PagePaginatorPaginateParams<TEntity>): Promise<PagePagination<TEntity>>;
-    promisePaginate(qb: SelectQueryBuilder<TEntity>, params?: PagePaginatorPaginateParams<TEntity>): PromisePagePagination<TEntity>;
+    constructor(entity: ObjectType<TEntity>, { orderBy, columnNames, take, }: PagePaginatorParams<TEntity, TColumnNames>);
+    paginate(qb: SelectQueryBuilder<TEntity>, params?: PagePaginatorPaginateParams<TEntity, TColumnNames>): Promise<PagePagination<TEntity>>;
+    promisePaginate(qb: SelectQueryBuilder<TEntity>, params?: PagePaginatorPaginateParams<TEntity, TColumnNames>): PromisePagePagination<TEntity>;
 }

lib/page-paginator.js

@@ -8,16 +8,6 @@ "use strict";
 
+var _normalizeOrderBy = require("./utils/normalizeOrderBy");
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function normalizeOrderBy(orderBy) {
-  const orders = [];
-
-  for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {
-    for (const [key, value] of Object.entries(order)) {
-      orders.push([key, value]);
-    }
-  }
-
-  return orders;
-}
-
 class PagePaginator {
@@ -59,3 +49,3 @@ constructor(entity, {
 
-    for (const [key, value] of normalizeOrderBy((_params$orderBy = params.orderBy) !== null && _params$orderBy !== void 0 ? _params$orderBy : this.orderBy)) {
+    for (const [key, value] of (0, _normalizeOrderBy.normalizeOrderBy)((_params$orderBy = params.orderBy) !== null && _params$orderBy !== void 0 ? _params$orderBy : this.orderBy)) {
       var _params$orderBy, _this$columnNames$key;
@@ -88,3 +78,3 @@
 
-    for (const [key, value] of normalizeOrderBy((_params$orderBy2 = params.orderBy) !== null && _params$orderBy2 !== void 0 ? _params$orderBy2 : this.orderBy)) {
+    for (const [key, value] of (0, _normalizeOrderBy.normalizeOrderBy)((_params$orderBy2 = params.orderBy) !== null && _params$orderBy2 !== void 0 ? _params$orderBy2 : this.orderBy)) {
       var _params$orderBy2, _this$columnNames$key2;
@@ -131,2 +121,2 @@
 exports.PagePaginator = PagePaginator;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/page-paginator.ts"],"names":["normalizeOrderBy","orderBy","orders","order","Array","isArray","key","value","Object","entries","push","PagePaginator","constructor","entity","columnNames","take","takeOptions","default","min","max","Infinity","Math","paginate","qb","params","page","addOrderBy","alias","qbForCount","clone","hasNext","nodes","offset","limit","getMany","then","length","slice","count","getCount","promisePaginate","promiseNodes"],"mappings":"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","sourcesContent":["import { SelectQueryBuilder, ObjectType } from 'typeorm'\n\nimport { OrderBy, ColumnNameMap, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator'\n\n\nfunction normalizeOrderBy<TEntity>(orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]): [keyof TEntity, boolean][] {\n  const orders = [] as [keyof TEntity, boolean][]\n  for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {\n    for (const [key, value] of Object.entries(order)) {\n      orders.push([key as keyof TEntity, value as boolean])\n    }\n  }\n  return orders\n}\n\nexport interface PagePaginatorParams<TEntity> {\n  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]\n  columnNames?: ColumnNameMap<TEntity> | null\n  take?: Nullable<Take> | number | null\n}\n\nexport interface PagePaginatorPaginateParams<TEntity> {\n  page?: number | null\n  take?: number | null\n  orderBy?: OrderBy<TEntity> | OrderBy<TEntity>[]\n}\n\nexport class PagePaginator<TEntity> {\n  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]\n  columnNames: ColumnNameMap<TEntity>\n  takeOptions: Take\n\n  constructor(\n    public entity: ObjectType<TEntity>,\n    {\n      orderBy,\n      columnNames,\n      take,\n    }: PagePaginatorParams<TEntity>,\n  ) {\n    this.orderBy = orderBy\n    this.columnNames = columnNames ?? {}\n    this.takeOptions = typeof take === 'number' ? {\n      default: take,\n      min: 0,\n      max: Infinity,\n    } : {\n      default: take?.default ?? 20,\n      min: Math.max(0, take?.min ?? 0), // never negative\n      max: take?.max ?? Infinity,\n    }\n  }\n\n  async paginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity> = {}): Promise<PagePagination<TEntity>> {\n    const page = Math.max(params.page ?? 1, 1)\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    for (const [key, value] of normalizeOrderBy(params.orderBy ?? this.orderBy)) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    const qbForCount = qb.clone()\n\n    let hasNext = false\n    const nodes = await qb.clone().offset((page - 1) * take).limit(take + 1).getMany().then(nodes => {\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return nodes.slice(0, take)\n    })\n\n    return {\n      count: await qbForCount.getCount(),\n      nodes,\n      hasNext,\n    }\n  }\n\n  promisePaginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity> = {}): PromisePagePagination<TEntity> {\n    const page = Math.max(params.page ?? 1, 1)\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    for (const [key, value] of normalizeOrderBy(params.orderBy ?? this.orderBy)) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    const qbForCount = qb.clone()\n    const promiseNodes = qb.clone().offset((page - 1) * take).limit(take + 1).getMany().then(nodes => {\n      let hasNext = false\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return {\n        hasNext,\n        nodes: nodes.slice(0, take),\n      }\n    })\n\n    return {\n      get count() {\n        return qbForCount.getCount()\n      },\n      get nodes() {\n        return promiseNodes.then(({ nodes }) => nodes)\n      },\n      get hasNext() {\n        return promiseNodes.then(({ hasNext }) => hasNext)\n      },\n    }\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/page-paginator.ts"],"names":["PagePaginator","constructor","entity","orderBy","columnNames","take","takeOptions","default","min","max","Infinity","Math","paginate","qb","params","page","key","value","addOrderBy","alias","qbForCount","clone","hasNext","nodes","offset","limit","getMany","then","length","slice","count","getCount","promisePaginate","promiseNodes"],"mappings":"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","sourcesContent":["import { SelectQueryBuilder, ObjectType } from 'typeorm'\n\nimport { OrderBy, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator'\nimport { normalizeOrderBy } from './utils/normalizeOrderBy'\n\n\nexport interface PagePaginatorParams<TEntity, TColumnNames extends Record<string, string>> {\n  columnNames?: TColumnNames | null\n  take?: Nullable<Take> | number | null\n  orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]\n}\n\nexport interface PagePaginatorPaginateParams<TEntity, TColumnNames extends Record<string, string>> {\n  page?: number | null\n  take?: number | null\n  orderBy?: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]\n}\n\nexport class PagePaginator<TEntity, TColumnNames extends Record<string, string>> {\n  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]\n  columnNames: Record<string, string>\n  takeOptions: Take\n\n  constructor(\n    public entity: ObjectType<TEntity>,\n    {\n      orderBy,\n      columnNames,\n      take,\n    }: PagePaginatorParams<TEntity, TColumnNames>,\n  ) {\n    this.orderBy = orderBy\n    this.columnNames = columnNames ?? {}\n    this.takeOptions = typeof take === 'number' ? {\n      default: take,\n      min: 0,\n      max: Infinity,\n    } : {\n      default: take?.default ?? 20,\n      min: Math.max(0, take?.min ?? 0), // never negative\n      max: take?.max ?? Infinity,\n    }\n  }\n\n  async paginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity, TColumnNames> = {}): Promise<PagePagination<TEntity>> {\n    const page = Math.max(params.page ?? 1, 1)\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    for (const [key, value] of normalizeOrderBy(params.orderBy ?? this.orderBy)) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    const qbForCount = qb.clone()\n\n    let hasNext = false\n    const nodes = await qb.clone().offset((page - 1) * take).limit(take + 1).getMany().then(nodes => {\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return nodes.slice(0, take)\n    })\n\n    return {\n      count: await qbForCount.getCount(),\n      nodes,\n      hasNext,\n    }\n  }\n\n  promisePaginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity, TColumnNames> = {}): PromisePagePagination<TEntity> {\n    const page = Math.max(params.page ?? 1, 1)\n    const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))\n\n    for (const [key, value] of normalizeOrderBy(params.orderBy ?? this.orderBy)) {\n      qb.addOrderBy(this.columnNames[key] ?? `${qb.alias}.${key}`, value ? 'ASC' : 'DESC')\n    }\n\n    const qbForCount = qb.clone()\n    const promiseNodes = qb.clone().offset((page - 1) * take).limit(take + 1).getMany().then(nodes => {\n      let hasNext = false\n      if (nodes.length > take) {\n        hasNext = true\n      }\n      return {\n        hasNext,\n        nodes: nodes.slice(0, take),\n      }\n    })\n\n    return {\n      get count() {\n        return qbForCount.getCount()\n      },\n      get nodes() {\n        return promiseNodes.then(({ nodes }) => nodes)\n      },\n      get hasNext() {\n        return promiseNodes.then(({ hasNext }) => hasNext)\n      },\n    }\n  }\n}\n"]}

package.json

 {
   "name": "typeorm-paginator",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "TypeORM query builder pagination library.",
@@ -5,0 +5,0 @@ "keywords": [

src/cursor-paginator.ts

 import { SelectQueryBuilder, ObjectType } from 'typeorm'
 
-import { CursorPagination, Cursor, OrderBy, ColumnNameMap, CursorTransformer, Nullable, Take } from './interfaces/paginator'
+import { CursorPagination, Cursor, OrderBy, CursorTransformer, Nullable, Take } from './interfaces/paginator'
 import { Base64Transformer } from './transformers/base64-transformer'
+import { normalizeOrderBy } from './utils/normalizeOrderBy'
 
 
-export interface CursorPaginatorParams<TEntity> {
-  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]
-  columnNames?: ColumnNameMap<TEntity> | null
+export interface CursorPaginatorParams<TEntity, TColumnNames extends Record<string, string>> {
+  orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]
+  columnNames?: TColumnNames | null
   take?: Nullable<Take> | number | null
@@ -20,6 +21,6 @@ transformer?: CursorTransformer<TEntity> | null
 
-export class CursorPaginator<TEntity> {
+export class CursorPaginator<TEntity, TColumnNames extends Record<string, string>> {
 
-  orders: [keyof TEntity, boolean][] = []
-  columnNames: ColumnNameMap<TEntity>
+  orders: [string, boolean][] = []
+  columnNames: Record<string, string>
   takeOptions: Take
@@ -35,9 +36,5 @@ transformer: CursorTransformer<TEntity>
       transformer,
-    }: CursorPaginatorParams<TEntity>,
+    }: CursorPaginatorParams<TEntity, TColumnNames>,
   ) {
-    for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {
-      for (const [key, value] of Object.entries(order)) {
-        this.orders.push([key as keyof TEntity, value as boolean])
-      }
-    }
+    this.orders = normalizeOrderBy(orderBy)
     this.columnNames = columnNames ?? {}
@@ -123,7 +120,7 @@ this.takeOptions = typeof take === 'number' ? {
       const columnName = this.columnNames[key] ?? `${qb.alias}.${key}`
-      queryParts.push(`(${queryPrefix}${columnName} ${!asc !== isNext ? '>' : '<'} :cursor__${key as string})`)
-      queryPrefix = `${queryPrefix}${columnName} = :cursor__${key as string} AND `
+      queryParts.push(`(${queryPrefix}${columnName} ${!asc !== isNext ? '>' : '<'} :cursor__${key})`)
+      queryPrefix = `${queryPrefix}${columnName} = :cursor__${key} AND `
 
-      const column = metadata.findColumnWithPropertyPath(key as string)
-      queryParams[`cursor__${key as string}`] = column ? qb.connection.driver.preparePersistentValue(cursor[key], column) : cursor[key]
+      const column = metadata.findColumnWithPropertyPath(key)
+      queryParams[`cursor__${key}`] = column ? qb.connection.driver.preparePersistentValue(cursor[key as keyof TEntity], column) : cursor[key as keyof TEntity]
     }
@@ -137,3 +134,3 @@
     for (const [key, _] of this.orders) {
-      cursor[key] = node[key]
+      cursor[key as keyof TEntity] = node[key as keyof TEntity]
     }
@@ -140,0 +137,0 @@ return cursor

src/interfaces/paginator.ts

@@ -16,6 +16,2 @@
 
-export type ColumnNameMap<TEntity> = {
-  [TKey in keyof TEntity]?: string
-}
-
 export type Cursor<TEntity> = {
@@ -22,0 +18,0 @@ [TKey in keyof TEntity]?: any

src/page-paginator.test.ts

@@ -187,2 +187,45 @@ import { Column, Connection, createConnection, Entity, PrimaryGeneratedColumn } from 'typeorm'
   })
+
+  it('test page paginate by custom column name', async () => {
+    const repoUsers = connection.getRepository(User)
+
+    const nodes = [
+      repoUsers.create({ name: 'c' }),
+      repoUsers.create({ name: 'b' }),
+      repoUsers.create({ name: 'a' }),
+      repoUsers.create({ name: 'c' }),
+      repoUsers.create({ name: 'b' }),
+      repoUsers.create({ name: 'c' }),
+    ]
+
+    await repoUsers.save(nodes)
+
+    const paginator = new PagePaginator(User, {
+      columnNames: {
+        customName: 'User.name',
+      },
+      orderBy: [
+        { id: false },
+      ],
+    })
+
+    const pagination1 = await paginator.paginate(repoUsers.createQueryBuilder(), {
+      orderBy: [
+        { customName: true },
+        { id: false },
+      ],
+    })
+    expect(pagination1).toEqual({
+      count: 6,
+      nodes: [
+        nodes[2],
+        nodes[4],
+        nodes[1],
+        nodes[5],
+        nodes[3],
+        nodes[0],
+      ],
+      hasNext: false,
+    })
+  })
 })

src/page-paginator.ts

 import { SelectQueryBuilder, ObjectType } from 'typeorm'
 
-import { OrderBy, ColumnNameMap, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator'
+import { OrderBy, PromisePagePagination, PagePagination, Nullable, Take } from './interfaces/paginator'
+import { normalizeOrderBy } from './utils/normalizeOrderBy'
 
 
-function normalizeOrderBy<TEntity>(orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]): [keyof TEntity, boolean][] {
-  const orders = [] as [keyof TEntity, boolean][]
-  for (const order of Array.isArray(orderBy) ? orderBy : [orderBy]) {
-    for (const [key, value] of Object.entries(order)) {
-      orders.push([key as keyof TEntity, value as boolean])
-    }
-  }
-  return orders
-}
-
-export interface PagePaginatorParams<TEntity> {
-  orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]
-  columnNames?: ColumnNameMap<TEntity> | null
+export interface PagePaginatorParams<TEntity, TColumnNames extends Record<string, string>> {
+  columnNames?: TColumnNames | null
   take?: Nullable<Take> | number | null
+  orderBy: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]
 }
 
-export interface PagePaginatorPaginateParams<TEntity> {
+export interface PagePaginatorPaginateParams<TEntity, TColumnNames extends Record<string, string>> {
   page?: number | null
   take?: number | null
-  orderBy?: OrderBy<TEntity> | OrderBy<TEntity>[]
+  orderBy?: OrderBy<TEntity & TColumnNames> | OrderBy<TEntity & TColumnNames>[]
 }
 
-export class PagePaginator<TEntity> {
+export class PagePaginator<TEntity, TColumnNames extends Record<string, string>> {
   orderBy: OrderBy<TEntity> | OrderBy<TEntity>[]
-  columnNames: ColumnNameMap<TEntity>
+  columnNames: Record<string, string>
   takeOptions: Take
@@ -39,3 +30,3 @@
       take,
-    }: PagePaginatorParams<TEntity>,
+    }: PagePaginatorParams<TEntity, TColumnNames>,
   ) {
@@ -55,3 +46,3 @@ this.orderBy = orderBy
 
-  async paginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity> = {}): Promise<PagePagination<TEntity>> {
+  async paginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity, TColumnNames> = {}): Promise<PagePagination<TEntity>> {
     const page = Math.max(params.page ?? 1, 1)
@@ -81,3 +72,3 @@ const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))
 
-  promisePaginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity> = {}): PromisePagePagination<TEntity> {
+  promisePaginate(qb: SelectQueryBuilder<TEntity>, params: PagePaginatorPaginateParams<TEntity, TColumnNames> = {}): PromisePagePagination<TEntity> {
     const page = Math.max(params.page ?? 1, 1)
@@ -84,0 +75,0 @@ const take = Math.max(this.takeOptions.min, Math.min(params.take || this.takeOptions.default, this.takeOptions.max))

No alert changes

Improved metrics

Total package byte prevSize

81981

increased by2.94%

Number of package files

26

increased by13.04%

Lines of code

1208

increased by3.25%

No dependency changes