@vendure/core 1.4.4 → 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/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/common/types/entity-relation-paths.d.ts +1 -1
- 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/entity/register-custom-entity-fields.js +4 -1
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +6 -6
- 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 +8 -8
- 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/package.json +3 -3
|
@@ -4,7 +4,7 @@ import { I18nError } from '../../i18n/i18n-error';
|
|
|
4
4
|
* Logs thrown I18nErrors via the configured VendureLogger.
|
|
5
5
|
*/
|
|
6
6
|
export declare class ExceptionLoggerFilter implements ExceptionFilter {
|
|
7
|
-
catch(exception: Error | HttpException | I18nError, host: ArgumentsHost):
|
|
7
|
+
catch(exception: Error | HttpException | I18nError, host: ArgumentsHost): I18nError | undefined;
|
|
8
8
|
/**
|
|
9
9
|
* For a given I18nError.code, returns a corresponding HTTP
|
|
10
10
|
* status code.
|
|
@@ -35,17 +35,23 @@ class ExceptionLoggerFilter {
|
|
|
35
35
|
config_1.Logger.verbose(message);
|
|
36
36
|
break;
|
|
37
37
|
}
|
|
38
|
+
if (exception.stack) {
|
|
39
|
+
config_1.Logger.debug(exception.stack);
|
|
40
|
+
}
|
|
41
|
+
if (isGraphQL) {
|
|
42
|
+
return exception;
|
|
43
|
+
}
|
|
38
44
|
}
|
|
39
45
|
else if (exception instanceof common_1.HttpException) {
|
|
40
46
|
// Handle other Nestjs errors
|
|
41
47
|
statusCode = exception.getStatus();
|
|
42
48
|
message = exception.message;
|
|
43
|
-
let stack = exception.stack;
|
|
44
49
|
if (statusCode === 404) {
|
|
45
|
-
|
|
46
|
-
|
|
50
|
+
config_1.Logger.verbose(exception.message);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
config_1.Logger.error(message, undefined, exception.stack);
|
|
47
54
|
}
|
|
48
|
-
config_1.Logger.error(message, undefined, stack);
|
|
49
55
|
}
|
|
50
56
|
else {
|
|
51
57
|
config_1.Logger.error(exception.message, undefined, exception.stack);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exception-logger.filter.js","sourceRoot":"","sources":["../../../src/api/middleware/exception-logger.filter.ts"],"names":[],"mappings":";;;AAAA,2CAA+E;AAE/E,yCAAgD;AAChD,4DAAkE;AAClE,sDAAkD;AAClD,2DAAuD;AAEvD;;GAEG;AACH,MAAa,qBAAqB;IAC9B,KAAK,CAAC,SAA4C,EAAE,IAAmB;QACnE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,4BAAY,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,UAAU,GAAG,GAAG,CAAC;QACrB,IAAI,SAAS,YAAY,sBAAS,EAAE;YAChC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;YACnD,OAAO,GAAG,GAAG,IAAI,IAAI,OAAO,KAAK,GAAG,EAAE,CAAC;YACvC,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAE9C,QAAQ,QAAQ,EAAE;gBACd,KAAK,iBAAQ,CAAC,KAAK;oBACf,eAAM,CAAC,KAAK,CACR,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EACpE,SAAS,EACT,SAAS,CAAC,KAAK,CAClB,CAAC;oBACF,MAAM;gBACV,KAAK,iBAAQ,CAAC,IAAI;oBACd,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACrB,MAAM;gBACV,KAAK,iBAAQ,CAAC,IAAI;oBACd,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACrB,MAAM;gBACV,KAAK,iBAAQ,CAAC,KAAK;oBACf,eAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;oBACtB,MAAM;gBACV,KAAK,iBAAQ,CAAC,OAAO;oBACjB,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;oBACxB,MAAM;aACb;SACJ;aAAM,IAAI,SAAS,YAAY,sBAAa,EAAE;YAC3C,6BAA6B;YAC7B,UAAU,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;YACnC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;YAC5B,IAAI,
|
|
1
|
+
{"version":3,"file":"exception-logger.filter.js","sourceRoot":"","sources":["../../../src/api/middleware/exception-logger.filter.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ import { VendureEntity } from '../../entity/base/base.entity';
|
|
|
21
21
|
*/
|
|
22
22
|
export declare type EntityRelationPaths<T extends VendureEntity> = `customFields.${string}` | PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
|
|
23
23
|
export declare type EntityRelationKeys<T extends VendureEntity> = {
|
|
24
|
-
[K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity ? K : Required<T>[K] extends VendureEntity[] ? K : never;
|
|
24
|
+
[K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity | null ? K : Required<T>[K] extends VendureEntity[] ? K : never;
|
|
25
25
|
}[Extract<keyof T, string>];
|
|
26
26
|
export declare type EntityRelations<T extends VendureEntity> = {
|
|
27
27
|
[K in EntityRelationKeys<T>]: T[K];
|
|
@@ -3,15 +3,18 @@ import { EntityIdStrategy } from './entity-id-strategy';
|
|
|
3
3
|
* @description
|
|
4
4
|
* An id strategy which uses string uuids as primary keys
|
|
5
5
|
* for all entities. This strategy can be configured with the
|
|
6
|
-
* `entityIdStrategy` property of the
|
|
6
|
+
* `entityIdStrategy` property of the `entityOptions` property
|
|
7
|
+
* of {@link VendureConfig}.
|
|
7
8
|
*
|
|
8
9
|
* @example
|
|
9
10
|
* ```TypeScript
|
|
10
11
|
* import { UuidIdStrategy, VendureConfig } from '\@vendure/core';
|
|
11
12
|
*
|
|
12
13
|
* export const config: VendureConfig = {
|
|
13
|
-
*
|
|
14
|
-
*
|
|
14
|
+
* entityOptions: {
|
|
15
|
+
* entityIdStrategy: new UuidIdStrategy(),
|
|
16
|
+
* // ...
|
|
17
|
+
* }
|
|
15
18
|
* }
|
|
16
19
|
* ```
|
|
17
20
|
*
|
|
@@ -5,15 +5,18 @@ exports.UuidIdStrategy = void 0;
|
|
|
5
5
|
* @description
|
|
6
6
|
* An id strategy which uses string uuids as primary keys
|
|
7
7
|
* for all entities. This strategy can be configured with the
|
|
8
|
-
* `entityIdStrategy` property of the
|
|
8
|
+
* `entityIdStrategy` property of the `entityOptions` property
|
|
9
|
+
* of {@link VendureConfig}.
|
|
9
10
|
*
|
|
10
11
|
* @example
|
|
11
12
|
* ```TypeScript
|
|
12
13
|
* import { UuidIdStrategy, VendureConfig } from '\@vendure/core';
|
|
13
14
|
*
|
|
14
15
|
* export const config: VendureConfig = {
|
|
15
|
-
*
|
|
16
|
-
*
|
|
16
|
+
* entityOptions: {
|
|
17
|
+
* entityIdStrategy: new UuidIdStrategy(),
|
|
18
|
+
* // ...
|
|
19
|
+
* }
|
|
17
20
|
* }
|
|
18
21
|
* ```
|
|
19
22
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uuid-id-strategy.js","sourceRoot":"","sources":["../../../src/config/entity-id-strategy/uuid-id-strategy.ts"],"names":[],"mappings":";;;AAEA
|
|
1
|
+
{"version":3,"file":"uuid-id-strategy.js","sourceRoot":"","sources":["../../../src/config/entity-id-strategy/uuid-id-strategy.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,cAAc;IAA3B;QACa,mBAAc,GAAG,MAAM,CAAC;IAOrC,CAAC;IANG,QAAQ,CAAC,EAAU;QACf,OAAO,EAAE,CAAC;IACd,CAAC;IACD,QAAQ,CAAC,UAAkB;QACvB,OAAO,UAAU,CAAC;IACtB,CAAC;CACJ;AARD,wCAQC"}
|
|
@@ -8,12 +8,31 @@ import { LoggerService } from '@nestjs/common';
|
|
|
8
8
|
export declare enum LogLevel {
|
|
9
9
|
/**
|
|
10
10
|
* @description
|
|
11
|
-
* Log Errors only.
|
|
11
|
+
* Log Errors only. These are usually indicative of some potentially
|
|
12
|
+
* serious issue, so should be acted upon.
|
|
12
13
|
*/
|
|
13
14
|
Error = 0,
|
|
15
|
+
/**
|
|
16
|
+
* @description
|
|
17
|
+
* Warnings indicate that some situation may require investigation
|
|
18
|
+
* and handling. But not as serious as an Error.
|
|
19
|
+
*/
|
|
14
20
|
Warn = 1,
|
|
21
|
+
/**
|
|
22
|
+
* @description
|
|
23
|
+
* Logs general information such as startup messages.
|
|
24
|
+
*/
|
|
15
25
|
Info = 2,
|
|
26
|
+
/**
|
|
27
|
+
* @description
|
|
28
|
+
* Logs additional information
|
|
29
|
+
*/
|
|
16
30
|
Verbose = 3,
|
|
31
|
+
/**
|
|
32
|
+
* @description
|
|
33
|
+
* Logs detailed info useful in debug scenarios, including stack traces for
|
|
34
|
+
* all errors. In production this would probably generate too much noise.
|
|
35
|
+
*/
|
|
17
36
|
Debug = 4
|
|
18
37
|
}
|
|
19
38
|
/**
|
|
@@ -11,20 +11,49 @@ var LogLevel;
|
|
|
11
11
|
(function (LogLevel) {
|
|
12
12
|
/**
|
|
13
13
|
* @description
|
|
14
|
-
* Log Errors only.
|
|
14
|
+
* Log Errors only. These are usually indicative of some potentially
|
|
15
|
+
* serious issue, so should be acted upon.
|
|
15
16
|
*/
|
|
16
17
|
LogLevel[LogLevel["Error"] = 0] = "Error";
|
|
18
|
+
/**
|
|
19
|
+
* @description
|
|
20
|
+
* Warnings indicate that some situation may require investigation
|
|
21
|
+
* and handling. But not as serious as an Error.
|
|
22
|
+
*/
|
|
17
23
|
LogLevel[LogLevel["Warn"] = 1] = "Warn";
|
|
24
|
+
/**
|
|
25
|
+
* @description
|
|
26
|
+
* Logs general information such as startup messages.
|
|
27
|
+
*/
|
|
18
28
|
LogLevel[LogLevel["Info"] = 2] = "Info";
|
|
29
|
+
/**
|
|
30
|
+
* @description
|
|
31
|
+
* Logs additional information
|
|
32
|
+
*/
|
|
19
33
|
LogLevel[LogLevel["Verbose"] = 3] = "Verbose";
|
|
34
|
+
/**
|
|
35
|
+
* @description
|
|
36
|
+
* Logs detailed info useful in debug scenarios, including stack traces for
|
|
37
|
+
* all errors. In production this would probably generate too much noise.
|
|
38
|
+
*/
|
|
20
39
|
LogLevel[LogLevel["Debug"] = 4] = "Debug";
|
|
21
40
|
})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
|
|
22
41
|
const noopLogger = {
|
|
23
|
-
error() {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
42
|
+
error() {
|
|
43
|
+
/* */
|
|
44
|
+
},
|
|
45
|
+
warn() {
|
|
46
|
+
/* */
|
|
47
|
+
},
|
|
48
|
+
info() {
|
|
49
|
+
/* */
|
|
50
|
+
},
|
|
51
|
+
verbose() {
|
|
52
|
+
/* */
|
|
53
|
+
},
|
|
54
|
+
debug() {
|
|
55
|
+
/* */
|
|
56
|
+
},
|
|
28
57
|
};
|
|
29
58
|
/**
|
|
30
59
|
* @description
|
|
@@ -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"}
|
|
@@ -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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"}
|
|
@@ -109,9 +109,9 @@ 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 IN BOOLEAN MODE) * 2 +
|
|
114
|
-
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
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
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')
|
|
@@ -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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"}
|
|
@@ -116,11 +116,11 @@ class PostgresSearchStrategy {
|
|
|
116
116
|
qb.where('1 = 1');
|
|
117
117
|
if (term && term.length > this.minTermLength) {
|
|
118
118
|
const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
|
|
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)
|
|
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)
|
|
124
124
|
`, 'score')
|
|
125
125
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
126
126
|
qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')
|
|
@@ -141,7 +141,7 @@ class PostgresSearchStrategy {
|
|
|
141
141
|
if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
|
|
142
142
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
143
143
|
for (const id of facetValueIds) {
|
|
144
|
-
const placeholder =
|
|
144
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
145
145
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
146
146
|
const params = { [placeholder]: id };
|
|
147
147
|
if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
|
|
@@ -162,14 +162,14 @@ class PostgresSearchStrategy {
|
|
|
162
162
|
throw new errors_1.UserInputError('error.facetfilterinput-invalid-input');
|
|
163
163
|
}
|
|
164
164
|
if (facetValueFilter.and) {
|
|
165
|
-
const placeholder =
|
|
165
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
|
|
166
166
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
167
167
|
const params = { [placeholder]: facetValueFilter.and };
|
|
168
168
|
qb2.where(clause, params);
|
|
169
169
|
}
|
|
170
170
|
if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
|
|
171
171
|
for (const id of facetValueFilter.or) {
|
|
172
|
-
const placeholder =
|
|
172
|
+
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
173
173
|
const clause = `:${placeholder} = ANY (string_to_array(si.facetValueIds, ','))`;
|
|
174
174
|
const params = { [placeholder]: id };
|
|
175
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":";;;AASA,uDAAoD;AAEpD;;GAEG;AACH,SAAgB,iBAAiB,CAAC,GAAQ,EAAE,YAA0B;IAClE,MAAM,KAAK,GACP,GAAG,CAAC,QAAQ,KAAK,SAAS;QACtB,CAAC,CAAE,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,QAAQ,EAAiB;QAC1D,CAAC,CAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAkB,CAAC;IACnD,MAAM,YAAY,GACd,GAAG,CAAC,eAAe,KAAK,SAAS;QAC7B,CAAC,CAAE,EAAE,GAAG,EAAE,GAAG,CAAC,eAAe,EAAE,GAAG,EAAE,GAAG,CAAC,eAAe,EAAiB;QACxE,CAAC,CAAE,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAkB,CAAC;IAE1D,MAAM,YAAY,GAAkC,CAAC,GAAG,CAAC,iBAAiB;QACtE,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACI,EAAE,EAAE,GAAG,CAAC,iBAAiB;YACzB,OAAO,EAAE,GAAG,CAAC,iBAAiB;YAC9B,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,2BAA2B,CAAC;SAC/D,CAAC;IACR,MAAM,mBAAmB,GAAkC,CAAC,GAAG,CAAC,wBAAwB;QACpF,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACI,EAAE,EAAE,GAAG,CAAC,wBAAwB;YAChC,OAAO,EAAE,GAAG,CAAC,wBAAwB;YACrC,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,kCAAkC,CAAC;SACtE,CAAC;IAER,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;IAC3F,OAAO;QACH,GAAG,EAAE,GAAG,CAAC,MAAM;QACf,IAAI,EAAE,GAAG,CAAC,OAAO;QACjB,KAAK;QACL,OAAO;QACP,YAAY;QACZ,YAAY;QACZ,gBAAgB,EAAE,GAAG,CAAC,mBAAmB;QACzC,SAAS,EAAE,GAAG,CAAC,YAAY;QAC3B,WAAW,EAAE,GAAG,CAAC,cAAc;QAC/B,kBAAkB,EAAE,GAAG,CAAC,qBAAqB;QAC7C,WAAW,EAAE,GAAG,CAAC,cAAc;QAC/B,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACjE,aAAa,EAAE,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,aAAa,EAAE,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,UAAU,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,YAAY;QACZ,mBAAmB;QACnB,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,CAAC;QACrB,aAAa;QACb,OAAO,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACN,CAAC;AAhDD,8CAgDC;AAED;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,iBAAiD;IACnF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAc,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;QACjC,MAAM,aAAa,GAAS,eAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrF,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC5B;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAXD,sDAWC;AAED;;;GAGG;AACH,SAAgB,0BAA0B,CAAC,iBAAiD;IACxF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAc,CAAC;IACrC,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE;QACjC,MAAM,aAAa,GAAS,eAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QACrF,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;YAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;SAC5B;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAXD,gEAWC;AAED,SAAS,eAAe,CAAC,UAAe;IACpC,IAAI,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAC9C,IAAI;YACA,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACR,cAAc;SACjB;KACJ;IACD,OAAO;AACX,CAAC"}
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "1.4.
|
|
3
|
+
"version": "1.4.5",
|
|
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.4.
|
|
52
|
+
"@vendure/common": "^1.4.5",
|
|
53
53
|
"apollo-server-express": "2.24.1",
|
|
54
54
|
"bcrypt": "^5.0.0",
|
|
55
55
|
"body-parser": "^1.19.0",
|
|
@@ -99,5 +99,5 @@
|
|
|
99
99
|
"sqlite3": "^5.0.0",
|
|
100
100
|
"typescript": "4.3.5"
|
|
101
101
|
},
|
|
102
|
-
"gitHead": "
|
|
102
|
+
"gitHead": "e55ab047e8c6478546a776ab770c2145b8e86b4b"
|
|
103
103
|
}
|