@vendure/core 3.8.0-minor-202610110227 → 3.8.0
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/api.module.js +0 -5
- package/dist/api/api.module.js.map +1 -1
- package/dist/api/resolvers/entity/product-entity.resolver.d.ts +1 -2
- package/dist/api/resolvers/entity/product-entity.resolver.js +4 -11
- package/dist/api/resolvers/entity/product-entity.resolver.js.map +1 -1
- package/dist/config/default-config.js +0 -3
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/vendure-config.d.ts +0 -21
- package/dist/i18n/messages/en.json +0 -1
- package/dist/migrate.d.ts +1 -1
- package/dist/migrate.js +1 -1
- package/dist/migration-utils/translation-deduplication.d.ts +1 -0
- package/dist/migration-utils/translation-deduplication.js +1 -0
- package/dist/migration-utils/translation-deduplication.js.map +1 -1
- package/dist/migration-utils/v3_8_orderline_promotion_rescale.d.ts +8 -0
- package/dist/migration-utils/v3_8_orderline_promotion_rescale.js +8 -0
- package/dist/migration-utils/v3_8_orderline_promotion_rescale.js.map +1 -1
- package/dist/scheduler/scheduler.service.js +6 -3
- package/dist/scheduler/scheduler.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +20 -1
- package/dist/service/services/facet-value.service.js +62 -2
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/package.json +2 -2
- package/dist/api/common/required-input-fields.d.ts +0 -27
- package/dist/api/common/required-input-fields.js +0 -80
- package/dist/api/common/required-input-fields.js.map +0 -1
- package/dist/api/middleware/input-validation-interceptor.d.ts +0 -24
- package/dist/api/middleware/input-validation-interceptor.js +0 -98
- package/dist/api/middleware/input-validation-interceptor.js.map +0 -1
package/dist/api/api.module.js
CHANGED
|
@@ -24,7 +24,6 @@ const auth_guard_1 = require("./middleware/auth-guard");
|
|
|
24
24
|
const custom_field_processing_interceptor_1 = require("./middleware/custom-field-processing-interceptor");
|
|
25
25
|
const exception_logger_filter_1 = require("./middleware/exception-logger.filter");
|
|
26
26
|
const id_interceptor_1 = require("./middleware/id-interceptor");
|
|
27
|
-
const input_validation_interceptor_1 = require("./middleware/input-validation-interceptor");
|
|
28
27
|
const translate_error_result_interceptor_1 = require("./middleware/translate-error-result-interceptor");
|
|
29
28
|
/**
|
|
30
29
|
* The ApiModule is responsible for the public API of the application. This is where requests
|
|
@@ -82,10 +81,6 @@ exports.ApiModule = ApiModule = __decorate([
|
|
|
82
81
|
provide: core_1.APP_INTERCEPTOR,
|
|
83
82
|
useClass: id_interceptor_1.IdInterceptor,
|
|
84
83
|
},
|
|
85
|
-
{
|
|
86
|
-
provide: core_1.APP_INTERCEPTOR,
|
|
87
|
-
useClass: input_validation_interceptor_1.InputValidationInterceptor,
|
|
88
|
-
},
|
|
89
84
|
{
|
|
90
85
|
provide: core_1.APP_INTERCEPTOR,
|
|
91
86
|
useClass: custom_field_processing_interceptor_1.CustomFieldProcessingInterceptor,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.module.js","sourceRoot":"","sources":["../../src/api/api.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsE;AAEtE,6DAAyD;AACzD,uEAAmE;AACnE,0EAAqE;AACrE,qDAAiD;AACjD,8DAA0D;AAE1D,iEAAwF;AACxF,gFAA2E;AAC3E,2CAAwF;AACxF,wDAAoD;AACpD,0GAAoG;AACpG,kFAA6E;AAC7E,gEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"api.module.js","sourceRoot":"","sources":["../../src/api/api.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAwE;AACxE,uCAAsE;AAEtE,6DAAyD;AACzD,uEAAmE;AACnE,0EAAqE;AACrE,qDAAiD;AACjD,8DAA0D;AAE1D,iEAAwF;AACxF,gFAA2E;AAC3E,2CAAwF;AACxF,wDAAoD;AACpD,0GAAoG;AACpG,kFAA6E;AAC7E,gEAA4D;AAC5D,wGAAkG;AAElG;;;;GAIG;AAkDI,IAAM,SAAS,GAAf,MAAM,SAAS;IAClB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAEpD,KAAK,CAAC,SAAS,CAAC,QAA4B;QACxC,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QACpE,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QAC9D,aAAa;QACb,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,yCAAyC,CAAC,CAAC;QAClG,QAAQ;aACH,KAAK,CAAC,oBAAoB,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAC;aAC/D,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;CACJ,CAAA;AAZY,8BAAS;oBAAT,SAAS;IAjDrB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,8BAAa;YACb,oCAAgB,CAAC,OAAO,EAAE;YAC1B,qCAAgB;YAChB,wBAAU;YACV,sCAAe;YACf,qCAAc;YACd,oCAAa;YACb,IAAA,iDAAsB,EAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,MAAM;gBACf,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,WAAW;gBAC7C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,iBAAiB;gBACtD,SAAS,EAAE,uCAA2B;gBACtC,cAAc,EAAE,oCAAa;gBAC7B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,sBAAsB;aACnE,CAAC,CAAC;YACH,IAAA,iDAAsB,EAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACrC,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,YAAY;gBAC9C,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,kBAAkB;gBACvD,SAAS,EAAE,wCAA4B;gBACvC,cAAc,EAAE,qCAAc;gBAC9B,eAAe,EAAE,aAAa,CAAC,UAAU,CAAC,uBAAuB;aACpE,CAAC,CAAC;SACN;QACD,SAAS,EAAE;YACP;gBACI,OAAO,EAAE,gBAAS;gBAClB,QAAQ,EAAE,sBAAS;aACtB;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,8BAAa;aAC1B;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,sEAAgC;aAC7C;YACD;gBACI,OAAO,EAAE,sBAAe;gBACxB,QAAQ,EAAE,oEAA+B;aAC5C;YACD;gBACI,OAAO,EAAE,iBAAU;gBACnB,QAAQ,EAAE,+CAAqB;aAClC;SACJ;KACJ,CAAC;qCAEqC,8BAAa;GADvC,SAAS,CAYrB"}
|
|
@@ -23,10 +23,9 @@ export declare class ProductEntityResolver {
|
|
|
23
23
|
private collectionService;
|
|
24
24
|
private productOptionGroupService;
|
|
25
25
|
private assetService;
|
|
26
|
-
private productService;
|
|
27
26
|
private facetValueService;
|
|
28
27
|
private localeStringHydrator;
|
|
29
|
-
constructor(productVariantService: ProductVariantService, collectionService: CollectionService, productOptionGroupService: ProductOptionGroupService, assetService: AssetService,
|
|
28
|
+
constructor(productVariantService: ProductVariantService, collectionService: CollectionService, productOptionGroupService: ProductOptionGroupService, assetService: AssetService, facetValueService: FacetValueService, localeStringHydrator: LocaleStringHydrator);
|
|
30
29
|
name(ctx: RequestContext, product: Product): Promise<string>;
|
|
31
30
|
slug(ctx: RequestContext, product: Product): Promise<string>;
|
|
32
31
|
description(ctx: RequestContext, product: Product): Promise<string>;
|
|
@@ -30,12 +30,11 @@ const api_decorator_1 = require("../../decorators/api.decorator");
|
|
|
30
30
|
const relations_decorator_1 = require("../../decorators/relations.decorator");
|
|
31
31
|
const request_context_decorator_1 = require("../../decorators/request-context.decorator");
|
|
32
32
|
let ProductEntityResolver = class ProductEntityResolver {
|
|
33
|
-
constructor(productVariantService, collectionService, productOptionGroupService, assetService,
|
|
33
|
+
constructor(productVariantService, collectionService, productOptionGroupService, assetService, facetValueService, localeStringHydrator) {
|
|
34
34
|
this.productVariantService = productVariantService;
|
|
35
35
|
this.collectionService = collectionService;
|
|
36
36
|
this.productOptionGroupService = productOptionGroupService;
|
|
37
37
|
this.assetService = assetService;
|
|
38
|
-
this.productService = productService;
|
|
39
38
|
this.facetValueService = facetValueService;
|
|
40
39
|
this.localeStringHydrator = localeStringHydrator;
|
|
41
40
|
}
|
|
@@ -69,14 +68,9 @@ let ProductEntityResolver = class ProductEntityResolver {
|
|
|
69
68
|
if (((_a = product.facetValues) === null || _a === void 0 ? void 0 : _a.length) === 0) {
|
|
70
69
|
return [];
|
|
71
70
|
}
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
facetValues = await this.productService.getFacetValuesForProduct(ctx, product.id);
|
|
78
|
-
}
|
|
79
|
-
const filteredFacetValues = await this.facetValueService.findByIds(ctx, facetValues.map(facetValue => facetValue.id));
|
|
71
|
+
const filteredFacetValues = ((_c = (_b = product.facetValues) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.channels)
|
|
72
|
+
? await this.facetValueService.findByIds(ctx, product.facetValues.map(facetValue => facetValue.id))
|
|
73
|
+
: await this.facetValueService.findByProductId(ctx, product.id);
|
|
80
74
|
if (apiType === 'shop') {
|
|
81
75
|
return filteredFacetValues.filter(fv => !fv.facet.isPrivate);
|
|
82
76
|
}
|
|
@@ -200,7 +194,6 @@ exports.ProductEntityResolver = ProductEntityResolver = __decorate([
|
|
|
200
194
|
collection_service_1.CollectionService,
|
|
201
195
|
product_option_group_service_1.ProductOptionGroupService,
|
|
202
196
|
asset_service_1.AssetService,
|
|
203
|
-
product_service_1.ProductService,
|
|
204
197
|
facet_value_service_1.FacetValueService,
|
|
205
198
|
locale_string_hydrator_1.LocaleStringHydrator])
|
|
206
199
|
], ProductEntityResolver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/product-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA6E;AAE7E,2EAA4E;AAI5E,iDAAoD;AAKpD,2EAAiE;AAEjE,mGAAwF;AACxF,mHAA8G;AAC9G,2EAAuE;AACvE,qFAAiF;AACjF,uFAAkF;AAClF,yGAAmG;AACnG,+FAA0F;AAC1F,+EAA2E;AAE3E,kEAA8D;AAC9D,kEAAqD;AACrD,8EAAgF;AAChF,0FAAiE;AAG1D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YACY,qBAA4C,EAC5C,iBAAoC,EACpC,yBAAoD,EACpD,YAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"product-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/product-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA6E;AAE7E,2EAA4E;AAI5E,iDAAoD;AAKpD,2EAAiE;AAEjE,mGAAwF;AACxF,mHAA8G;AAC9G,2EAAuE;AACvE,qFAAiF;AACjF,uFAAkF;AAClF,yGAAmG;AACnG,+FAA0F;AAC1F,+EAA2E;AAE3E,kEAA8D;AAC9D,kEAAqD;AACrD,8EAAgF;AAChF,0FAAiE;AAG1D,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,YACY,qBAA4C,EAC5C,iBAAoC,EACpC,yBAAoD,EACpD,YAA0B,EAC1B,iBAAoC,EACpC,oBAA0C;QAL1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,iBAAY,GAAZ,YAAY,CAAc;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAAsB;IACnD,CAAC;IAGJ,IAAI,CAAQ,GAAmB,EAAY,OAAgB;QACvD,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;IAGD,IAAI,CAAQ,GAAmB,EAAY,OAAgB;QACvD,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACpF,CAAC;IAGD,WAAW,CAAQ,GAAmB,EAAY,OAAgB;QAC9D,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAC3F,CAAC;IAGD,YAAY,CAAQ,GAAmB,EAAY,OAAgB;QAC/D,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5F,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CACH,GAAmB,EAChB,OAAgB,EAC+B,SAAwC;QAEjG,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,CAC/E,GAAG,EACH,OAAO,CAAC,EAAE,EACV,EAAE,EACF,SAAS,CACZ,CAAC;QACF,OAAO,QAAQ,CAAC;IACpB,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACN,GAAmB,EAChB,OAAgB,EAClB,IAA4C,EACK,SAAwC;QAEjG,OAAO,IAAI,CAAC,qBAAqB,CAAC,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACvG,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACN,GAAmB,EAChB,OAAgB,EACnB,OAAgB;QAEvB,OAAO,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC;IACjG,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACN,IAAS,EACV,GAAmB,EAChB,OAAgB;QAE1B,OAAO,IAAI,CAAC,yBAAyB,CAAC,0BAA0B,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACN,GAAmB,EAChB,OAAgB,EACnB,OAAgB;;QAEvB,IAAI,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,MAAM,MAAK,CAAC,EAAE,CAAC;YACpC,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,mBAAmB,GAAG,CAAA,MAAA,MAAA,OAAO,CAAC,WAAW,0CAAG,CAAC,CAAC,0CAAE,QAAQ;YAC1D,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAClC,GAAG,EACH,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CACvD;YACH,CAAC,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAEpE,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACrB,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACJ,OAAO,mBAAmB,CAAC;QAC/B,CAAC;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAAQ,GAAmB,EAAY,OAAgB;QACtE,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,OAAO,CAAC,aAAa,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAQ,GAAmB,EAAY,OAAgB;QAC/D,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AA5GY,sDAAqB;AAW9B;IADC,IAAA,sBAAY,GAAE;IACT,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;iDAE1D;AAGD;IADC,IAAA,sBAAY,GAAE;IACT,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;iDAE1D;AAGD;IADC,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;wDAEjE;AAGD;IADC,IAAA,sBAAY,GAAE;IACD,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;yDAElE;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,+BAAS,EAAC,EAAE,MAAM,EAAE,uCAAc,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;;qCAF5C,gCAAc;QACP,wBAAO;;qDAU7B;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,cAAI,GAAE,CAAA;IACN,WAAA,IAAA,+BAAS,EAAC,EAAE,MAAM,EAAE,uCAAc,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;;qCAH5C,gCAAc;QACP,wBAAO;;wDAK7B;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,mBAAG,GAAE,CAAA;;qCAFM,gCAAc;QACP,wBAAO;;wDAI7B;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,cAAI,GAAE,CAAA;IACN,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;6CADG,gCAAc;QACP,wBAAO;;yDAG7B;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,mBAAG,GAAE,CAAA;;qCAFM,gCAAc;QACP,wBAAO;;wDAkB7B;AAGK;IADL,IAAA,sBAAY,GAAE;IACM,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;0DAKzE;AAGK;IADL,IAAA,sBAAY,GAAE;IACD,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;mDAElE;gCA3GQ,qBAAqB;IADjC,IAAA,kBAAQ,EAAC,SAAS,CAAC;qCAGmB,+CAAqB;QACzB,sCAAiB;QACT,wDAAyB;QACtC,4BAAY;QACP,uCAAiB;QACd,6CAAoB;GAP7C,qBAAqB,CA4GjC;AAGM,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IACnC,YAAoB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAGhD,AAAN,KAAK,CAAC,QAAQ,CAAQ,GAAmB,EAAY,OAAgB;QACjE,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,uCAAoB,CAAC;QACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QACrG,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1G,CAAC;CACJ,CAAA;AATY,gEAA0B;AAI7B;IADL,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAqB,wBAAO;;0DAIpE;qCARQ,0BAA0B;IADtC,IAAA,kBAAQ,EAAC,SAAS,CAAC;qCAEoB,gCAAc;GADzC,0BAA0B,CAStC"}
|
|
@@ -94,9 +94,6 @@ exports.defaultConfig = {
|
|
|
94
94
|
middleware: [],
|
|
95
95
|
introspection: true,
|
|
96
96
|
apolloServerPlugins: [],
|
|
97
|
-
inputValidation: {
|
|
98
|
-
requiredFieldValidation: true,
|
|
99
|
-
},
|
|
100
97
|
},
|
|
101
98
|
entityIdStrategy: new auto_increment_id_strategy_1.AutoIncrementIdStrategy(),
|
|
102
99
|
authOptions: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-config.js","sourceRoot":"","sources":["../../src/config/default-config.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AACnE,2EAM8C;AAC9C,mCAAqC;AAErC,4FAAqF;AACrF,yHAAiH;AACjH,kFAA6E;AAC7E,gFAA2E;AAE3E,oGAA6F;AAC7F,yGAAmG;AACnG,yGAAmG;AACnG,kGAA4F;AAC5F,kGAA4F;AAC5F,8FAAwF;AACxF,sHAA+G;AAC/G,0GAAmG;AACnG,sGAAgG;AAChG,oGAA8F;AAC9F,0FAAqF;AACrF,qFAAgF;AAChF,qIAA6H;AAC7H,iIAAyH;AACzH,2HAAmH;AACnH,6FAAuF;AACvF,2GAAoG;AACpG,oFAA8E;AAC9E,4EAAuE;AACvE,0EAAqE;AACrE,6DAA6E;AAC7E,2FAAsF;AACtF,yFAAoF;AACpF,4DAAwD;AACxD,yFAAmF;AACnF,6GAAsG;AACtG,6FAAuF;AACvF,yHAAiH;AACjH,iIAAyH;AACzH,yFAAmF;AACnF,yEAAoE;AACpE,yFAAmF;AACnF,iGAA2F;AAC3F,yEAAoE;AACpE,6FAAuF;AACvF,yFAAyF;AACzF,qEAAuE;AACvE,mEAA8D;AAC9D,+EAA0E;AAC1E,2CAAkF;AAClF,4EAAuE;AACvE,mGAA6F;AAC7F,4GAAqG;AACrG,+FAA0F;AAC1F,iHAA2G;AAC3G,2HAAoH;AACpH,sFAAiF;AACjF,gFAA0E;AAC1E,0FAAqF;AACrF,kGAA4F;AAC5F,yGAAkG;AAClG,uGAAgG;AAChG,+EAAyE;AAGzE;;;;;GAKG;AACU,QAAA,aAAa,GAAyB;IAC/C,mBAAmB,EAAE,IAAI;IACzB,mBAAmB,EAAE,8BAAY,CAAC,EAAE;IACpC,MAAM,EAAE,IAAI,8BAAa,EAAE;IAC3B,UAAU,EAAE;QACR,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,IAAI;QACV,YAAY,EAAE,WAAW;QACzB,kBAAkB,EAAE,KAAK;QACzB,aAAa,EAAE,KAAK;QACpB,mBAAmB,EAAE,IAAI;QACzB,uBAAuB,EAAE,EAAE;QAC3B,WAAW,EAAE,UAAU;QACvB,iBAAiB,EAAE,KAAK;QACxB,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,GAAG;QACvB,sBAAsB,EAAE,EAAE;QAC1B,eAAe,EAAE,4CAAyB;QAC1C,IAAI,EAAE;YACF,MAAM,EAAE,IAAI;YACZ,WAAW,EAAE,IAAI;SACpB;QACD,cAAc,EAAE,KAAK;QACrB,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,EAAE;QACd,aAAa,EAAE,IAAI;QACnB,mBAAmB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"default-config.js","sourceRoot":"","sources":["../../src/config/default-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -310,27 +310,6 @@ export interface ApiOptions {
|
|
|
310
310
|
* @since 1.5.0
|
|
311
311
|
*/
|
|
312
312
|
introspection?: boolean;
|
|
313
|
-
/**
|
|
314
|
-
* @description
|
|
315
|
-
* Controls input validation behaviour for mutation arguments.
|
|
316
|
-
*
|
|
317
|
-
* @since 3.8.0
|
|
318
|
-
*/
|
|
319
|
-
inputValidation?: {
|
|
320
|
-
/**
|
|
321
|
-
* @description
|
|
322
|
-
* When enabled, blank (empty or whitespace-only) string values are rejected for
|
|
323
|
-
* business-required fields on top-level mutation inputs (e.g. product name, facet code,
|
|
324
|
-
* channel token). Returns a `UserInputError` with the `field-cannot-be-blank` i18n code.
|
|
325
|
-
*
|
|
326
|
-
* Disable this if your integration cannot change its clients overnight and
|
|
327
|
-
* still sends empty strings for required fields.
|
|
328
|
-
*
|
|
329
|
-
* @default true
|
|
330
|
-
* @since 3.8.0
|
|
331
|
-
*/
|
|
332
|
-
requiredFieldValidation?: boolean;
|
|
333
|
-
};
|
|
334
313
|
}
|
|
335
314
|
/**
|
|
336
315
|
* @description
|
|
@@ -27,7 +27,6 @@
|
|
|
27
27
|
"entity-with-id-not-found": "No { entityName } with the id \"{ id }\" could be found",
|
|
28
28
|
"items-cannot-be-removed-from-default-channel": "Items cannot be removed from the default Channel",
|
|
29
29
|
"facetfilterinput-invalid-input": "A FacetValueFilterInput object may not specify the 'and' and 'or' fields simultaneously",
|
|
30
|
-
"field-cannot-be-blank": "The \"{ fieldName }\" field cannot be blank",
|
|
31
30
|
"field-invalid-datetime-range-max": "The custom field \"{ name }\" value [{ value }] is greater than the maximum [{ max }]",
|
|
32
31
|
"field-invalid-datetime-range-min": "The custom field \"{ name }\" value [{ value }] is less than the minimum [{ min }]",
|
|
33
32
|
"field-invalid-non-nullable": "The custom field \"{ name }\" value cannot be set to null",
|
package/dist/migrate.d.ts
CHANGED
|
@@ -102,7 +102,7 @@ export declare function revertLastMigration(userConfig: Partial<VendureConfig>):
|
|
|
102
102
|
* underlying migration mechanism.
|
|
103
103
|
*
|
|
104
104
|
* If the schema changes include adding the `(languageCode, baseId)` unique constraint to one or more
|
|
105
|
-
* translation tables (introduced in v3.
|
|
105
|
+
* translation tables (introduced in v3.8 to prevent duplicate translations, see
|
|
106
106
|
* [#4884](https://github.com/vendurehq/vendure/issues/4884)), the generated migration will begin
|
|
107
107
|
* with a call to {@link deduplicateTranslations} for exactly those tables, so that any duplicate rows
|
|
108
108
|
* already present in the database are removed before the constraint is created.
|
package/dist/migrate.js
CHANGED
|
@@ -203,7 +203,7 @@ async function revertLastMigration(userConfig) {
|
|
|
203
203
|
* underlying migration mechanism.
|
|
204
204
|
*
|
|
205
205
|
* If the schema changes include adding the `(languageCode, baseId)` unique constraint to one or more
|
|
206
|
-
* translation tables (introduced in v3.
|
|
206
|
+
* translation tables (introduced in v3.8 to prevent duplicate translations, see
|
|
207
207
|
* [#4884](https://github.com/vendurehq/vendure/issues/4884)), the generated migration will begin
|
|
208
208
|
* with a call to {@link deduplicateTranslations} for exactly those tables, so that any duplicate rows
|
|
209
209
|
* already present in the database are removed before the constraint is created.
|
|
@@ -96,6 +96,7 @@ import { QueryRunner } from 'typeorm';
|
|
|
96
96
|
* `columns` must hold the physical column names as they are when the migration runs.
|
|
97
97
|
*
|
|
98
98
|
* @docsCategory migration
|
|
99
|
+
* @since 3.8.0
|
|
99
100
|
*/
|
|
100
101
|
export declare function deduplicateTranslations(queryRunner: QueryRunner, translationTables: TranslationTableToDeduplicate | TranslationTableToDeduplicate[]): Promise<void>;
|
|
101
102
|
/**
|
|
@@ -99,6 +99,7 @@ exports.deduplicateTranslations = deduplicateTranslations;
|
|
|
99
99
|
* `columns` must hold the physical column names as they are when the migration runs.
|
|
100
100
|
*
|
|
101
101
|
* @docsCategory migration
|
|
102
|
+
* @since 3.8.0
|
|
102
103
|
*/
|
|
103
104
|
async function deduplicateTranslations(queryRunner, translationTables) {
|
|
104
105
|
const tables = Array.isArray(translationTables) ? translationTables : [translationTables];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translation-deduplication.js","sourceRoot":"","sources":["../../src/migration-utils/translation-deduplication.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"translation-deduplication.js","sourceRoot":"","sources":["../../src/migration-utils/translation-deduplication.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,14 @@ export interface RescaleOrderLinePromotionAdjustmentsOptions {
|
|
|
36
36
|
* Call this from your migration's `up()` method - it needs no schema change, so it
|
|
37
37
|
* can run at any point in the migration.
|
|
38
38
|
*
|
|
39
|
+
* :::warning
|
|
40
|
+
* Run it in the same deployment as the upgrade to v3.8, before the server handles any
|
|
41
|
+
* order cancellation, and never add it in a later migration. From v3.8 a partial
|
|
42
|
+
* cancellation rescales the line's `PROMOTION` adjustments itself. The helper cannot tell
|
|
43
|
+
* those lines apart from lines cancelled before v3.8, so it would scale them a second time
|
|
44
|
+
* and shrink their discount.
|
|
45
|
+
* :::
|
|
46
|
+
*
|
|
39
47
|
* ```ts
|
|
40
48
|
* import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
41
49
|
* import { rescaleOrderLinePromotionAdjustments } from '\@vendure/core';
|
|
@@ -88,6 +88,14 @@ function getRelationColumnName(metadata, propertyName) {
|
|
|
88
88
|
* Call this from your migration's `up()` method - it needs no schema change, so it
|
|
89
89
|
* can run at any point in the migration.
|
|
90
90
|
*
|
|
91
|
+
* :::warning
|
|
92
|
+
* Run it in the same deployment as the upgrade to v3.8, before the server handles any
|
|
93
|
+
* order cancellation, and never add it in a later migration. From v3.8 a partial
|
|
94
|
+
* cancellation rescales the line's `PROMOTION` adjustments itself. The helper cannot tell
|
|
95
|
+
* those lines apart from lines cancelled before v3.8, so it would scale them a second time
|
|
96
|
+
* and shrink their discount.
|
|
97
|
+
* :::
|
|
98
|
+
*
|
|
91
99
|
* ```ts
|
|
92
100
|
* import { MigrationInterface, QueryRunner } from 'typeorm';
|
|
93
101
|
* import { rescaleOrderLinePromotionAdjustments } from '\@vendure/core';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"v3_8_orderline_promotion_rescale.js","sourceRoot":"","sources":["../../src/migration-utils/v3_8_orderline_promotion_rescale.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"v3_8_orderline_promotion_rescale.js","sourceRoot":"","sources":["../../src/migration-utils/v3_8_orderline_promotion_rescale.ts"],"names":[],"mappings":";;AAmKA,oFAwJC;AA3TD,+BAA+B;AAC/B,yEAAuE;AAGvE,mGAAuF;AACvF,8EAAmE;AACnE,sGAA2F;AAyB3F,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAiBlD,SAAS,MAAM,CAAC,KAA2B;IACvC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,YAAY,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACjF,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5C,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,sBAAsB,CAC3B,GAAiB,EACjB,aAAgC,EAChC,aAAkC;IAElC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC7B,qFAAqF;QACrF,gCAAgC;QAChC,OAAO,GAAG,CAAC,mBAAmB,CAAC;IACnC,CAAC;IACD,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5F,MAAM,iBAAiB,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5F,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;QAC/F,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAI,iBAA8B,CAAC,CAAC;IACpE,IAAI,iBAAiB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC7C,OAAO,eAAe,CAAC;IAC3B,CAAC;IACD,MAAM,kCAAkC,GAAG,aAAa;SACnD,MAAM,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,EAAE,CAAE,iBAAiB,CAAC,KAAK,CAAY,GAAG,cAAc,CAAC;SACvF,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACvE,OAAO,kCAAkC,GAAG,CAAC;QACzC,CAAC,CAAC,GAAG,CAAC,QAAQ,GAAG,kCAAkC;QACnD,CAAC,CAAC,SAAS,CAAC;AACpB,CAAC;AAED,SAAS,sBAAsB,CAAC,GAA2B;IACvD,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAC5E,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;AACxD,CAAC;AAED,SAAS,aAAa,CAAC,QAAwB,EAAE,YAAoB;IACjE,MAAM,MAAM,GAAG,QAAQ,CAAC,0BAA0B,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,IAAI,IAAI,YAAY,mBAAmB,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,MAAM,CAAC,YAAY,CAAC;AAC/B,CAAC;AAED,SAAS,qBAAqB,CAAC,QAAwB,EAAE,YAAoB;;IACzE,MAAM,MAAM,GAAG,MAAA,QAAQ,CAAC,4BAA4B,CAAC,YAAY,CAAC,0CAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IACnF,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,kBAAkB,QAAQ,CAAC,IAAI,IAAI,YAAY,4BAA4B,CAAC,CAAC;IACjG,CAAC;IACD,OAAO,MAAM,CAAC,YAAY,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AACI,KAAK,UAAU,oCAAoC,CACtD,WAAwB,EACxB,UAAuD,EAAE;;IAEzD,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChF,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3F,MAAM,iBAAiB,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,6BAAS,CAAC,CAAC;IACxE,MAAM,oBAAoB,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,6CAAiB,CAAC,CAAC;IACnF,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,8CAAiB,CAAC,CAAC;IAE9E,MAAM,cAAc,GAAG,QAAQ,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,CAAC;IAChE,MAAM,gBAAgB,GAAG,GAAG,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC,CAAC;IAChF,MAAM,iBAAiB,GAAG,GAAG,CAAC,aAAa,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5E,MAAM,uBAAuB,GAAG,GAAG,CAAC,aAAa,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAC7F,MAAM,oBAAoB,GAAG,GAAG,CAAC,aAAa,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC,CAAC;IAClF,MAAM,iBAAiB,GAAG,QAAQ,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACnE,MAAM,mBAAmB,GAAG,GAAG,CAAC,qBAAqB,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC,CAAC;IACtF,MAAM,qBAAqB,GAAG,GAAG,CAAC,aAAa,CAAC,oBAAoB,EAAE,WAAW,CAAC,CAAC,CAAC;IACpF,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,cAAc,GAAG,GAAG,CAAC,qBAAqB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;IAC5E,MAAM,gBAAgB,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,GAAG,CAAC,aAAa,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC,CAAC;IAEhE,MAAM,IAAI,GAAmB,MAAM,WAAW,CAAC,KAAK,CAChD,aAAa,WAAW,OAAO,GAAG,CAAC,IAAI,CAAC;qBAC3B,gBAAgB,OAAO,GAAG,CAAC,SAAS,CAAC;qBACrC,iBAAiB,OAAO,GAAG,CAAC,UAAU,CAAC;qBACvC,uBAAuB,OAAO,GAAG,CAAC,qBAAqB,CAAC;qBACxD,oBAAoB,OAAO,GAAG,CAAC,aAAa,CAAC;gBAClD,cAAc;oBACV,iBAAiB,SAAS,uBAAuB;oBACjD,iBAAiB;oBACjB,uBAAuB,MAAM,CAC5C,CAAC;IAEF,MAAM,aAAa,GAAsB,MAAM,WAAW,CAAC,KAAK,CAC5D,aAAa,mBAAmB,OAAO,GAAG,CAAC,SAAS,CAAC;qBACxC,qBAAqB,OAAO,GAAG,CAAC,WAAW,CAAC;gBACjD,iBAAiB;;6BAEJ,cAAc;wBACnB,gBAAgB,SAAS,mBAAmB;wBAC5C,iBAAiB,SAAS,uBAAuB;wBACjD,iBAAiB;wBACjB,uBAAuB;WACpC,CACN,CAAC;IACF,MAAM,mBAAmB,GAA6B,MAAM,WAAW,CAAC,KAAK,CACzE,YAAY,gBAAgB,OAAO,GAAG,CAAC,WAAW,CAAC;oBACvC,WAAW,OAAO,GAAG,CAAC,MAAM,CAAC;gBACjC,YAAY;mBACT,WAAW,MAAM,KAAK,CAAC,CAAC,CAAC;;+BAEb,cAAc;0BACnB,gBAAgB,QAAQ,cAAc;0BACtC,iBAAiB,SAAS,uBAAuB;0BACjD,iBAAiB;0BACjB,uBAAuB;aACpC,EACL,CAAC,kCAAgB,CAAC,kBAAkB,CAAC,CACxC,CAAC;IAEF,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAA6B,CAAC;IACpE,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACvC,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7C,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,MAAA,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IACxG,CAAC;IACD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA+B,CAAC;IACrE,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE,CAAC;QAC3C,KAAK,MAAM,IAAI,IAAI,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACxC,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC9B,GAAG,CAAC,MAAA,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAI,EAAE,CAAC;gBAC5C,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;aACvE,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GAAwD,EAAE,CAAC;IACxE,MAAM,iBAAiB,GAA2B,EAAE,CAAC;IACrD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,IAAI,GAAG,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YACxC,SAAS;QACb,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;YACvF,SAAS;QACb,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC9B,MAAM,aAAa,GAAG,sBAAsB,CACxC,GAAG,EACH,MAAA,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,mCAAI,EAAE,EACrD,MAAA,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,mCAAI,EAAE,CAC1C,CAAC;QACF,IAAI,KAAyB,CAAC;QAC9B,IAAI,aAAa,KAAK,eAAe,EAAE,CAAC;YACpC,MAAM,eAAe,GAAG,MAAA,OAAO,CAAC,+BAA+B,0CAAG,MAAM,CAAC,CAAC;YAC1E,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;gBAC1B,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC/B,SAAS;YACb,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,eAAe,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACvE,MAAM,IAAI,KAAK,CACX,+CAA+C,GAAG,CAAC,EAAE,sEAAsE,GAAG,CAAC,QAAQ,IAAI,CAC9I,CAAC;YACN,CAAC;YACD,KAAK,GAAG,eAAe,CAAC;QAC5B,CAAC;aAAM,CAAC;YACJ,KAAK,GAAG,aAAa,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC;YACnC,SAAS;QACb,CAAC;QACD,MAAM,WAAW,GAAG,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC;QACzC,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAe,EAAE,EAAE,CAC5D,UAAU,CAAC,IAAI,KAAK,WAAW;YAC3B,CAAC,iCAAM,UAAU,KAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC,IACtE,CAAC,CAAC,UAAU,CACnB,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACX,wEAAwE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACpG,0FAA0F,CACjG,CAAC;IACN,CAAC;IAED,KAAK,IAAI,MAAM,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACxE,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAAC,CAAC;QAChE,MAAM,MAAM,GAA2B,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,KAAK;aACpB,GAAG,CAAC,MAAM,CAAC,EAAE;YACV,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;YAClD,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;YACpE,OAAO,QAAQ,OAAO,SAAS,gBAAgB,EAAE,CAAC;QACtD,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnF,MAAM,WAAW,CAAC,KAAK,CACnB,UAAU,cAAc;mBACjB,oBAAoB,WAAW,WAAW,IAAI,WAAW;qBACvD,WAAW,QAAQ,QAAQ,GAAG,EACvC,MAAM,CACT,CAAC;IACN,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,qCAAqC,OAAO,CAAC,MAAM,wCAAwC,CAAC,CAAC;AAC7G,CAAC"}
|
|
@@ -74,8 +74,10 @@ let SchedulerService = class SchedulerService {
|
|
|
74
74
|
const startTime = Date.now();
|
|
75
75
|
// If any tasks are still running, wait a short time for them to finish
|
|
76
76
|
const maxWaitTime = 10000;
|
|
77
|
-
|
|
77
|
+
if (this.runningTasks > 0) {
|
|
78
78
|
vendure_logger_1.Logger.warn(`Waiting for ${this.runningTasks} running tasks to finish before shutting down (signal: ${signal !== null && signal !== void 0 ? signal : 'unknown'})`);
|
|
79
|
+
}
|
|
80
|
+
while (this.runningTasks > 0 && Date.now() - startTime < maxWaitTime) {
|
|
79
81
|
await new Promise(resolve => setTimeout(resolve, 100));
|
|
80
82
|
}
|
|
81
83
|
}
|
|
@@ -153,14 +155,15 @@ let SchedulerService = class SchedulerService {
|
|
|
153
155
|
name: task.id,
|
|
154
156
|
protect: task.options.preventOverlap ? protectCallback : undefined,
|
|
155
157
|
timezone: (0, schedule_timezone_1.getScheduleTimezone)(task, this.configService.schedulerOptions),
|
|
156
|
-
}, () => {
|
|
158
|
+
}, async () => {
|
|
157
159
|
if (this.shouldRunTasks) {
|
|
158
160
|
// Only execute the cron task on the worker process
|
|
159
161
|
// so that any expensive logic does not affect
|
|
160
162
|
// the responsiveness of server processes
|
|
161
163
|
this.runningTasks++;
|
|
162
164
|
try {
|
|
163
|
-
|
|
165
|
+
// Awaiting keeps croner's `protect` blocking for the full run
|
|
166
|
+
await schedulerStrategy.executeTask(task)(job);
|
|
164
167
|
}
|
|
165
168
|
catch (e) {
|
|
166
169
|
const message = e instanceof Error ? e.message : String(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../src/scheduler/scheduler.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA2F;AAE3F,8EAA2C;AAC3C,mCAA8B;AAC9B,0DAAkC;AAElC,6DAAyD;AACzD,oEAAyD;AACzD,wDAAoD;AAEpD,uEAAkE;AAClE,2DAAgF;AAiBhF;;;;;;GAMG;AAEI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAIzB,YACqB,aAA4B,EAC5B,cAA8B;QAD9B,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QALlC,SAAI,GAAoD,IAAI,GAAG,EAAE,CAAC;QAC3E,mBAAc,GAAG,KAAK,CAAC;QACvB,iBAAY,GAAG,CAAC,CAAC;IAItB,CAAC;IAEJ,sBAAsB;;QAClB,IAAA,wCAAoB,EAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,KAAK,mCAAI,EAAE,CAAC;QACvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;QAChF,IAAI,CAAC,iBAAiB,IAAI,iBAAiB,YAAY,+CAAqB,EAAE,CAAC;YAC3E,uBAAM,CAAC,IAAI,CAAC,4EAA4E,CAAC,CAAC;YAC1F,uBAAM,CAAC,IAAI,CACP,qFAAqF,CACxF,CAAC;YACF,OAAO;QACX,CAAC;QACD,IAAI,CAAC,cAAc;YACf,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,oBAAoB,KAAK,KAAK;gBAClE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;QAEjC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,uBAAM,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACJ,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;oBACtB,MAAM,QAAQ,GAAG,mBAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC7C,MAAM,QAAQ,GAAG,IAAA,uCAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;oBAChF,uBAAM,CAAC,IAAI,CACP,8BAA8B,IAAI,CAAC,EAAE,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3F,CAAC;gBACN,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YAC1C,CAAC;YACD,MAAA,iBAAiB,CAAC,YAAY,kEAAG,IAAI,CAAC,CAAC;QAC3C,CAAC;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;YACnC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,uEAAuE;QACvE,MAAM,WAAW,GAAG,KAAM,CAAC;QAC3B,
|
|
1
|
+
{"version":3,"file":"scheduler.service.js","sourceRoot":"","sources":["../../src/scheduler/scheduler.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { CreateFacetValueInput, CreateFacetValueWithFacetInput, DeletionResponse
|
|
|
2
2
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
4
|
import { RelationPaths } from '../../api/decorators/relations.decorator';
|
|
5
|
+
import { RequestContextCacheService } from '../../cache/request-context-cache.service';
|
|
5
6
|
import { ListQueryOptions } from '../../common/types/common-types';
|
|
6
7
|
import { Translated } from '../../common/types/locale-types';
|
|
7
8
|
import { ConfigService } from '../../config/config.service';
|
|
@@ -29,7 +30,8 @@ export declare class FacetValueService {
|
|
|
29
30
|
private eventBus;
|
|
30
31
|
private translator;
|
|
31
32
|
private listQueryBuilder;
|
|
32
|
-
|
|
33
|
+
private requestCache;
|
|
34
|
+
constructor(connection: TransactionalConnection, translatableSaver: TranslatableSaver, configService: ConfigService, customFieldRelationService: CustomFieldRelationService, channelService: ChannelService, eventBus: EventBus, translator: TranslatorService, listQueryBuilder: ListQueryBuilder, requestCache: RequestContextCacheService);
|
|
33
35
|
/**
|
|
34
36
|
* @deprecated Use {@link FacetValueService.findAll findAll(ctx, lang)} instead
|
|
35
37
|
*/
|
|
@@ -45,6 +47,23 @@ export declare class FacetValueService {
|
|
|
45
47
|
findAllList(ctx: RequestContext, options?: ListQueryOptions<FacetValue>, relations?: RelationPaths<FacetValue>): Promise<PaginatedList<Translated<FacetValue>>>;
|
|
46
48
|
findOne(ctx: RequestContext, id: ID): Promise<Translated<FacetValue> | undefined>;
|
|
47
49
|
findByIds(ctx: RequestContext, ids: ID[]): Promise<Array<Translated<FacetValue>>>;
|
|
50
|
+
/**
|
|
51
|
+
* @description
|
|
52
|
+
* Returns the FacetValues assigned to the given Product which are available in the
|
|
53
|
+
* Channel of the RequestContext. Concurrent calls in the same request are batched into
|
|
54
|
+
* a fixed number of queries.
|
|
55
|
+
*
|
|
56
|
+
* @since 3.8.0
|
|
57
|
+
*/
|
|
58
|
+
findByProductId(ctx: RequestContext, productId: ID): Promise<Array<Translated<FacetValue>>>;
|
|
59
|
+
/**
|
|
60
|
+
* Resolving `Product.facetValues` on a product list costs several queries per product
|
|
61
|
+
* otherwise. Held against the RequestContext which also supplies the channel filter, so a
|
|
62
|
+
* single loader cannot mix channels. `cache: false` batches without memoizing, so a write
|
|
63
|
+
* earlier in the request is not masked.
|
|
64
|
+
*/
|
|
65
|
+
private getProductFacetValuesLoader;
|
|
66
|
+
private batchLoadProductFacetValues;
|
|
48
67
|
/**
|
|
49
68
|
* @description
|
|
50
69
|
* Returns all FacetValues belonging to the Facet with the given id.
|
|
@@ -8,11 +8,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.FacetValueService = void 0;
|
|
13
16
|
const common_1 = require("@nestjs/common");
|
|
14
17
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
18
|
+
const unique_1 = require("@vendure/common/lib/unique");
|
|
19
|
+
const dataloader_1 = __importDefault(require("dataloader"));
|
|
15
20
|
const request_context_1 = require("../../api/common/request-context");
|
|
21
|
+
const request_context_cache_service_1 = require("../../cache/request-context-cache.service");
|
|
16
22
|
const instrument_decorator_1 = require("../../common/instrument-decorator");
|
|
17
23
|
const utils_1 = require("../../common/utils");
|
|
18
24
|
const config_service_1 = require("../../config/config.service");
|
|
@@ -35,7 +41,7 @@ const channel_service_1 = require("./channel.service");
|
|
|
35
41
|
* @docsCategory services
|
|
36
42
|
*/
|
|
37
43
|
let FacetValueService = class FacetValueService {
|
|
38
|
-
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus, translator, listQueryBuilder) {
|
|
44
|
+
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus, translator, listQueryBuilder, requestCache) {
|
|
39
45
|
this.connection = connection;
|
|
40
46
|
this.translatableSaver = translatableSaver;
|
|
41
47
|
this.configService = configService;
|
|
@@ -44,6 +50,7 @@ let FacetValueService = class FacetValueService {
|
|
|
44
50
|
this.eventBus = eventBus;
|
|
45
51
|
this.translator = translator;
|
|
46
52
|
this.listQueryBuilder = listQueryBuilder;
|
|
53
|
+
this.requestCache = requestCache;
|
|
47
54
|
}
|
|
48
55
|
findAll(ctxOrLang, lang) {
|
|
49
56
|
const [repository, languageCode, channelLanguageCode] = ctxOrLang instanceof request_context_1.RequestContext
|
|
@@ -100,6 +107,58 @@ let FacetValueService = class FacetValueService {
|
|
|
100
107
|
});
|
|
101
108
|
return facetValues.then(values => values.map(facetValue => this.translator.translate(facetValue, ctx, ['facet'])));
|
|
102
109
|
}
|
|
110
|
+
/**
|
|
111
|
+
* @description
|
|
112
|
+
* Returns the FacetValues assigned to the given Product which are available in the
|
|
113
|
+
* Channel of the RequestContext. Concurrent calls in the same request are batched into
|
|
114
|
+
* a fixed number of queries.
|
|
115
|
+
*
|
|
116
|
+
* @since 3.8.0
|
|
117
|
+
*/
|
|
118
|
+
findByProductId(ctx, productId) {
|
|
119
|
+
return this.getProductFacetValuesLoader(ctx).load(productId);
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Resolving `Product.facetValues` on a product list costs several queries per product
|
|
123
|
+
* otherwise. Held against the RequestContext which also supplies the channel filter, so a
|
|
124
|
+
* single loader cannot mix channels. `cache: false` batches without memoizing, so a write
|
|
125
|
+
* earlier in the request is not masked.
|
|
126
|
+
*/
|
|
127
|
+
getProductFacetValuesLoader(ctx) {
|
|
128
|
+
return this.requestCache.get(ctx, 'FacetValueService.facetValuesByProductId', () => new dataloader_1.default(ids => this.batchLoadProductFacetValues(ctx, ids), { cache: false }));
|
|
129
|
+
}
|
|
130
|
+
async batchLoadProductFacetValues(ctx, productIds) {
|
|
131
|
+
const links = await this.connection
|
|
132
|
+
.getRepository(ctx, entity_1.Product)
|
|
133
|
+
.createQueryBuilder('product')
|
|
134
|
+
.innerJoin('product.facetValues', 'facetValue')
|
|
135
|
+
.select('product.id', 'productId')
|
|
136
|
+
.addSelect('facetValue.id', 'facetValueId')
|
|
137
|
+
.where('product.id IN (:...productIds)', { productIds: (0, unique_1.unique)(productIds) })
|
|
138
|
+
// An IN (...) query gives no row order guarantee, so sort to keep the order of
|
|
139
|
+
// `Product.facetValues` stable for API clients.
|
|
140
|
+
.orderBy('facetValue.id', 'ASC')
|
|
141
|
+
.getRawMany();
|
|
142
|
+
// One channel-filtered read for the whole batch.
|
|
143
|
+
const facetValues = await this.findByIds(ctx, (0, unique_1.unique)(links.map(link => link.facetValueId)));
|
|
144
|
+
const facetValuesById = new Map(facetValues.map(facetValue => [String(facetValue.id), facetValue]));
|
|
145
|
+
const byProductId = new Map();
|
|
146
|
+
for (const { productId, facetValueId } of links) {
|
|
147
|
+
const facetValue = facetValuesById.get(String(facetValueId));
|
|
148
|
+
if (!facetValue) {
|
|
149
|
+
// Not in the Channel of the RequestContext
|
|
150
|
+
continue;
|
|
151
|
+
}
|
|
152
|
+
const existing = byProductId.get(String(productId));
|
|
153
|
+
if (existing) {
|
|
154
|
+
existing.push(facetValue);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
byProductId.set(String(productId), [facetValue]);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
return productIds.map(id => { var _a; return (_a = byProductId.get(String(id))) !== null && _a !== void 0 ? _a : []; });
|
|
161
|
+
}
|
|
103
162
|
/**
|
|
104
163
|
* @description
|
|
105
164
|
* Returns all FacetValues belonging to the Facet with the given id.
|
|
@@ -249,6 +308,7 @@ exports.FacetValueService = FacetValueService = __decorate([
|
|
|
249
308
|
channel_service_1.ChannelService,
|
|
250
309
|
event_bus_1.EventBus,
|
|
251
310
|
translator_service_1.TranslatorService,
|
|
252
|
-
list_query_builder_1.ListQueryBuilder
|
|
311
|
+
list_query_builder_1.ListQueryBuilder,
|
|
312
|
+
request_context_cache_service_1.RequestContextCacheService])
|
|
253
313
|
], FacetValueService);
|
|
254
314
|
//# sourceMappingURL=facet-value.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.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.8.0
|
|
3
|
+
"version": "3.8.0",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"@nestjs/platform-express": "^12.0.1",
|
|
54
54
|
"@nestjs/typeorm": "^12.0.1",
|
|
55
55
|
"@types/express": "^5.0.1",
|
|
56
|
-
"@vendure/common": "
|
|
56
|
+
"@vendure/common": "3.8.0",
|
|
57
57
|
"bcrypt": "^6.0.0",
|
|
58
58
|
"cookie-session": "^2.1.0",
|
|
59
59
|
"cron-time-generator": "^2.0.3",
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @description
|
|
3
|
-
* Registry of input types whose string fields must not be blank (empty or whitespace-only).
|
|
4
|
-
* Only business-required identifier/label fields are listed here — description fields and
|
|
5
|
-
* system-populated defaults are intentionally excluded.
|
|
6
|
-
*
|
|
7
|
-
* The `fields` array covers direct string properties on the input type.
|
|
8
|
-
* The `translations` array covers string properties on each entry in the `translations` array.
|
|
9
|
-
*
|
|
10
|
-
* Both create and update inputs are registered because an update that explicitly sets a field
|
|
11
|
-
* to blank should also be rejected, even though the field is optional on update types.
|
|
12
|
-
*
|
|
13
|
-
* Scope: Only top-level mutation arguments are validated. Nested input types that appear
|
|
14
|
-
* inside other inputs (e.g. CreateFacetValueWithFacetInput within CreateFacetInput.values,
|
|
15
|
-
* CreateGroupOptionInput within CreateProductOptionGroupInput.options) are not covered.
|
|
16
|
-
* These should be validated in the service layer if needed.
|
|
17
|
-
*
|
|
18
|
-
* MAINTENANCE: Keep this registry in sync with the GraphQL schema definitions in
|
|
19
|
-
* `packages/core/src/api/schema/admin-api/` and `packages/core/src/api/schema/shop-api/`.
|
|
20
|
-
* When a new entity with required string fields is added, or an existing field is renamed,
|
|
21
|
-
* this registry must be updated accordingly. Mismatches silently become no-ops (the type or
|
|
22
|
-
* field won't match, so validation won't apply).
|
|
23
|
-
*/
|
|
24
|
-
export declare const requiredInputFields: Record<string, {
|
|
25
|
-
fields?: string[];
|
|
26
|
-
translations?: string[];
|
|
27
|
-
}>;
|
|
@@ -1,80 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requiredInputFields = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* @description
|
|
6
|
-
* Registry of input types whose string fields must not be blank (empty or whitespace-only).
|
|
7
|
-
* Only business-required identifier/label fields are listed here — description fields and
|
|
8
|
-
* system-populated defaults are intentionally excluded.
|
|
9
|
-
*
|
|
10
|
-
* The `fields` array covers direct string properties on the input type.
|
|
11
|
-
* The `translations` array covers string properties on each entry in the `translations` array.
|
|
12
|
-
*
|
|
13
|
-
* Both create and update inputs are registered because an update that explicitly sets a field
|
|
14
|
-
* to blank should also be rejected, even though the field is optional on update types.
|
|
15
|
-
*
|
|
16
|
-
* Scope: Only top-level mutation arguments are validated. Nested input types that appear
|
|
17
|
-
* inside other inputs (e.g. CreateFacetValueWithFacetInput within CreateFacetInput.values,
|
|
18
|
-
* CreateGroupOptionInput within CreateProductOptionGroupInput.options) are not covered.
|
|
19
|
-
* These should be validated in the service layer if needed.
|
|
20
|
-
*
|
|
21
|
-
* MAINTENANCE: Keep this registry in sync with the GraphQL schema definitions in
|
|
22
|
-
* `packages/core/src/api/schema/admin-api/` and `packages/core/src/api/schema/shop-api/`.
|
|
23
|
-
* When a new entity with required string fields is added, or an existing field is renamed,
|
|
24
|
-
* this registry must be updated accordingly. Mismatches silently become no-ops (the type or
|
|
25
|
-
* field won't match, so validation won't apply).
|
|
26
|
-
*/
|
|
27
|
-
exports.requiredInputFields = {
|
|
28
|
-
CreateProductInput: { translations: ['name', 'slug'] },
|
|
29
|
-
UpdateProductInput: { translations: ['name', 'slug'] },
|
|
30
|
-
CreateProductVariantInput: { fields: ['sku'], translations: ['name'] },
|
|
31
|
-
UpdateProductVariantInput: { fields: ['sku'], translations: ['name'] },
|
|
32
|
-
CreateProductOptionInput: { fields: ['code'], translations: ['name'] },
|
|
33
|
-
UpdateProductOptionInput: { fields: ['code'], translations: ['name'] },
|
|
34
|
-
CreateProductOptionGroupInput: { fields: ['code'], translations: ['name'] },
|
|
35
|
-
UpdateProductOptionGroupInput: { fields: ['code'], translations: ['name'] },
|
|
36
|
-
CreateFacetInput: { fields: ['code'], translations: ['name'] },
|
|
37
|
-
UpdateFacetInput: { fields: ['code'], translations: ['name'] },
|
|
38
|
-
CreateFacetValueInput: { fields: ['code'], translations: ['name'] },
|
|
39
|
-
UpdateFacetValueInput: { fields: ['code'], translations: ['name'] },
|
|
40
|
-
CreateCollectionInput: { translations: ['name', 'slug'] },
|
|
41
|
-
UpdateCollectionInput: { translations: ['name', 'slug'] },
|
|
42
|
-
CreateChannelInput: { fields: ['code', 'token'] },
|
|
43
|
-
UpdateChannelInput: { fields: ['code', 'token'] },
|
|
44
|
-
CreateShippingMethodInput: { fields: ['code', 'fulfillmentHandler'], translations: ['name'] },
|
|
45
|
-
UpdateShippingMethodInput: { fields: ['code', 'fulfillmentHandler'], translations: ['name'] },
|
|
46
|
-
CreatePaymentMethodInput: { fields: ['code'], translations: ['name'] },
|
|
47
|
-
UpdatePaymentMethodInput: { fields: ['code'], translations: ['name'] },
|
|
48
|
-
CreateTaxCategoryInput: { fields: ['name'] },
|
|
49
|
-
UpdateTaxCategoryInput: { fields: ['name'] },
|
|
50
|
-
CreateTaxRateInput: { fields: ['name'] },
|
|
51
|
-
UpdateTaxRateInput: { fields: ['name'] },
|
|
52
|
-
CreateRoleInput: { fields: ['code'] },
|
|
53
|
-
UpdateRoleInput: { fields: ['code'] },
|
|
54
|
-
CreateZoneInput: { fields: ['name'] },
|
|
55
|
-
UpdateZoneInput: { fields: ['name'] },
|
|
56
|
-
CreateCountryInput: { fields: ['code'], translations: ['name'] },
|
|
57
|
-
UpdateCountryInput: { fields: ['code'], translations: ['name'] },
|
|
58
|
-
CreateProvinceInput: { fields: ['code'], translations: ['name'] },
|
|
59
|
-
UpdateProvinceInput: { fields: ['code'], translations: ['name'] },
|
|
60
|
-
CreateSellerInput: { fields: ['name'] },
|
|
61
|
-
UpdateSellerInput: { fields: ['name'] },
|
|
62
|
-
CreateStockLocationInput: { fields: ['name'] },
|
|
63
|
-
UpdateStockLocationInput: { fields: ['name'] },
|
|
64
|
-
CreateAdministratorInput: { fields: ['firstName', 'lastName', 'emailAddress'] },
|
|
65
|
-
UpdateAdministratorInput: { fields: ['firstName', 'lastName', 'emailAddress'] },
|
|
66
|
-
UpdateActiveAdministratorInput: { fields: ['firstName', 'lastName', 'emailAddress'] },
|
|
67
|
-
CreateCustomerInput: { fields: ['firstName', 'lastName', 'emailAddress'] },
|
|
68
|
-
UpdateCustomerInput: { fields: ['firstName', 'lastName', 'emailAddress'] },
|
|
69
|
-
CreateCustomerGroupInput: { fields: ['name'] },
|
|
70
|
-
UpdateCustomerGroupInput: { fields: ['name'] },
|
|
71
|
-
CreatePromotionInput: { translations: ['name'] },
|
|
72
|
-
UpdatePromotionInput: { translations: ['name'] },
|
|
73
|
-
CreateTagInput: { fields: ['value'] },
|
|
74
|
-
UpdateTagInput: { fields: ['value'] },
|
|
75
|
-
CreateAddressInput: { fields: ['streetLine1'] },
|
|
76
|
-
UpdateAddressInput: { fields: ['streetLine1'] },
|
|
77
|
-
RegisterCustomerInput: { fields: ['emailAddress'] },
|
|
78
|
-
PaymentInput: { fields: ['method'] },
|
|
79
|
-
};
|
|
80
|
-
//# sourceMappingURL=required-input-fields.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"required-input-fields.js","sourceRoot":"","sources":["../../../src/api/common/required-input-fields.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
|
|
2
|
-
import { Observable } from 'rxjs';
|
|
3
|
-
import { ConfigService } from '../../config/config.service';
|
|
4
|
-
/**
|
|
5
|
-
* @description
|
|
6
|
-
* Interceptor that validates string fields on GraphQL mutation inputs are not blank
|
|
7
|
-
* (empty or whitespace-only). Uses a hand-curated registry of fields that are
|
|
8
|
-
* business-required — description fields and system-populated defaults are excluded.
|
|
9
|
-
*
|
|
10
|
-
* Only validates top-level mutation arguments. Nested input types (e.g. within arrays
|
|
11
|
-
* passed as non-argument fields) are not covered and should be validated in the
|
|
12
|
-
* service layer if needed.
|
|
13
|
-
*
|
|
14
|
-
* Can be disabled via `apiOptions.inputValidation.requiredFieldValidation: false`.
|
|
15
|
-
*
|
|
16
|
-
* @since 3.8.0
|
|
17
|
-
*/
|
|
18
|
-
export declare class InputValidationInterceptor implements NestInterceptor {
|
|
19
|
-
private readonly configService;
|
|
20
|
-
constructor(configService: ConfigService);
|
|
21
|
-
intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any>;
|
|
22
|
-
private validateInput;
|
|
23
|
-
private checkBlank;
|
|
24
|
-
}
|
|
@@ -1,98 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.InputValidationInterceptor = void 0;
|
|
13
|
-
const common_1 = require("@nestjs/common");
|
|
14
|
-
const graphql_1 = require("@nestjs/graphql");
|
|
15
|
-
const graphql_2 = require("graphql");
|
|
16
|
-
const errors_1 = require("../../common/error/errors");
|
|
17
|
-
const config_service_1 = require("../../config/config.service");
|
|
18
|
-
const parse_context_1 = require("../common/parse-context");
|
|
19
|
-
const required_input_fields_1 = require("../common/required-input-fields");
|
|
20
|
-
/**
|
|
21
|
-
* @description
|
|
22
|
-
* Interceptor that validates string fields on GraphQL mutation inputs are not blank
|
|
23
|
-
* (empty or whitespace-only). Uses a hand-curated registry of fields that are
|
|
24
|
-
* business-required — description fields and system-populated defaults are excluded.
|
|
25
|
-
*
|
|
26
|
-
* Only validates top-level mutation arguments. Nested input types (e.g. within arrays
|
|
27
|
-
* passed as non-argument fields) are not covered and should be validated in the
|
|
28
|
-
* service layer if needed.
|
|
29
|
-
*
|
|
30
|
-
* Can be disabled via `apiOptions.inputValidation.requiredFieldValidation: false`.
|
|
31
|
-
*
|
|
32
|
-
* @since 3.8.0
|
|
33
|
-
*/
|
|
34
|
-
let InputValidationInterceptor = class InputValidationInterceptor {
|
|
35
|
-
constructor(configService) {
|
|
36
|
-
this.configService = configService;
|
|
37
|
-
}
|
|
38
|
-
intercept(context, next) {
|
|
39
|
-
var _a;
|
|
40
|
-
const parsedContext = (0, parse_context_1.parseContext)(context);
|
|
41
|
-
if (!parsedContext.isGraphQL) {
|
|
42
|
-
return next.handle();
|
|
43
|
-
}
|
|
44
|
-
const { operation, schema, fieldName } = parsedContext.info;
|
|
45
|
-
if (operation.operation !== 'mutation') {
|
|
46
|
-
return next.handle();
|
|
47
|
-
}
|
|
48
|
-
if (((_a = this.configService.apiOptions.inputValidation) === null || _a === void 0 ? void 0 : _a.requiredFieldValidation) === false) {
|
|
49
|
-
return next.handle();
|
|
50
|
-
}
|
|
51
|
-
const gqlExecutionContext = graphql_1.GqlExecutionContext.create(context);
|
|
52
|
-
const variables = gqlExecutionContext.getArgs();
|
|
53
|
-
const mutationType = schema.getMutationType();
|
|
54
|
-
const fieldDef = mutationType === null || mutationType === void 0 ? void 0 : mutationType.getFields()[fieldName];
|
|
55
|
-
if (!fieldDef) {
|
|
56
|
-
return next.handle();
|
|
57
|
-
}
|
|
58
|
-
for (const arg of fieldDef.args) {
|
|
59
|
-
const typeName = (0, graphql_2.getNamedType)(arg.type).name;
|
|
60
|
-
const spec = required_input_fields_1.requiredInputFields[typeName];
|
|
61
|
-
if (spec && variables[arg.name]) {
|
|
62
|
-
const inputValues = Array.isArray(variables[arg.name])
|
|
63
|
-
? variables[arg.name]
|
|
64
|
-
: [variables[arg.name]];
|
|
65
|
-
for (const inputValue of inputValues) {
|
|
66
|
-
this.validateInput(spec, inputValue);
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
return next.handle();
|
|
71
|
-
}
|
|
72
|
-
validateInput(spec, inputValue) {
|
|
73
|
-
if (spec.fields) {
|
|
74
|
-
this.checkBlank(inputValue, spec.fields);
|
|
75
|
-
}
|
|
76
|
-
if (spec.translations && Array.isArray(inputValue.translations)) {
|
|
77
|
-
for (const translation of inputValue.translations) {
|
|
78
|
-
if (translation && typeof translation === 'object') {
|
|
79
|
-
this.checkBlank(translation, spec.translations);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
checkBlank(obj, fieldNames) {
|
|
85
|
-
for (const fieldName of fieldNames) {
|
|
86
|
-
const value = obj[fieldName];
|
|
87
|
-
if (typeof value === 'string' && value.trim() === '') {
|
|
88
|
-
throw new errors_1.UserInputError('error.field-cannot-be-blank', { fieldName });
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
};
|
|
93
|
-
exports.InputValidationInterceptor = InputValidationInterceptor;
|
|
94
|
-
exports.InputValidationInterceptor = InputValidationInterceptor = __decorate([
|
|
95
|
-
(0, common_1.Injectable)(),
|
|
96
|
-
__metadata("design:paramtypes", [config_service_1.ConfigService])
|
|
97
|
-
], InputValidationInterceptor);
|
|
98
|
-
//# sourceMappingURL=input-validation-interceptor.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"input-validation-interceptor.js","sourceRoot":"","sources":["../../../src/api/middleware/input-validation-interceptor.ts"],"names":[],"mappings":"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"}
|