@vendure/core 1.7.2 → 1.7.3
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/entity/order/order.entity.js +5 -3
- package/dist/entity/order/order.entity.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +4 -4
- 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 +5 -5
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +4 -4
- package/package.json +3 -3
|
@@ -43,9 +43,10 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
|
|
|
43
43
|
super(input);
|
|
44
44
|
}
|
|
45
45
|
get discounts() {
|
|
46
|
+
var _a, _b;
|
|
46
47
|
this.throwIfLinesNotJoined('discounts');
|
|
47
48
|
const groupedAdjustments = new Map();
|
|
48
|
-
for (const line of this.lines) {
|
|
49
|
+
for (const line of (_a = this.lines) !== null && _a !== void 0 ? _a : []) {
|
|
49
50
|
for (const discount of line.discounts) {
|
|
50
51
|
const adjustment = groupedAdjustments.get(discount.adjustmentSource);
|
|
51
52
|
if (adjustment) {
|
|
@@ -57,7 +58,7 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
|
|
|
57
58
|
}
|
|
58
59
|
}
|
|
59
60
|
}
|
|
60
|
-
for (const shippingLine of this.shippingLines) {
|
|
61
|
+
for (const shippingLine of (_b = this.shippingLines) !== null && _b !== void 0 ? _b : []) {
|
|
61
62
|
for (const discount of shippingLine.discounts) {
|
|
62
63
|
const adjustment = groupedAdjustments.get(discount.adjustmentSource);
|
|
63
64
|
if (adjustment) {
|
|
@@ -94,10 +95,11 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
|
|
|
94
95
|
* A summary of the taxes being applied to this Order.
|
|
95
96
|
*/
|
|
96
97
|
get taxSummary() {
|
|
98
|
+
var _a, _b;
|
|
97
99
|
this.throwIfLinesNotJoined('taxSummary');
|
|
98
100
|
const taxRateMap = new Map();
|
|
99
101
|
const taxId = (taxLine) => `${taxLine.description}:${taxLine.taxRate}`;
|
|
100
|
-
const taxableLines = [...this.lines, ...this.shippingLines];
|
|
102
|
+
const taxableLines = [...((_a = this.lines) !== null && _a !== void 0 ? _a : []), ...((_b = this.shippingLines) !== null && _b !== void 0 ? _b : [])];
|
|
101
103
|
for (const line of taxableLines) {
|
|
102
104
|
const taxRateTotal = shared_utils_1.summate(line.taxLines, 'taxRate');
|
|
103
105
|
for (const taxLine of line.taxLines) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yEAO6C;AAE7C,mEAA2D;AAC3D,qCAAsF;AAEtF,4EAA+D;AAC/D,sDAAgE;AAIhE,qDAAoD;AACpD,8DAAoD;AACpD,kEAA4D;AAC5D,iEAAuD;AACvD,gEAAkD;AAElD,uEAA4D;AAC5D,+FAAoF;AACpF,8DAAoD;AACpD,oEAA0D;AAC1D,gFAAqE;AACrE,oEAA0D;AAE1D;;;;;;;;;;GAUG;AAEH,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,2BAAa;IACpC,YAAY,KAA0B;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAyHD,IAAI,SAAS
|
|
1
|
+
{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ class MysqlSearchStrategy {
|
|
|
28
28
|
.addSelect('GROUP_CONCAT(si.facetValueIds)', 'facetValues');
|
|
29
29
|
this.applyTermAndFilters(ctx, facetValuesQb, Object.assign(Object.assign({}, input), { groupByProduct: true }));
|
|
30
30
|
if (!input.groupByProduct) {
|
|
31
|
-
facetValuesQb.groupBy('productVariantId');
|
|
31
|
+
facetValuesQb.groupBy('si.productVariantId');
|
|
32
32
|
}
|
|
33
33
|
if (enabledOnly) {
|
|
34
34
|
facetValuesQb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
@@ -114,9 +114,9 @@ class MysqlSearchStrategy {
|
|
|
114
114
|
.select('si_inner.productId', 'inner_productId')
|
|
115
115
|
.addSelect('si_inner.productVariantId', 'inner_productVariantId')
|
|
116
116
|
.addSelect(`IF (si_inner.sku LIKE :like_term, 10, 0)`, 'sku_score')
|
|
117
|
-
.addSelect(`(SELECT sku_score) +
|
|
118
|
-
MATCH (si_inner.productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
119
|
-
MATCH (si_inner.productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
117
|
+
.addSelect(`(SELECT sku_score) +
|
|
118
|
+
MATCH (si_inner.productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
119
|
+
MATCH (si_inner.productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
120
120
|
MATCH (si_inner.description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
|
|
121
121
|
.where(new typeorm_1.Brackets(qb1 => {
|
|
122
122
|
qb1.where('si_inner.sku LIKE :like_term')
|
|
@@ -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;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACqB,kBAAa,GAAG,CAAC,CAAC;IAkQvC,CAAC;IA9PG,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,kCAAO,KAAK,KAAE,cAAc,EAAE,IAAI,IAAG,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,
|
|
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;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACqB,kBAAa,GAAG,CAAC,CAAC;IAkQvC,CAAC;IA9PG,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,kCAAO,KAAK,KAAE,cAAc,EAAE,IAAI,IAAG,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,6CAAqB,CAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,kDAA0B,CAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACpC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACtC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC;iBACpD,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7F;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAClF;SACJ;aAAM;YACH,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;gBACtD,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;aAC/B;SACJ;QACD,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,EAAE;aACJ,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC;aACZ,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,yCAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnF,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,KAAkB,EAAE,WAAoB;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CACpC,GAAG,EACH,IAAI,CAAC,UAAU;aACV,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,EAC3D,KAAK,CACR,CAAC;QACF,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAChE;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aAC7C,kBAAkB,EAAE;aACpB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC;aACxC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5C,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEO,mBAAmB,CACvB,GAAmB,EACnB,EAAuC,EACvC,KAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,GAC9F,KAAK,CAAC;QAEV,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU;iBACjC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;iBACnC,kBAAkB,CAAC,UAAU,CAAC;iBAC9B,MAAM,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;iBAC/C,SAAS,CAAC,2BAA2B,EAAE,wBAAwB,CAAC;iBAChE,SAAS,CAAC,0CAA0C,EAAE,WAAW,CAAC;iBAClE,SAAS,CACN;;;sFAGkE,EAClE,OAAO,CACV;iBACA,KAAK,CACF,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC;qBACpC,OAAO,CAAC,8DAA8D,CAAC;qBACvE,OAAO,CAAC,qEAAqE,CAAC;qBAC9E,OAAO,CAAC,8DAA8D,CAAC,CAAC;YACjF,CAAC,CAAC,CACL;iBACA,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,aAAa,CAAC;gBACX,IAAI,EAAE,GAAG,QAAQ,GAAG;gBACpB,SAAS,EAAE,IAAI,QAAQ,GAAG;gBAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;aAC3B,CAAC,CAAC;YAEP,EAAE,CAAC,SAAS,CAAC,IAAI,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,gCAAgC,CAAC;iBAC1F,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC;iBACzF,QAAQ,CAAC,0DAA0D,CAAC;iBACpE,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC;SACtD;aAAM;YACH,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SAC9B;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;YACvB,IAAI,KAAK,CAAC,cAAc,EAAE;gBACtB,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACH,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACpE;SACJ;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;YACvB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;oBAC5B,MAAM,WAAW,GAAG,+CAAuB,CAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;oBAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;oBACrC,IAAI,kBAAkB,KAAK,iCAAe,CAAC,GAAG,EAAE;wBAC5C,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAChC;yBAAM;wBACH,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;YAC3B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;oBAC9C,GAAG,CAAC,QAAQ,CACR,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;;wBACf,IAAI,gBAAgB,CAAC,GAAG,KAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,CAAA,EAAE;4BACrD,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;yBACpE;wBACD,IAAI,gBAAgB,CAAC,GAAG,EAAE;4BACtB,MAAM,WAAW,GAAG,+CAAuB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;4BAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;4BACvD,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;yBAC7B;wBACD,IAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,EAAE;4BAC7B,KAAK,MAAM,EAAE,IAAI,gBAAgB,CAAC,EAAE,EAAE;gCAClC,MAAM,WAAW,GAAG,+CAAuB,CAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;gCAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;6BAC/B;yBACJ;oBACL,CAAC,CAAC,CACL,CAAC;iBACL;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;SAClF;QACD,IAAI,cAAc,EAAE;YAChB,EAAE,CAAC,QAAQ,CAAC,mDAAmD,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;SACxF;QAED,gDAAwB,CAAC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAChF,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvE,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;SACxD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,cAAuB;QAC7C,OAAO,0CAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;aAClD,GAAG,CAAC,GAAG,CAAC,EAAE;YACP,MAAM,aAAa,GAAG,MAAM,GAAG,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;YAC1B,IAAI,cAAc,IAAI,GAAG,KAAK,WAAW,EAAE;gBACvC,IACI,GAAG,KAAK,UAAU;oBAClB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,YAAY,EACtB;oBACE,OAAO,gBAAgB,aAAa,SAAS,KAAK,GAAG,CAAC;iBACzD;qBAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,gBAAgB,EAAE;oBAC3E,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;qBAAM;oBACH,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;aACJ;iBAAM;gBACH,OAAO,GAAG,aAAa,QAAQ,KAAK,GAAG,CAAC;aAC3C;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACJ;AAnQD,kDAmQC"}
|
|
@@ -120,11 +120,11 @@ class PostgresSearchStrategy {
|
|
|
120
120
|
qb.where('1 = 1');
|
|
121
121
|
if (term && term.length > this.minTermLength) {
|
|
122
122
|
const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
|
|
123
|
-
qb.addSelect(`
|
|
124
|
-
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
123
|
+
qb.addSelect(`
|
|
124
|
+
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
128
128
|
`, 'score')
|
|
129
129
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
130
130
|
qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')
|
|
@@ -103,10 +103,10 @@ class SqliteSearchStrategy {
|
|
|
103
103
|
if (term && term.length > this.minTermLength) {
|
|
104
104
|
// Note: SQLite does not natively have fulltext search capabilities,
|
|
105
105
|
// so we just use a weighted LIKE match
|
|
106
|
-
qb.addSelect(`
|
|
107
|
-
CASE WHEN si.sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
-
CASE WHEN si.productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
-
CASE WHEN si.productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
106
|
+
qb.addSelect(`
|
|
107
|
+
CASE WHEN si.sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
+
CASE WHEN si.productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
+
CASE WHEN si.productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
110
110
|
CASE WHEN si.description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
111
111
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
112
112
|
qb1.where('si.sku LIKE :like_term')
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.3",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@nestjs/testing": "7.6.17",
|
|
50
50
|
"@nestjs/typeorm": "7.1.5",
|
|
51
51
|
"@types/fs-extra": "^9.0.1",
|
|
52
|
-
"@vendure/common": "^1.7.
|
|
52
|
+
"@vendure/common": "^1.7.3",
|
|
53
53
|
"apollo-server-express": "2.24.1",
|
|
54
54
|
"bcrypt": "^5.0.0",
|
|
55
55
|
"body-parser": "^1.19.0",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"sqlite3": "^5.0.0",
|
|
102
102
|
"typescript": "4.3.5"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "34625625da351222ea0a7f45424185321f9cd1f9"
|
|
105
105
|
}
|