@vendure/core 1.6.5 → 1.7.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/common/custom-field-relation-resolver.service.d.ts +3 -1
- package/dist/api/common/custom-field-relation-resolver.service.js +7 -5
- package/dist/api/common/custom-field-relation-resolver.service.js.map +1 -1
- package/dist/api/config/generate-resolvers.d.ts +3 -0
- package/dist/api/config/generate-resolvers.js +7 -1
- package/dist/api/config/generate-resolvers.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.js +8 -2
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/order.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/order.resolver.js +15 -3
- package/dist/api/resolvers/admin/order.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product-option.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/product-option.resolver.js +13 -0
- package/dist/api/resolvers/admin/product-option.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.d.ts +8 -2
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.js +17 -3
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/order-item-entity.resolver.d.ts +3 -1
- package/dist/api/resolvers/entity/order-item-entity.resolver.js +9 -3
- package/dist/api/resolvers/entity/order-item-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/order-line-entity.resolver.d.ts +5 -3
- package/dist/api/resolvers/entity/order-line-entity.resolver.js +19 -2
- package/dist/api/resolvers/entity/order-line-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/payment-entity.resolver.d.ts +3 -1
- package/dist/api/resolvers/entity/payment-entity.resolver.js +6 -3
- package/dist/api/resolvers/entity/payment-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js +8 -3
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-products.resolver.js +8 -2
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +11 -0
- package/dist/api/schema/admin-api/product-option-group.api.graphql +2 -0
- package/dist/api/schema/common/order.type.graphql +7 -0
- package/dist/bootstrap.js +2 -3
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/configurable-operation.js +9 -4
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/error/errors.d.ts +1 -0
- package/dist/common/error/errors.js.map +1 -1
- package/dist/common/error/generated-graphql-admin-errors.d.ts +10 -0
- package/dist/common/error/generated-graphql-admin-errors.js +17 -2
- package/dist/common/error/generated-graphql-admin-errors.js.map +1 -1
- package/dist/config/asset-import-strategy/asset-import-strategy.d.ts +24 -0
- package/dist/config/asset-import-strategy/asset-import-strategy.js +3 -0
- package/dist/config/asset-import-strategy/asset-import-strategy.js.map +1 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.d.ts +24 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.js +91 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.js.map +1 -0
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js +1 -1
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js.map +1 -1
- package/dist/config/config.module.js +2 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/default-config.js +3 -1
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/entity-id-strategy/entity-id-strategy.d.ts +7 -0
- package/dist/config/fulfillment/custom-fulfillment-process.d.ts +2 -2
- 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/logger/vendure-logger.d.ts +1 -0
- package/dist/config/logger/vendure-logger.js.map +1 -1
- package/dist/config/order/custom-order-process.d.ts +2 -2
- package/dist/config/payment/custom-payment-process.d.ts +2 -2
- package/dist/config/payment/dummy-payment-method-handler.js +8 -0
- package/dist/config/payment/dummy-payment-method-handler.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +66 -0
- package/dist/config/payment/payment-method-handler.js +11 -1
- package/dist/config/payment/payment-method-handler.js.map +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js.map +1 -1
- package/dist/config/vendure-config.d.ts +18 -0
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transaction-subscriber.d.ts +16 -2
- package/dist/connection/transaction-subscriber.js +27 -7
- package/dist/connection/transaction-subscriber.js.map +1 -1
- package/dist/connection/transaction-wrapper.js +6 -9
- package/dist/connection/transaction-wrapper.js.map +1 -1
- package/dist/connection/transactional-connection.d.ts +2 -0
- package/dist/connection/transactional-connection.js +2 -2
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/data-import/providers/asset-importer/asset-importer.js +12 -18
- package/dist/data-import/providers/asset-importer/asset-importer.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +4 -0
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/entity/product-option/product-option-translation.entity.js.map +1 -1
- package/dist/entity/product-option-group/product-option-group-translation.entity.js.map +1 -1
- package/dist/event-bus/event-bus.js +14 -3
- package/dist/event-bus/event-bus.js.map +1 -1
- package/dist/event-bus/events/initializer-event.d.ts +12 -0
- package/dist/event-bus/events/initializer-event.js +19 -0
- package/dist/event-bus/events/initializer-event.js.map +1 -0
- package/dist/event-bus/events/product-option-event.d.ts +1 -1
- package/dist/event-bus/events/product-option-event.js.map +1 -1
- package/dist/event-bus/events/product-option-group-event.d.ts +1 -1
- package/dist/event-bus/events/product-option-group-event.js.map +1 -1
- package/dist/event-bus/index.d.ts +1 -0
- package/dist/event-bus/index.js +1 -0
- package/dist/event-bus/index.js.map +1 -1
- package/dist/i18n/messages/en.json +3 -0
- package/dist/migrate.js +14 -0
- package/dist/migrate.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +31 -31
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +5 -5
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.d.ts +1 -0
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.js +8 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.d.ts +11 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js +33 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +31 -28
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/plugin-metadata.js +2 -1
- package/dist/plugin/plugin-metadata.js.map +1 -1
- package/dist/plugin/vendure-plugin.d.ts +11 -2
- package/dist/plugin/vendure-plugin.js.map +1 -1
- package/dist/service/helpers/config-arg/config-arg.service.d.ts +1 -0
- package/dist/service/helpers/config-arg/config-arg.service.js +12 -1
- package/dist/service/helpers/config-arg/config-arg.service.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.d.ts +3 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +6 -4
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.d.ts +9 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.js.map +1 -1
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.d.ts +3 -1
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js +6 -4
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +3 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +15 -8
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state.d.ts +9 -1
- package/dist/service/helpers/order-state-machine/order-state.js.map +1 -1
- package/dist/service/helpers/payment-state-machine/payment-state.d.ts +9 -1
- package/dist/service/helpers/payment-state-machine/payment-state.js.map +1 -1
- package/dist/service/helpers/slug-validator/slug-validator.js +3 -1
- package/dist/service/helpers/slug-validator/slug-validator.js.map +1 -1
- package/dist/service/helpers/translator/translator.service.d.ts +10 -0
- package/dist/service/helpers/translator/translator.service.js +29 -0
- package/dist/service/helpers/translator/translator.service.js.map +1 -0
- package/dist/service/helpers/utils/translate-entity.d.ts +3 -3
- package/dist/service/helpers/utils/translate-entity.js +11 -2
- package/dist/service/helpers/utils/translate-entity.js.map +1 -1
- package/dist/service/index.d.ts +1 -0
- package/dist/service/index.js +1 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/initializer.service.d.ts +3 -1
- package/dist/service/initializer.service.js +7 -2
- package/dist/service/initializer.service.js.map +1 -1
- package/dist/service/service.module.js +2 -0
- package/dist/service/service.module.js.map +1 -1
- package/dist/service/services/asset.service.d.ts +2 -1
- package/dist/service/services/asset.service.js +19 -4
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +3 -1
- package/dist/service/services/collection.service.js +16 -16
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -1
- package/dist/service/services/country.service.js +9 -7
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer.service.d.ts +3 -1
- package/dist/service/services/customer.service.js +8 -6
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +3 -1
- package/dist/service/services/facet-value.service.js +11 -6
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +3 -1
- package/dist/service/services/facet.service.js +18 -8
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.d.ts +9 -0
- package/dist/service/services/fulfillment.service.js +48 -8
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/order-testing.service.d.ts +3 -1
- package/dist/service/services/order-testing.service.js +6 -4
- package/dist/service/services/order-testing.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +10 -2
- package/dist/service/services/order.service.js +49 -26
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment.service.d.ts +2 -0
- package/dist/service/services/payment.service.js +30 -10
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +24 -2
- package/dist/service/services/product-option-group.service.js +92 -6
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-option.service.d.ts +15 -2
- package/dist/service/services/product-option.service.js +66 -5
- package/dist/service/services/product-option.service.js.map +1 -1
- package/dist/service/services/product-variant.service.d.ts +3 -1
- package/dist/service/services/product-variant.service.js +12 -10
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.d.ts +5 -1
- package/dist/service/services/product.service.js +42 -12
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +3 -1
- package/dist/service/services/shipping-method.service.js +8 -6
- package/dist/service/services/shipping-method.service.js.map +1 -1
- package/dist/service/services/stock-movement.service.js +8 -7
- package/dist/service/services/stock-movement.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +3 -1
- package/dist/service/services/zone.service.js +8 -6
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,10 +61,10 @@ class PostgresSearchStrategy {
|
|
|
61
61
|
.createQueryBuilder('si')
|
|
62
62
|
.select(this.createPostgresSelect(!!input.groupByProduct));
|
|
63
63
|
if (input.groupByProduct) {
|
|
64
|
-
qb.addSelect('MIN(price)', 'minPrice')
|
|
65
|
-
.addSelect('MAX(price)', 'maxPrice')
|
|
66
|
-
.addSelect('MIN(
|
|
67
|
-
.addSelect('MAX(
|
|
64
|
+
qb.addSelect('MIN(si.price)', 'minPrice')
|
|
65
|
+
.addSelect('MAX(si.price)', 'maxPrice')
|
|
66
|
+
.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax')
|
|
67
|
+
.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
68
68
|
}
|
|
69
69
|
this.applyTermAndFilters(ctx, qb, input);
|
|
70
70
|
if (sort) {
|
|
@@ -191,7 +191,7 @@ class PostgresSearchStrategy {
|
|
|
191
191
|
collectionSlug,
|
|
192
192
|
});
|
|
193
193
|
}
|
|
194
|
-
|
|
194
|
+
search_strategy_utils_1.applyLanguageConstraints(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
|
|
195
195
|
qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
|
|
196
196
|
if (input.groupByProduct === true) {
|
|
197
197
|
qb.groupBy('si.productId');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getFieldsToSelect = exports.fieldsToSelect = void 0;
|
|
3
|
+
exports.getFieldsToSelect = exports.identifierFields = exports.fieldsToSelect = void 0;
|
|
4
4
|
exports.fieldsToSelect = [
|
|
5
5
|
'sku',
|
|
6
6
|
'enabled',
|
|
@@ -24,6 +24,13 @@ exports.fieldsToSelect = [
|
|
|
24
24
|
'productVariantPreview',
|
|
25
25
|
'productVariantPreviewFocalPoint',
|
|
26
26
|
];
|
|
27
|
+
exports.identifierFields = [
|
|
28
|
+
'channelId',
|
|
29
|
+
'productVariantId',
|
|
30
|
+
'productId',
|
|
31
|
+
'productAssetId',
|
|
32
|
+
'productVariantAssetId',
|
|
33
|
+
];
|
|
27
34
|
function getFieldsToSelect(includeStockStatus = false) {
|
|
28
35
|
return includeStockStatus ? [...exports.fieldsToSelect, 'inStock', 'productInStock'] : exports.fieldsToSelect;
|
|
29
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-strategy-common.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-common.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,KAAK;IACL,SAAS;IACT,MAAM;IACN,OAAO;IACP,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,WAAW;IACX,aAAa;IACb,oBAAoB;IACpB,aAAa;IACb,UAAU;IACV,eAAe;IACf,eAAe;IACf,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,0BAA0B;IAC1B,uBAAuB;IACvB,uBAAuB;IACvB,iCAAiC;CACpC,CAAC;
|
|
1
|
+
{"version":3,"file":"search-strategy-common.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-common.ts"],"names":[],"mappings":";;;AAAa,QAAA,cAAc,GAAG;IAC1B,KAAK;IACL,SAAS;IACT,MAAM;IACN,OAAO;IACP,cAAc;IACd,kBAAkB;IAClB,cAAc;IACd,WAAW;IACX,aAAa;IACb,oBAAoB;IACpB,aAAa;IACb,UAAU;IACV,eAAe;IACf,eAAe;IACf,YAAY;IACZ,gBAAgB;IAChB,gBAAgB;IAChB,0BAA0B;IAC1B,uBAAuB;IACvB,uBAAuB;IACvB,iCAAiC;CACpC,CAAC;AAEW,QAAA,gBAAgB,GAAG;IAC5B,WAAW;IACX,kBAAkB;IAClB,WAAW;IACX,gBAAgB;IAChB,uBAAuB;CAC1B,CAAA;AAED,SAAgB,iBAAiB,CAAC,qBAA8B,KAAK;IACjE,OAAO,kBAAkB,CAAC,CAAC,CAAC,CAAC,GAAG,sBAAc,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,sBAAc,CAAC;AAClG,CAAC;AAFD,8CAEC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { CurrencyCode, SearchResult } from '@vendure/common/lib/generated-types';
|
|
1
|
+
import { CurrencyCode, LanguageCode, SearchResult } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID } from '@vendure/common/lib/shared-types';
|
|
3
|
+
import { SelectQueryBuilder } from 'typeorm';
|
|
4
|
+
import { SearchIndexItem } from '../entities/search-index-item.entity';
|
|
3
5
|
/**
|
|
4
6
|
* Maps a raw database result to a SearchResult.
|
|
5
7
|
*/
|
|
@@ -19,3 +21,11 @@ export declare function createCollectionIdCountMap(collectionsResult: Array<{
|
|
|
19
21
|
collections: string;
|
|
20
22
|
}>): Map<ID, number>;
|
|
21
23
|
export declare function createPlaceholderFromId(id: ID): string;
|
|
24
|
+
/**
|
|
25
|
+
* Applies language constraints for {@link SearchIndexItem} query.
|
|
26
|
+
*
|
|
27
|
+
* @param qb QueryBuilder instance
|
|
28
|
+
* @param languageCode Preferred language code
|
|
29
|
+
* @param defaultLanguageCode Default language code that is used if {@link SearchIndexItem} is not available in preferred language
|
|
30
|
+
*/
|
|
31
|
+
export declare function applyLanguageConstraints(qb: SelectQueryBuilder<SearchIndexItem>, languageCode: LanguageCode, defaultLanguageCode: LanguageCode): SelectQueryBuilder<SearchIndexItem>;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
|
|
3
|
+
exports.applyLanguageConstraints = exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
|
|
4
4
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
5
|
+
const search_index_item_entity_1 = require("../entities/search-index-item.entity");
|
|
6
|
+
const search_strategy_common_1 = require("./search-strategy-common");
|
|
5
7
|
/**
|
|
6
8
|
* Maps a raw database result to a SearchResult.
|
|
7
9
|
*/
|
|
@@ -100,4 +102,34 @@ function createPlaceholderFromId(id) {
|
|
|
100
102
|
return '_' + id.toString().replace(/-/g, '_');
|
|
101
103
|
}
|
|
102
104
|
exports.createPlaceholderFromId = createPlaceholderFromId;
|
|
105
|
+
/**
|
|
106
|
+
* Applies language constraints for {@link SearchIndexItem} query.
|
|
107
|
+
*
|
|
108
|
+
* @param qb QueryBuilder instance
|
|
109
|
+
* @param languageCode Preferred language code
|
|
110
|
+
* @param defaultLanguageCode Default language code that is used if {@link SearchIndexItem} is not available in preferred language
|
|
111
|
+
*/
|
|
112
|
+
function applyLanguageConstraints(qb, languageCode, defaultLanguageCode) {
|
|
113
|
+
if (languageCode == defaultLanguageCode) {
|
|
114
|
+
qb.andWhere('si.languageCode = :languageCode', { languageCode: languageCode });
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
qb.andWhere('si.languageCode IN (:...languageCodes)', {
|
|
118
|
+
languageCodes: [languageCode, defaultLanguageCode],
|
|
119
|
+
});
|
|
120
|
+
const joinFieldConditions = search_strategy_common_1.identifierFields
|
|
121
|
+
.map(field => `si.${field} = sil.${field}`)
|
|
122
|
+
.join(' AND ');
|
|
123
|
+
qb.leftJoin(search_index_item_entity_1.SearchIndexItem, 'sil', `
|
|
124
|
+
${joinFieldConditions}
|
|
125
|
+
AND si.languageCode != sil.languageCode
|
|
126
|
+
AND sil.languageCode = :languageCode
|
|
127
|
+
`, {
|
|
128
|
+
languageCode: languageCode,
|
|
129
|
+
});
|
|
130
|
+
qb.andWhere('sil.languageCode IS NULL');
|
|
131
|
+
}
|
|
132
|
+
return qb;
|
|
133
|
+
}
|
|
134
|
+
exports.applyLanguageConstraints = applyLanguageConstraints;
|
|
103
135
|
//# sourceMappingURL=search-strategy-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,11 @@ class SqliteSearchStrategy {
|
|
|
24
24
|
const facetValuesQb = this.connection
|
|
25
25
|
.getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
|
|
26
26
|
.createQueryBuilder('si')
|
|
27
|
-
.select(['productId', 'productVariantId'])
|
|
27
|
+
.select(['si.productId', 'si.productVariantId'])
|
|
28
28
|
.addSelect('GROUP_CONCAT(si.facetValueIds)', 'facetValues');
|
|
29
29
|
this.applyTermAndFilters(ctx, facetValuesQb, input);
|
|
30
30
|
if (!input.groupByProduct) {
|
|
31
|
-
facetValuesQb.groupBy('productVariantId');
|
|
31
|
+
facetValuesQb.groupBy('si.productVariantId');
|
|
32
32
|
}
|
|
33
33
|
if (enabledOnly) {
|
|
34
34
|
facetValuesQb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
@@ -40,11 +40,11 @@ class SqliteSearchStrategy {
|
|
|
40
40
|
const collectionsQb = this.connection
|
|
41
41
|
.getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
|
|
42
42
|
.createQueryBuilder('si')
|
|
43
|
-
.select(['productId', 'productVariantId'])
|
|
43
|
+
.select(['si.productId', 'si.productVariantId'])
|
|
44
44
|
.addSelect('GROUP_CONCAT(si.collectionIds)', 'collections');
|
|
45
45
|
this.applyTermAndFilters(ctx, collectionsQb, input);
|
|
46
46
|
if (!input.groupByProduct) {
|
|
47
|
-
collectionsQb.groupBy('productVariantId');
|
|
47
|
+
collectionsQb.groupBy('si.productVariantId');
|
|
48
48
|
}
|
|
49
49
|
if (enabledOnly) {
|
|
50
50
|
collectionsQb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
@@ -58,8 +58,8 @@ 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(price)', 'minPrice').addSelect('MAX(price)', 'maxPrice');
|
|
62
|
-
qb.addSelect('MIN(priceWithTax)', 'minPriceWithTax').addSelect('MAX(priceWithTax)', 'maxPriceWithTax');
|
|
61
|
+
qb.addSelect('MIN(si.price)', 'minPrice').addSelect('MAX(si.price)', 'maxPrice');
|
|
62
|
+
qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax').addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
|
|
63
63
|
}
|
|
64
64
|
this.applyTermAndFilters(ctx, qb, input);
|
|
65
65
|
if (input.term && input.term.length > this.minTermLength) {
|
|
@@ -67,14 +67,14 @@ class SqliteSearchStrategy {
|
|
|
67
67
|
}
|
|
68
68
|
if (sort) {
|
|
69
69
|
if (sort.name) {
|
|
70
|
-
qb.addOrderBy('productName', sort.name);
|
|
70
|
+
qb.addOrderBy('si.productName', sort.name);
|
|
71
71
|
}
|
|
72
72
|
if (sort.price) {
|
|
73
|
-
qb.addOrderBy('price', sort.price);
|
|
73
|
+
qb.addOrderBy('si.price', sort.price);
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
else {
|
|
77
|
-
qb.addOrderBy('productVariantId', 'ASC');
|
|
77
|
+
qb.addOrderBy('si.productVariantId', 'ASC');
|
|
78
78
|
}
|
|
79
79
|
if (enabledOnly) {
|
|
80
80
|
qb.andWhere('si.enabled = :enabled', { enabled: true });
|
|
@@ -83,7 +83,10 @@ class SqliteSearchStrategy {
|
|
|
83
83
|
.take(take)
|
|
84
84
|
.skip(skip)
|
|
85
85
|
.getRawMany()
|
|
86
|
-
.then(res =>
|
|
86
|
+
.then(res => {
|
|
87
|
+
// console.warn(qb.getQueryAndParameters(), "take", take, "skip", skip, "length", res.length)
|
|
88
|
+
return res.map(r => search_strategy_utils_1.mapToSearchResult(r, ctx.channel.currencyCode));
|
|
89
|
+
});
|
|
87
90
|
}
|
|
88
91
|
async getTotalCount(ctx, input, enabledOnly) {
|
|
89
92
|
const innerQb = this.applyTermAndFilters(ctx, this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si'), input);
|
|
@@ -104,31 +107,31 @@ class SqliteSearchStrategy {
|
|
|
104
107
|
// Note: SQLite does not natively have fulltext search capabilities,
|
|
105
108
|
// so we just use a weighted LIKE match
|
|
106
109
|
qb.addSelect(`
|
|
107
|
-
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
-
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
-
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
110
|
-
CASE WHEN description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
110
|
+
CASE WHEN si.sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
111
|
+
CASE WHEN si.productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
112
|
+
CASE WHEN si.productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
113
|
+
CASE WHEN si.description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
111
114
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
112
|
-
qb1.where('sku LIKE :like_term')
|
|
113
|
-
.orWhere('productName LIKE :like_term')
|
|
114
|
-
.orWhere('productVariantName LIKE :like_term')
|
|
115
|
-
.orWhere('description LIKE :like_term');
|
|
115
|
+
qb1.where('si.sku LIKE :like_term')
|
|
116
|
+
.orWhere('si.productName LIKE :like_term')
|
|
117
|
+
.orWhere('si.productVariantName LIKE :like_term')
|
|
118
|
+
.orWhere('si.description LIKE :like_term');
|
|
116
119
|
}))
|
|
117
120
|
.setParameters({ term, like_term: `%${term}%` });
|
|
118
121
|
}
|
|
119
122
|
if (input.inStock != null) {
|
|
120
123
|
if (input.groupByProduct) {
|
|
121
|
-
qb.andWhere('productInStock = :inStock', { inStock: input.inStock });
|
|
124
|
+
qb.andWhere('si.productInStock = :inStock', { inStock: input.inStock });
|
|
122
125
|
}
|
|
123
126
|
else {
|
|
124
|
-
qb.andWhere('inStock = :inStock', { inStock: input.inStock });
|
|
127
|
+
qb.andWhere('si.inStock = :inStock', { inStock: input.inStock });
|
|
125
128
|
}
|
|
126
129
|
}
|
|
127
130
|
if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
|
|
128
131
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
129
132
|
for (const id of facetValueIds) {
|
|
130
133
|
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
131
|
-
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
134
|
+
const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
|
|
132
135
|
const params = { [placeholder]: `%,${id},%` };
|
|
133
136
|
if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
|
|
134
137
|
qb1.andWhere(clause, params);
|
|
@@ -149,14 +152,14 @@ class SqliteSearchStrategy {
|
|
|
149
152
|
}
|
|
150
153
|
if (facetValueFilter.and) {
|
|
151
154
|
const placeholder = search_strategy_utils_1.createPlaceholderFromId(facetValueFilter.and);
|
|
152
|
-
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
155
|
+
const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
|
|
153
156
|
const params = { [placeholder]: `%,${facetValueFilter.and},%` };
|
|
154
157
|
qb2.where(clause, params);
|
|
155
158
|
}
|
|
156
159
|
if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
|
|
157
160
|
for (const id of facetValueFilter.or) {
|
|
158
161
|
const placeholder = search_strategy_utils_1.createPlaceholderFromId(id);
|
|
159
|
-
const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
|
|
162
|
+
const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
|
|
160
163
|
const params = { [placeholder]: `%,${id},%` };
|
|
161
164
|
qb2.orWhere(clause, params);
|
|
162
165
|
}
|
|
@@ -166,19 +169,19 @@ class SqliteSearchStrategy {
|
|
|
166
169
|
}));
|
|
167
170
|
}
|
|
168
171
|
if (collectionId) {
|
|
169
|
-
qb.andWhere(`(',' || collectionIds || ',') LIKE :collectionId`, {
|
|
172
|
+
qb.andWhere(`(',' || si.collectionIds || ',') LIKE :collectionId`, {
|
|
170
173
|
collectionId: `%,${collectionId},%`,
|
|
171
174
|
});
|
|
172
175
|
}
|
|
173
176
|
if (collectionSlug) {
|
|
174
|
-
qb.andWhere(`(',' || collectionSlugs || ',') LIKE :collectionSlug`, {
|
|
177
|
+
qb.andWhere(`(',' || si.collectionSlugs || ',') LIKE :collectionSlug`, {
|
|
175
178
|
collectionSlug: `%,${collectionSlug},%`,
|
|
176
179
|
});
|
|
177
180
|
}
|
|
178
|
-
|
|
179
|
-
qb.andWhere('channelId = :channelId', { channelId: ctx.channelId });
|
|
181
|
+
search_strategy_utils_1.applyLanguageConstraints(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
|
|
182
|
+
qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
|
|
180
183
|
if (input.groupByProduct === true) {
|
|
181
|
-
qb.groupBy('productId');
|
|
184
|
+
qb.groupBy('si.productId');
|
|
182
185
|
}
|
|
183
186
|
return qb;
|
|
184
187
|
}
|
|
@@ -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;AAEvD,gCAA+C;AAG/C,yDAA8D;AAC9D,2FAAuF;AACvF,mFAAuE;AAIvE,
|
|
1
|
+
{"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAEvD,gCAA+C;AAG/C,yDAA8D;AAC9D,2FAAuF;AACvF,mFAAuE;AAIvE,mEAMiC;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IAAjC;QACqB,kBAAa,GAAG,CAAC,CAAC;IA0NvC,CAAC;IAtNG,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,uBAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;aAC/C,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,6CAAqB,CAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;aAC/C,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,kDAA0B,CAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACxF,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;YACjF,EAAE,CAAC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC,SAAS,CAC7D,sBAAsB,EACtB,iBAAiB,CACpB,CAAC;SACL;QACD,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QACzC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;YACtD,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;SAC/B;QACD,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9C;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aACzC;SACJ;aAAM;YACH,EAAE,CAAC,UAAU,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;SAC/C;QACD,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,MAAM,EAAE;aACV,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,CAAC,IAAI,CAAC;aACV,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,CAAC,EAAE;YACR,6FAA6F;YAC7F,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,yCAAiB,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAA;QACvE,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,KAAkB,EAAE,WAAoB;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CACpC,GAAG,EACH,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAC5E,KAAK,CACR,CAAC;QAEF,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAChE;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aAC7C,kBAAkB,EAAE;aACpB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC;aACxC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5C,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEO,mBAAmB,CACvB,GAAmB,EACnB,EAAuC,EACvC,KAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,GAC9F,KAAK,CAAC;QAEV,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;YAC1C,oEAAoE;YACpE,uCAAuC;YACvC,EAAE,CAAC,SAAS,CACR;;;;+EAI+D,EAC/D,OAAO,CACV;iBACI,QAAQ,CACL,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC;qBAC9B,OAAO,CAAC,gCAAgC,CAAC;qBACzC,OAAO,CAAC,uCAAuC,CAAC;qBAChD,OAAO,CAAC,gCAAgC,CAAC,CAAC;YACnD,CAAC,CAAC,CACL;iBACA,aAAa,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC,CAAC;SACxD;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;YACvB,IAAI,KAAK,CAAC,cAAc,EAAE;gBACtB,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACH,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACpE;SACJ;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;YACvB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;oBAC5B,MAAM,WAAW,GAAG,+CAAuB,CAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,0CAA0C,WAAW,EAAE,CAAC;oBACvE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;oBAC9C,IAAI,kBAAkB,KAAK,iCAAe,CAAC,GAAG,EAAE;wBAC5C,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAChC;yBAAM;wBACH,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;YAC3B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;oBAC9C,GAAG,CAAC,QAAQ,CACR,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;;wBACf,IAAI,gBAAgB,CAAC,GAAG,KAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,CAAA,EAAE;4BACrD,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;yBACpE;wBACD,IAAI,gBAAgB,CAAC,GAAG,EAAE;4BACtB,MAAM,WAAW,GAAG,+CAAuB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,0CAA0C,WAAW,EAAE,CAAC;4BACvE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,gBAAgB,CAAC,GAAG,IAAI,EAAE,CAAC;4BAChE,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;yBAC7B;wBACD,IAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,EAAE;4BAC7B,KAAK,MAAM,EAAE,IAAI,gBAAgB,CAAC,EAAE,EAAE;gCAClC,MAAM,WAAW,GAAG,+CAAuB,CAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,0CAA0C,WAAW,EAAE,CAAC;gCACvE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gCAC9C,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;6BAC/B;yBACJ;oBACL,CAAC,CAAC,CACL,CAAC;iBACL;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,QAAQ,CAAC,qDAAqD,EAAE;gBAC/D,YAAY,EAAE,KAAK,YAAY,IAAI;aACtC,CAAC,CAAC;SACN;QACD,IAAI,cAAc,EAAE;YAChB,EAAE,CAAC,QAAQ,CAAC,yDAAyD,EAAE;gBACnE,cAAc,EAAE,KAAK,cAAc,IAAI;aAC1C,CAAC,CAAC;SACN;QAED,gDAAwB,CAAC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAChF,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QAEvE,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SAC9B;QAED,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AA3ND,oDA2NC"}
|
|
@@ -46,13 +46,14 @@ function getConfigurationFunction(plugin) {
|
|
|
46
46
|
}
|
|
47
47
|
exports.getConfigurationFunction = getConfigurationFunction;
|
|
48
48
|
function graphQLResolversFor(plugin, apiType) {
|
|
49
|
+
var _a;
|
|
49
50
|
const apiExtensions = apiType === 'shop'
|
|
50
51
|
? reflectMetadata(plugin, exports.PLUGIN_METADATA.SHOP_API_EXTENSIONS)
|
|
51
52
|
: reflectMetadata(plugin, exports.PLUGIN_METADATA.ADMIN_API_EXTENSIONS);
|
|
52
53
|
return apiExtensions
|
|
53
54
|
? typeof apiExtensions.resolvers === 'function'
|
|
54
55
|
? apiExtensions.resolvers()
|
|
55
|
-
: apiExtensions.resolvers
|
|
56
|
+
: (_a = apiExtensions.resolvers) !== null && _a !== void 0 ? _a : []
|
|
56
57
|
: [];
|
|
57
58
|
}
|
|
58
59
|
exports.graphQLResolversFor = graphQLResolversFor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-metadata.js","sourceRoot":"","sources":["../../src/plugin/plugin-metadata.ts"],"names":[],"mappings":";;;AACA,wDAA2D;AAE3D,mEAAsE;AAIzD,QAAA,eAAe,GAAG;IAC3B,aAAa,EAAE,eAAe;IAC9B,mBAAmB,EAAE,mBAAmB;IACxC,oBAAoB,EAAE,oBAAoB;IAC1C,QAAQ,EAAE,UAAU;CACvB,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAA0C;IAC7E,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,EAAE,CAAC;KACb;IACD,OAAO,OAAO;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,QAAQ,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACtB,MAAM,gBAAgB,GAAG,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QACtF,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;AACf,CAAC;AAVD,wDAUC;AAED,SAAgB,iBAAiB,CAAC,MAAiB;IAC/C,OAAO;QACH,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE;QAC3E,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE;QACvE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;QACnE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;KACtE,CAAC;AACN,CAAC;AAPD,8CAOC;AAED,SAAgB,sBAAsB,CAClC,OAAyC,EACzC,OAAyB;IAEzB,MAAM,UAAU,GACZ,OAAO,KAAK,MAAM;QACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,mBAAmB,CAAC,CAAC;QAC3E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAErF,OAAO,UAAU,CAAC,MAAM,CAAC,iCAAkB,CAAC,CAAC;AACjD,CAAC;AAVD,wDAUC;AAED,SAAgB,gBAAgB,CAAC,OAAyC;IACtE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,4CAEC;AAED,SAAgB,wBAAwB,CACpC,MAAiC;IAEjC,OAAO,eAAe,CAAC,MAAM,EAAE,uBAAe,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC;AAJD,4DAIC;AAED,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,OAAyB
|
|
1
|
+
{"version":3,"file":"plugin-metadata.js","sourceRoot":"","sources":["../../src/plugin/plugin-metadata.ts"],"names":[],"mappings":";;;AACA,wDAA2D;AAE3D,mEAAsE;AAIzD,QAAA,eAAe,GAAG;IAC3B,aAAa,EAAE,eAAe;IAC9B,mBAAmB,EAAE,mBAAmB;IACxC,oBAAoB,EAAE,oBAAoB;IAC1C,QAAQ,EAAE,UAAU;CACvB,CAAC;AAEF,SAAgB,sBAAsB,CAAC,OAA0C;IAC7E,IAAI,CAAC,OAAO,EAAE;QACV,OAAO,EAAE,CAAC;KACb;IACD,OAAO,OAAO;SACT,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,QAAQ,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;QACtB,MAAM,gBAAgB,GAAG,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QACtF,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;AACf,CAAC;AAVD,wDAUC;AAED,SAAgB,iBAAiB,CAAC,MAAiB;IAC/C,OAAO;QACH,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE;QAC3E,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE;QACvE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;QACnE,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,2BAAe,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;KACtE,CAAC;AACN,CAAC;AAPD,8CAOC;AAED,SAAgB,sBAAsB,CAClC,OAAyC,EACzC,OAAyB;IAEzB,MAAM,UAAU,GACZ,OAAO,KAAK,MAAM;QACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,mBAAmB,CAAC,CAAC;QAC3E,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,EAAE,uBAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAErF,OAAO,UAAU,CAAC,MAAM,CAAC,iCAAkB,CAAC,CAAC;AACjD,CAAC;AAVD,wDAUC;AAED,SAAgB,gBAAgB,CAAC,OAAyC;IACtE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC;AAFD,4CAEC;AAED,SAAgB,wBAAwB,CACpC,MAAiC;IAEjC,OAAO,eAAe,CAAC,MAAM,EAAE,uBAAe,CAAC,aAAa,CAAC,CAAC;AAClE,CAAC;AAJD,4DAIC;AAED,SAAgB,mBAAmB,CAC/B,MAAiC,EACjC,OAAyB;;IAEzB,MAAM,aAAa,GACf,OAAO,KAAK,MAAM;QACd,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,uBAAe,CAAC,mBAAmB,CAAC;QAC9D,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE,uBAAe,CAAC,oBAAoB,CAAC,CAAC;IAExE,OAAO,aAAa;QAChB,CAAC,CAAC,OAAO,aAAa,CAAC,SAAS,KAAK,UAAU;YAC3C,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE;YAC3B,CAAC,CAAC,MAAA,aAAa,CAAC,SAAS,mCAAI,EAAE;QACnC,CAAC,CAAC,EAAE,CAAC;AACb,CAAC;AAdD,kDAcC;AAED,SAAS,eAAe,CAAC,QAAmC,EAAE,WAAmB;IAC7E,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;KAC5D;SAAM;QACH,OAAO,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KACrD;AACL,CAAC;AAED,SAAgB,eAAe,CAAC,KAAgC;IAC5D,OAAO,CAAC,CAAE,KAAuB,CAAC,MAAM,CAAC;AAC7C,CAAC;AAFD,0CAEC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ModuleMetadata } from '@nestjs/common/interfaces';
|
|
2
2
|
import { Type } from '@vendure/common/lib/shared-types';
|
|
3
|
-
import { DocumentNode } from 'graphql';
|
|
3
|
+
import { DocumentNode, GraphQLScalarType } from 'graphql';
|
|
4
4
|
import { RuntimeVendureConfig } from '../config/vendure-config';
|
|
5
5
|
/**
|
|
6
6
|
* @description
|
|
@@ -62,7 +62,16 @@ export interface APIExtensionDefinition {
|
|
|
62
62
|
* An array of resolvers for the schema extensions. Should be defined as [Nestjs GraphQL resolver](https://docs.nestjs.com/graphql/resolvers-map)
|
|
63
63
|
* classes, i.e. using the Nest `\@Resolver()` decorator etc.
|
|
64
64
|
*/
|
|
65
|
-
resolvers
|
|
65
|
+
resolvers?: Array<Type<any>> | (() => Array<Type<any>>);
|
|
66
|
+
/**
|
|
67
|
+
* @description
|
|
68
|
+
* A map of GraphQL scalar types which should correspond to any custom scalars defined in your schema.
|
|
69
|
+
* Read more about defining custom scalars in the
|
|
70
|
+
* [Apollo Server Custom Scalars docs](https://www.apollographql.com/docs/apollo-server/schema/custom-scalars)
|
|
71
|
+
*
|
|
72
|
+
* @since 1.7.0
|
|
73
|
+
*/
|
|
74
|
+
scalars?: Record<string, GraphQLScalarType> | (() => Record<string, GraphQLScalarType>);
|
|
66
75
|
}
|
|
67
76
|
/**
|
|
68
77
|
* @description
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vendure-plugin.js","sourceRoot":"","sources":["../../src/plugin/vendure-plugin.ts"],"names":[],"mappings":";;;AAAA,2CAAoE;AACpE,wDAA2D;AAE3D,uCAAgF;AAChF,mDAAgD;AAMhD,uDAAoD;
|
|
1
|
+
{"version":3,"file":"vendure-plugin.js","sourceRoot":"","sources":["../../src/plugin/vendure-plugin.ts"],"names":[],"mappings":";;;AAAA,2CAAoE;AACpE,wDAA2D;AAE3D,uCAAgF;AAChF,mDAAgD;AAMhD,uDAAoD;AAsFpD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,SAAgB,aAAa,CAAC,cAAqC;IAC/D,qCAAqC;IACrC,OAAO,CAAC,MAAgB,EAAE,EAAE;QACxB,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,MAAM,CAAC,iCAAe,CAAC,EAAE;YAC3D,MAAM,QAAQ,GAAG,gBAA+C,CAAC;YACjE,IAAI,cAAc,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE;gBAClC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;aACtE;SACJ;QACD,MAAM,kBAAkB,GAAG,WAAI,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,2BAAe,CAAQ,CAAC,CAAC;QACvF,yFAAyF;QACzF,2FAA2F;QAC3F,yFAAyF;QACzF,uFAAuF;QACvF,0BAA0B;QAC1B,uGAAuG;QACvG,MAAM,wBAAwB,GAAG,CAAC,sBAAe,EAAE,iBAAU,EAAE,gBAAS,EAAE,eAAQ,CAAC,CAAC;QACpF,MAAM,iBAAiB,GAAG,CAAC,kBAAkB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;YAC7E,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE;gBAC3B,IAAI,wBAAwB,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAc,CAAC,EAAE;oBAC5D,OAAO,KAAK,CAAC;iBAChB;aACJ;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,kBAAkB,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,iBAAiB,CAAC,CAAC;QAC3F,eAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC;AACN,CAAC;AA5BD,sCA4BC;AAED,SAAS,eAAe,CAAC,QAAkB;IACvC,OAAO,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AAC9C,CAAC"}
|
|
@@ -32,6 +32,7 @@ export declare class ConfigArgService {
|
|
|
32
32
|
* Parses and validates the input to a ConfigurableOperation.
|
|
33
33
|
*/
|
|
34
34
|
parseInput(defType: ConfigDefType, input: ConfigurableOperationInput): ConfigurableOperation;
|
|
35
|
+
private orderArgsToMatchDef;
|
|
35
36
|
private parseOperationArgs;
|
|
36
37
|
private validateRequiredFields;
|
|
37
38
|
}
|
|
@@ -50,11 +50,22 @@ let ConfigArgService = class ConfigArgService {
|
|
|
50
50
|
parseInput(defType, input) {
|
|
51
51
|
const match = this.getByCode(defType, input.code);
|
|
52
52
|
this.validateRequiredFields(input, match);
|
|
53
|
+
const orderedArgs = this.orderArgsToMatchDef(match, input.arguments);
|
|
53
54
|
return {
|
|
54
55
|
code: input.code,
|
|
55
|
-
args:
|
|
56
|
+
args: orderedArgs,
|
|
56
57
|
};
|
|
57
58
|
}
|
|
59
|
+
orderArgsToMatchDef(def, args) {
|
|
60
|
+
const output = [];
|
|
61
|
+
for (const name of Object.keys(def.args)) {
|
|
62
|
+
const match = args.find(arg => arg.name === name);
|
|
63
|
+
if (match) {
|
|
64
|
+
output.push(match);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return output;
|
|
68
|
+
}
|
|
58
69
|
parseOperationArgs(input, checkerOrCalculator) {
|
|
59
70
|
const output = {
|
|
60
71
|
code: input.code,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-arg.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/config-arg/config-arg.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,yDAA8D;AAE9D,mEAA+D;AAsB/D;;GAEG;AAEH,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAGzB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAC5C,IAAI,CAAC,iBAAiB,GAAG;YACrB,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,iBAAiB;YACrE,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,mBAAmB;YAC1E,+BAA+B,EAC3B,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,gCAAgC,IAAI,EAAE;YAC5E,oBAAoB,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,qBAAqB;YAC7E,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,gBAAgB;YACrE,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,mBAAmB;YAC3E,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,mBAAmB;YAC1E,0BAA0B,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,2BAA2B;SAC7F,CAAC;IACN,CAAC;IAED,cAAc,CAA0B,OAAU;QAC9C,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAA+B,CAAC;IACzE,CAAC;IAED,SAAS,CAA0B,OAAU,EAAE,IAAY;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK,EAAE;YACR,MAAM,IAAI,uBAAc,CAAC,qDAAqD,EAAE;gBAC5E,IAAI;gBACJ,IAAI,EAAE,OAAO;aAChB,CAAC,CAAC;SACN;QACD,OAAO,KAA4B,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,OAAsB,EAAE,KAAiC;QAChE,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1C,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"config-arg.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/config-arg/config-arg.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { RequestContext } from '../../../api/common/request-context';
|
|
|
2
2
|
import { TransactionalConnection } from '../../../connection/transactional-connection';
|
|
3
3
|
import { VendureEntity } from '../../../entity/base/base.entity';
|
|
4
4
|
import { ProductPriceApplicator } from '../product-price-applicator/product-price-applicator';
|
|
5
|
+
import { TranslatorService } from '../translator/translator.service';
|
|
5
6
|
import { HydrateOptions } from './entity-hydrator-types';
|
|
6
7
|
/**
|
|
7
8
|
* @description
|
|
@@ -43,7 +44,8 @@ import { HydrateOptions } from './entity-hydrator-types';
|
|
|
43
44
|
export declare class EntityHydrator {
|
|
44
45
|
private connection;
|
|
45
46
|
private productPriceApplicator;
|
|
46
|
-
|
|
47
|
+
private translator;
|
|
48
|
+
constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator, translator: TranslatorService);
|
|
47
49
|
/**
|
|
48
50
|
* @description
|
|
49
51
|
* Hydrates (joins) the specified relations to the target entity instance. This method
|
|
@@ -17,7 +17,7 @@ const errors_1 = require("../../../common/error/errors");
|
|
|
17
17
|
const transactional_connection_1 = require("../../../connection/transactional-connection");
|
|
18
18
|
const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
|
|
19
19
|
const product_price_applicator_1 = require("../product-price-applicator/product-price-applicator");
|
|
20
|
-
const
|
|
20
|
+
const translator_service_1 = require("../translator/translator.service");
|
|
21
21
|
/**
|
|
22
22
|
* @description
|
|
23
23
|
* This is a helper class which is used to "hydrate" entity instances, which means to populate them
|
|
@@ -56,9 +56,10 @@ const translate_entity_1 = require("../utils/translate-entity");
|
|
|
56
56
|
* @since 1.3.0
|
|
57
57
|
*/
|
|
58
58
|
let EntityHydrator = class EntityHydrator {
|
|
59
|
-
constructor(connection, productPriceApplicator) {
|
|
59
|
+
constructor(connection, productPriceApplicator, translator) {
|
|
60
60
|
this.connection = connection;
|
|
61
61
|
this.productPriceApplicator = productPriceApplicator;
|
|
62
|
+
this.translator = translator;
|
|
62
63
|
}
|
|
63
64
|
/**
|
|
64
65
|
* @description
|
|
@@ -120,7 +121,7 @@ let EntityHydrator = class EntityHydrator {
|
|
|
120
121
|
const translateDeepRelations = relationsWithEntities
|
|
121
122
|
.filter(item => this.isTranslatable(item.entity))
|
|
122
123
|
.map(item => item.relation.split('.'));
|
|
123
|
-
this.assignSettableProperties(target,
|
|
124
|
+
this.assignSettableProperties(target, this.translator.translate(target, ctx, translateDeepRelations));
|
|
124
125
|
}
|
|
125
126
|
}
|
|
126
127
|
return target;
|
|
@@ -255,7 +256,8 @@ let EntityHydrator = class EntityHydrator {
|
|
|
255
256
|
EntityHydrator = __decorate([
|
|
256
257
|
common_1.Injectable(),
|
|
257
258
|
__metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
|
|
258
|
-
product_price_applicator_1.ProductPriceApplicator
|
|
259
|
+
product_price_applicator_1.ProductPriceApplicator,
|
|
260
|
+
translator_service_1.TranslatorService])
|
|
259
261
|
], EntityHydrator);
|
|
260
262
|
exports.EntityHydrator = EntityHydrator;
|
|
261
263
|
//# sourceMappingURL=entity-hydrator.service.js.map
|