@vendure/core 3.7.4-master-202609060211 → 3.7.4-master-202609090211
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/config/promotion/promotion-action.d.ts +8 -0
- package/dist/config/promotion/promotion-action.js +10 -0
- package/dist/config/promotion/promotion-action.js.map +1 -1
- package/dist/config/system/health-check-strategy.d.ts +7 -20
- package/dist/config/vendure-config.d.ts +5 -4
- package/dist/entity/promotion/promotion.entity.d.ts +9 -0
- package/dist/entity/promotion/promotion.entity.js +11 -0
- package/dist/entity/promotion/promotion.entity.js.map +1 -1
- package/dist/health-check/health-check-registry.service.d.ts +5 -18
- package/dist/health-check/health-check-registry.service.js +5 -18
- package/dist/health-check/health-check-registry.service.js.map +1 -1
- package/dist/health-check/http-health-check-strategy.d.ts +2 -1
- package/dist/health-check/http-health-check-strategy.js +2 -1
- package/dist/health-check/http-health-check-strategy.js.map +1 -1
- package/dist/health-check/terminus-compat.d.ts +2 -2
- package/dist/health-check/terminus-compat.js +2 -2
- package/dist/health-check/typeorm-health-check-strategy.d.ts +2 -5
- package/dist/health-check/typeorm-health-check-strategy.js +2 -5
- package/dist/health-check/typeorm-health-check-strategy.js.map +1 -1
- package/dist/plugin/default-scheduler-plugin/default-scheduler-strategy.js +13 -6
- package/dist/plugin/default-scheduler-plugin/default-scheduler-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +1 -1
- 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 +1 -1
- 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 +10 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js +12 -0
- 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 +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/plugin-utils.js +0 -6
- package/dist/plugin/plugin-utils.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.d.ts +12 -0
- package/dist/service/helpers/order-calculator/order-calculator.js +30 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/package.json +4 -2
|
@@ -223,6 +223,14 @@ export declare abstract class PromotionAction<T extends ConfigArgs = ConfigArgs,
|
|
|
223
223
|
/** @internal */
|
|
224
224
|
protected readonly onDeactivateFn?: PromotionActionSideEffectFn<T>;
|
|
225
225
|
protected constructor(config: PromotionActionConfig<T, U>);
|
|
226
|
+
/**
|
|
227
|
+
* @description
|
|
228
|
+
* Whether this action defines any of the side-effect functions. Such an action can have an
|
|
229
|
+
* effect on the Order (adding a free gift, say) without producing a price adjustment.
|
|
230
|
+
*
|
|
231
|
+
* @internal
|
|
232
|
+
*/
|
|
233
|
+
get hasSideEffects(): boolean;
|
|
226
234
|
/** @internal */
|
|
227
235
|
abstract execute(...arg: any[]): number | Promise<number>;
|
|
228
236
|
/** @internal */
|
|
@@ -20,6 +20,16 @@ class PromotionAction extends configurable_operation_1.ConfigurableOperationDef
|
|
|
20
20
|
this.onActivateFn = config.onActivate;
|
|
21
21
|
this.onDeactivateFn = config.onDeactivate;
|
|
22
22
|
}
|
|
23
|
+
/**
|
|
24
|
+
* @description
|
|
25
|
+
* Whether this action defines any of the side-effect functions. Such an action can have an
|
|
26
|
+
* effect on the Order (adding a free gift, say) without producing a price adjustment.
|
|
27
|
+
*
|
|
28
|
+
* @internal
|
|
29
|
+
*/
|
|
30
|
+
get hasSideEffects() {
|
|
31
|
+
return !!(this.onActivateFn || this.onDeactivateFn);
|
|
32
|
+
}
|
|
23
33
|
/** @internal */
|
|
24
34
|
onActivate(ctx, order, args, promotion) {
|
|
25
35
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promotion-action.js","sourceRoot":"","sources":["../../../src/config/promotion/promotion-action.ts"],"names":[],"mappings":";;;AACA,mDAAgD;AAGhD,gFAK6C;AAsQ7C;;;;;;;;GAQG;AACH,MAAsB,eAGpB,SAAQ,iDAA2B;IAiBjC,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;QACpC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC;IAC9C,CAAC;IAKD,gBAAgB;IAChB,UAAU,CACN,GAAmB,EACnB,KAAY,EACZ,IAAiB,EACjB,SAAoB;;QAEpB,OAAO,MAAA,IAAI,CAAC,YAAY,qDAAG,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;IAClF,CAAC;IAED,gBAAgB;IAChB,YAAY,CACR,GAAmB,EACnB,KAAY,EACZ,IAAiB,EACjB,SAAoB;;QAEpB,OAAO,MAAA,IAAI,CAAC,cAAc,qDAAG,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"promotion-action.js","sourceRoot":"","sources":["../../../src/config/promotion/promotion-action.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,25 +1,12 @@
|
|
|
1
|
-
import { HealthIndicatorFunction } from '../../health-check/terminus-compat';
|
|
2
1
|
import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
2
|
+
import { HealthIndicatorFunction } from '../../health-check/terminus-compat';
|
|
3
3
|
/**
|
|
4
4
|
* @description
|
|
5
|
-
* This strategy defines health checks which
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* Custom strategies should be added to the `systemOptions.healthChecks` array.
|
|
10
|
-
* By default, Vendure includes the `TypeORMHealthCheckStrategy`, so if you set the value of the `healthChecks`
|
|
11
|
-
* array, be sure to include it manually.
|
|
12
|
-
*
|
|
13
|
-
* Vendure also ships with the {@link HttpHealthCheckStrategy}, which is convenient
|
|
14
|
-
* for adding a health check dependent on an HTTP ping.
|
|
15
|
-
*
|
|
16
|
-
* :::info
|
|
17
|
-
*
|
|
18
|
-
* This is configured via the `systemOptions.healthChecks` property of
|
|
19
|
-
* your VendureConfig.
|
|
20
|
-
*
|
|
21
|
-
* :::
|
|
5
|
+
* This strategy defines health checks which, before v3.6.0, were run by the `/health` endpoint.
|
|
6
|
+
* Since v3.6.0 the strategies configured in `systemOptions.healthChecks` are not executed, and this
|
|
7
|
+
* interface will be removed in v4.0.0. See the [health checks guide](/core-concepts/healthchecks/).
|
|
22
8
|
*
|
|
9
|
+
* The example below shows how strategies were configured before v3.6.0.
|
|
23
10
|
*
|
|
24
11
|
* @example
|
|
25
12
|
* ```ts
|
|
@@ -39,14 +26,14 @@ import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
|
39
26
|
* ```
|
|
40
27
|
*
|
|
41
28
|
* @docsCategory health-check
|
|
42
|
-
* @deprecated Use infrastructure-level health checks (e.g. Kubernetes probes, Docker healthchecks,
|
|
29
|
+
* @deprecated Not executed since v3.6.0. Use infrastructure-level health checks (e.g. Kubernetes probes, Docker healthchecks,
|
|
43
30
|
* load balancer checks) instead of application-level health checks. This interface will be removed in v4.0.0.
|
|
44
31
|
*/
|
|
45
32
|
export interface HealthCheckStrategy extends InjectableStrategy {
|
|
46
33
|
/**
|
|
47
34
|
* @description
|
|
48
35
|
* Should return a {@link HealthIndicatorFunction} which performs the check
|
|
49
|
-
* and resolves to a status payload.
|
|
36
|
+
* and resolves to a status payload. Since v3.6.0 this method is never called.
|
|
50
37
|
*/
|
|
51
38
|
getHealthIndicator(): HealthIndicatorFunction;
|
|
52
39
|
}
|
|
@@ -1251,12 +1251,13 @@ export interface EntityOptions {
|
|
|
1251
1251
|
export interface SystemOptions {
|
|
1252
1252
|
/**
|
|
1253
1253
|
* @description
|
|
1254
|
-
* Defines an array of {@link HealthCheckStrategy} instances
|
|
1255
|
-
* that
|
|
1254
|
+
* Defines an array of {@link HealthCheckStrategy} instances. Before v3.6.0 the `/health` endpoint ran these
|
|
1255
|
+
* strategies to verify that critical systems which the Vendure server depends on were healthy. Since v3.6.0
|
|
1256
|
+
* the strategies are not executed and this option has no effect on the `/health` response.
|
|
1256
1257
|
*
|
|
1257
|
-
* @default [
|
|
1258
|
+
* @default []
|
|
1258
1259
|
* @since 1.6.0
|
|
1259
|
-
* @deprecated Use infrastructure-level health checks (e.g. Kubernetes probes, Docker healthchecks,
|
|
1260
|
+
* @deprecated Not executed since v3.6.0. Use infrastructure-level health checks (e.g. Kubernetes probes, Docker healthchecks,
|
|
1260
1261
|
* load balancer checks) instead of application-level health checks. The application should not
|
|
1261
1262
|
* be responsible for determining its own health. This config option will be removed in v4.0.0.
|
|
1262
1263
|
*/
|
|
@@ -78,6 +78,15 @@ export declare class Promotion extends AdjustmentSource implements ChannelAware,
|
|
|
78
78
|
* if the subsequent application of Promotion 1 brings the order total down to way below $50.
|
|
79
79
|
*/
|
|
80
80
|
priorityScore: number;
|
|
81
|
+
/**
|
|
82
|
+
* @description
|
|
83
|
+
* Whether any of this Promotion's actions define a side effect (`onActivate` / `onDeactivate`).
|
|
84
|
+
* Such a Promotion can benefit the Order without producing a price adjustment - the free gift
|
|
85
|
+
* action being the canonical example - so it counts as applied even when it discounts nothing.
|
|
86
|
+
*
|
|
87
|
+
* @internal
|
|
88
|
+
*/
|
|
89
|
+
get hasSideEffects(): boolean;
|
|
81
90
|
apply(ctx: RequestContext, args: ApplyOrderActionArgs | ApplyOrderItemActionArgs | ApplyShippingActionArgs, state?: PromotionState): Promise<Adjustment | undefined>;
|
|
82
91
|
test(ctx: RequestContext, order: Order): Promise<PromotionTestResult>;
|
|
83
92
|
activate(ctx: RequestContext, order: Order): Promise<void>;
|
|
@@ -42,6 +42,17 @@ let Promotion = class Promotion extends adjustment_source_1.AdjustmentSource {
|
|
|
42
42
|
this.allConditions = conditions.reduce((hash, o) => (Object.assign(Object.assign({}, hash), { [o.code]: o })), {});
|
|
43
43
|
this.allActions = actions.reduce((hash, o) => (Object.assign(Object.assign({}, hash), { [o.code]: o })), {});
|
|
44
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* @description
|
|
47
|
+
* Whether any of this Promotion's actions define a side effect (`onActivate` / `onDeactivate`).
|
|
48
|
+
* Such a Promotion can benefit the Order without producing a price adjustment - the free gift
|
|
49
|
+
* action being the canonical example - so it counts as applied even when it discounts nothing.
|
|
50
|
+
*
|
|
51
|
+
* @internal
|
|
52
|
+
*/
|
|
53
|
+
get hasSideEffects() {
|
|
54
|
+
return this.actions.some(action => { var _a; return (_a = this.allActions[action.code]) === null || _a === void 0 ? void 0 : _a.hasSideEffects; });
|
|
55
|
+
}
|
|
45
56
|
async apply(ctx, args, state) {
|
|
46
57
|
let amount = 0;
|
|
47
58
|
state = state || {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promotion.entity.js","sourceRoot":"","sources":["../../../src/entity/promotion/promotion.entity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"promotion.entity.js","sourceRoot":"","sources":["../../../src/entity/promotion/promotion.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yEAAwG;AAExG,qCAA2E;AAG3E,0DAAsD;AACtD,4EAAwE;AAGxE,gEAAwD;AAExD,8EAMiD;AAEjD,uFAAkF;AAClF,8DAAoD;AACpD,kEAAgE;AAEhE,wDAA8C;AAG9C,iFAAsE;AAyBtE;;;;;;;;;GASG;AAEI,IAAM,SAAS,GAAf,MAAM,SACT,SAAQ,oCAAgB;IAaxB,YACI,KAGC;QAED,KAAK,CAAC,KAAK,CAAC,CAAC;QAhBjB,SAAI,GAAG,gCAAc,CAAC,SAAS,CAAC;QACf,kBAAa,GAA2C,EAAE,CAAC;QAC3D,eAAU,GAMvB,EAAE,CAAC;QASH,MAAM,UAAU,GACZ,CAAC,KAAK,IAAI,KAAK,CAAC,mBAAmB,CAAC,IAAI,IAAA,0BAAS,GAAE,CAAC,gBAAgB,CAAC,mBAAmB,IAAI,EAAE,CAAC;QACnG,MAAM,OAAO,GACT,CAAC,KAAK,IAAI,KAAK,CAAC,gBAAgB,CAAC,IAAI,IAAA,0BAAS,GAAE,CAAC,gBAAgB,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAC7F,IAAI,CAAC,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,IAAI,KAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,iCAAM,IAAI,KAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAG,EAAE,EAAE,CAAC,CAAC;IAClF,CAAC;IA4DD;;;;;;;OAOG;IACH,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,0CAAE,cAAc,CAAA,EAAA,CAAC,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,KAAK,CACP,GAAmB,EACnB,IAA+E,EAC/E,KAAsB;QAEtB,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,GAAG,KAAK,IAAI,EAAE,CAAC;QAEpB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrD,IAAI,eAAe,YAAY,sCAAmB,EAAE,CAAC;gBACjD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;oBAC3B,MAAM,IAAI,IAAA,wBAAU,EAChB,MAAM,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,EACvE,SAAS,CAAC,QAAQ,CACrB,CAAC;gBACN,CAAC;YACL,CAAC;iBAAM,IAAI,eAAe,YAAY,sCAAmB,EAAE,CAAC;gBACxD,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;oBAC3B,MAAM,IAAI,IAAA,wBAAU,EAChB,MAAM,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAC1E,CAAC;gBACN,CAAC;YACL,CAAC;iBAAM,IAAI,eAAe,YAAY,uCAAoB,EAAE,CAAC;gBACzD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;oBACxB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;oBACvB,MAAM,IAAI,IAAA,wBAAU,EAAC,MAAM,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC9F,CAAC;YACL,CAAC;iBAAM,IAAI,eAAe,YAAY,0CAAuB,EAAE,CAAC;gBAC5D,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3B,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;oBACrC,MAAM,IAAI,IAAA,wBAAU,EAChB,MAAM,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CACpF,CAAC;gBACN,CAAC;YACL,CAAC;QACL,CAAC;QACD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;YACf,OAAO;gBACH,MAAM;gBACN,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,WAAW,EAAE,IAAI,CAAC,IAAI;gBACtB,gBAAgB,EAAE,IAAI,CAAC,WAAW,EAAE;gBACpC,IAAI,EAAE,EAAE;aACX,CAAC;QACN,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAmB,EAAE,KAAY;QACxC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;YAC9C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,qCAAgB,EAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;YAC1F,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,cAAc,GAAmB,EAAE,CAAC;QAC1C,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAC9D,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtB,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,MAAM,0BAA0B,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAC7D,GAAG,EACH,KAAK,EACL,SAAS,CAAC,IAAI,EACd,IAAI,CACP,CAAC;YACF,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC;YACjB,CAAC;YACD,IAAI,OAAO,0BAA0B,KAAK,QAAQ,EAAE,CAAC;gBACjD,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,0BAA0B,CAAC;YAChE,CAAC;QACL,CAAC;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAmB,EAAE,KAAY;QAC5C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,eAAe,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpE,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,KAAY;QAC9C,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrD,MAAM,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACtE,CAAC;IACL,CAAC;IAEO,gBAAgB,CACpB,KAA2E;QAE3E,OAAO,KAAK,YAAY,0CAAuB,CAAC;IACpD,CAAC;IAEO,UAAU,CACd,KAAgF;QAEhF,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IACrE,CAAC;IAEO,cAAc,CAClB,KAAgF;QAEhF,OAAO,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAEO,cAAc,CAClB,KAAgF;QAEhF,OAAO,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7C,CAAC;IAEO,aAAa,CACjB,KAAgF;QAEhF,OAAO,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;IAChD,CAAC;CACJ,CAAA;AAhOY,8BAAS;AA8BlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAChB;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACjB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACnB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACG;AAG9B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACR;AAOnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mDAAoB,EAAE,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;8BAC5E,KAAK;+CAAyB;AAElC;IAAT,IAAA,gBAAM,GAAE;;0CAAkB;AAI3B;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC;IAC1D,IAAA,mBAAS,GAAE;;2CACQ;AAGpB;IADC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,oBAAK,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;;yCACrC;AAGhB;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,4CAAqB,CAAC;8BACxB,4CAAqB;+CAAC;AAEb;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;6CAAqC;AAEpC;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;0CAAkC;AAiB9C;IAAT,IAAA,gBAAM,GAAE;;gDAAuB;oBArFvB,SAAS;IADrB,IAAA,gBAAM,GAAE;;GACI,SAAS,CAgOrB"}
|
|
@@ -1,22 +1,11 @@
|
|
|
1
1
|
import { HealthIndicatorFunction } from './terminus-compat';
|
|
2
2
|
/**
|
|
3
3
|
* @description
|
|
4
|
-
* This service is used to register health indicator functions
|
|
5
|
-
* health
|
|
6
|
-
*
|
|
7
|
-
* administrators to get an overview of the health of all the parts of the
|
|
8
|
-
* Vendure stack.
|
|
4
|
+
* This service is used to register health indicator functions which, before v3.6.0, were run by the
|
|
5
|
+
* `/health` endpoint. Since v3.6.0 registered indicators are not executed, and this service will be
|
|
6
|
+
* removed in v4.0.0. See the [health checks guide](/core-concepts/healthchecks/).
|
|
9
7
|
*
|
|
10
|
-
*
|
|
11
|
-
* service to add a check for that dependency to the Vendure health check.
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* Since v1.6.0, the preferred way to implement a custom health check is by creating a new {@link HealthCheckStrategy}
|
|
15
|
-
* and then passing it to the `systemOptions.healthChecks` array.
|
|
16
|
-
* See the {@link HealthCheckStrategy} docs for an example configuration.
|
|
17
|
-
*
|
|
18
|
-
* The alternative way to register a health check is by injecting this service directly into your
|
|
19
|
-
* plugin module. To use it in your plugin, you'll need to import the {@link PluginCommonModule}:
|
|
8
|
+
* The example below shows how a plugin registered an indicator before v3.6.0:
|
|
20
9
|
*
|
|
21
10
|
* @example
|
|
22
11
|
* ```ts
|
|
@@ -44,9 +33,7 @@ export declare class HealthCheckRegistryService {
|
|
|
44
33
|
private _healthIndicatorFunctions;
|
|
45
34
|
/**
|
|
46
35
|
* @description
|
|
47
|
-
* Registers one or more {@link HealthIndicatorFunction}s
|
|
48
|
-
* health check endpoint. The indicator will also appear in the Admin UI's
|
|
49
|
-
* "system status" view.
|
|
36
|
+
* Registers one or more {@link HealthIndicatorFunction}s. Since v3.6.0 the registered functions are never called.
|
|
50
37
|
*
|
|
51
38
|
* @deprecated Use infrastructure-level health checks instead. This method will be removed in v4.0.0.
|
|
52
39
|
*/
|
|
@@ -3,22 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.HealthCheckRegistryService = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* @description
|
|
6
|
-
* This service is used to register health indicator functions
|
|
7
|
-
* health
|
|
8
|
-
*
|
|
9
|
-
* administrators to get an overview of the health of all the parts of the
|
|
10
|
-
* Vendure stack.
|
|
6
|
+
* This service is used to register health indicator functions which, before v3.6.0, were run by the
|
|
7
|
+
* `/health` endpoint. Since v3.6.0 registered indicators are not executed, and this service will be
|
|
8
|
+
* removed in v4.0.0. See the [health checks guide](/core-concepts/healthchecks/).
|
|
11
9
|
*
|
|
12
|
-
*
|
|
13
|
-
* service to add a check for that dependency to the Vendure health check.
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
* Since v1.6.0, the preferred way to implement a custom health check is by creating a new {@link HealthCheckStrategy}
|
|
17
|
-
* and then passing it to the `systemOptions.healthChecks` array.
|
|
18
|
-
* See the {@link HealthCheckStrategy} docs for an example configuration.
|
|
19
|
-
*
|
|
20
|
-
* The alternative way to register a health check is by injecting this service directly into your
|
|
21
|
-
* plugin module. To use it in your plugin, you'll need to import the {@link PluginCommonModule}:
|
|
10
|
+
* The example below shows how a plugin registered an indicator before v3.6.0:
|
|
22
11
|
*
|
|
23
12
|
* @example
|
|
24
13
|
* ```ts
|
|
@@ -50,9 +39,7 @@ class HealthCheckRegistryService {
|
|
|
50
39
|
}
|
|
51
40
|
/**
|
|
52
41
|
* @description
|
|
53
|
-
* Registers one or more {@link HealthIndicatorFunction}s
|
|
54
|
-
* health check endpoint. The indicator will also appear in the Admin UI's
|
|
55
|
-
* "system status" view.
|
|
42
|
+
* Registers one or more {@link HealthIndicatorFunction}s. Since v3.6.0 the registered functions are never called.
|
|
56
43
|
*
|
|
57
44
|
* @deprecated Use infrastructure-level health checks instead. This method will be removed in v4.0.0.
|
|
58
45
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health-check-registry.service.js","sourceRoot":"","sources":["../../src/health-check/health-check-registry.service.ts"],"names":[],"mappings":";;;AAEA
|
|
1
|
+
{"version":3,"file":"health-check-registry.service.js","sourceRoot":"","sources":["../../src/health-check/health-check-registry.service.ts"],"names":[],"mappings":";;;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,0BAA0B;IAAvC;QAKY,8BAAyB,GAA8B,EAAE,CAAC;IAYtE,CAAC;IAhBG,gBAAgB;IAChB,IAAI,wBAAwB;QACxB,OAAO,IAAI,CAAC,yBAAyB,CAAC;IAC1C,CAAC;IAGD;;;;;OAKG;IACH,yBAAyB,CAAC,EAAuD;QAC7E,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IACpD,CAAC;CACJ;AAjBD,gEAiBC"}
|
|
@@ -11,7 +11,8 @@ export interface HttpHealthCheckOptions {
|
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
13
|
* @description
|
|
14
|
-
* A {@link HealthCheckStrategy} used to check health by pinging a url.
|
|
14
|
+
* A {@link HealthCheckStrategy} used to check health by pinging a url. Since v3.6.0 it is not
|
|
15
|
+
* executed and will be removed in v4.0.0. The example below shows the pre-v3.6.0 configuration:
|
|
15
16
|
*
|
|
16
17
|
* @example
|
|
17
18
|
* ```ts
|
|
@@ -11,7 +11,8 @@ const common_1 = require("@nestjs/common");
|
|
|
11
11
|
const terminus_compat_1 = require("./terminus-compat");
|
|
12
12
|
/**
|
|
13
13
|
* @description
|
|
14
|
-
* A {@link HealthCheckStrategy} used to check health by pinging a url.
|
|
14
|
+
* A {@link HealthCheckStrategy} used to check health by pinging a url. Since v3.6.0 it is not
|
|
15
|
+
* executed and will be removed in v4.0.0. The example below shows the pre-v3.6.0 configuration:
|
|
15
16
|
*
|
|
16
17
|
* @example
|
|
17
18
|
* ```ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-health-check-strategy.js","sourceRoot":"","sources":["../../src/health-check/http-health-check-strategy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAmD;AAKnD,uDAK2B;AAW3B
|
|
1
|
+
{"version":3,"file":"http-health-check-strategy.js","sourceRoot":"","sources":["../../src/health-check/http-health-check-strategy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAmD;AAKnD,uDAK2B;AAW3B;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,uBAAuB;IAChC,YAAoB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAGvD,IAAI,CAAC,QAAkB;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,kBAAkB;QACd,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3C,OAAO,KAAK,IAAI,EAAE;YACd,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;YACzE,OAAO,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;QAClD,CAAC,CAAC;IACN,CAAC;CACJ;AAfD,0DAeC;AAED;;;;;;GAMG;AAII,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,iCAAe;IAC1D;;;;OAIG;IACK,iBAAiB,CAAC,GAAW,EAAE,KAAU;QAC7C,MAAM,QAAQ,GAA2B;YACrC,OAAO,EAAE,KAAK,CAAC,OAAO;SACzB,CAAC;QACF,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACjB,QAAQ,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC5C,QAAQ,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC;QACpD,CAAC;QACD,MAAM,IAAI,kCAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW,EAAE,GAAW,EAAE,OAAgB;QACtD,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,IAAI,CAAC;YACD,sEAAsE;YACtE,oEAAoE;YACpE,oEAAoE;YACpE,oEAAoE;YACpE,gCAAgC;YAChC,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACjF,SAAS,GAAG,IAAI,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AAlCY,8DAAyB;oCAAzB,yBAAyB;IAHrC,IAAA,mBAAU,EAAC;QACR,KAAK,EAAE,cAAK,CAAC,SAAS;KACzB,CAAC;GACW,yBAAyB,CAkCrC"}
|
|
@@ -47,8 +47,8 @@ export type HealthIndicatorResult<Key extends string = string, Status extends He
|
|
|
47
47
|
export type HealthIndicatorFunction = () => PromiseLike<HealthIndicatorResult> | HealthIndicatorResult;
|
|
48
48
|
/**
|
|
49
49
|
* @description
|
|
50
|
-
* Thrown from a health indicator to signal a failed check.
|
|
51
|
-
* payload
|
|
50
|
+
* Thrown from a health indicator to signal a failed check. Before v3.6.0 the `causes`
|
|
51
|
+
* payload was forwarded to the `/health` response so callers could inspect
|
|
52
52
|
* which indicator failed and why. `causes` is intentionally typed as
|
|
53
53
|
* `any` (matching terminus) so handlers can pass through arbitrary
|
|
54
54
|
* upstream error payloads (HTTP responses, DB driver errors, etc.)
|
|
@@ -20,8 +20,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
20
20
|
exports.HealthIndicator = exports.HealthCheckError = void 0;
|
|
21
21
|
/**
|
|
22
22
|
* @description
|
|
23
|
-
* Thrown from a health indicator to signal a failed check.
|
|
24
|
-
* payload
|
|
23
|
+
* Thrown from a health indicator to signal a failed check. Before v3.6.0 the `causes`
|
|
24
|
+
* payload was forwarded to the `/health` response so callers could inspect
|
|
25
25
|
* which indicator failed and why. `causes` is intentionally typed as
|
|
26
26
|
* `any` (matching terminus) so handlers can pass through arbitrary
|
|
27
27
|
* upstream error payloads (HTTP responses, DB driver errors, etc.)
|
|
@@ -10,9 +10,8 @@ export interface TypeORMHealthCheckOptions {
|
|
|
10
10
|
}
|
|
11
11
|
/**
|
|
12
12
|
* @description
|
|
13
|
-
* A {@link HealthCheckStrategy} used to check the health of the database.
|
|
14
|
-
*
|
|
15
|
-
* `systemOptions.healthChecks` array:
|
|
13
|
+
* A {@link HealthCheckStrategy} used to check the health of the database. Since v3.6.0 it is not
|
|
14
|
+
* executed and will be removed in v4.0.0. The example below shows the pre-v3.6.0 configuration:
|
|
16
15
|
*
|
|
17
16
|
* @example
|
|
18
17
|
* ```ts
|
|
@@ -23,8 +22,6 @@ export interface TypeORMHealthCheckOptions {
|
|
|
23
22
|
* systemOptions: {
|
|
24
23
|
* healthChecks:[
|
|
25
24
|
* // The default key is "database" and the default timeout is 1000ms
|
|
26
|
-
* // Sometimes this is too short and leads to false negatives in the
|
|
27
|
-
* // /health endpoint.
|
|
28
25
|
* new TypeORMHealthCheckStrategy({ key: 'postgres-db', timeout: 5000 }),
|
|
29
26
|
* ]
|
|
30
27
|
* }
|
|
@@ -5,9 +5,8 @@ const transactional_connection_1 = require("../connection/transactional-connecti
|
|
|
5
5
|
const terminus_compat_1 = require("./terminus-compat");
|
|
6
6
|
/**
|
|
7
7
|
* @description
|
|
8
|
-
* A {@link HealthCheckStrategy} used to check the health of the database.
|
|
9
|
-
*
|
|
10
|
-
* `systemOptions.healthChecks` array:
|
|
8
|
+
* A {@link HealthCheckStrategy} used to check the health of the database. Since v3.6.0 it is not
|
|
9
|
+
* executed and will be removed in v4.0.0. The example below shows the pre-v3.6.0 configuration:
|
|
11
10
|
*
|
|
12
11
|
* @example
|
|
13
12
|
* ```ts
|
|
@@ -18,8 +17,6 @@ const terminus_compat_1 = require("./terminus-compat");
|
|
|
18
17
|
* systemOptions: {
|
|
19
18
|
* healthChecks:[
|
|
20
19
|
* // The default key is "database" and the default timeout is 1000ms
|
|
21
|
-
* // Sometimes this is too short and leads to false negatives in the
|
|
22
|
-
* // /health endpoint.
|
|
23
20
|
* new TypeORMHealthCheckStrategy({ key: 'postgres-db', timeout: 5000 }),
|
|
24
21
|
* ]
|
|
25
22
|
* }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-health-check-strategy.js","sourceRoot":"","sources":["../../src/health-check/typeorm-health-check-strategy.ts"],"names":[],"mappings":";;;AAEA,qFAAiF;AAEjF,uDAAqG;AAUrG
|
|
1
|
+
{"version":3,"file":"typeorm-health-check-strategy.js","sourceRoot":"","sources":["../../src/health-check/typeorm-health-check-strategy.ts"],"names":[],"mappings":";;;AAEA,qFAAiF;AAEjF,uDAAqG;AAUrG;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,0BAA0B;IAGnC,YAAoB,OAAmC;QAAnC,YAAO,GAAP,OAAO,CAA4B;IAAG,CAAC;IAE3D,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,kDAAuB,CAAC,CAAC;IACtE,CAAC;IAED,kBAAkB;;QACd,MAAM,GAAG,GAAG,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,GAAG,KAAI,UAAU,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,mCAAI,IAAI,CAAC;QAC9C,OAAO,KAAK,IAAoC,EAAE;YAC9C,IAAI,KAAiC,CAAC;YACtC,IAAI,CAAC;gBACD,qDAAqD;gBACrD,6DAA6D;gBAC7D,gEAAgE;gBAChE,2DAA2D;gBAC3D,2BAA2B;gBAC3B,oEAAoE;gBACpE,gEAAgE;gBAChE,iEAAiE;gBACjE,mEAAmE;gBACnE,4DAA4D;gBAC5D,MAAM,OAAO,CAAC,IAAI,CAAC;oBACf,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;oBAC/C,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;wBAC7B,KAAK,GAAG,UAAU,CACd,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,yCAAyC,OAAO,IAAI,CAAC,CAAC,EAC7E,OAAO,CACV,CAAC;oBACN,CAAC,CAAC;iBACL,CAAC,CAAC;gBACH,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACjE,MAAM,IAAI,kCAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;YAChF,CAAC;oBAAS,CAAC;gBACP,IAAI,KAAK,EAAE,CAAC;oBACR,YAAY,CAAC,KAAK,CAAC,CAAC;gBACxB,CAAC;YACL,CAAC;QACL,CAAC,CAAC;IACN,CAAC;CACJ;AA7CD,gEA6CC"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DefaultSchedulerStrategy = void 0;
|
|
7
7
|
const ms_1 = __importDefault(require("ms"));
|
|
8
|
+
const node_util_1 = require("node:util");
|
|
8
9
|
const utils_1 = require("../../common/utils");
|
|
9
10
|
const config_service_1 = require("../../config/config.service");
|
|
10
11
|
const vendure_logger_1 = require("../../config/logger/vendure-logger");
|
|
@@ -94,15 +95,11 @@ class DefaultSchedulerStrategy {
|
|
|
94
95
|
vendure_logger_1.Logger.verbose(`Scheduled task "${task.id}" completed successfully`);
|
|
95
96
|
}
|
|
96
97
|
catch (error) {
|
|
97
|
-
|
|
98
|
-
if (error instanceof Error) {
|
|
99
|
-
errorMessage = error.message;
|
|
100
|
-
}
|
|
101
|
-
vendure_logger_1.Logger.error(`Scheduled task "${task.id}" failed with error: ${errorMessage}`);
|
|
98
|
+
vendure_logger_1.Logger.error(`Scheduled task "${task.id}" failed with error: ${(0, node_util_1.inspect)(error)}`);
|
|
102
99
|
await this.connection.rawConnection.getRepository(scheduled_task_record_entity_1.ScheduledTaskRecord).update({ taskId: task.id }, {
|
|
103
100
|
lastExecutedAt: new Date(),
|
|
104
101
|
lockedAt: null,
|
|
105
|
-
lastResult: { error:
|
|
102
|
+
lastResult: { error: errorLabel(error) },
|
|
106
103
|
});
|
|
107
104
|
}
|
|
108
105
|
finally {
|
|
@@ -309,4 +306,14 @@ class DefaultSchedulerStrategy {
|
|
|
309
306
|
}
|
|
310
307
|
}
|
|
311
308
|
exports.DefaultSchedulerStrategy = DefaultSchedulerStrategy;
|
|
309
|
+
/**
|
|
310
|
+
* `constructor.name` rather than `name` because a subclass which does not set `name`
|
|
311
|
+
* still inherits `'Error'` from `Error.prototype`.
|
|
312
|
+
*/
|
|
313
|
+
function errorLabel(error) {
|
|
314
|
+
if (!(error instanceof Error)) {
|
|
315
|
+
return 'Unknown error';
|
|
316
|
+
}
|
|
317
|
+
return error.message || error.constructor.name;
|
|
318
|
+
}
|
|
312
319
|
//# sourceMappingURL=default-scheduler-strategy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-scheduler-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/default-scheduler-strategy.ts"],"names":[],"mappings":";;;;;;AAEA,4CAA0C;
|
|
1
|
+
{"version":3,"file":"default-scheduler-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-scheduler-plugin/default-scheduler-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,7 @@ class MysqlSearchStrategy {
|
|
|
69
69
|
.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
70
70
|
}
|
|
71
71
|
this.applyTermAndFilters(ctx, qb, input);
|
|
72
|
-
if (sort) {
|
|
72
|
+
if ((0, search_strategy_utils_1.hasSortParameter)(sort)) {
|
|
73
73
|
if (sort.name) {
|
|
74
74
|
qb.addOrderBy('si_productName', sort.name);
|
|
75
75
|
}
|
|
@@ -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,
|
|
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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"}
|
|
@@ -69,7 +69,7 @@ class PostgresSearchStrategy {
|
|
|
69
69
|
.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
70
70
|
}
|
|
71
71
|
this.applyTermAndFilters(ctx, qb, input);
|
|
72
|
-
if (sort) {
|
|
72
|
+
if ((0, search_strategy_utils_1.hasSortParameter)(sort)) {
|
|
73
73
|
if (sort.name) {
|
|
74
74
|
qb.addOrderBy('"si_productName"', sort.name);
|
|
75
75
|
}
|
|
@@ -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;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,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":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAOiC;AAEjC;;;;GAIG;AACH,MAAa,sBAAsB;IAAnC;QACqB,kBAAa,GAAG,CAAC,CAAC;IA2TvC,CAAC;IAvTG,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,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YACd,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,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,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;YACxB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YACd,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,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,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,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;QAC9D,CAAC;QAED,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAEzC,IAAI,IAAA,wCAAgB,EAAC,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACZ,EAAE,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACb,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9D,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,4CAA4C;QAC5C,gFAAgF;QAChF,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;QAE9C,IAAI,WAAW,EAAE,CAAC;YACd,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,EAAE;aACJ,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC;aACZ,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,CAAC,EAAE,CACR,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACR,IAAA,yCAAiB,EACb,CAAC,EACD,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CACvF,CACJ,CACJ,CAAC;IACV,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,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,EAC9D,KAAK,CACR,CAAC;QACF,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,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,EAClB,aAAsB,KAAK;QAE3B,MAAM,EACF,IAAI,EACJ,iBAAiB,EACjB,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,aAAa,EACb,eAAe,GAClB,GAAG,KAAK,CAAC;QACV,oDAAoD;QACpD,MAAM,cAAc,GAAG,IAAI;YACvB,CAAC,CAAC,IAAI;iBACC,IAAI,EAAE;iBACN,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC;iBAC7B,KAAK,CAAC,MAAM,CAAC;iBACb,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;iBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;iBACpB,IAAI,CAAC,KAAK,CAAC;YAClB,CAAC,CAAC,EAAE,CAAC;QAET,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YAC3C,MAAM,YAAY,GAAG,CAAC,OAAe,EAAE,EAAE,CACrC,KAAK,CAAC,cAAc,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;YACrE,EAAE,CAAC,SAAS,CACR;8CAC8B,YAAY,CAAC,QAAQ,CAAC;6CACvB,YAAY,CAAC,gBAAgB,CAAC;6CAC9B,YAAY,CACjC,uBAAuB,CAC1B;6CACwB,YAAY,CAAC,gBAAgB,CAAC;6BAC9C,EACb,OAAO,CACV;iBACI,QAAQ,CACL,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,0CAA0C,CAAC;qBAChD,OAAO,CAAC,kDAAkD,CAAC;qBAC3D,OAAO,CAAC,yDAAyD,CAAC;qBAClE,OAAO,CAAC,kDAAkD,CAAC,CAAC;YACrE,CAAC,CAAC,CACL;iBACA,aAAa,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;gBACvB,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACJ,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YACrE,CAAC;QACL,CAAC;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE,CAAC;YACxB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE,CAAC;oBAC7B,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,IAAI,WAAW,0DAA0D,CAAC;oBACzF,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;oBACrC,IAAI,kBAAkB,KAAK,iCAAe,CAAC,GAAG,EAAE,CAAC;wBAC7C,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBACjC,CAAC;yBAAM,CAAC;wBACJ,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAChC,CAAC;gBACL,CAAC;YACL,CAAC,CAAC,CACL,CAAC;QACN,CAAC;QACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE,CAAC;YAC5B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE,CAAC;oBAC/C,GAAG,CAAC,QAAQ,CACR,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;;wBACf,IAAI,gBAAgB,CAAC,GAAG,KAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,CAAA,EAAE,CAAC;4BACtD,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;wBACrE,CAAC;wBACD,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC;4BACvB,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,IAAI,WAAW,0DAA0D,CAAC;4BACzF,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;4BACvD,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;wBAC9B,CAAC;wBACD,IAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,EAAE,CAAC;4BAC9B,KAAK,MAAM,EAAE,IAAI,gBAAgB,CAAC,EAAE,EAAE,CAAC;gCACnC,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,IAAI,WAAW,0DAA0D,CAAC;gCACzF,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;4BAChC,CAAC;wBACL,CAAC;oBACL,CAAC,CAAC,CACL,CAAC;gBACN,CAAC;YACL,CAAC,CAAC,CACL,CAAC;QACN,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACf,EAAE,CAAC,QAAQ,CAAC,uEAAuE,EAAE;gBACjF,YAAY;aACf,CAAC,CAAC;QACP,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACjB,EAAE,CAAC,QAAQ,CAAC,2EAA2E,EAAE;gBACrF,cAAc;aACjB,CAAC,CAAC;QACP,CAAC;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE,CAAC;YACxB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;oBAClD,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;oBAChD,GAAG,CAAC,OAAO,CACP,IAAI,WAAW,0DAA0D,EACzE;wBACI,CAAC,WAAW,CAAC,EAAE,EAAE;qBACpB,CACJ,CAAC;gBACN,CAAC;YACL,CAAC,CAAC,CACL,CAAC;QACN,CAAC;QACD,IAAI,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,MAAM,EAAE,CAAC;YAC1B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC;oBACtD,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,IAAI,CAAC,CAAC;oBAClD,GAAG,CAAC,OAAO,CACP,IAAI,WAAW,4DAA4D,EAC3E;wBACI,CAAC,WAAW,CAAC,EAAE,IAAI;qBACtB,CACJ,CAAC;gBACN,CAAC;YACL,CAAC,CAAC,CACL,CAAC;QACN,CAAC;QAED,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvE,IAAA,gDAAwB,EAAC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEhF,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACjC,EAAE,CAAC,QAAQ,CAAC,iCAAiC,EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;QACvF,CAAC;QAED,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;YAChC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;OAIG;IACK,oBAAoB,CAAC,cAAuB;QAChD,OAAO,IAAA,0CAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC;aAClF,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,CAAC;gBACxC,IACI,GAAG,KAAK,UAAU;oBAClB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,YAAY,EACtB,CAAC;oBACC,OAAO,cAAc,aAAa,cAAc,KAAK,GAAG,CAAC;gBAC7D,CAAC;qBAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,gBAAgB,EAAE,CAAC;oBAC5E,OAAO,WAAW,aAAa,SAAS,KAAK,GAAG,CAAC;gBACrD,CAAC;qBAAM,CAAC;oBACJ,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;gBACjD,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,aAAa,QAAQ,KAAK,GAAG,CAAC;YAC5C,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACJ;AA5TD,wDA4TC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { CurrencyCode, LanguageCode, SearchResult } from '@vendure/common/lib/generated-types';
|
|
1
|
+
import { CurrencyCode, LanguageCode, SearchResult, SearchResultSortParameter } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { SelectQueryBuilder } from 'typeorm';
|
|
4
4
|
import { SearchIndexItem } from '../entities/search-index-item.entity';
|
|
@@ -21,6 +21,15 @@ export declare function createCollectionIdCountMap(collectionsResult: Array<{
|
|
|
21
21
|
collections: string;
|
|
22
22
|
}>): Map<ID, number>;
|
|
23
23
|
export declare function createPlaceholderFromId(id: ID): string;
|
|
24
|
+
/**
|
|
25
|
+
* Returns true if the given sort parameter actually specifies a field to sort by.
|
|
26
|
+
*
|
|
27
|
+
* Clients built with GraphQL code generation commonly send `sort: {}` when the user has
|
|
28
|
+
* not selected any sort order. Since an empty object is truthy, it must not be treated as
|
|
29
|
+
* an explicit sort, otherwise no ordering would be applied at all and the relevance
|
|
30
|
+
* ordering which applies when searching by term would be silently suppressed.
|
|
31
|
+
*/
|
|
32
|
+
export declare function hasSortParameter(sort?: SearchResultSortParameter | null): sort is SearchResultSortParameter;
|
|
24
33
|
/**
|
|
25
34
|
* Applies language constraints for {@link SearchIndexItem} query.
|
|
26
35
|
*
|
|
@@ -4,6 +4,7 @@ exports.mapToSearchResult = mapToSearchResult;
|
|
|
4
4
|
exports.createFacetIdCountMap = createFacetIdCountMap;
|
|
5
5
|
exports.createCollectionIdCountMap = createCollectionIdCountMap;
|
|
6
6
|
exports.createPlaceholderFromId = createPlaceholderFromId;
|
|
7
|
+
exports.hasSortParameter = hasSortParameter;
|
|
7
8
|
exports.applyLanguageConstraints = applyLanguageConstraints;
|
|
8
9
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
9
10
|
const typeorm_1 = require("typeorm");
|
|
@@ -103,6 +104,17 @@ function parseFocalPoint(focalPoint) {
|
|
|
103
104
|
function createPlaceholderFromId(id) {
|
|
104
105
|
return '_' + id.toString().replace(/-/g, '_');
|
|
105
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Returns true if the given sort parameter actually specifies a field to sort by.
|
|
109
|
+
*
|
|
110
|
+
* Clients built with GraphQL code generation commonly send `sort: {}` when the user has
|
|
111
|
+
* not selected any sort order. Since an empty object is truthy, it must not be treated as
|
|
112
|
+
* an explicit sort, otherwise no ordering would be applied at all and the relevance
|
|
113
|
+
* ordering which applies when searching by term would be silently suppressed.
|
|
114
|
+
*/
|
|
115
|
+
function hasSortParameter(sort) {
|
|
116
|
+
return sort != null && Object.values(sort).some(value => value != null);
|
|
117
|
+
}
|
|
106
118
|
/**
|
|
107
119
|
* Applies language constraints for {@link SearchIndexItem} query.
|
|
108
120
|
*
|
|
@@ -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":";;
|
|
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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"}
|
|
@@ -68,7 +68,7 @@ class SqliteSearchStrategy {
|
|
|
68
68
|
qb.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
69
69
|
}
|
|
70
70
|
this.applyTermAndFilters(ctx, qb, input);
|
|
71
|
-
if (sort) {
|
|
71
|
+
if ((0, search_strategy_utils_1.hasSortParameter)(sort)) {
|
|
72
72
|
if (sort.name) {
|
|
73
73
|
// TODO: v3 - set the collation on the SearchIndexItem entity
|
|
74
74
|
qb.addOrderBy('si.productName COLLATE NOCASE', sort.name);
|
|
@@ -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;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,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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"}
|
|
@@ -47,12 +47,6 @@ function createProxyHandler(options) {
|
|
|
47
47
|
[`^${route}`]: '/' + (options.basePath || ''),
|
|
48
48
|
},
|
|
49
49
|
logger: {
|
|
50
|
-
log(message) {
|
|
51
|
-
config_1.Logger.debug(message, options.label);
|
|
52
|
-
},
|
|
53
|
-
debug(message) {
|
|
54
|
-
config_1.Logger.debug(message, options.label);
|
|
55
|
-
},
|
|
56
50
|
info(message) {
|
|
57
51
|
config_1.Logger.debug(message, options.label);
|
|
58
52
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../src/plugin/plugin-utils.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../src/plugin/plugin-utils.ts"],"names":[],"mappings":";;AAoCA,gDAsBC;AA8CD,oEAEC;AAED,4DAEC;AA7GD,iEAA8D;AAE9D,sCAAmC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,kBAAkB,CAAC,OAAqB;;IACpD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC;IACpF,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,6CAAqB,EAAC;QACrC,gCAAgC;QAChC,MAAM,EAAE,UAAU,aAAa,IAAI,OAAO,CAAC,IAAI,IAAI,MAAA,OAAO,CAAC,QAAQ,mCAAI,EAAE,EAAE;QAC3E,WAAW,EAAE;YACT,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;SAChD;QACD,MAAM,EAAE;YACJ,IAAI,CAAC,OAAe;gBAChB,eAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;YACD,IAAI,CAAC,OAAe;gBAChB,eAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;YACD,KAAK,CAAC,OAAe;gBACjB,eAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;SACJ;KACJ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAwCD,MAAM,qBAAqB,GAA2C,EAAE,CAAC;AAEzE;;;GAGG;AACH,SAAgB,4BAA4B,CAAC,WAAmB,EAAE,IAAY;IAC1E,qBAAqB,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,SAAgB,wBAAwB;IACpC,OAAO,qBAAqB,CAAC;AACjC,CAAC"}
|
|
@@ -82,4 +82,16 @@ export declare class OrderCalculator {
|
|
|
82
82
|
*/
|
|
83
83
|
calculateOrderTotals(order: Order): void;
|
|
84
84
|
private addPromotion;
|
|
85
|
+
/**
|
|
86
|
+
* Promotions are added to the Order as soon as their conditions pass, since a Promotion which
|
|
87
|
+
* discounts nothing on one OrderLine may still discount a later line, the Order total or the
|
|
88
|
+
* shipping. Once everything has been applied, any Promotion which ended up adjusting nothing
|
|
89
|
+
* at all is removed again: `Order.promotions` is what the usage limits are counted from, so a
|
|
90
|
+
* Promotion the customer got no benefit from must not consume a usage.
|
|
91
|
+
*
|
|
92
|
+
* Promotions whose actions define side effects are kept regardless, as their benefit (a free
|
|
93
|
+
* gift, say) is not expressed as an adjustment amount - and on the first pass the side effect
|
|
94
|
+
* has not run yet, so there is nothing to discount.
|
|
95
|
+
*/
|
|
96
|
+
private removeIneffectivePromotions;
|
|
85
97
|
}
|
|
@@ -96,6 +96,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
96
96
|
await this.applyShippingPromotions(ctx, order, promotions);
|
|
97
97
|
}
|
|
98
98
|
this.calculateOrderTotals(order);
|
|
99
|
+
this.removeIneffectivePromotions(order);
|
|
99
100
|
return order;
|
|
100
101
|
}
|
|
101
102
|
/**
|
|
@@ -330,6 +331,35 @@ let OrderCalculator = class OrderCalculator {
|
|
|
330
331
|
order.promotions.push(promotion);
|
|
331
332
|
}
|
|
332
333
|
}
|
|
334
|
+
/**
|
|
335
|
+
* Promotions are added to the Order as soon as their conditions pass, since a Promotion which
|
|
336
|
+
* discounts nothing on one OrderLine may still discount a later line, the Order total or the
|
|
337
|
+
* shipping. Once everything has been applied, any Promotion which ended up adjusting nothing
|
|
338
|
+
* at all is removed again: `Order.promotions` is what the usage limits are counted from, so a
|
|
339
|
+
* Promotion the customer got no benefit from must not consume a usage.
|
|
340
|
+
*
|
|
341
|
+
* Promotions whose actions define side effects are kept regardless, as their benefit (a free
|
|
342
|
+
* gift, say) is not expressed as an adjustment amount - and on the first pass the side effect
|
|
343
|
+
* has not run yet, so there is nothing to discount.
|
|
344
|
+
*/
|
|
345
|
+
removeIneffectivePromotions(order) {
|
|
346
|
+
var _a, _b, _c, _d;
|
|
347
|
+
if (!((_a = order.promotions) === null || _a === void 0 ? void 0 : _a.length)) {
|
|
348
|
+
return;
|
|
349
|
+
}
|
|
350
|
+
const adjustmentSources = new Set();
|
|
351
|
+
for (const line of order.lines) {
|
|
352
|
+
for (const adjustment of (_b = line.adjustments) !== null && _b !== void 0 ? _b : []) {
|
|
353
|
+
adjustmentSources.add(adjustment.adjustmentSource);
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
for (const shippingLine of (_c = order.shippingLines) !== null && _c !== void 0 ? _c : []) {
|
|
357
|
+
for (const adjustment of (_d = shippingLine.adjustments) !== null && _d !== void 0 ? _d : []) {
|
|
358
|
+
adjustmentSources.add(adjustment.adjustmentSource);
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
order.promotions = order.promotions.filter(promotion => adjustmentSources.has(promotion.getSourceId()) || promotion.hasSideEffects);
|
|
362
|
+
}
|
|
333
363
|
};
|
|
334
364
|
exports.OrderCalculator = OrderCalculator;
|
|
335
365
|
exports.OrderCalculator = OrderCalculator = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "3.7.4-master-
|
|
3
|
+
"version": "3.7.4-master-202609090211",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -41,7 +41,9 @@
|
|
|
41
41
|
],
|
|
42
42
|
"dependencies": {
|
|
43
43
|
"@apollo/server": "^4.12.2",
|
|
44
|
+
"@apollographql/graphql-playground-html": "^1.6.29",
|
|
44
45
|
"@graphql-tools/stitch": "^10.1.16",
|
|
46
|
+
"@graphql-tools/utils": "^11.0.0",
|
|
45
47
|
"@nestjs/apollo": "~13.1.0",
|
|
46
48
|
"@nestjs/common": "^11.0.12",
|
|
47
49
|
"@nestjs/core": "^11.0.12",
|
|
@@ -49,7 +51,7 @@
|
|
|
49
51
|
"@nestjs/platform-express": "^11.0.12",
|
|
50
52
|
"@nestjs/typeorm": "^11.0.0",
|
|
51
53
|
"@types/express": "^5.0.1",
|
|
52
|
-
"@vendure/common": "^3.7.4-master-
|
|
54
|
+
"@vendure/common": "^3.7.4-master-202609090211",
|
|
53
55
|
"bcrypt": "^6.0.0",
|
|
54
56
|
"cookie-session": "^2.1.0",
|
|
55
57
|
"cron-time-generator": "^2.0.3",
|