npm - @vendure/core - Versions diffs - 2.0.0-next.2 → 2.0.0-next.21 - Mend

@vendure/core 2.0.0-next.2 → 2.0.0-next.21

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.

Files changed (1580) hide show

package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js CHANGED Viewed

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
+exports.applyLanguageConstraints = exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
 const unique_1 = require("@vendure/common/lib/unique");
+const search_index_item_entity_1 = require("../entities/search-index-item.entity");
+const search_strategy_common_1 = require("./search-strategy-common");
 /**
  * Maps a raw database result to a SearchResult.
  */
@@ -100,4 +102,32 @@ function createPlaceholderFromId(id) {
     return '_' + id.toString().replace(/-/g, '_');
 }
 exports.createPlaceholderFromId = createPlaceholderFromId;
+/**
+ * Applies language constraints for {@link SearchIndexItem} query.
+ *
+ * @param qb QueryBuilder instance
+ * @param languageCode Preferred language code
+ * @param defaultLanguageCode Default language code that is used if {@link SearchIndexItem} is not available in preferred language
+ */
+function applyLanguageConstraints(qb, languageCode, defaultLanguageCode) {
+    if (languageCode === defaultLanguageCode) {
+        qb.andWhere('si.languageCode = :languageCode', { languageCode });
+    }
+    else {
+        qb.andWhere('si.languageCode IN (:...languageCodes)', {
+            languageCodes: [languageCode, defaultLanguageCode],
+        });
+        const joinFieldConditions = search_strategy_common_1.identifierFields.map(field => `si.${field} = sil.${field}`).join(' AND ');
+        qb.leftJoin(search_index_item_entity_1.SearchIndexItem, 'sil', `
+            ${joinFieldConditions}
+            AND si.languageCode != sil.languageCode
+            AND sil.languageCode = :languageCode
+        `, {
+            languageCode,
+        });
+        qb.andWhere('sil.languageCode IS NULL');
+    }
+    return qb;
+}
+exports.applyLanguageConstraints = applyLanguageConstraints;
 //# sourceMappingURL=search-strategy-utils.js.map

package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":";;;~~AASA~~,uDAAoD;~~AAEpD~~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"}
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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"}

package/dist/plugin/default-search-plugin/search-strategy/search-strategy.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
 import { SearchInput, SearchResult } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../../api';
+import { InjectableStrategy } from '../../../common';
 /**
  * This interface defines the contract that any database-specific search implementations
  * should follow.
  */
-export interface SearchStrategy {
+export interface SearchStrategy extends InjectableStrategy {
     getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;
     getTotalCount(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<number>;
     /**

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.d.ts CHANGED Viewed

@@ -1,18 +1,18 @@
 import { SearchResult } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { RequestContext } from '../../../api/common/request-context';
-import { TransactionalConnection } from '../../../connection/transactional-connection';
-import { DefaultSearchPluginInitOptions, SearchInput } from '../types';
+import { Injector } from '../../../common';
+import { SearchInput } from '../types';
 import { SearchStrategy } from './search-strategy';
 /**
  * A rather naive search for SQLite / SQL.js. Rather than proper
  * full-text searching, it uses a weighted `LIKE "%term%"` operator instead.
  */
 export declare class SqliteSearchStrategy implements SearchStrategy {
+    private readonly minTermLength;
     private connection;
     private options;
-    private readonly minTermLength;
-    constructor(connection: TransactionalConnection, options: DefaultSearchPluginInitOptions);
+    init(injector: Injector): Promise<void>;
     getFacetValueIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
     getCollectionIds(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<Map<ID, number>>;
     getSearchResults(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<SearchResult[]>;

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js CHANGED Viewed

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqliteSearchStrategy = void 0;
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const typeorm_1 = require("typeorm");
+const __1 = require("../../..");
 const errors_1 = require("../../../common/error/errors");
+const transactional_connection_1 = require("../../../connection/transactional-connection");
 const search_index_item_entity_1 = require("../entities/search-index-item.entity");
 const search_strategy_utils_1 = require("./search-strategy-utils");
 /**
@@ -11,20 +13,22 @@ const search_strategy_utils_1 = require("./search-strategy-utils");
  * full-text searching, it uses a weighted `LIKE "%term%"` operator instead.
  */
 class SqliteSearchStrategy {
-    constructor(connection, options) {
-        this.connection = connection;
-        this.options = options;
+    constructor() {
         this.minTermLength = 2;
     }
+    async init(injector) {
+        this.connection = injector.get(transactional_connection_1.TransactionalConnection);
+        this.options = injector.get(__1.PLUGIN_INIT_OPTIONS);
+    }
     async getFacetValueIds(ctx, input, enabledOnly) {
         const facetValuesQb = this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .createQueryBuilder('si')
-            .select(['productId', 'productVariantId'])
+            .select(['si.productId', 'si.productVariantId'])
             .addSelect('GROUP_CONCAT(si.facetValueIds)', 'facetValues');
         this.applyTermAndFilters(ctx, facetValuesQb, input);
         if (!input.groupByProduct) {
-            facetValuesQb.groupBy('productVariantId');
+            facetValuesQb.groupBy('si.productVariantId');
         }
         if (enabledOnly) {
             facetValuesQb.andWhere('si.enabled = :enabled', { enabled: true });
@@ -34,13 +38,13 @@ class SqliteSearchStrategy {
     }
     async getCollectionIds(ctx, input, enabledOnly) {
         const collectionsQb = this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .createQueryBuilder('si')
-            .select(['productId', 'productVariantId'])
+            .select(['si.productId', 'si.productVariantId'])
             .addSelect('GROUP_CONCAT(si.collectionIds)', 'collections');
         this.applyTermAndFilters(ctx, collectionsQb, input);
         if (!input.groupByProduct) {
-            collectionsQb.groupBy('productVariantId');
+            collectionsQb.groupBy('si.productVariantId');
         }
         if (enabledOnly) {
             collectionsQb.andWhere('si.enabled = :enabled', { enabled: true });
@@ -52,10 +56,10 @@ class SqliteSearchStrategy {
         const take = input.take || 25;
         const skip = input.skip || 0;
         const sort = input.sort;
-        const qb = this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si');
+        const qb = this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si');
         if (input.groupByProduct) {
-            qb.addSelect('MIN(price)', 'minPrice').addSelect('MAX(price)', 'maxPrice');
-            qb.addSelect('MIN(priceWithTax)', 'minPriceWithTax').addSelect('MAX(priceWithTax)', 'maxPriceWithTax');
+            qb.addSelect('MIN(si.price)', 'minPrice').addSelect('MAX(si.price)', 'maxPrice');
+            qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax').addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
         }
         this.applyTermAndFilters(ctx, qb, input);
         if (input.term && input.term.length > this.minTermLength) {
@@ -63,26 +67,26 @@ class SqliteSearchStrategy {
         }
         if (sort) {
             if (sort.name) {
-                qb.addOrderBy('productName', sort.name);
+                qb.addOrderBy('si.productName', sort.name);
             }
             if (sort.price) {
-                qb.addOrderBy('price', sort.price);
+                qb.addOrderBy('si.price', sort.price);
             }
         }
         else {
-            qb.addOrderBy('productVariantId', 'ASC');
+            qb.addOrderBy('si.productVariantId', 'ASC');
         }
         if (enabledOnly) {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }
         return await qb
-            .take(take)
-            .skip(skip)
+            .limit(take)
+            .offset(skip)
             .getRawMany()
             .then(res => res.map(r => (0, search_strategy_utils_1.mapToSearchResult)(r, ctx.channel.currencyCode)));
     }
     async getTotalCount(ctx, input, enabledOnly) {
-        const innerQb = this.applyTermAndFilters(ctx, this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si'), input);
+        const innerQb = this.applyTermAndFilters(ctx, this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si'), input);
         if (enabledOnly) {
             innerQb.andWhere('si.enabled = :enabled', { enabled: true });
         }
@@ -100,31 +104,31 @@ class SqliteSearchStrategy {
             // Note: SQLite does not natively have fulltext search capabilities,
             // so we just use a weighted LIKE match
             qb.addSelect(`
-                    CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
-                    CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
-                    CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
-                    CASE WHEN description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
+                    CASE WHEN si.sku LIKE :like_term THEN 10 ELSE 0 END +
+                    CASE WHEN si.productName LIKE :like_term THEN 3 ELSE 0 END +
+                    CASE WHEN si.productVariantName LIKE :like_term THEN 2 ELSE 0 END +
+                    CASE WHEN si.description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
                 .andWhere(new typeorm_1.Brackets(qb1 => {
-                qb1.where('sku LIKE :like_term')
-                    .orWhere('productName LIKE :like_term')
-                    .orWhere('productVariantName LIKE :like_term')
-                    .orWhere('description LIKE :like_term');
+                qb1.where('si.sku LIKE :like_term')
+                    .orWhere('si.productName LIKE :like_term')
+                    .orWhere('si.productVariantName LIKE :like_term')
+                    .orWhere('si.description LIKE :like_term');
             }))
                 .setParameters({ term, like_term: `%${term}%` });
         }
         if (input.inStock != null) {
             if (input.groupByProduct) {
-                qb.andWhere('productInStock = :inStock', { inStock: input.inStock });
+                qb.andWhere('si.productInStock = :inStock', { inStock: input.inStock });
             }
             else {
-                qb.andWhere('inStock = :inStock', { inStock: input.inStock });
+                qb.andWhere('si.inStock = :inStock', { inStock: input.inStock });
             }
         }
         if (facetValueIds === null || facetValueIds === void 0 ? void 0 : facetValueIds.length) {
             qb.andWhere(new typeorm_1.Brackets(qb1 => {
                 for (const id of facetValueIds) {
                     const placeholder = (0, search_strategy_utils_1.createPlaceholderFromId)(id);
-                    const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
+                    const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
                     const params = { [placeholder]: `%,${id},%` };
                     if (facetValueOperator === generated_types_1.LogicalOperator.AND) {
                         qb1.andWhere(clause, params);
@@ -145,14 +149,14 @@ class SqliteSearchStrategy {
                         }
                         if (facetValueFilter.and) {
                             const placeholder = (0, search_strategy_utils_1.createPlaceholderFromId)(facetValueFilter.and);
-                            const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
+                            const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
                             const params = { [placeholder]: `%,${facetValueFilter.and},%` };
                             qb2.where(clause, params);
                         }
                         if ((_b = facetValueFilter.or) === null || _b === void 0 ? void 0 : _b.length) {
                             for (const id of facetValueFilter.or) {
                                 const placeholder = (0, search_strategy_utils_1.createPlaceholderFromId)(id);
-                                const clause = `(',' || facetValueIds || ',') LIKE :${placeholder}`;
+                                const clause = `(',' || si.facetValueIds || ',') LIKE :${placeholder}`;
                                 const params = { [placeholder]: `%,${id},%` };
                                 qb2.orWhere(clause, params);
                             }
@@ -162,19 +166,19 @@ class SqliteSearchStrategy {
             }));
         }
         if (collectionId) {
-            qb.andWhere(`(',' || collectionIds || ',') LIKE :collectionId`, {
+            qb.andWhere(`(',' || si.collectionIds || ',') LIKE :collectionId`, {
                 collectionId: `%,${collectionId},%`,
             });
         }
         if (collectionSlug) {
-            qb.andWhere(`(',' || collectionSlugs || ',') LIKE :collectionSlug`, {
+            qb.andWhere(`(',' || si.collectionSlugs || ',') LIKE :collectionSlug`, {
                 collectionSlug: `%,${collectionSlug},%`,
             });
         }
-        qb.andWhere('languageCode = :languageCode', { languageCode: ctx.languageCode });
-        qb.andWhere('channelId = :channelId', { channelId: ctx.channelId });
+        (0, search_strategy_utils_1.applyLanguageConstraints)(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
+        qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
         if (input.groupByProduct === true) {
-            qb.groupBy('productId');
+            qb.groupBy('si.productId');
         }
         return qb;
     }

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;~~AAGvD~~,yDAA8D;~~AAE9D~~,mFAAuE;AAIvE,~~mEAKiC~~;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;~~IAG7B~~,~~YACY~~,~~UAAmC~~,~~EACnC~~,~~OAAuC~~;~~QADvC~~,~~eAAU~~,~~GAAV~~,UAAU,~~CAAyB~~;~~QACnC~~,~~YAAO~~,~~GAAP~~,OAAO,~~CAAgC;QAJlC~~,~~kBAAa~~,GAAG,CAAC,CAAC;~~IAKhC~~,CAAC;~~IAEJ~~,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;~~aAC9B~~,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,~~WAAW~~,EAAE,~~kBAAkB~~,CAAC,CAAC;~~aACzC~~,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,~~kBAAkB~~,CAAC,CAAC;~~SAC7C~~;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,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;~~aAC9B~~,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,~~WAAW~~,EAAE,~~kBAAkB~~,CAAC,CAAC;~~aACzC~~,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,~~kBAAkB~~,CAAC,CAAC;~~SAC7C~~;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,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;~~QACnF~~,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,~~YAAY~~,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,~~YAAY~~,EAAE,UAAU,CAAC,CAAC;~~YAC3E~~,EAAE,CAAC,SAAS,CAAC,~~mBAAmB~~,EAAE,iBAAiB,CAAC,CAAC,SAAS,~~CAC1D~~,~~mBAAmB~~,~~EACnB~~,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,~~aAAa~~,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~aAC3C~~;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,~~OAAO~~,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;~~aACtC~~;SACJ;aAAM;YACH,EAAE,CAAC,UAAU,CAAC,~~kBAAkB~~,EAAE,KAAK,CAAC,CAAC;~~SAC5C~~;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,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yCAAiB,EAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACnF,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,0CAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,~~EACvE~~,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~~;;;;4EAI4D~~,~~EAC5D~~,OAAO,CACV;iBACI,QAAQ,CACL,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,~~qBAAqB~~,CAAC;~~qBAC3B~~,OAAO,CAAC,~~6BAA6B~~,CAAC;~~qBACtC~~,OAAO,CAAC,~~oCAAoC~~,CAAC;~~qBAC7C~~,OAAO,CAAC,~~6BAA6B~~,CAAC,CAAC;~~YAChD~~,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,~~2BAA2B~~,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;~~aACxE~~;iBAAM;gBACH,EAAE,CAAC,QAAQ,CAAC,~~oBAAoB~~,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;~~aACjE~~;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,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,~~uCAAuC~~,WAAW,EAAE,CAAC;~~oBACpE~~,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,IAAA,+CAAuB,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,~~uCAAuC~~,WAAW,EAAE,CAAC;~~4BACpE~~,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,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,~~uCAAuC~~,WAAW,EAAE,CAAC;~~gCACpE~~,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,~~kDAAkD~~,EAAE;~~gBAC5D~~,YAAY,EAAE,KAAK,YAAY,IAAI;aACtC,CAAC,CAAC;SACN;QACD,IAAI,cAAc,EAAE;YAChB,EAAE,CAAC,QAAQ,CAAC,~~sDAAsD~~,EAAE;~~gBAChE~~,cAAc,EAAE,KAAK,cAAc,IAAI;aAC1C,CAAC,CAAC;SACN;~~QACD~~,~~EAAE~~,~~CAAC~~,~~QAAQ~~,~~CAAC,8BAA8B,~~EAAE,EAAE,YAAY,EAAE,GAAG,CAAC,~~YAAY~~,~~EAAE~~,CAAC,CAAC;QAChF,EAAE,CAAC,QAAQ,CAAC,~~wBAAwB~~,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;~~QACpE~~,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,~~WAAW~~,CAAC,CAAC;~~SAC3B~~;~~QACD~~,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;~~AAnND~~,~~oDAmNC~~"}
1	+ {"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/types.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { SearchInput as GeneratedSearchInput } from '@vendure/common/lib/generat
 import { ID, JsonCompatible } from '@vendure/common/lib/shared-types';
 import { SerializedRequestContext } from '../../api/common/request-context';
 import { Asset } from '../../entity/asset/asset.entity';
+import { SearchStrategy } from './search-strategy/search-strategy';
 /**
  * @description
  * Options which configure the behaviour of the DefaultSearchPlugin
@@ -11,7 +12,7 @@ import { Asset } from '../../entity/asset/asset.entity';
 export interface DefaultSearchPluginInitOptions {
     /**
      * @description
-     * If set to `true`, the stock status of a ProductVariant (isStock: Boolean) will
+     * If set to `true`, the stock status of a ProductVariant (inStock: Boolean) will
      * be exposed in the `search` query results. Enabling this option on an existing
      * Vendure installation will require a DB migration/synchronization.
      *
@@ -33,6 +34,89 @@ export interface DefaultSearchPluginInitOptions {
      * @default false
      */
     bufferUpdates?: boolean;
+    /**
+     * @description
+     * Set a custom search strategy that implements {@link SearchStrategy} or extends an existing search strategy
+     * such as {@link MysqlSearchStrategy}, {@link PostgresSearchStrategy} or {@link SqliteSearchStrategy}.
+     *
+     * @example
+     * ```Typescript
+     * export class MySearchStrategy implements SearchStrategy {
+     *     private readonly minTermLength = 2;
+     *     private connection: TransactionalConnection;
+     *     private options: DefaultSearchPluginInitOptions;
+     *
+     *     async init(injector: Injector) {
+     *         this.connection = injector.get(TransactionalConnection);
+     *         this.options = injector.get(PLUGIN_INIT_OPTIONS);
+     *     }
+     *
+     *     async getFacetValueIds(
+     *         ctx: RequestContext,
+     *         input: SearchInput,
+     *         enabledOnly: boolean,
+     *     ): Promise<Map<ID, number>> {
+     *         // ...
+     *         return createFacetIdCountMap(facetValuesResult);
+     *     }
+     *
+     *     async getCollectionIds(
+     *         ctx: RequestContext,
+     *         input: SearchInput,
+     *         enabledOnly: boolean,
+     *     ): Promise<Map<ID, number>> {
+     *         // ...
+     *         return createCollectionIdCountMap(collectionsResult);
+     *     }
+     *
+     *     async getSearchResults(
+     *         ctx: RequestContext,
+     *         input: SearchInput,
+     *         enabledOnly: boolean,
+     *     ): Promise<SearchResult[]> {
+     *         const take = input.take || 25;
+     *         const skip = input.skip || 0;
+     *         const sort = input.sort;
+     *         const qb = this.connection
+     *             .getRepository(SearchIndexItem)
+     *             .createQueryBuilder('si')
+     *             .select(this.createMysqlSelect(!!input.groupByProduct));
+     *         // ...
+     *
+     *         return qb
+     *             .take(take)
+     *             .skip(skip)
+     *             .getRawMany()
+     *             .then(res => res.map(r => mapToSearchResult(r, ctx.channel.currencyCode)));
+     *     }
+     *
+     *     async getTotalCount(ctx: RequestContext, input: SearchInput, enabledOnly: boolean): Promise<number> {
+     *         const innerQb = this.applyTermAndFilters(
+     *             ctx,
+     *             this.connection
+     *                 .getRepository(SearchIndexItem)
+     *                 .createQueryBuilder('si')
+     *                 .select(this.createMysqlSelect(!!input.groupByProduct)),
+     *             input,
+     *         );
+     *         if (enabledOnly) {
+     *             innerQb.andWhere('si.enabled = :enabled', { enabled: true });
+     *         }
+     *
+     *         const totalItemsQb = this.connection.rawConnection
+     *             .createQueryBuilder()
+     *             .select('COUNT(*) as total')
+     *             .from(`(${innerQb.getQuery()})`, 'inner')
+     *             .setParameters(innerQb.getParameters());
+     *         return totalItemsQb.getRawOne().then(res => res.total);
+     *     }
+     * }
+     * ```
+     *
+     * @since 1.6.0
+     * @default undefined
+     */
+    searchStategy?: SearchStrategy;
 }
 /**
  * Because the `inStock` field is opt-in based on the `indexStockStatus` option,

package/dist/plugin/plugin-metadata.js CHANGED Viewed

@@ -46,13 +46,14 @@ function getConfigurationFunction(plugin) {
 }
 exports.getConfigurationFunction = getConfigurationFunction;
 function graphQLResolversFor(plugin, apiType) {
+    var _a;
     const apiExtensions = apiType === 'shop'
         ? reflectMetadata(plugin, exports.PLUGIN_METADATA.SHOP_API_EXTENSIONS)
         : reflectMetadata(plugin, exports.PLUGIN_METADATA.ADMIN_API_EXTENSIONS);
     return apiExtensions
         ? typeof apiExtensions.resolvers === 'function'
             ? apiExtensions.resolvers()
-            : apiExtensions.resolvers
+            : (_a = apiExtensions.resolvers) !== null && _a !== void 0 ? _a : []
         : [];
 }
 exports.graphQLResolversFor = graphQLResolversFor;

package/dist/plugin/plugin-metadata.js.map CHANGED Viewed

	@@ -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;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,aAAa,CAAC,SAAS;~~QAC7B~~,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	+ {"version":3,"file":"plugin-metadata.js","sourceRoot":"","sources":["../../src/plugin/plugin-metadata.ts"],"names":[],"mappings":"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"}

package/dist/plugin/vendure-plugin.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ModuleMetadata } from '@nestjs/common/interfaces';
 import { Type } from '@vendure/common/lib/shared-types';
-import { DocumentNode } from 'graphql';
+import { DocumentNode, GraphQLScalarType } from 'graphql';
 import { RuntimeVendureConfig } from '../config/vendure-config';
 /**
  * @description
@@ -62,7 +62,16 @@ export interface APIExtensionDefinition {
      * An array of resolvers for the schema extensions. Should be defined as [Nestjs GraphQL resolver](https://docs.nestjs.com/graphql/resolvers-map)
      * classes, i.e. using the Nest `\@Resolver()` decorator etc.
      */
-    resolvers: Array<Type<any>> | (() => Array<Type<any>>);
+    resolvers?: Array<Type<any>> | (() => Array<Type<any>>);
+    /**
+     * @description
+     * A map of GraphQL scalar types which should correspond to any custom scalars defined in your schema.
+     * Read more about defining custom scalars in the
+     * [Apollo Server Custom Scalars docs](https://www.apollographql.com/docs/apollo-server/schema/custom-scalars)
+     *
+     * @since 1.7.0
+     */
+    scalars?: Record<string, GraphQLScalarType> | (() => Record<string, GraphQLScalarType>);
 }
 /**
  * @description

package/dist/plugin/vendure-plugin.js.map CHANGED Viewed

	@@ -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;~~AA6EpD~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,IAAA,WAAI,EAAC,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,IAAA,eAAM,EAAC,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"}
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,IAAA,WAAI,EAAC,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,IAAA,eAAM,EAAC,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"}

package/dist/service/helpers/config-arg/config-arg.service.d.ts CHANGED Viewed

@@ -32,6 +32,7 @@ export declare class ConfigArgService {
      * Parses and validates the input to a ConfigurableOperation.
      */
     parseInput(defType: ConfigDefType, input: ConfigurableOperationInput): ConfigurableOperation;
+    private orderArgsToMatchDef;
     private parseOperationArgs;
     private validateRequiredFields;
 }

package/dist/service/helpers/config-arg/config-arg.service.js CHANGED Viewed

@@ -50,11 +50,22 @@ let ConfigArgService = class ConfigArgService {
     parseInput(defType, input) {
         const match = this.getByCode(defType, input.code);
         this.validateRequiredFields(input, match);
+        const orderedArgs = this.orderArgsToMatchDef(match, input.arguments);
         return {
             code: input.code,
-            args: input.arguments,
+            args: orderedArgs,
         };
     }
+    orderArgsToMatchDef(def, args) {
+        const output = [];
+        for (const name of Object.keys(def.args)) {
+            const match = args.find(arg => arg.name === name);
+            if (match) {
+                output.push(match);
+            }
+        }
+        return output;
+    }
     parseOperationArgs(input, checkerOrCalculator) {
         const output = {
             code: input.code,

package/dist/service/helpers/config-arg/config-arg.service.js.map CHANGED Viewed

	@@ -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,~~SAAS~~;~~SACxB~~,CAAC;~~IACN~~,CAAC;IAEO,kBAAkB,CACtB,KAAiC,EACjC,mBAAoE;QAEpE,MAAM,MAAM,GAA0B;YAClC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,SAAS;SACxB,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,sBAAsB,CAAC,KAAiC,EAAE,GAA6B;QAC3F,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACnD,IAAI,MAAM,CAAC,QAAQ,EAAE;gBACjB,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;gBAE5D,IAAI,KAAK,GAAG,KAAK,CAAC;gBAClB,IAAI;oBACA,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;wBACpD,KAAK,GAAG,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,KAAK,KAAK,EAAE,IAAI,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC;qBACzE;yBAAM;wBACH,KAAK,GAAG,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;qBAC5D;iBACJ;gBAAC,OAAO,CAAM,EAAE;oBACb,SAAS;iBACZ;gBAED,IAAI,CAAC,KAAK,EAAE;oBACR,MAAM,IAAI,uBAAc,CAAC,yCAAyC,EAAE;wBAChE,IAAI;qBACP,CAAC,CAAC;iBACN;aACJ;SACJ;IACL,CAAC;CACJ,CAAA;~~AAhFY~~,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAI0B,8BAAa;GAHvC,gBAAgB,~~CAgF5B~~;~~AAhFY~~,4CAAgB"}
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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"}

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { RequestContext } from '../../../api/common/request-context';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { VendureEntity } from '../../../entity/base/base.entity';
 import { ProductPriceApplicator } from '../product-price-applicator/product-price-applicator';
+import { TranslatorService } from '../translator/translator.service';
 import { HydrateOptions } from './entity-hydrator-types';
 /**
  * @description
@@ -43,7 +44,8 @@ import { HydrateOptions } from './entity-hydrator-types';
 export declare class EntityHydrator {
     private connection;
     private productPriceApplicator;
-    constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator);
+    private translator;
+    constructor(connection: TransactionalConnection, productPriceApplicator: ProductPriceApplicator, translator: TranslatorService);
     /**
      * @description
      * Hydrates (joins) the specified relations to the target entity instance. This method

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js CHANGED Viewed

@@ -17,7 +17,7 @@ const errors_1 = require("../../../common/error/errors");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
 const product_variant_entity_1 = require("../../../entity/product-variant/product-variant.entity");
 const product_price_applicator_1 = require("../product-price-applicator/product-price-applicator");
-const translate_entity_1 = require("../utils/translate-entity");
+const translator_service_1 = require("../translator/translator.service");
 /**
  * @description
  * 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");
  * @since 1.3.0
  */
 let EntityHydrator = class EntityHydrator {
-    constructor(connection, productPriceApplicator) {
+    constructor(connection, productPriceApplicator, translator) {
         this.connection = connection;
         this.productPriceApplicator = productPriceApplicator;
+        this.translator = translator;
     }
     /**
      * @description
@@ -120,7 +121,7 @@ let EntityHydrator = class EntityHydrator {
                 const translateDeepRelations = relationsWithEntities
                     .filter(item => this.isTranslatable(item.entity))
                     .map(item => item.relation.split('.'));
-                this.assignSettableProperties(target, (0, translate_entity_1.translateDeep)(target, ctx.languageCode, translateDeepRelations));
+                this.assignSettableProperties(target, this.translator.translate(target, ctx, translateDeepRelations));
             }
         }
         return target;
@@ -255,7 +256,8 @@ let EntityHydrator = class EntityHydrator {
 EntityHydrator = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
-        product_price_applicator_1.ProductPriceApplicator])
+        product_price_applicator_1.ProductPriceApplicator,
+        translator_service_1.TranslatorService])
 ], EntityHydrator);
 exports.EntityHydrator = EntityHydrator;
 //# sourceMappingURL=entity-hydrator.service.js.map