@vendure/core 1.4.1 → 1.4.5
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.
- package/dist/api/config/graphql-custom-fields.js +128 -128
- package/dist/api/middleware/exception-logger.filter.d.ts +1 -1
- package/dist/api/middleware/exception-logger.filter.js +10 -4
- package/dist/api/middleware/exception-logger.filter.js.map +1 -1
- package/dist/api/resolvers/shop/shop-auth.resolver.js +3 -0
- package/dist/api/resolvers/shop/shop-auth.resolver.js.map +1 -1
- package/dist/api/schema/shop-api/shop.api.graphql +1 -0
- package/dist/common/types/entity-relation-paths.d.ts +2 -2
- package/dist/config/entity-id-strategy/uuid-id-strategy.d.ts +6 -3
- package/dist/config/entity-id-strategy/uuid-id-strategy.js +6 -3
- package/dist/config/entity-id-strategy/uuid-id-strategy.js.map +1 -1
- package/dist/config/logger/vendure-logger.d.ts +20 -1
- package/dist/config/logger/vendure-logger.js +35 -6
- package/dist/config/logger/vendure-logger.js.map +1 -1
- package/dist/config/promotion/promotion-action.js +2 -2
- package/dist/config/promotion/promotion-action.js.map +1 -1
- package/dist/entity/asset/orderable-asset.entity.d.ts +3 -0
- package/dist/entity/asset/orderable-asset.entity.js +4 -1
- package/dist/entity/asset/orderable-asset.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +4 -1
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/i18n/messages/en.json +2 -0
- package/dist/i18n/messages/pt_PT.json +1 -1
- package/dist/job-queue/subscribable-job.js +1 -1
- package/dist/job-queue/subscribable-job.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js +6 -1
- package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +11 -11
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +15 -9
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.d.ts +1 -0
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js +5 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +7 -7
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.d.ts +12 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +17 -3
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +10 -2
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/services/administrator.service.d.ts +6 -0
- package/dist/service/services/administrator.service.js +57 -0
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.d.ts +40 -2
- package/dist/service/services/asset.service.js +23 -1
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/customer.service.js +2 -4
- package/dist/service/services/customer.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,IAAY,QA6BX;AA7BD,WAAY,QAAQ;IAChB;;;;OAIG;IACH,yCAAS,CAAA;IACT;;;;OAIG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,6CAAW,CAAA;IACX;;;;OAIG;IACH,yCAAS,CAAA;AACb,CAAC,EA7BW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QA6BnB;AAiBD,MAAM,UAAU,GAAkB;IAC9B,KAAK;QACD,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,OAAO;QACH,KAAK;IACT,CAAC;IACD,KAAK;QACD,KAAK;IACT,CAAC;CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,MAAa,MAAM;IAIf,MAAM,KAAK,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;IACtC,CAAC;IAED,IAAY,QAAQ;QAChB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,gBAAgB;IAChB,MAAM,CAAC,SAAS,CAAC,MAAqB;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,KAAc,EAAE,OAAgB;QAChD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,GAAG,CAAC,OAAY,EAAE,OAAgB;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,OAAO,CAAC,OAAY,EAAE,OAAgB;QAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,KAAc;QAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAe,EAAE,OAAgB;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;;AA7DL,wBA8DC;AA7DkB,gBAAS,GAAkB,MAAM,CAAC"}
|
|
@@ -83,7 +83,7 @@ class PromotionOrderAction extends PromotionAction {
|
|
|
83
83
|
}
|
|
84
84
|
/** @internal */
|
|
85
85
|
execute(ctx, order, args, state) {
|
|
86
|
-
const actionState = this.conditions ? pick_1.pick(state,
|
|
86
|
+
const actionState = this.conditions ? pick_1.pick(state, this.conditions.map(c => c.code)) : {};
|
|
87
87
|
return this.executeFn(ctx, order, this.argsArrayToHash(args), actionState);
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -103,7 +103,7 @@ class PromotionShippingAction extends PromotionAction {
|
|
|
103
103
|
}
|
|
104
104
|
/** @internal */
|
|
105
105
|
execute(ctx, shippingLine, order, args, state) {
|
|
106
|
-
const actionState = this.conditions ? pick_1.pick(state,
|
|
106
|
+
const actionState = this.conditions ? pick_1.pick(state, this.conditions.map(c => c.code)) : {};
|
|
107
107
|
return this.executeFn(ctx, shippingLine, order, this.argsArrayToHash(args), actionState);
|
|
108
108
|
}
|
|
109
109
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promotion-action.js","sourceRoot":"","sources":["../../../src/config/promotion/promotion-action.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAGhD,gFAK6C;AAuL7C;;;;;;;;GAQG;AACH,MAAsB,eAGpB,SAAQ,iDAA2B;IAYjC,YAAsB,MAAmC;QACrD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACxC,CAAC;CACJ;AApBD,0CAoBC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,mBAGX,SAAQ,eAAqB;IAE3B,YAAY,MAAuC;QAC/C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,gBAAgB;IAChB,OAAO,CACH,GAAmB,EACnB,SAAoB,EACpB,SAAoB,EACpB,IAAiB,EACjB,KAAqB;QAErB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU;YAC/B,CAAC,CAAC,WAAI,CACA,KAAK,EACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACnC;YACH,CAAC,CAAC,EAAE,CAAC;QACT,OAAO,IAAI,CAAC,SAAS,CACjB,GAAG,EACH,SAAS,EACT,SAAS,EACT,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAC1B,WAAgC,CACnC,CAAC;IACN,CAAC;CACJ;AAhCD,kDAgCC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,oBAGX,SAAQ,eAAqB;IAE3B,YAAY,MAAwC;QAChD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,gBAAgB;IAChB,OAAO,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,KAAqB;QAC/E,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAI,CAAC,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"promotion-action.js","sourceRoot":"","sources":["../../../src/config/promotion/promotion-action.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAGhD,gFAK6C;AAuL7C;;;;;;;;GAQG;AACH,MAAsB,eAGpB,SAAQ,iDAA2B;IAYjC,YAAsB,MAAmC;QACrD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACxC,CAAC;CACJ;AApBD,0CAoBC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,mBAGX,SAAQ,eAAqB;IAE3B,YAAY,MAAuC;QAC/C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,gBAAgB;IAChB,OAAO,CACH,GAAmB,EACnB,SAAoB,EACpB,SAAoB,EACpB,IAAiB,EACjB,KAAqB;QAErB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU;YAC/B,CAAC,CAAC,WAAI,CACA,KAAK,EACL,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACnC;YACH,CAAC,CAAC,EAAE,CAAC;QACT,OAAO,IAAI,CAAC,SAAS,CACjB,GAAG,EACH,SAAS,EACT,SAAS,EACT,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAC1B,WAAgC,CACnC,CAAC;IACN,CAAC;CACJ;AAhCD,kDAgCC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAa,oBAGX,SAAQ,eAAqB;IAE3B,YAAY,MAAwC;QAChD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,gBAAgB;IAChB,OAAO,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,KAAqB;QAC/E,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,WAAgC,CAAC,CAAC;IACpG,CAAC;CACJ;AAfD,oDAeC;AAED;;;;;;;GAOG;AACH,MAAa,uBAGX,SAAQ,eAAqB;IAE3B,YAAY,MAA2C;QACnD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACpC,CAAC;IAED,gBAAgB;IAChB,OAAO,CACH,GAAmB,EACnB,YAA0B,EAC1B,KAAY,EACZ,IAAiB,EACjB,KAAqB;QAErB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAI,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,OAAO,IAAI,CAAC,SAAS,CACjB,GAAG,EACH,YAAY,EACZ,KAAK,EACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAC1B,WAAgC,CACnC,CAAC;IACN,CAAC;CACJ;AA3BD,0DA2BC"}
|
|
@@ -3,11 +3,14 @@ import { Orderable } from '../../common/types/common-types';
|
|
|
3
3
|
import { Asset } from '../asset/asset.entity';
|
|
4
4
|
import { VendureEntity } from '../base/base.entity';
|
|
5
5
|
/**
|
|
6
|
+
* @description
|
|
6
7
|
* This base class is extended in order to enable specific ordering of the one-to-many
|
|
7
8
|
* Entity -> Assets relation. Using a many-to-many relation does not provide a way
|
|
8
9
|
* to guarantee order of the Assets, so this entity is used in place of the
|
|
9
10
|
* usual join table that would be created by TypeORM.
|
|
10
11
|
* See https://typeorm.io/#/many-to-many-relations/many-to-many-relations-with-custom-properties
|
|
12
|
+
*
|
|
13
|
+
* @docsCategory entities
|
|
11
14
|
*/
|
|
12
15
|
export declare abstract class OrderableAsset extends VendureEntity implements Orderable {
|
|
13
16
|
protected constructor(input?: DeepPartial<OrderableAsset>);
|
|
@@ -14,11 +14,14 @@ const typeorm_1 = require("typeorm");
|
|
|
14
14
|
const asset_entity_1 = require("../asset/asset.entity");
|
|
15
15
|
const base_entity_1 = require("../base/base.entity");
|
|
16
16
|
/**
|
|
17
|
+
* @description
|
|
17
18
|
* This base class is extended in order to enable specific ordering of the one-to-many
|
|
18
19
|
* Entity -> Assets relation. Using a many-to-many relation does not provide a way
|
|
19
20
|
* to guarantee order of the Assets, so this entity is used in place of the
|
|
20
21
|
* usual join table that would be created by TypeORM.
|
|
21
22
|
* See https://typeorm.io/#/many-to-many-relations/many-to-many-relations-with-custom-properties
|
|
23
|
+
*
|
|
24
|
+
* @docsCategory entities
|
|
22
25
|
*/
|
|
23
26
|
class OrderableAsset extends base_entity_1.VendureEntity {
|
|
24
27
|
constructor(input) {
|
|
@@ -30,7 +33,7 @@ __decorate([
|
|
|
30
33
|
__metadata("design:type", Object)
|
|
31
34
|
], OrderableAsset.prototype, "assetId", void 0);
|
|
32
35
|
__decorate([
|
|
33
|
-
typeorm_1.ManyToOne(
|
|
36
|
+
typeorm_1.ManyToOne(type => asset_entity_1.Asset, { eager: true, onDelete: 'CASCADE' }),
|
|
34
37
|
__metadata("design:type", asset_entity_1.Asset)
|
|
35
38
|
], OrderableAsset.prototype, "asset", void 0);
|
|
36
39
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orderable-asset.entity.js","sourceRoot":"","sources":["../../../src/entity/asset/orderable-asset.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA4C;AAG5C,wDAA8C;AAC9C,qDAAoD;AAEpD
|
|
1
|
+
{"version":3,"file":"orderable-asset.entity.js","sourceRoot":"","sources":["../../../src/entity/asset/orderable-asset.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA4C;AAG5C,wDAA8C;AAC9C,qDAAoD;AAEpD;;;;;;;;;GASG;AACH,MAAsB,cAAe,SAAQ,2BAAa;IACtD,YAAsB,KAAmC;QACrD,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAUJ;AAPG;IADC,gBAAM,EAAE;;+CACG;AAGZ;IADC,mBAAS,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;8BACxD,oBAAK;6CAAC;AAGb;IADC,gBAAM,EAAE;;gDACQ;AAZrB,wCAaC"}
|
|
@@ -72,7 +72,10 @@ ctor, translation = false) {
|
|
|
72
72
|
registerColumn();
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
-
|
|
75
|
+
const relationFieldsCount = customFields.filter(f => f.type === 'relation').length;
|
|
76
|
+
const nonLocaleStringFieldsCount = customFields.filter(f => f.type !== 'localeString' && f.type !== 'relation').length;
|
|
77
|
+
if (0 < relationFieldsCount && nonLocaleStringFieldsCount === 0) {
|
|
78
|
+
// if (customFields.filter(f => f.type === 'relation').length === customFields.length) {
|
|
76
79
|
// If there are _only_ relational customFields defined for an Entity, then TypeORM
|
|
77
80
|
// errors when attempting to load that entity ("Cannot set property <fieldName> of undefined").
|
|
78
81
|
// Therefore as a work-around we will add a "fake" column to the customFields embedded type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"error": {
|
|
3
3
|
"cannot-delete-role": "The role '{ roleCode }' cannot be deleted",
|
|
4
|
+
"cannot-delete-sole-superadmin": "The sole SuperAdmin cannot be deleted",
|
|
4
5
|
"cannot-locate-customer-for-user": "Cannot locate a Customer for the user",
|
|
5
6
|
"cannot-modify-role": "The role '{ roleCode }' cannot be modified",
|
|
6
7
|
"cannot-create-sales-for-active-order": "Cannot create a Sale for an Order which is still active",
|
|
@@ -43,6 +44,7 @@
|
|
|
43
44
|
"product-variant-options-combination-already-exists": "A ProductVariant with the selected options already exists: {variantName}",
|
|
44
45
|
"promotion-channels-can-only-be-changed-from-default-channel": "Promotions channels may only be changed from the Default Channel",
|
|
45
46
|
"stockonhand-cannot-be-negative": "stockOnHand cannot be a negative value",
|
|
47
|
+
"superadmin-must-have-superadmin-role": "Cannot remove the SuperAdmin role from the sole SuperAdmin",
|
|
46
48
|
"unauthorized": "The credentials did not match. Please check and try again"
|
|
47
49
|
},
|
|
48
50
|
"errorResult": {
|
|
@@ -115,4 +115,4 @@
|
|
|
115
115
|
"zone-used-in-channels": "A região seleccionada não pode ser eliminada porque é utilizada como padrão nos seguintes canais: {channelCodes}",
|
|
116
116
|
"zone-used-in-tax-rates": "A região seleccionada não pode ser eliminada, porque é utilizada nos seguintes impostos: {taxRateNames}"
|
|
117
117
|
}
|
|
118
|
-
}
|
|
118
|
+
}
|
|
@@ -48,7 +48,7 @@ class SubscribableJob extends job_1.Job {
|
|
|
48
48
|
// tslint:disable-next-line:no-non-null-assertion
|
|
49
49
|
return rxjs_1.interval(pollInterval).pipe(operators_1.tap(i => {
|
|
50
50
|
if (timeoutMs < i * pollInterval) {
|
|
51
|
-
throw new Error(`Job ${this.id} update polling timed out after ${timeoutMs}ms. The job may still be running.`);
|
|
51
|
+
throw new Error(`Job ${this.id} SubscribableJob update polling timed out after ${timeoutMs}ms. The job may still be running.`);
|
|
52
52
|
}
|
|
53
53
|
}), operators_1.switchMap(() => {
|
|
54
54
|
const id = this.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,mDAAmD,SAAS,mCAAmC,CAChH,CAAC;iBACL;YACL,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACX,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,EAAE;oBACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBAC1E;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,kBAAM,CAAC,iCAAkB,CAAC,EAC1B,gCAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,CAAC,EAC3D,qBAAS,CACL,GAAG,CAAC,EAAE,CACF,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,MAAM;gBAC9B,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS;gBAChC,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EACpC,IAAI,CACP,EACD,eAAG,CAAC,GAAG,CAAC,EAAE;gBACN,IAAI,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,MAAM,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACL,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChF,CAAC;SACL;IACL,CAAC;CACJ;AAjED,0CAiEC"}
|
|
@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
|
|
|
17
17
|
const rxjs_1 = require("rxjs");
|
|
18
18
|
const config_service_1 = require("../../../config/config.service");
|
|
19
19
|
const inspectable_job_queue_strategy_1 = require("../../../config/job-queue/inspectable-job-queue-strategy");
|
|
20
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
20
21
|
const job_queue_service_1 = require("../../../job-queue/job-queue.service");
|
|
21
22
|
const subscribable_job_1 = require("../../../job-queue/subscribable-job");
|
|
22
23
|
const constants_1 = require("../constants");
|
|
@@ -52,7 +53,11 @@ let SearchJobBufferService = class SearchJobBufferService {
|
|
|
52
53
|
const collectionFilterJobs = await this.jobQueueService.flush(this.collectionJobBuffer);
|
|
53
54
|
if (collectionFilterJobs.length && inspectable_job_queue_strategy_1.isInspectableJobQueueStrategy(jobQueueStrategy)) {
|
|
54
55
|
const subscribableCollectionJobs = collectionFilterJobs.map(job => new subscribable_job_1.SubscribableJob(job, jobQueueStrategy));
|
|
55
|
-
await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs:
|
|
56
|
+
await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs: 15 * 60 * 1000 })))
|
|
57
|
+
.toPromise()
|
|
58
|
+
.catch(err => {
|
|
59
|
+
vendure_logger_1.Logger.error(err.message);
|
|
60
|
+
});
|
|
56
61
|
}
|
|
57
62
|
await this.jobQueueService.flush(this.searchIndexJobBuffer);
|
|
58
63
|
}
|
package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,0EAA+D;AAC/D,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAC/D,CACJ;iBACI,SAAS,EAAE;iBACX,KAAK,CAAC,GAAG,CAAC,EAAE;gBACT,uBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;SACV;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AArDY,sBAAsB;IADlC,mBAAU,EAAE;IAQJ,WAAA,eAAM,CAAC,uCAA2B,CAAC,CAAA;qCAFX,mCAAe;QACjB,8BAAa;GAN/B,sBAAsB,CAqDlC;AArDY,wDAAsB"}
|
|
@@ -109,18 +109,18 @@ class MysqlSearchStrategy {
|
|
|
109
109
|
.select('si_inner.productId', 'inner_productId')
|
|
110
110
|
.addSelect('si_inner.productVariantId', 'inner_productVariantId')
|
|
111
111
|
.addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
|
|
112
|
-
.addSelect(`(SELECT sku_score) +
|
|
113
|
-
MATCH (productName) AGAINST (:term) * 2 +
|
|
114
|
-
MATCH (productVariantName) AGAINST (:term) * 1.5 +
|
|
115
|
-
MATCH (description) AGAINST (:term)* 1`, 'score')
|
|
112
|
+
.addSelect(`(SELECT sku_score) +
|
|
113
|
+
MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
114
|
+
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
115
|
+
MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
|
|
116
116
|
.where(new typeorm_1.Brackets(qb1 => {
|
|
117
117
|
qb1.where('sku LIKE :like_term')
|
|
118
|
-
.orWhere('MATCH (productName) AGAINST (:term)')
|
|
119
|
-
.orWhere('MATCH (productVariantName) AGAINST (:term)')
|
|
120
|
-
.orWhere('MATCH (description) AGAINST (:term)');
|
|
118
|
+
.orWhere('MATCH (productName) AGAINST (:term IN BOOLEAN MODE)')
|
|
119
|
+
.orWhere('MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE)')
|
|
120
|
+
.orWhere('MATCH (description) AGAINST (:term IN BOOLEAN MODE)');
|
|
121
121
|
}))
|
|
122
122
|
.andWhere('channelId = :channelId')
|
|
123
|
-
.setParameters({ term
|
|
123
|
+
.setParameters({ term: `${term}*`, like_term: `%${term}%`, channelId: ctx.channelId });
|
|
124
124
|
qb.innerJoin(`(${termScoreQuery.getQuery()})`, 'term_result', 'inner_productId = si.productId')
|
|
125
125
|
.addSelect(input.groupByProduct ? 'MAX(term_result.score)' : 'term_result.score', 'score')
|
|
126
126
|
.andWhere('term_result.inner_productVariantId = si.productVariantId')
|
|
@@ -140,7 +140,7 @@ class MysqlSearchStrategy {
|
|
|
140
140
|
if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
|
|
141
141
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
142
142
|
for (const id of facetValueIds) {
|
|
143
|
-
const placeholder =
|
|
143
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
144
144
|
const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
|
|
145
145
|
const params = { [placeholder]: id };
|
|
146
146
|
if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
|
|
@@ -161,14 +161,14 @@ class MysqlSearchStrategy {
|
|
|
161
161
|
throw new errors_1.UserInputError('error.facetfilterinput-invalid-input');
|
|
162
162
|
}
|
|
163
163
|
if (facetValueFilter.and) {
|
|
164
|
-
const placeholder =
|
|
164
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
|
|
165
165
|
const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
|
|
166
166
|
const params = { [placeholder]: facetValueFilter.and };
|
|
167
167
|
qb2.where(clause, params);
|
|
168
168
|
}
|
|
169
169
|
if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
|
|
170
170
|
for (const id of facetValueFilter.or) {
|
|
171
|
-
const placeholder =
|
|
171
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
172
172
|
const clause = `FIND_IN_SET(:${placeholder}, facetValueIds)`;
|
|
173
173
|
const params = { [placeholder]: id };
|
|
174
174
|
qb2.orWhere(clause, params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAGvD,yDAA8D;AAE9D,mFAAuE;AAIvE,qEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,15 +106,21 @@ class PostgresSearchStrategy {
|
|
|
106
106
|
applyTermAndFilters(ctx, qb, input, forceGroup = false) {
|
|
107
107
|
const { term, facetValueFilters, facetValueIds, facetValueOperator, collectionId, collectionSlug } = input;
|
|
108
108
|
// join multiple words with the logical AND operator
|
|
109
|
-
const termLogicalAnd = term
|
|
109
|
+
const termLogicalAnd = term
|
|
110
|
+
? term
|
|
111
|
+
.trim()
|
|
112
|
+
.split(/\s+/g)
|
|
113
|
+
.map(t => `${t}:*`)
|
|
114
|
+
.join(' & ')
|
|
115
|
+
: '';
|
|
110
116
|
qb.where('1 = 1');
|
|
111
117
|
if (term && term.length > this.minTermLength) {
|
|
112
118
|
const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
|
|
113
|
-
qb.addSelect(`
|
|
114
|
-
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
115
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
116
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
117
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
119
|
+
qb.addSelect(`
|
|
120
|
+
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
121
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
122
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
123
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
118
124
|
`, 'score')
|
|
119
125
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
120
126
|
qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')
|
|
@@ -135,7 +141,7 @@ class PostgresSearchStrategy {
|
|
|
135
141
|
if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
|
|
136
142
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
137
143
|
for (const id of facetValueIds) {
|
|
138
|
-
const placeholder =
|
|
144
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
139
145
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
140
146
|
const params = { [placeholder]: id };
|
|
141
147
|
if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
|
|
@@ -156,14 +162,14 @@ class PostgresSearchStrategy {
|
|
|
156
162
|
throw new errors_1.UserInputError('error.facetfilterinput-invalid-input');
|
|
157
163
|
}
|
|
158
164
|
if (facetValueFilter.and) {
|
|
159
|
-
const placeholder =
|
|
165
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
|
|
160
166
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
161
167
|
const params = { [placeholder]: facetValueFilter.and };
|
|
162
168
|
qb2.where(clause, params);
|
|
163
169
|
}
|
|
164
170
|
if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
|
|
165
171
|
for (const id of facetValueFilter.or) {
|
|
166
|
-
const placeholder =
|
|
172
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
167
173
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
168
174
|
const params = { [placeholder]: id };
|
|
169
175
|
qb2.orWhere(clause, params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAGvD,yDAA8D;AAE9D,mFAAuE;AAIvE,qEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
|
|
3
|
+
exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
|
|
4
4
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
5
5
|
/**
|
|
6
6
|
* Maps a raw database result to a SearchResult.
|
|
@@ -96,4 +96,8 @@ function parseFocalPoint(focalPoint) {
|
|
|
96
96
|
}
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
|
+
function createPlaceholderFromId(id) {
|
|
100
|
+
return '_' + id.toString().replace(/-/g, '_');
|
|
101
|
+
}
|
|
102
|
+
exports.createPlaceholderFromId = createPlaceholderFromId;
|
|
99
103
|
//# sourceMappingURL=search-strategy-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,10 +99,10 @@ class SqliteSearchStrategy {
|
|
|
99
99
|
if (term && term.length > this.minTermLength) {
|
|
100
100
|
// Note: SQLite does not natively have fulltext search capabilities,
|
|
101
101
|
// so we just use a weighted LIKE match
|
|
102
|
-
qb.addSelect(`
|
|
103
|
-
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
104
|
-
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
105
|
-
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
102
|
+
qb.addSelect(`
|
|
103
|
+
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
104
|
+
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
105
|
+
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
106
106
|
CASE WHEN description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
107
107
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
108
108
|
qb1.where('sku LIKE :like_term')
|
|
@@ -123,7 +123,7 @@ class SqliteSearchStrategy {
|
|
|
123
123
|
if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
|
|
124
124
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
125
125
|
for (const id of facetValueIds) {
|
|
126
|
-
const placeholder =
|
|
126
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
127
127
|
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
128
128
|
const params = { [placeholder]: `%,${id},%` };
|
|
129
129
|
if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
|
|
@@ -144,14 +144,14 @@ class SqliteSearchStrategy {
|
|
|
144
144
|
throw new errors_1.UserInputError('error.facetfilterinput-invalid-input');
|
|
145
145
|
}
|
|
146
146
|
if (facetValueFilter.and) {
|
|
147
|
-
const placeholder =
|
|
147
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
|
|
148
148
|
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
149
149
|
const params = { [placeholder]: `%,${facetValueFilter.and},%` };
|
|
150
150
|
qb2.where(clause, params);
|
|
151
151
|
}
|
|
152
152
|
if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
|
|
153
153
|
for (const id of facetValueFilter.or) {
|
|
154
|
-
const placeholder =
|
|
154
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
155
155
|
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
156
156
|
const params = { [placeholder]: `%,${id},%` };
|
|
157
157
|
qb2.orWhere(clause, params);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAGvD,yDAA8D;AAE9D,mFAAuE;AAIvE,
|
|
1
|
+
{"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ import { HydrateOptions } from './entity-hydrator-types';
|
|
|
11
11
|
*
|
|
12
12
|
* @example
|
|
13
13
|
* ```TypeScript
|
|
14
|
-
* const product = this.productVariantService
|
|
14
|
+
* const product = await this.productVariantService
|
|
15
15
|
* .getProductForVariant(ctx, variantId);
|
|
16
16
|
*
|
|
17
17
|
* await this.entityHydrator
|
|
@@ -26,6 +26,17 @@ import { HydrateOptions } from './entity-hydrator-types';
|
|
|
26
26
|
* options is used (see {@link HydrateOptions}), any related ProductVariant will have the correct
|
|
27
27
|
* Channel-specific prices applied to them.
|
|
28
28
|
*
|
|
29
|
+
* Custom field relations may also be hydrated:
|
|
30
|
+
*
|
|
31
|
+
* @example
|
|
32
|
+
* ```TypeScript
|
|
33
|
+
* const customer = await this.customerService
|
|
34
|
+
* .findOne(ctx, id);
|
|
35
|
+
*
|
|
36
|
+
* await this.entityHydrator
|
|
37
|
+
* .hydrate(ctx, customer, { relations: ['customFields.avatar' ]});
|
|
38
|
+
* ```
|
|
39
|
+
*
|
|
29
40
|
* @docsCategory data-access
|
|
30
41
|
* @since 1.3.0
|
|
31
42
|
*/
|
|
@@ -26,7 +26,7 @@ const translate_entity_1 = require("../utils/translate-entity");
|
|
|
26
26
|
*
|
|
27
27
|
* @example
|
|
28
28
|
* ```TypeScript
|
|
29
|
-
* const product = this.productVariantService
|
|
29
|
+
* const product = await this.productVariantService
|
|
30
30
|
* .getProductForVariant(ctx, variantId);
|
|
31
31
|
*
|
|
32
32
|
* await this.entityHydrator
|
|
@@ -41,6 +41,17 @@ const translate_entity_1 = require("../utils/translate-entity");
|
|
|
41
41
|
* options is used (see {@link HydrateOptions}), any related ProductVariant will have the correct
|
|
42
42
|
* Channel-specific prices applied to them.
|
|
43
43
|
*
|
|
44
|
+
* Custom field relations may also be hydrated:
|
|
45
|
+
*
|
|
46
|
+
* @example
|
|
47
|
+
* ```TypeScript
|
|
48
|
+
* const customer = await this.customerService
|
|
49
|
+
* .findOne(ctx, id);
|
|
50
|
+
*
|
|
51
|
+
* await this.entityHydrator
|
|
52
|
+
* .hydrate(ctx, customer, { relations: ['customFields.avatar' ]});
|
|
53
|
+
* ```
|
|
54
|
+
*
|
|
44
55
|
* @docsCategory data-access
|
|
45
56
|
* @since 1.3.0
|
|
46
57
|
*/
|
|
@@ -134,7 +145,7 @@ let EntityHydrator = class EntityHydrator {
|
|
|
134
145
|
const missingRelations = [];
|
|
135
146
|
for (const relation of options.relations.slice().sort()) {
|
|
136
147
|
if (typeof relation === 'string') {
|
|
137
|
-
const parts = relation.split('.');
|
|
148
|
+
const parts = !relation.startsWith('customFields') ? relation.split('.') : [relation];
|
|
138
149
|
let entity = target;
|
|
139
150
|
const path = [];
|
|
140
151
|
for (const part of parts) {
|
|
@@ -179,7 +190,10 @@ let EntityHydrator = class EntityHydrator {
|
|
|
179
190
|
const part = path[i];
|
|
180
191
|
const isLast = i === path.length - 1;
|
|
181
192
|
if (relation[part]) {
|
|
182
|
-
relation =
|
|
193
|
+
relation =
|
|
194
|
+
Array.isArray(relation[part]) && relation[part].length && !isLast
|
|
195
|
+
? relation[part][0]
|
|
196
|
+
: relation[part];
|
|
183
197
|
}
|
|
184
198
|
else {
|
|
185
199
|
return;
|