nestjs-paginate 8.3.0 → 8.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/lib/__tests__/cat-toy.entity.d.ts +2 -0
  2. package/lib/__tests__/cat-toy.entity.js +6 -0
  3. package/lib/__tests__/cat-toy.entity.js.map +1 -1
  4. package/lib/__tests__/toy-shop-address.entity.d.ts +5 -0
  5. package/lib/__tests__/toy-shop-address.entity.js +32 -0
  6. package/lib/__tests__/toy-shop-address.entity.js.map +1 -0
  7. package/lib/__tests__/toy-shop.entity.d.ts +7 -0
  8. package/lib/__tests__/toy-shop.entity.js +38 -0
  9. package/lib/__tests__/toy-shop.entity.js.map +1 -0
  10. package/lib/helper.js +7 -2
  11. package/lib/helper.js.map +1 -1
  12. package/lib/paginate.d.ts +1 -1
  13. package/lib/paginate.js +25 -2
  14. package/lib/paginate.js.map +1 -1
  15. package/lib/paginate.spec.js +158 -18
  16. package/lib/paginate.spec.js.map +1 -1
  17. package/lib/tsconfig.tsbuildinfo +1 -1
  18. package/package.json +16 -16
package/lib/__tests__/cat-toy.entity.d.ts CHANGED
@@ -1,9 +1,11 @@
1
1
  import { CatEntity } from './cat.entity';
2
2
  import { SizeEmbed } from './size.embed';
3
+ import { ToyShopEntity } from './toy-shop.entity';
3
4
  export declare class CatToyEntity {
4
5
  id: number;
5
6
  name: string;
6
7
  size: SizeEmbed;
8
+ shop?: ToyShopEntity;
7
9
  cat: CatEntity;
8
10
  createdAt: string;
9
11
  }
package/lib/__tests__/cat-toy.entity.js CHANGED
@@ -13,6 +13,7 @@ exports.CatToyEntity = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
14
  const cat_entity_1 = require("./cat.entity");
15
15
  const size_embed_1 = require("./size.embed");
16
+ const toy_shop_entity_1 = require("./toy-shop.entity");
16
17
  let CatToyEntity = class CatToyEntity {
17
18
  };
18
19
  exports.CatToyEntity = CatToyEntity;
@@ -28,6 +29,11 @@ __decorate([
28
29
  (0, typeorm_1.Column)(() => size_embed_1.SizeEmbed),
29
30
  __metadata("design:type", size_embed_1.SizeEmbed)
30
31
  ], CatToyEntity.prototype, "size", void 0);
32
+ __decorate([
33
+ (0, typeorm_1.ManyToOne)(() => toy_shop_entity_1.ToyShopEntity, { nullable: true }),
34
+ (0, typeorm_1.JoinColumn)(),
35
+ __metadata("design:type", toy_shop_entity_1.ToyShopEntity)
36
+ ], CatToyEntity.prototype, "shop", void 0);
31
37
  __decorate([
32
38
  (0, typeorm_1.ManyToOne)(() => cat_entity_1.CatEntity, (cat) => cat.toys),
33
39
  (0, typeorm_1.JoinColumn)(),
package/lib/__tests__/cat-toy.entity.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cat-toy.entity.js","sourceRoot":"","sources":["../../src/__tests__/cat-toy.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyG;AACzG,6CAAwC;AACxC,6CAAwC;AAGjC,IAAM,YAAY,GAAlB,MAAM,YAAY;CAgBxB,CAAA;AAhBY,oCAAY;AAErB;IADC,IAAA,gCAAsB,GAAE;;wCACf;AAGV;IADC,IAAA,gBAAM,GAAE;;0CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;8BAClB,sBAAS;0CAAA;AAIf;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,sBAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;IAC7C,IAAA,oBAAU,GAAE;8BACR,sBAAS;yCAAA;AAGd;IADC,IAAA,0BAAgB,GAAE;;+CACF;uBAfR,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CAgBxB"}
1
+ {"version":3,"file":"cat-toy.entity.js","sourceRoot":"","sources":["../../src/__tests__/cat-toy.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyG;AACzG,6CAAwC;AACxC,6CAAwC;AACxC,uDAAiD;AAG1C,IAAM,YAAY,GAAlB,MAAM,YAAY;CAoBxB,CAAA;AApBY,oCAAY;AAErB;IADC,IAAA,gCAAsB,GAAE;;wCACf;AAGV;IADC,IAAA,gBAAM,GAAE;;0CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;8BAClB,sBAAS;0CAAA;AAIf;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,+BAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAClD,IAAA,oBAAU,GAAE;8BACN,+BAAa;0CAAA;AAIpB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,sBAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;IAC7C,IAAA,oBAAU,GAAE;8BACR,sBAAS;yCAAA;AAGd;IADC,IAAA,0BAAgB,GAAE;;+CACF;uBAnBR,YAAY;IADxB,IAAA,gBAAM,GAAE;GACI,YAAY,CAoBxB"}
package/lib/__tests__/toy-shop-address.entity.d.ts ADDED
@@ -0,0 +1,5 @@
1
+ export declare class ToyShopAddressEntity {
2
+ id: number;
3
+ address: string;
4
+ createdAt: string;
5
+ }
package/lib/__tests__/toy-shop-address.entity.js ADDED
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.ToyShopAddressEntity = void 0;
13
+ const typeorm_1 = require("typeorm");
14
+ let ToyShopAddressEntity = class ToyShopAddressEntity {
15
+ };
16
+ exports.ToyShopAddressEntity = ToyShopAddressEntity;
17
+ __decorate([
18
+ (0, typeorm_1.PrimaryGeneratedColumn)(),
19
+ __metadata("design:type", Number)
20
+ ], ToyShopAddressEntity.prototype, "id", void 0);
21
+ __decorate([
22
+ (0, typeorm_1.Column)(),
23
+ __metadata("design:type", String)
24
+ ], ToyShopAddressEntity.prototype, "address", void 0);
25
+ __decorate([
26
+ (0, typeorm_1.CreateDateColumn)(),
27
+ __metadata("design:type", String)
28
+ ], ToyShopAddressEntity.prototype, "createdAt", void 0);
29
+ exports.ToyShopAddressEntity = ToyShopAddressEntity = __decorate([
30
+ (0, typeorm_1.Entity)()
31
+ ], ToyShopAddressEntity);
32
+ //# sourceMappingURL=toy-shop-address.entity.js.map
package/lib/__tests__/toy-shop-address.entity.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toy-shop-address.entity.js","sourceRoot":"","sources":["../../src/__tests__/toy-shop-address.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAkF;AAG3E,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAShC,CAAA;AATY,oDAAoB;AAE7B;IADC,IAAA,gCAAsB,GAAE;;gDACf;AAGV;IADC,IAAA,gBAAM,GAAE;;qDACM;AAGf;IADC,IAAA,0BAAgB,GAAE;;uDACF;+BARR,oBAAoB;IADhC,IAAA,gBAAM,GAAE;GACI,oBAAoB,CAShC"}
package/lib/__tests__/toy-shop.entity.d.ts ADDED
@@ -0,0 +1,7 @@
1
+ import { ToyShopAddressEntity } from './toy-shop-address.entity';
2
+ export declare class ToyShopEntity {
3
+ id: number;
4
+ shopName: string;
5
+ address: ToyShopAddressEntity;
6
+ createdAt: string;
7
+ }
package/lib/__tests__/toy-shop.entity.js ADDED
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ exports.ToyShopEntity = void 0;
13
+ const typeorm_1 = require("typeorm");
14
+ const toy_shop_address_entity_1 = require("./toy-shop-address.entity");
15
+ let ToyShopEntity = class ToyShopEntity {
16
+ };
17
+ exports.ToyShopEntity = ToyShopEntity;
18
+ __decorate([
19
+ (0, typeorm_1.PrimaryGeneratedColumn)(),
20
+ __metadata("design:type", Number)
21
+ ], ToyShopEntity.prototype, "id", void 0);
22
+ __decorate([
23
+ (0, typeorm_1.Column)(),
24
+ __metadata("design:type", String)
25
+ ], ToyShopEntity.prototype, "shopName", void 0);
26
+ __decorate([
27
+ (0, typeorm_1.OneToOne)(() => toy_shop_address_entity_1.ToyShopAddressEntity, { nullable: true }),
28
+ (0, typeorm_1.JoinColumn)(),
29
+ __metadata("design:type", toy_shop_address_entity_1.ToyShopAddressEntity)
30
+ ], ToyShopEntity.prototype, "address", void 0);
31
+ __decorate([
32
+ (0, typeorm_1.CreateDateColumn)(),
33
+ __metadata("design:type", String)
34
+ ], ToyShopEntity.prototype, "createdAt", void 0);
35
+ exports.ToyShopEntity = ToyShopEntity = __decorate([
36
+ (0, typeorm_1.Entity)()
37
+ ], ToyShopEntity);
38
+ //# sourceMappingURL=toy-shop.entity.js.map
package/lib/__tests__/toy-shop.entity.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"toy-shop.entity.js","sourceRoot":"","sources":["../../src/__tests__/toy-shop.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAwG;AACxG,uEAAgE;AAGzD,IAAM,aAAa,GAAnB,MAAM,aAAa;CAazB,CAAA;AAbY,sCAAa;AAEtB;IADC,IAAA,gCAAsB,GAAE;;yCACf;AAGV;IADC,IAAA,gBAAM,GAAE;;+CACO;AAIhB;IAFC,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,8CAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxD,IAAA,oBAAU,GAAE;8BACJ,8CAAoB;8CAAA;AAG7B;IADC,IAAA,0BAAgB,GAAE;;gDACF;wBAZR,aAAa;IADzB,IAAA,gBAAM,GAAE;GACI,aAAa,CAazB"}
package/lib/helper.js CHANGED
@@ -79,8 +79,13 @@ function fixColumnAlias(properties, alias, isRelation = false, isVirtualProperty
79
79
  }
80
80
  else if ((isVirtualProperty && !query) || properties.isNested) {
81
81
  if (properties.propertyName.includes('.')) {
82
- const [nestedRel, nestedCol] = properties.propertyName.split('.');
83
- return `${alias}_${properties.propertyPath}_rel_${nestedRel}_rel.${nestedCol}`;
82
+ const propertyPath = properties.propertyName.split('.');
83
+ const nestedRelations = propertyPath
84
+ .slice(0, -1)
85
+ .map((v) => `${v}_rel`)
86
+ .join('_');
87
+ const nestedCol = propertyPath[propertyPath.length - 1];
88
+ return `${alias}_${properties.propertyPath}_rel_${nestedRelations}.${nestedCol}`;
84
89
  }
85
90
  else {
86
91
  return `${alias}_${properties.propertyPath}_rel_${properties.propertyName}`;
package/lib/helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":";;;AA8CA,SAAgB,WAAW,CAAI,aAA0B,EAAE,MAAc;IACrE,OAAO,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;AACpD,CAAC;AAFD,kCAEC;AAEM,MAAM,uBAAuB,GAAG,CAAC,KAAyB,EAAE,YAAoB,EAAE,WAAkB,CAAC,EAAE,EAAE,CAC5G,KAAK,KAAK,SAAS,IAAI,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAA;AADrD,QAAA,uBAAuB,2BAC8B;AAIlE,SAAgB,yBAAyB,CAAC,MAAc;IACpD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACtC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QAC9C,IAAI,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAE7C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,QAAQ,GAAG,IAAI,CAAA;SAClB;QAED,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAE7D,OAAO;YACH,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC;YAC7B,YAAY;YACZ,QAAQ;YACR,MAAM,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,EAAE;SAC/C,CAAA;KACJ;SAAM;QACH,OAAO,EAAE,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAA;KACrF;AACL,CAAC;AAtBD,8DAsBC;AAED,SAAgB,sBAAsB,CAClC,EAA+B,EAC/B,gBAAkC;;IAElC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,YAAY;QAC1C,CAAC,CAAC,MAAA,MAAA,MAAA,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,0CAAE,SAAS,0CAAE,QAAQ,0CAAE,0BAA0B,CAAC,gBAAgB,CAAC,YAAY,CAAC,0CAC3F,gBAAgB,0CAAE,cAAc,CAAC,cAAc;QACvD,CAAC,CAAC,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,0CAAE,SAAS,0CAAE,QAAQ,CAAA;IAC5C,OAAO,CACH,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,0CAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,KAAK,gBAAgB,CAAC,YAAY,CAAC,KAAI;QAC1F,iBAAiB,EAAE,KAAK;QACxB,KAAK,EAAE,SAAS;KACnB,CACJ,CAAA;AACL,CAAC;AAdD,wDAcC;AAED,SAAgB,4BAA4B,CAAC,EAA+B,EAAE,YAAsB;;IAChG,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE;QACtB,OAAO,KAAK,CAAA;KACf;IACD,OAAO,MAAA,MAAA,EAAE,CAAC,aAAa,CAAC,SAAS,0CAAE,QAAQ,0CAAE,cAAc,CACtD,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,EACnC,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;AACzD,CAAC;AAPD,oEAOC;AAED,SAAgB,yBAAyB,CACrC,EAA+B,EAC/B,gBAAkC;;IAElC,IAAI,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE;QAC1B,OAAO,KAAK,CAAA;KACf;IACD,OAAO,CAAC,CAAC,CAAA,MAAA,MAAA,EAAE,CAAC,aAAa,CAAC,SAAS,0CAAE,QAAQ,0CAAE,yBAAyB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA,CAAA;AAC3G,CAAC;AARD,8DAQC;AAED,SAAgB,eAAe,CAAC,EAA+B,EAAE,YAAoB;;IACjF,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE;QACtB,OAAO,KAAK,CAAA;KACf;IACD,OAAO,CAAC,CAAC,CAAA,MAAA,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,0CAAE,SAAS,0CAAE,QAAQ,0CAAE,2BAA2B,CAAC,YAAY,CAAC,CAAA,CAAA;AAC9F,CAAC;AALD,0CAKC;AAED,SAAgB,eAAe,CAAC,EAA+B,EAAE,YAAoB;;IACjF,IAAI,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE;QACtB,OAAO,KAAK,CAAA;KACf;IACD,OAAO,CAAC,CAAC,CAAA,MAAA,MAAA,MAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,aAAa,0CAAE,SAAS,0CAAE,QAAQ,0CAAE,2BAA2B,CAAC,YAAY,CAAC,CAAA,CAAA;AAC9F,CAAC;AALD,0CAKC;AAED,oGAAoG;AACpG,SAAgB,cAAc,CAC1B,UAA4B,EAC5B,KAAa,EACb,UAAU,GAAG,KAAK,EAClB,iBAAiB,GAAG,KAAK,EACzB,UAAU,GAAG,KAAK,EAClB,KAA+B;IAE/B,IAAI,UAAU,EAAE;QACZ,IAAI,iBAAiB,IAAI,KAAK,EAAE;YAC5B,OAAO,IAAI,KAAK,CAAC,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,MAAM,CAAC,GAAG,CAAA,CAAC,2CAA2C;SAC7G;aAAM,IAAI,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,EAAE;YAC7D,IAAI,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBACvC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACjE,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,QAAQ,SAAS,QAAQ,SAAS,EAAE,CAAA;aACjF;iBAAM;gBACH,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,QAAQ,UAAU,CAAC,YAAY,EAAE,CAAA;aAC9E;SACJ;aAAM;YACH,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,QAAQ,UAAU,CAAC,YAAY,EAAE,CAAA;SAC9E;KACJ;SAAM,IAAI,iBAAiB,EAAE;QAC1B,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,EAAE,CAAA;KAClF;SAAM,IAAI,UAAU,EAAE;QACnB,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,EAAE,CAAA;KAC1E;SAAM;QACH,OAAO,GAAG,KAAK,IAAI,UAAU,CAAC,YAAY,EAAE,CAAA;KAC/C;AACL,CAAC;AA5BD,wCA4BC;AAED,SAAgB,qBAAqB,CAAC,IAAY;IAC9C,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAA;IAC7C,IAAI,WAAW,GAAG,EAAE,CAAA;IACpB,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACd,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;QACzB,WAAW,GAAG,GAAG,CAAC,MAAM,CAAA;QACxB,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAA;KAC3B;SAAM;QACH,SAAS,GAAG,IAAI,CAAA;KACnB;IACD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,CAAA;AACrC,CAAC;AAZD,sDAYC;AAED,MAAM,aAAa,GAAG,IAAI,MAAM,CAC5B,gNAAgN,CACnN,CAAA;AAED,SAAgB,SAAS,CAAC,GAAW;IACjC,OAAO,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAClC,CAAC;AAFD,8BAEC"}
1
+ {"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
package/lib/paginate.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { Repository, SelectQueryBuilder, FindOptionsWhere, FindOptionsRelations, ObjectLiteral, FindOptionsRelationByString } from 'typeorm';
1
+ import { FindOptionsRelationByString, FindOptionsRelations, FindOptionsWhere, ObjectLiteral, Repository, SelectQueryBuilder } from 'typeorm';
2
2
  import { PaginateQuery } from './decorator';
3
3
  import { Column, RelationColumn, SortBy } from './helper';
4
4
  import { FilterOperator, FilterSuffix } from './filter';
package/lib/paginate.js CHANGED
@@ -22,6 +22,28 @@ var PaginationType;
22
22
  exports.DEFAULT_MAX_LIMIT = 100;
23
23
  exports.DEFAULT_LIMIT = 20;
24
24
  exports.NO_PAGINATION = 0;
25
+ function generateWhereStatement(queryBuilder, obj) {
26
+ const toTransform = Array.isArray(obj) ? obj : [obj];
27
+ return toTransform.map((item) => flattenWhereAndTransform(queryBuilder, item).join(' AND ')).join(' OR ');
28
+ }
29
+ function flattenWhereAndTransform(queryBuilder, obj, separator = '.', parentKey = '') {
30
+ return Object.entries(obj).flatMap(([key, value]) => {
31
+ if (obj.hasOwnProperty(key)) {
32
+ const joinedKey = parentKey ? `${parentKey}${separator}${key}` : key;
33
+ if (typeof value === 'object' && value !== null && !(value instanceof typeorm_1.FindOperator)) {
34
+ return flattenWhereAndTransform(queryBuilder, value, separator, joinedKey);
35
+ }
36
+ else {
37
+ const property = (0, helper_1.getPropertiesByColumnName)(joinedKey);
38
+ const { isVirtualProperty, query: virtualQuery } = (0, helper_1.extractVirtualProperty)(queryBuilder, property);
39
+ const isRelation = (0, helper_1.checkIsRelation)(queryBuilder, property.propertyPath);
40
+ const isEmbedded = (0, helper_1.checkIsEmbedded)(queryBuilder, property.propertyPath);
41
+ const alias = (0, helper_1.fixColumnAlias)(property, queryBuilder.alias, isRelation, isVirtualProperty, isEmbedded, virtualQuery);
42
+ return queryBuilder['createWhereConditionExpression'](queryBuilder['getWherePredicateCondition'](alias, value));
43
+ }
44
+ }
45
+ });
46
+ }
25
47
  async function paginate(query, repo, config) {
26
48
  var _a;
27
49
  const page = (0, helper_1.positiveNumberOrDefault)(query.page, 1, 1);
@@ -107,8 +129,9 @@ async function paginate(query, repo, config) {
107
129
  }, []);
108
130
  queryBuilder.select(cols);
109
131
  }
110
- if (config.where) {
111
- queryBuilder.andWhere(new typeorm_1.Brackets((qb) => qb.andWhere(config.where)));
132
+ if (config.where && repo instanceof typeorm_1.Repository) {
133
+ const baseWhereStr = generateWhereStatement(queryBuilder, config.where);
134
+ queryBuilder.andWhere(`(${baseWhereStr})`);
112
135
  }
113
136
  if (config.withDeleted) {
114
137
  queryBuilder.withDeleted();
package/lib/paginate.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"paginate.js","sourceRoot":"","sources":["../src/paginate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"paginate.js","sourceRoot":"","sources":["../src/paginate.ts"],"names":[],"mappings":"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"}
package/lib/paginate.spec.js CHANGED
@@ -1,4 +1,15 @@
1
1
  "use strict";
2
+ var __rest = (this && this.__rest) || function (s, e) {
3
+ var t = {};
4
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
5
+ t[p] = s[p];
6
+ if (s != null && typeof Object.getOwnPropertySymbols === "function")
7
+ for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
8
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
9
+ t[p[i]] = s[p[i]];
10
+ }
11
+ return t;
12
+ };
2
13
  Object.defineProperty(exports, "__esModule", { value: true });
3
14
  const typeorm_1 = require("typeorm");
4
15
  const paginate_1 = require("./paginate");
@@ -9,15 +20,22 @@ const cat_home_entity_1 = require("./__tests__/cat-home.entity");
9
20
  const cat_home_pillow_entity_1 = require("./__tests__/cat-home-pillow.entity");
10
21
  const lodash_1 = require("lodash");
11
22
  const filter_1 = require("./filter");
23
+ const toy_shop_entity_1 = require("./__tests__/toy-shop.entity");
24
+ const toy_shop_address_entity_1 = require("./__tests__/toy-shop-address.entity");
12
25
  const isoStringToDate = (isoString) => new Date(isoString);
13
26
  describe('paginate', () => {
14
27
  let dataSource;
15
28
  let catRepo;
16
29
  let catToyRepo;
30
+ let toyShopRepo;
31
+ let toyShopAddressRepository;
17
32
  let catHomeRepo;
18
33
  let catHomePillowRepo;
19
34
  let cats;
20
35
  let catToys;
36
+ let catToysWithoutShop;
37
+ let toyShopsAddresses;
38
+ let toysShops;
21
39
  let catHomes;
22
40
  let catHomePillows;
23
41
  beforeAll(async () => {
@@ -33,12 +51,21 @@ describe('paginate', () => {
33
51
  : {
34
52
  type: 'sqlite',
35
53
  database: ':memory:',
36
- })), { synchronize: true, logging: ['error'], entities: [cat_entity_1.CatEntity, cat_toy_entity_1.CatToyEntity, cat_home_entity_1.CatHomeEntity, cat_home_pillow_entity_1.CatHomePillowEntity] }));
54
+ })), { synchronize: true, logging: ['error'], entities: [
55
+ cat_entity_1.CatEntity,
56
+ cat_toy_entity_1.CatToyEntity,
57
+ toy_shop_address_entity_1.ToyShopAddressEntity,
58
+ cat_home_entity_1.CatHomeEntity,
59
+ cat_home_pillow_entity_1.CatHomePillowEntity,
60
+ toy_shop_entity_1.ToyShopEntity,
61
+ ] }));
37
62
  await dataSource.initialize();
38
63
  catRepo = dataSource.getRepository(cat_entity_1.CatEntity);
39
64
  catToyRepo = dataSource.getRepository(cat_toy_entity_1.CatToyEntity);
40
65
  catHomeRepo = dataSource.getRepository(cat_home_entity_1.CatHomeEntity);
41
66
  catHomePillowRepo = dataSource.getRepository(cat_home_pillow_entity_1.CatHomePillowEntity);
67
+ toyShopRepo = dataSource.getRepository(toy_shop_entity_1.ToyShopEntity);
68
+ toyShopAddressRepository = dataSource.getRepository(toy_shop_address_entity_1.ToyShopAddressEntity);
42
69
  cats = await catRepo.save([
43
70
  catRepo.create({
44
71
  name: 'Milo',
@@ -81,12 +108,37 @@ describe('paginate', () => {
81
108
  size: { height: 10, width: 5, length: 15 },
82
109
  }),
83
110
  ]);
111
+ toyShopsAddresses = await toyShopAddressRepository.save([
112
+ toyShopAddressRepository.create({ address: '123 Main St' }),
113
+ ]);
114
+ toysShops = await toyShopRepo.save([
115
+ toyShopRepo.create({ shopName: 'Best Toys', address: toyShopsAddresses[0] }),
116
+ toyShopRepo.create({ shopName: 'Lovely Toys' }),
117
+ ]);
84
118
  catToys = await catToyRepo.save([
85
119
  catToyRepo.create({ name: 'Fuzzy Thing', cat: cats[0], size: { height: 10, width: 10, length: 10 } }),
86
- catToyRepo.create({ name: 'Stuffed Mouse', cat: cats[0], size: { height: 5, width: 5, length: 12 } }),
87
- catToyRepo.create({ name: 'Mouse', cat: cats[0], size: { height: 6, width: 4, length: 13 } }),
120
+ catToyRepo.create({
121
+ name: 'Stuffed Mouse',
122
+ shop: toysShops[0],
123
+ cat: cats[0],
124
+ size: { height: 5, width: 5, length: 12 },
125
+ }),
126
+ catToyRepo.create({
127
+ name: 'Mouse',
128
+ shop: toysShops[1],
129
+ cat: cats[0],
130
+ size: { height: 6, width: 4, length: 13 },
131
+ }),
88
132
  catToyRepo.create({ name: 'String', cat: cats[1], size: { height: 1, width: 1, length: 50 } }),
89
133
  ]);
134
+ catToysWithoutShop = catToys.map((_a) => {
135
+ var { shop: _ } = _a, other = __rest(_a, ["shop"]);
136
+ const newInstance = new cat_toy_entity_1.CatToyEntity();
137
+ for (const otherKey in other) {
138
+ newInstance[otherKey] = other[otherKey];
139
+ }
140
+ return newInstance;
141
+ });
90
142
  catHomes = await catHomeRepo.save([
91
143
  catHomeRepo.create({ name: 'Box', cat: cats[0] }),
92
144
  catHomeRepo.create({ name: 'House', cat: cats[1] }),
@@ -491,7 +543,7 @@ describe('paginate', () => {
491
543
  };
492
544
  const result = await (0, paginate_1.paginate)(query, catToyRepo, config);
493
545
  expect(result.meta.search).toStrictEqual('Milo');
494
- expect(result.data).toStrictEqual([catToys[0], catToys[1], catToys[2]]);
546
+ expect(result.data).toStrictEqual([catToysWithoutShop[0], catToysWithoutShop[1], catToysWithoutShop[2]]);
495
547
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&search=Milo');
496
548
  });
497
549
  it('should return result based on search term on one-to-many relation', async () => {
@@ -510,9 +562,9 @@ describe('paginate', () => {
510
562
  };
511
563
  const result = await (0, paginate_1.paginate)(query, catRepo, config);
512
564
  expect(result.meta.search).toStrictEqual('Mouse');
513
- const toy = (0, lodash_1.clone)(catToys[1]);
565
+ const toy = (0, lodash_1.clone)(catToysWithoutShop[1]);
514
566
  delete toy.cat;
515
- const toy2 = (0, lodash_1.clone)(catToys[2]);
567
+ const toy2 = (0, lodash_1.clone)(catToysWithoutShop[2]);
516
568
  delete toy2.cat;
517
569
  expect(result.data).toStrictEqual([Object.assign((0, lodash_1.clone)(cats[0]), { toys: [toy2, toy] })]);
518
570
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&sortBy=toys.id:DESC&search=Mouse');
@@ -547,12 +599,12 @@ describe('paginate', () => {
547
599
  };
548
600
  const result = await (0, paginate_1.paginate)(query, catToyRepo, config);
549
601
  expect(result.meta.search).toStrictEqual('Milo');
550
- expect(result.data).toStrictEqual([catToys[0], catToys[1], catToys[2]].sort((a, b) => b.cat.id - a.cat.id));
602
+ expect(result.data).toStrictEqual([catToysWithoutShop[0], catToysWithoutShop[1], catToysWithoutShop[2]].sort((a, b) => b.cat.id - a.cat.id));
551
603
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=cat.id:DESC&search=Milo');
552
604
  });
553
605
  it('should return result based on sort on one-to-many relation', async () => {
554
606
  const config = {
555
- relations: ['toys'],
607
+ relations: ['toys', 'toys.shop', 'toys.shop.address'],
556
608
  sortableColumns: ['id', 'name', 'toys.id'],
557
609
  searchableColumns: ['name', 'toys.name'],
558
610
  };
@@ -567,6 +619,7 @@ describe('paginate', () => {
567
619
  delete toy1.cat;
568
620
  const toy2 = (0, lodash_1.clone)(catToys[2]);
569
621
  delete toy2.cat;
622
+ delete result.data[0].toys[0].shop.address;
570
623
  expect(result.data).toStrictEqual([Object.assign((0, lodash_1.clone)(cats[0]), { toys: [toy2, toy1] })]);
571
624
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=toys.id:DESC&search=Mouse');
572
625
  });
@@ -719,6 +772,88 @@ describe('paginate', () => {
719
772
  });
720
773
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC');
721
774
  });
775
+ it('should return valid data filtering by not id field many-to-one', async () => {
776
+ const config = {
777
+ sortableColumns: ['id', 'name'],
778
+ relations: ['cat'],
779
+ where: {
780
+ cat: {
781
+ name: cats[0].name,
782
+ },
783
+ },
784
+ };
785
+ const query = {
786
+ path: '',
787
+ };
788
+ const result = await (0, paginate_1.paginate)(query, catToyRepo, config);
789
+ expect(result.meta.totalItems).toBe(3);
790
+ result.data.forEach((toy) => {
791
+ expect(toy.cat.id).toBe(cats[0].id);
792
+ });
793
+ expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC');
794
+ });
795
+ it('should return result based on where one-to-many relation', async () => {
796
+ const config = {
797
+ relations: ['toys'],
798
+ sortableColumns: ['id', 'name'],
799
+ where: {
800
+ toys: {
801
+ name: 'Stuffed Mouse',
802
+ },
803
+ },
804
+ };
805
+ const query = {
806
+ path: '',
807
+ };
808
+ const result = await (0, paginate_1.paginate)(query, catRepo, config);
809
+ expect(result.data.length).toBe(1);
810
+ expect(result.data[0].toys.length).toBe(1);
811
+ expect(result.data[0].toys[0].name).toBe('Stuffed Mouse');
812
+ });
813
+ it('should return all cats with a toys from the lovely shop', async () => {
814
+ const config = {
815
+ relations: ['toys', 'toys.shop'],
816
+ sortableColumns: ['id', 'name'],
817
+ where: {
818
+ toys: {
819
+ shop: {
820
+ shopName: 'Lovely Toys',
821
+ },
822
+ },
823
+ },
824
+ };
825
+ const query = {
826
+ path: '',
827
+ };
828
+ const result = await (0, paginate_1.paginate)(query, catRepo, config);
829
+ expect(result.data.length).toBe(1);
830
+ expect(result.data[0].toys.length).toBe(1);
831
+ expect(result.data[0].toys[0].shop.id).toStrictEqual(toysShops[1].id);
832
+ expect(result.data[0].toys[0].name).toBe('Mouse');
833
+ });
834
+ it('should return all cats from shop where street name like 123', async () => {
835
+ const config = {
836
+ relations: ['toys', 'toys.shop', 'toys.shop.address'],
837
+ sortableColumns: ['id', 'name'],
838
+ where: {
839
+ toys: {
840
+ shop: {
841
+ address: {
842
+ address: (0, typeorm_1.Like)('%123%'),
843
+ },
844
+ },
845
+ },
846
+ },
847
+ };
848
+ const query = {
849
+ path: '',
850
+ };
851
+ const result = await (0, paginate_1.paginate)(query, catRepo, config);
852
+ expect(result.data.length).toBe(1);
853
+ expect(result.data[0].toys.length).toBe(1);
854
+ expect(result.data[0].toys[0].shop).toStrictEqual(toysShops[0]);
855
+ expect(result.data[0].toys[0].name).toBe('Stuffed Mouse');
856
+ });
722
857
  it('should return result based on filter on many-to-one relation', async () => {
723
858
  const config = {
724
859
  relations: ['cat'],
@@ -757,9 +892,9 @@ describe('paginate', () => {
757
892
  const result = await (0, paginate_1.paginate)(query, catRepo, config);
758
893
  const cat1 = (0, lodash_1.clone)(cats[0]);
759
894
  const cat2 = (0, lodash_1.clone)(cats[1]);
760
- const catToys1 = (0, lodash_1.clone)(catToys[0]);
761
- const catToys2 = (0, lodash_1.clone)(catToys[2]);
762
- const catToys3 = (0, lodash_1.clone)(catToys[3]);
895
+ const catToys1 = (0, lodash_1.clone)(catToysWithoutShop[0]);
896
+ const catToys2 = (0, lodash_1.clone)(catToysWithoutShop[2]);
897
+ const catToys3 = (0, lodash_1.clone)(catToysWithoutShop[3]);
763
898
  delete catToys1.cat;
764
899
  delete catToys2.cat;
765
900
  delete catToys3.cat;
@@ -886,7 +1021,7 @@ describe('paginate', () => {
886
1021
  });
887
1022
  copyCats[0].home = copyHomes[0];
888
1023
  copyCats[1].home = copyHomes[1];
889
- const copyToys = catToys.map((toy) => {
1024
+ const copyToys = catToysWithoutShop.map((toy) => {
890
1025
  const copy = (0, lodash_1.clone)(toy);
891
1026
  delete copy.cat;
892
1027
  return copy;
@@ -912,13 +1047,13 @@ describe('paginate', () => {
912
1047
  ],
913
1048
  };
914
1049
  const result = await (0, paginate_1.paginate)(query, catRepo, config);
915
- const toy0 = (0, lodash_1.clone)(catToys[0]);
1050
+ const toy0 = (0, lodash_1.clone)(catToysWithoutShop[0]);
916
1051
  delete toy0.cat;
917
- const toy1 = (0, lodash_1.clone)(catToys[1]);
1052
+ const toy1 = (0, lodash_1.clone)(catToysWithoutShop[1]);
918
1053
  delete toy1.cat;
919
- const toy2 = (0, lodash_1.clone)(catToys[2]);
1054
+ const toy2 = (0, lodash_1.clone)(catToysWithoutShop[2]);
920
1055
  delete toy2.cat;
921
- const toy3 = (0, lodash_1.clone)(catToys[3]);
1056
+ const toy3 = (0, lodash_1.clone)(catToysWithoutShop[3]);
922
1057
  delete toy3.cat;
923
1058
  const orderedCats = [
924
1059
  Object.assign((0, lodash_1.clone)(cats[4]), { toys: [] }),
@@ -945,7 +1080,7 @@ describe('paginate', () => {
945
1080
  ],
946
1081
  };
947
1082
  const result = await (0, paginate_1.paginate)(query, catToyRepo, config);
948
- const orderedToys = [catToys[3], catToys[0], catToys[2], catToys[1]];
1083
+ const orderedToys = [catToysWithoutShop[3], catToysWithoutShop[0], catToysWithoutShop[2], catToysWithoutShop[1]];
949
1084
  expect(result.data).toStrictEqual(orderedToys);
950
1085
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=cat.(size.height):DESC&sortBy=cat.(size.length):DESC&sortBy=name:ASC');
951
1086
  });
@@ -1062,7 +1197,12 @@ describe('paginate', () => {
1062
1197
  };
1063
1198
  const result = await (0, paginate_1.paginate)(query, catToyRepo, config);
1064
1199
  expect(result.meta.search).toStrictEqual('1');
1065
- expect(result.data).toStrictEqual([catToys[3], catToys[0], catToys[1], catToys[2]]);
1200
+ expect(result.data).toStrictEqual([
1201
+ catToysWithoutShop[3],
1202
+ catToysWithoutShop[0],
1203
+ catToysWithoutShop[1],
1204
+ catToysWithoutShop[2],
1205
+ ]);
1066
1206
  expect(result.links.current).toBe('?page=1&limit=20&sortBy=cat.(size.height):DESC&search=1');
1067
1207
  });
1068
1208
  it('should return result based on filter on embedded entity', async () => {