@vendure/core 2.2.0-next.1 → 2.2.0-next.2
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/common/validate-custom-field-value.d.ts +2 -2
- package/dist/api/common/validate-custom-field-value.js +5 -5
- package/dist/api/common/validate-custom-field-value.js.map +1 -1
- package/dist/api/config/get-custom-fields-config-without-interfaces.d.ts +1 -1
- package/dist/api/config/get-custom-fields-config-without-interfaces.js +2 -1
- package/dist/api/config/get-custom-fields-config-without-interfaces.js.map +1 -1
- package/dist/api/config/graphql-custom-fields.js +14 -0
- package/dist/api/config/graphql-custom-fields.js.map +1 -1
- package/dist/api/middleware/exception-logger.filter.d.ts +5 -2
- package/dist/api/middleware/exception-logger.filter.js +21 -2
- package/dist/api/middleware/exception-logger.filter.js.map +1 -1
- package/dist/api/middleware/id-codec-plugin.js +2 -0
- package/dist/api/middleware/id-codec-plugin.js.map +1 -1
- package/dist/api/middleware/validate-custom-fields-interceptor.js +7 -7
- package/dist/api/middleware/validate-custom-fields-interceptor.js.map +1 -1
- package/dist/api/resolvers/admin/global-settings.resolver.d.ts +1 -0
- package/dist/api/resolvers/admin/global-settings.resolver.js +27 -3
- package/dist/api/resolvers/admin/global-settings.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/order.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/order.resolver.js +13 -0
- package/dist/api/resolvers/admin/order.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/administrator-entity.resolver.d.ts +3 -3
- package/dist/api/resolvers/entity/administrator-entity.resolver.js +9 -9
- package/dist/api/resolvers/entity/administrator-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-variant-entity.resolver.js +2 -1
- package/dist/api/resolvers/entity/product-variant-entity.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +41 -0
- package/dist/api/schema/common/history-entry.type.graphql +1 -0
- package/dist/common/error/generated-graphql-admin-errors.d.ts +9 -0
- package/dist/common/error/generated-graphql-admin-errors.js +12 -2
- package/dist/common/error/generated-graphql-admin-errors.js.map +1 -1
- package/dist/config/config.module.js +2 -1
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/custom-field/custom-field-types.d.ts +7 -3
- package/dist/config/default-config.js +2 -0
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/index.d.ts +1 -0
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/system/error-handler-strategy.d.ts +75 -0
- package/dist/config/system/error-handler-strategy.js +3 -0
- package/dist/config/system/error-handler-strategy.js.map +1 -0
- package/dist/config/vendure-config.d.ts +10 -0
- package/dist/entity/custom-entity-fields.d.ts +2 -0
- package/dist/entity/custom-entity-fields.js +4 -1
- package/dist/entity/custom-entity-fields.js.map +1 -1
- package/dist/entity/product-variant/product-variant-price.entity.d.ts +4 -1
- package/dist/entity/product-variant/product-variant-price.entity.js +5 -0
- package/dist/entity/product-variant/product-variant-price.entity.js.map +1 -1
- package/dist/entity/refund/refund.entity.d.ts +12 -0
- package/dist/entity/refund/refund.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +43 -55
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/i18n/messages/de.json +3 -3
- package/dist/i18n/messages/en.json +2 -0
- package/dist/job-queue/job-queue.service.d.ts +5 -0
- package/dist/job-queue/job-queue.service.js +22 -0
- package/dist/job-queue/job-queue.service.js.map +1 -1
- package/dist/job-queue/polling-job-queue-strategy.d.ts +34 -1
- package/dist/job-queue/polling-job-queue-strategy.js +54 -24
- package/dist/job-queue/polling-job-queue-strategy.js.map +1 -1
- package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.d.ts +12 -0
- package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.js +2 -1
- package/dist/plugin/default-job-queue-plugin/default-job-queue-plugin.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.d.ts +4 -3
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js +12 -3
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js +2 -2
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +7 -6
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +5 -7
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +9 -7
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +9 -4
- package/dist/service/helpers/order-modifier/order-modifier.js +118 -34
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.js +1 -0
- package/dist/service/helpers/translatable-saver/translatable-saver.js.map +1 -1
- package/dist/service/services/collection.service.js +3 -0
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/history.service.d.ts +7 -0
- package/dist/service/services/history.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +12 -8
- package/dist/service/services/order.service.js +58 -67
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment.service.d.ts +8 -2
- package/dist/service/services/payment.service.js +54 -25
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +9 -3
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.IndexerController = exports.workerLoggerCtx = exports.variantRelations = exports.productRelations = exports.BATCH_SIZE = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
17
18
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
18
19
|
const typeorm_1 = require("typeorm");
|
|
19
20
|
const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
|
|
@@ -22,8 +23,8 @@ const utils_1 = require("../../../common/utils");
|
|
|
22
23
|
const config_service_1 = require("../../../config/config.service");
|
|
23
24
|
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
24
25
|
const transactional_connection_1 = require("../../../connection/transactional-connection");
|
|
25
|
-
const product_entity_1 = require("../../../entity/product/product.entity");
|
|
26
26
|
const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
|
|
27
|
+
const product_entity_1 = require("../../../entity/product/product.entity");
|
|
27
28
|
const product_price_applicator_1 = require("../../../service/helpers/product-price-applicator/product-price-applicator");
|
|
28
29
|
const product_variant_service_1 = require("../../../service/services/product-variant.service");
|
|
29
30
|
const constants_1 = require("../constants");
|
|
@@ -51,7 +52,8 @@ let IndexerController = class IndexerController {
|
|
|
51
52
|
this.options = options;
|
|
52
53
|
this.queue = new async_queue_1.AsyncQueue('search-index');
|
|
53
54
|
}
|
|
54
|
-
reindex(
|
|
55
|
+
reindex(job) {
|
|
56
|
+
const { ctx: rawContext } = job.data;
|
|
55
57
|
const ctx = mutable_request_context_1.MutableRequestContext.deserialize(rawContext);
|
|
56
58
|
return (0, utils_1.asyncObservable)(async (observer) => {
|
|
57
59
|
const timeStart = Date.now();
|
|
@@ -64,6 +66,9 @@ let IndexerController = class IndexerController {
|
|
|
64
66
|
.delete({ languageCode: ctx.languageCode, channelId: ctx.channelId });
|
|
65
67
|
vendure_logger_1.Logger.verbose('Deleted existing index items', exports.workerLoggerCtx);
|
|
66
68
|
for (let i = 0; i < batches; i++) {
|
|
69
|
+
if (job.state === generated_types_1.JobState.CANCELLED) {
|
|
70
|
+
throw new Error('reindex job was cancelled');
|
|
71
|
+
}
|
|
67
72
|
vendure_logger_1.Logger.verbose(`Processing batch ${i + 1} of ${batches}`, exports.workerLoggerCtx);
|
|
68
73
|
const variants = await qb
|
|
69
74
|
.take(exports.BATCH_SIZE)
|
|
@@ -84,7 +89,8 @@ let IndexerController = class IndexerController {
|
|
|
84
89
|
};
|
|
85
90
|
});
|
|
86
91
|
}
|
|
87
|
-
updateVariantsById(
|
|
92
|
+
updateVariantsById(job) {
|
|
93
|
+
const { ctx: rawContext, ids } = job.data;
|
|
88
94
|
const ctx = mutable_request_context_1.MutableRequestContext.deserialize(rawContext);
|
|
89
95
|
return (0, utils_1.asyncObservable)(async (observer) => {
|
|
90
96
|
const timeStart = Date.now();
|
|
@@ -92,6 +98,9 @@ let IndexerController = class IndexerController {
|
|
|
92
98
|
const batches = Math.ceil(ids.length / exports.BATCH_SIZE);
|
|
93
99
|
vendure_logger_1.Logger.verbose(`Updating ${ids.length} variants...`);
|
|
94
100
|
for (let i = 0; i < batches; i++) {
|
|
101
|
+
if (job.state === generated_types_1.JobState.CANCELLED) {
|
|
102
|
+
throw new Error('updateVariantsById job was cancelled');
|
|
103
|
+
}
|
|
95
104
|
const begin = i * exports.BATCH_SIZE;
|
|
96
105
|
const end = begin + exports.BATCH_SIZE;
|
|
97
106
|
vendure_logger_1.Logger.verbose(`Updating ids from index ${begin} to ${end}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAGpD,uDAAoD;AAEpD,qCAAqC;AAIrC,gGAA0F;AAC1F,6DAAyD;AAEzD,iDAAqE;AACrE,mEAA+D;AAC/D,0EAA+D;AAC/D,2FAAuF;AAEvF,2EAAiE;AACjE,mGAAwF;AACxF,yHAAoH;AACpH,+FAA0F;AAC1F,4CAAmD;AACnD,mFAAuE;AAavE,uEAAkE;AAErD,QAAA,UAAU,GAAG,IAAI,CAAC;AAClB,QAAA,gBAAgB,GAAG,CAAC,eAAe,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,CAAC,CAAC;AACrF,QAAA,gBAAgB,GAAG;IAC5B,eAAe;IACf,aAAa;IACb,mBAAmB;IACnB,aAAa;IACb,aAAa;IACb,UAAU;IACV,yBAAyB;CAC5B,CAAC;AAEW,QAAA,eAAe,GAAG,4BAA4B,CAAC;AAGrD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAG1B,YACY,UAAmC,EACnC,sBAA8C,EAC9C,aAA4B,EAC5B,mBAA+C,EAC/C,qBAA4C,EACf,OAAuC;QALpE,eAAU,GAAV,UAAU,CAAyB;QACnC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAA4B;QAC/C,0BAAqB,GAArB,qBAAqB,CAAuB;QACf,YAAO,GAAP,OAAO,CAAgC;QARxE,UAAK,GAAG,IAAI,wBAAU,CAAC,cAAc,CAAC,CAAC;IAS5C,CAAC;IAEJ,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAsB;QAC3C,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAC1D,OAAO,IAAA,uBAAe,EAAC,KAAK,EAAC,QAAQ,EAAC,EAAE;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;YAC/D,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC;YAClC,uBAAM,CAAC,OAAO,CAAC,cAAc,KAAK,yBAAyB,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,uBAAe,CAAC,CAAC;YAChG,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,kBAAU,CAAC,CAAC;YAE9C,MAAM,IAAI,CAAC,UAAU;iBAChB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;iBACnC,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC1E,uBAAM,CAAC,OAAO,CAAC,8BAA8B,EAAE,uBAAe,CAAC,CAAC;YAEhE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;gBAC9B,uBAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,OAAO,EAAE,EAAE,uBAAe,CAAC,CAAC;gBAE3E,MAAM,QAAQ,GAAG,MAAM,EAAE;qBACpB,IAAI,CAAC,kBAAU,CAAC;qBAChB,IAAI,CAAC,CAAC,GAAG,kBAAU,CAAC;qBACpB,OAAO,EAAE,CAAC;gBACf,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gBACvC,QAAQ,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,KAAK;oBACZ,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAU,EAAE,KAAK,CAAC;oBAChD,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,GAAG,SAAS;iBACpC,CAAC,CAAC;aACN;YACD,uBAAM,CAAC,OAAO,CAAC,sBAAsB,EAAE,uBAAe,CAAC,CAAC;YAExD,OAAO;gBACH,KAAK,EAAE,KAAK;gBACZ,SAAS,EAAE,KAAK;gBAChB,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,GAAG,SAAS;aACpC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,kBAAkB,CAAC,EACf,GAAG,EAAE,UAAU,EACf,GAAG,GACyB;QAC5B,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QAE1D,OAAO,IAAA,uBAAe,EAAC,KAAK,EAAC,QAAQ,EAAC,EAAE;YACpC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC7B,IAAI,GAAG,CAAC,MAAM,EAAE;gBACZ,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,kBAAU,CAAC,CAAC;gBACnD,uBAAM,CAAC,OAAO,CAAC,YAAY,GAAG,CAAC,MAAM,cAAc,CAAC,CAAC;gBAErD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;oBAC9B,MAAM,KAAK,GAAG,CAAC,GAAG,kBAAU,CAAC;oBAC7B,MAAM,GAAG,GAAG,KAAK,GAAG,kBAAU,CAAC;oBAC/B,uBAAM,CAAC,OAAO,CAAC,2BAA2B,KAAK,OAAO,GAAG,EAAE,CAAC,CAAC;oBAC7D,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBACvC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC;wBACxE,SAAS,EAAE,wBAAgB;wBAC3B,KAAK,EAAE;4BACH,EAAE,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC;4BAChB,SAAS,EAAE,IAAA,gBAAM,GAAE;yBACtB;qBACJ,CAAC,CAAC;oBACH,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;oBACpC,QAAQ,CAAC,IAAI,CAAC;wBACV,KAAK,EAAE,GAAG,CAAC,MAAM;wBACjB,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,kBAAU,EAAE,GAAG,CAAC,MAAM,CAAC;wBACrD,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,GAAG,SAAS;qBACpC,CAAC,CAAC;iBACN;aACJ;YACD,uBAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;YACxC,OAAO;gBACH,KAAK,EAAE,GAAG,CAAC,MAAM;gBACjB,SAAS,EAAE,GAAG,CAAC,MAAM;gBACrB,QAAQ,EAAE,CAAC,IAAI,IAAI,EAAE,GAAG,SAAS;aACpC,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAA8B;QAC9C,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAA8B;QAC/C,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAA8B;QAC9C,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAA8B;QAC9C,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC;YAC3E,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE;SACrC,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,MAAM,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAA,eAAM,EAAC;gBAC5B,GAAG,QAAQ;qBACN,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,EAAwC,CAAC;qBACvF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;aAChC,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,sBAAsB,CAC7B,GAAG,EACH,GAAG,CAAC,SAAS,EACb,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACvB,gBAAgB,CACnB,CAAC;SACL;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAA+B;QACxD,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,IAA+B;QAC1D,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAA+B;QACxD,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,IAA+B;;QAC1D,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;aAClC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QACvD,MAAM,gBAAgB,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,mCAAI,EAAE,CAAC;QAC9E,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAClG,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAA4B;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExD,SAAS,aAAa,CAAC,KAAgC;YACnD,OAAO,KAAK,IAAI,KAAK,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,wBAAwB,EAAE,UAAU,EAAE,CAAC,CAAC;QAC9E,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,MAAM,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,EAAE,EAAE,+BAA+B,EAAE,UAAU,EAAE,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAA4B;QAC1C,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,+CAAqB,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,MAAM,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,MAAM,IAAI,CAAC,UAAU;aAChB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,MAAM,CAAC,EAAE,qBAAqB,EAAE,EAAE,EAAE,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAChC,GAA0B,EAC1B,SAAa,EACb,SAAa;QAEb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;YACxB,SAAS,EAAE,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACT,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC;gBAClF,SAAS,EAAE,wBAAgB;gBAC3B,KAAK,EAAE;oBACH,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACvC,SAAS,EAAE,IAAA,gBAAM,GAAE;iBACtB;aACJ,CAAC,CAAC;YACH,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC9B,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aACjD;iBAAM;gBACH,IAAI,OAAO,CAAC,OAAO,KAAK,KAAK,EAAE;oBAC3B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC;iBACrD;gBACD,MAAM,wBAAwB,GAAG,eAAe,CAAC,MAAM,CACnD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAChE,CAAC;gBACF,uBAAM,CAAC,OAAO,CAAC,YAAY,wBAAwB,CAAC,MAAM,WAAW,EAAE,uBAAe,CAAC,CAAC;gBACxF,IAAI,wBAAwB,CAAC,MAAM,EAAE;oBACjC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAC;iBAC1D;aACJ;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,uBAAuB,CACjC,GAA0B,EAC1B,UAAgB,EAChB,SAAa;QAEb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC;YAC3E,SAAS,EAAE,wBAAgB;YAC3B,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC;gBAClB,SAAS,EAAE,IAAA,gBAAM,GAAE;aACtB;SACJ,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE;YACV,uBAAM,CAAC,OAAO,CAAC,YAAY,QAAQ,CAAC,MAAM,WAAW,EAAE,uBAAe,CAAC,CAAC;YACxE,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;SAC1C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAChC,GAAmB,EACnB,SAAa,EACb,SAAa;QAEb,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE;YACxB,SAAS,EAAE,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACT,MAAM,gBAAgB,GAAG,IAAA,eAAM,EAAC;gBAC5B,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;gBAChD,GAAG,OAAO,CAAC,QAAQ;qBACd,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,EAAwC,CAAC;qBACvF,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;aAChC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC1D,IAAI,iBAAiB,CAAC,MAAM,EAAE;gBAC1B,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,SAAS,EAAE,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;aAC1F;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,0BAA0B,CAAC,GAAmB,EAAE,SAAa;QACjE,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;aAClC,kBAAkB,CAAC,UAAU,CAAC;aAC9B,cAAc,CAAC;YACZ,SAAS,EAAE,wBAAgB;YAC3B,kBAAkB,EAAE,IAAI;SAC3B,CAAC;aACD,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;aACvC,QAAQ,CAAC,kBAAkB,EAAE,SAAS,CAAC;aACvC,KAAK,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAC/C,QAAQ,CAAC,2BAA2B,CAAC;aACrC,QAAQ,CAAC,4BAA4B,CAAC,CAAC;QAC5C,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,GAA0B,EAAE,QAA0B;QAC7E,MAAM,KAAK,GAAsB,EAAE,CAAC;QAEpC,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAe,CAAC;QAE1C,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,OAAO,CAAC,SAAS,EAAE;oBAC9E,SAAS,EAAE,wBAAgB;iBAC9B,CAAC,CAAC;gBACH,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;aAC9C;YAED,MAAM,gBAAgB,GAAG,IAAA,eAAM,EAAC;gBAC5B,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;gBAChD,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;aACnD,CAAC,CAAC;YACH,KAAK,MAAM,YAAY,IAAI,gBAAgB,EAAE;gBACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBACtE,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBACtE,MAAM,sBAAsB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACvD,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,YAAY,CAAC,CACvC,CAAC;gBAEF,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE;oBACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;oBACxB,MAAM,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;oBACxE,MAAM,IAAI,GAAG,IAAI,0CAAe,CAAC;wBAC7B,SAAS,EAAE,OAAO,CAAC,EAAE;wBACrB,YAAY;wBACZ,gBAAgB,EAAE,OAAO,CAAC,EAAE;wBAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;wBACpB,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,GAAG,EAAE,OAAO,CAAC,GAAG;wBAChB,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO;wBAC5D,IAAI,EAAE,kBAAkB,CAAC,IAAI;wBAC7B,SAAS,EAAE,OAAO,CAAC,EAAE;wBACrB,WAAW,EAAE,kBAAkB,CAAC,IAAI;wBACpC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,CAAC;wBACtE,kBAAkB,EAAE,kBAAkB,CAAC,IAAI;wBAC3C,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;wBACvE,wBAAwB,EAAE,OAAO,CAAC,aAAa;4BAC3C,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU;4BAClC,CAAC,CAAC,IAAI;wBACV,+BAA+B,EAAE,OAAO,CAAC,aAAa;4BAClD,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU;4BAClC,CAAC,CAAC,IAAI;wBACV,qBAAqB,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI;wBAC9E,cAAc,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBAC1E,qBAAqB,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBACjF,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAY,CAAC;wBACrD,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC;wBAC5C,aAAa,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC;wBACtD,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;wBAC5D,eAAe,EAAE,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;qBAC3D,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE;wBAC/B,IAAI,CAAC,OAAO;4BACR,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;wBAC/E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CACrD,GAAG,EACH,wBAAwB,OAAO,CAAC,SAAS,EAAE,EAC3C,GAAG,EAAE,CACD,IAAI,CAAC,UAAU;6BACV,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;6BAClC,IAAI,CAAC;4BACF,kBAAkB,EAAE,KAAK;4BACzB,KAAK,EAAE;gCACH,SAAS,EAAE,OAAO,CAAC,SAAS;6BAC/B;yBACJ,CAAC;6BACD,IAAI,CAAC,SAAS,CAAC,EAAE,CACd,OAAO,CAAC,GAAG,CACP,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACd,IAAI,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,CAC3D,CACJ,CACJ;6BACA,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAC/E,CAAC;wBACF,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;qBACxC;oBACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACpB;aACJ;SACJ;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CACvB,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CACnF,CAAC;IACN,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,OAAgB;;QACpE,MAAM,kBAAkB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,0CAAe,CAAC;YAC7B,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,gBAAgB,EAAE,CAAC;YACnB,KAAK,EAAE,CAAC;YACR,YAAY,EAAE,CAAC;YACf,GAAG,EAAE,EAAE;YACP,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,kBAAkB,CAAC,IAAI;YAC7B,SAAS,EAAE,OAAO,CAAC,EAAE;YACrB,WAAW,EAAE,kBAAkB,CAAC,IAAI;YACpC,WAAW,EAAE,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACtE,kBAAkB,EAAE,kBAAkB,CAAC,IAAI;YAC3C,cAAc,EAAE,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,EAAE,mCAAI,IAAI;YACjD,wBAAwB,EAAE,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,UAAU,mCAAI,IAAI;YACnE,+BAA+B,EAAE,IAAI;YACrC,qBAAqB,EAAE,IAAI;YAC3B,cAAc,EAAE,MAAA,MAAA,OAAO,CAAC,aAAa,0CAAE,OAAO,mCAAI,EAAE;YACpD,qBAAqB,EAAE,EAAE;YACzB,UAAU,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YACtC,QAAQ,EAAE,MAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,mCAAI,EAAE;YACtE,aAAa,EAAE,MAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,mCAAI,EAAE;YACrE,aAAa,EAAE,EAAE;YACjB,eAAe,EAAE,EAAE;SACtB,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChG,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,uBAAuB,CAAC,GAAmB,EAAE,QAA0B;QACjF,MAAM,OAAO,GAAG,IAAA,eAAM,EAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACvD,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;YAC7B,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CACvB,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,MAAM,CAAC;gBACvD,SAAS;gBACT,GAAG,EAAE,EAAE;gBACP,KAAK,EAAE,CAAC;aACX,CAAC,CACL,CAAC;SACL;IACL,CAAC;IAEO,cAAc,CAClB,YAAe,EACf,YAA0B;QAE1B,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,YAAY,CAAC;YACxE,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;YAC9F,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAA8B,CAAC;IACnE,CAAC;IAEO,WAAW,CAAC,OAAuB,EAAE,OAAgB;QACzD,MAAM,QAAQ,GAAG,CAAC,EAAc,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC5D,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1D,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1D,OAAO,IAAA,eAAM,EAAC,CAAC,GAAG,eAAe,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEO,gBAAgB,CAAC,OAAuB,EAAE,OAAgB;QAC9D,MAAM,aAAa,GAAG,CAAC,EAAc,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC3D,MAAM,oBAAoB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACpE,MAAM,oBAAoB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACpE,OAAO,IAAA,eAAM,EAAC,CAAC,GAAG,oBAAoB,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAC;IACtE,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,sBAAsB,CAChC,GAAmB,EACnB,SAAa,EACb,UAAgB,EAChB,aAA6B;QAE7B,MAAM,IAAI,GAAoC,EAAE,CAAC;QACjD,KAAK,MAAM,gBAAgB,IAAI,UAAU,EAAE;YACvC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;gBACtC,IAAI,CAAC,IAAI,CAAC;oBACN,gBAAgB;oBAChB,SAAS;oBACT,YAAY;iBACf,CAAC,CAAC;aACN;SACJ;QACD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,MAAM,CAAC,IAAW,CAAC,CAAC,CAAC;IACzG,CAAC;IAED;;;OAGG;IACK,oBAAoB,CAAC,WAAmB;QAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC;QACvD,MAAM,cAAc,GAAG,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,iBAAiB,IAAI,IAAI,KAAK,aAAa,CAAC;QACnG,IAAI,cAAc,EAAE;YAChB,OAAO,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SACzC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ,CAAA;AA/dY,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAUJ,WAAA,IAAA,eAAM,EAAC,+BAAmB,CAAC,CAAA;qCALR,kDAAuB;QACX,iDAAsB;QAC/B,8BAAa;QACP,0DAA0B;QACxB,+CAAqB;GAR/C,iBAAiB,CA+d7B;AA/dY,8CAAiB"}
|
|
1
|
+
{"version":3,"file":"indexer.controller.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/indexer.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
31
31
|
switch (data.type) {
|
|
32
32
|
case 'reindex':
|
|
33
33
|
vendure_logger_1.Logger.verbose('sending ReindexMessage');
|
|
34
|
-
return this.jobWithProgress(job, this.indexerController.reindex(
|
|
34
|
+
return this.jobWithProgress(job, this.indexerController.reindex(job));
|
|
35
35
|
case 'update-product':
|
|
36
36
|
return this.indexerController.updateProduct(data);
|
|
37
37
|
case 'update-variants':
|
|
@@ -41,7 +41,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
41
41
|
case 'delete-variant':
|
|
42
42
|
return this.indexerController.deleteVariant(data);
|
|
43
43
|
case 'update-variants-by-id':
|
|
44
|
-
return this.jobWithProgress(job, this.indexerController.updateVariantsById(
|
|
44
|
+
return this.jobWithProgress(job, this.indexerController.updateVariantsById(job));
|
|
45
45
|
case 'update-asset':
|
|
46
46
|
return this.indexerController.updateAsset(data);
|
|
47
47
|
case 'delete-asset':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AAEpE,mEAA+D;AAI/D,0EAA+D;AAM/D,4EAAuE;AAGvE,6DAAyD;AAEzD;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG3B,YAAoB,UAA2B,EAAU,iBAAoC;QAAzE,eAAU,GAAV,UAAU,CAAiB;QAAU,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAEjG,KAAK,CAAC,sBAAsB;QACxB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACtD,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE;gBACX,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;gBACtB,QAAQ,IAAI,CAAC,IAAI,EAAE;oBACf,KAAK,SAAS;wBACV,uBAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;wBACzC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,17 +69,18 @@ class MysqlSearchStrategy {
|
|
|
69
69
|
this.applyTermAndFilters(ctx, qb, input);
|
|
70
70
|
if (sort) {
|
|
71
71
|
if (sort.name) {
|
|
72
|
-
qb.addOrderBy(
|
|
72
|
+
qb.addOrderBy('si_productName', sort.name);
|
|
73
73
|
}
|
|
74
74
|
if (sort.price) {
|
|
75
|
-
qb.addOrderBy(
|
|
75
|
+
qb.addOrderBy('si_price', sort.price);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
else {
|
|
79
|
-
|
|
80
|
-
qb.orderBy('score', 'DESC');
|
|
81
|
-
}
|
|
78
|
+
else if (input.term && input.term.length > this.minTermLength) {
|
|
79
|
+
qb.addOrderBy('score', 'DESC');
|
|
82
80
|
}
|
|
81
|
+
// Required to ensure deterministic sorting.
|
|
82
|
+
// E.g. in case of sorting products with duplicate name, price or score results.
|
|
83
|
+
qb.addOrderBy('si_productVariantId', 'ASC');
|
|
83
84
|
if (enabledOnly) {
|
|
84
85
|
qb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
85
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACqB,kBAAa,GAAG,CAAC,CAAC;
|
|
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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"}
|
|
@@ -75,14 +75,12 @@ class PostgresSearchStrategy {
|
|
|
75
75
|
qb.addOrderBy('"si_price"', sort.price);
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
-
else {
|
|
79
|
-
|
|
80
|
-
qb.addOrderBy('score', 'DESC');
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
83
|
-
qb.addOrderBy('"si_productVariantId"', 'ASC');
|
|
84
|
-
}
|
|
78
|
+
else if (input.term && input.term.length > this.minTermLength) {
|
|
79
|
+
qb.addOrderBy('score', 'DESC');
|
|
85
80
|
}
|
|
81
|
+
// Required to ensure deterministic sorting.
|
|
82
|
+
// E.g. in case of sorting products with duplicate name, price or score results.
|
|
83
|
+
qb.addOrderBy('"si_productVariantId"', 'ASC');
|
|
86
84
|
if (enabledOnly) {
|
|
87
85
|
qb.andWhere('"si"."enabled" = :enabled', { enabled: true });
|
|
88
86
|
}
|
|
@@ -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,mEAMiC;AAEjC;;GAEG;AACH,MAAa,sBAAsB;IAAnC;QACqB,kBAAa,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,13 +58,12 @@ class SqliteSearchStrategy {
|
|
|
58
58
|
const sort = input.sort;
|
|
59
59
|
const qb = this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si');
|
|
60
60
|
if (input.groupByProduct) {
|
|
61
|
-
qb.addSelect('MIN(si.price)', 'minPrice')
|
|
62
|
-
qb.addSelect('
|
|
61
|
+
qb.addSelect('MIN(si.price)', 'minPrice');
|
|
62
|
+
qb.addSelect('MAX(si.price)', 'maxPrice');
|
|
63
|
+
qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax');
|
|
64
|
+
qb.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
63
65
|
}
|
|
64
66
|
this.applyTermAndFilters(ctx, qb, input);
|
|
65
|
-
if (input.term && input.term.length > this.minTermLength) {
|
|
66
|
-
qb.orderBy('score', 'DESC');
|
|
67
|
-
}
|
|
68
67
|
if (sort) {
|
|
69
68
|
if (sort.name) {
|
|
70
69
|
// TODO: v3 - set the collation on the SearchIndexItem entity
|
|
@@ -74,9 +73,12 @@ class SqliteSearchStrategy {
|
|
|
74
73
|
qb.addOrderBy('si.price', sort.price);
|
|
75
74
|
}
|
|
76
75
|
}
|
|
77
|
-
else {
|
|
78
|
-
qb.addOrderBy('
|
|
76
|
+
else if (input.term && input.term.length > this.minTermLength) {
|
|
77
|
+
qb.addOrderBy('score', 'DESC');
|
|
79
78
|
}
|
|
79
|
+
// Required to ensure deterministic sorting.
|
|
80
|
+
// E.g. in case of sorting products with duplicate name, price or score results.
|
|
81
|
+
qb.addOrderBy('si.productVariantId', 'ASC');
|
|
80
82
|
if (enabledOnly) {
|
|
81
83
|
qb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
82
84
|
}
|
|
@@ -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,mEAMiC;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IAAjC;QACqB,kBAAa,GAAG,CAAC,CAAC;
|
|
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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"}
|
|
@@ -3,11 +3,12 @@ import { ID } from '@vendure/common/lib/shared-types';
|
|
|
3
3
|
import { RequestContext } from '../../../api/common/request-context';
|
|
4
4
|
import { JustErrorResults } from '../../../common/error/error-result';
|
|
5
5
|
import { CancelActiveOrderError, EmptyOrderLineSelectionError, MultipleOrderError, QuantityTooGreatError } from '../../../common/error/generated-graphql-admin-errors';
|
|
6
|
+
import { IneligibleShippingMethodError } from '../../../common/error/generated-graphql-shop-errors';
|
|
6
7
|
import { ConfigService } from '../../../config/config.service';
|
|
7
8
|
import { TransactionalConnection } from '../../../connection/transactional-connection';
|
|
8
|
-
import { Order } from '../../../entity/order/order.entity';
|
|
9
9
|
import { OrderLine } from '../../../entity/order-line/order-line.entity';
|
|
10
10
|
import { OrderModification } from '../../../entity/order-modification/order-modification.entity';
|
|
11
|
+
import { Order } from '../../../entity/order/order.entity';
|
|
11
12
|
import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
|
|
12
13
|
import { EventBus } from '../../../event-bus/event-bus';
|
|
13
14
|
import { CountryService } from '../../services/country.service';
|
|
@@ -17,8 +18,8 @@ import { ProductVariantService } from '../../services/product-variant.service';
|
|
|
17
18
|
import { PromotionService } from '../../services/promotion.service';
|
|
18
19
|
import { StockMovementService } from '../../services/stock-movement.service';
|
|
19
20
|
import { CustomFieldRelationService } from '../custom-field-relation/custom-field-relation.service';
|
|
20
|
-
import { EntityHydrator } from '../entity-hydrator/entity-hydrator.service';
|
|
21
21
|
import { OrderCalculator } from '../order-calculator/order-calculator';
|
|
22
|
+
import { ShippingCalculator } from '../shipping-calculator/shipping-calculator';
|
|
22
23
|
import { TranslatorService } from '../translator/translator.service';
|
|
23
24
|
/**
|
|
24
25
|
* @description
|
|
@@ -44,10 +45,10 @@ export declare class OrderModifier {
|
|
|
44
45
|
private customFieldRelationService;
|
|
45
46
|
private promotionService;
|
|
46
47
|
private eventBus;
|
|
47
|
-
private
|
|
48
|
+
private shippingCalculator;
|
|
48
49
|
private historyService;
|
|
49
50
|
private translator;
|
|
50
|
-
constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus,
|
|
51
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, shippingCalculator: ShippingCalculator, historyService: HistoryService, translator: TranslatorService);
|
|
51
52
|
/**
|
|
52
53
|
* @description
|
|
53
54
|
* Ensure that the ProductVariant has sufficient saleable stock to add the given
|
|
@@ -82,12 +83,16 @@ export declare class OrderModifier {
|
|
|
82
83
|
order: Order;
|
|
83
84
|
modification: OrderModification;
|
|
84
85
|
}>;
|
|
86
|
+
setShippingMethods(ctx: RequestContext, order: Order, shippingMethodIds: ID[]): Promise<Order | IneligibleShippingMethodError>;
|
|
85
87
|
private noChangesSpecified;
|
|
86
88
|
/**
|
|
87
89
|
* @description
|
|
88
90
|
* Because a Refund's amount is calculated based on the orderItems changed, plus shipping change,
|
|
89
91
|
* we need to make sure the amount gets adjusted to match any changes caused by other factors,
|
|
90
92
|
* i.e. promotions that were previously active but are no longer.
|
|
93
|
+
*
|
|
94
|
+
* TODO: Deprecated - can be removed once we remove support for the "shipping" & "adjustment" input
|
|
95
|
+
* fields for refunds.
|
|
91
96
|
*/
|
|
92
97
|
private calculateRefundAdjustment;
|
|
93
98
|
private getOrderPayments;
|