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

package/dist/service/helpers/list-query-builder/parse-channel-param.js

@@ -5,9 +5,9 @@ exports.parseChannelParam = void 0;
  * Creates a WhereCondition for a channel-aware entity, filtering for only those entities
  * which are assigned to the channel specified by channelId,
  */
-function parseChannelParam(connection, entity, channelId) {
+function parseChannelParam(connection, entity, channelId, entityAlias) {
     const metadata = connection.getMetadata(entity);
-    const alias = metadata.name.toLowerCase();
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : metadata.name.toLowerCase();
     const relations = metadata.relations;
     const channelRelation = relations.find(r => r.propertyName === 'channels');
     if (!channelRelation) {

package/dist/service/helpers/list-query-builder/parse-channel-param.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-channel-param.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-channel-param.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAC7B,UAAsB,EACtB,MAAe,EACf,SAAa;IAEb,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QAClB,OAAO;KACV;IACD,OAAO;QACH,MAAM,EAAE,GAAG,KAAK,4BAA4B;QAC5C,UAAU,EAAE,EAAE,SAAS,EAAE;KAC5B,CAAC;AACN,CAAC;AAhBD,8CAgBC"}
+{"version":3,"file":"parse-channel-param.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-channel-param.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAC7B,UAAsB,EACtB,MAAe,EACf,SAAa,EACb,WAAoB;IAEpB,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IACzD,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACrC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAC3E,IAAI,CAAC,eAAe,EAAE;QAClB,OAAO;KACV;IACD,OAAO;QACH,MAAM,EAAE,GAAG,KAAK,4BAA4B;QAC5C,UAAU,EAAE,EAAE,SAAS,EAAE;KAC5B,CAAC;AACN,CAAC;AAjBD,8CAiBC"}

package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts

@@ -10,4 +10,4 @@ export interface WhereCondition {
 }
 export declare function parseFilterParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, filterParams?: NullOptionals<FilterParameter<T>> | null, customPropertyMap?: {
     [name: string]: string;
-}): WhereCondition[];
+}, entityAlias?: string): WhereCondition[];

package/dist/service/helpers/list-query-builder/parse-filter-params.js

@@ -6,11 +6,12 @@ const DateUtils_1 = require("typeorm/util/DateUtils");
 const errors_1 = require("../../../common/error/errors");
 const connection_utils_1 = require("./connection-utils");
 const get_calculated_columns_1 = require("./get-calculated-columns");
-function parseFilterParams(connection, entity, filterParams, customPropertyMap) {
+function parseFilterParams(connection, entity, filterParams, customPropertyMap, entityAlias) {
     if (!filterParams) {
         return [];
     }
-    const { columns, translationColumns, alias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const { columns, translationColumns, alias: defaultAlias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
     const calculatedColumns = (0, get_calculated_columns_1.getCalculatedColumns)(entity);
     const output = [];
     const dbType = connection.options.type;

package/dist/service/helpers/list-query-builder/parse-filter-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/list-query-builder/parse-sort-params.d.ts

@@ -1,6 +1,7 @@
 import { Type } from '@vendure/common/lib/shared-types';
 import { Connection, OrderByCondition } from 'typeorm';
 import { NullOptionals, SortParameter } from '../../../common/types/common-types';
+import { CustomFieldConfig } from '../../../config/index';
 import { VendureEntity } from '../../../entity/base/base.entity';
 /**
  * Parses the provided SortParameter array against the metadata of the given entity, ensuring that only
@@ -11,4 +12,4 @@ import { VendureEntity } from '../../../entity/base/base.entity';
  */
 export declare function parseSortParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, sortParams?: NullOptionals<SortParameter<T>> | null, customPropertyMap?: {
     [name: string]: string;
-}): OrderByCondition;
+}, entityAlias?: string, customFields?: CustomFieldConfig[]): OrderByCondition;

package/dist/service/helpers/list-query-builder/parse-sort-params.js

@@ -12,11 +12,13 @@ const get_calculated_columns_1 = require("./get-calculated-columns");
  * @param entity
  * @param sortParams
  */
-function parseSortParams(connection, entity, sortParams, customPropertyMap) {
+function parseSortParams(connection, entity, sortParams, customPropertyMap, entityAlias, customFields) {
+    var _a;
     if (!sortParams || Object.keys(sortParams).length === 0) {
         return {};
     }
-    const { columns, translationColumns, alias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const { columns, translationColumns, alias: defaultAlias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
+    const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
     const calculatedColumns = (0, get_calculated_columns_1.getCalculatedColumns)(entity);
     const output = {};
     for (const [key, order] of Object.entries(sortParams)) {
@@ -27,11 +29,17 @@ function parseSortParams(connection, entity, sortParams, customPropertyMap) {
         }
         else if (translationColumns.find(c => c.propertyName === key)) {
             const translationsAlias = connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
-            output[`${translationsAlias}.${key}`] = order;
+            const pathParts = [translationsAlias];
+            const isLocaleStringCustomField = ((_a = customFields === null || customFields === void 0 ? void 0 : customFields.find(f => f.name === key)) === null || _a === void 0 ? void 0 : _a.type) === 'localeString';
+            if (isLocaleStringCustomField) {
+                pathParts.push('customFields');
+            }
+            pathParts.push(key);
+            output[pathParts.join('.')] = order;
         }
         else if (calculatedColumnDef) {
             const instruction = calculatedColumnDef.listQuery;
-            if (instruction) {
+            if (instruction && instruction.expression) {
                 output[(0, connection_utils_1.escapeCalculatedColumnExpression)(connection, instruction.expression)] = order;
             }
         }

package/dist/service/helpers/list-query-builder/parse-sort-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-sort-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-sort-params.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,yDAA8D;AAI9D,yDAAyF;AACzF,qEAAgE;AAEhE;;;;;;GAMG;AACH,SAAgB,eAAe,CAC3B,UAAsB,EACtB,MAAe,EACf,UAAmD,EACnD,iBAA8C;IAE9C,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrD,OAAO,EAAE,CAAC;KACb;IACD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,IAAA,oCAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACrF,MAAM,iBAAiB,GAAG,IAAA,6CAAoB,EAAC,MAAM,CAAC,CAAC;IACvD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACnD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC;QACjE,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,GAAG,KAAK,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC,GAAG,KAAY,CAAC;SACpE;aAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAClG,MAAM,CAAC,GAAG,iBAAiB,IAAI,GAAG,EAAE,CAAC,GAAG,KAAY,CAAC;SACxD;aAAM,IAAI,mBAAmB,EAAE;YAC5B,MAAM,WAAW,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAClD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,IAAA,mDAAgC,EAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,KAAY,CAAC;aAC/F;SACJ;aAAM,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAY,CAAC;SACjD;aAAM;YACH,MAAM,IAAI,uBAAc,CAAC,0BAA0B,EAAE;gBACjD,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE;oBACT,GAAG,kBAAkB,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC;oBAC1D,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnD,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,CAAC,CAAC;SACN;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAtCD,0CAsCC;AAED,SAAS,kBAAkB,CAAC,OAAyB;IACjD,OAAO,IAAA,eAAM,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"parse-sort-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-sort-params.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.d.ts

@@ -1,8 +1,10 @@
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 import { RequestContext } from '../../../api/common/request-context';
 import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { Translatable, TranslatableKeys } from '../../../common/types/locale-types';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { VendureEntity } from '../../../entity/base/base.entity';
+import { TranslatorService } from '../translator/translator.service';
 /**
  * This helper class is to be used in GraphQL entity resolvers, to resolve fields which depend on being
  * translated (i.e. the corresponding entity field is of type `LocaleString`).
@@ -10,8 +12,11 @@ import { VendureEntity } from '../../../entity/base/base.entity';
 export declare class LocaleStringHydrator {
     private connection;
     private requestCache;
-    constructor(connection: TransactionalConnection, requestCache: RequestContextCacheService);
-    hydrateLocaleStringField<T extends VendureEntity & Translatable>(ctx: RequestContext, entity: T, fieldName: TranslatableKeys<T>): Promise<string>;
+    private translator;
+    constructor(connection: TransactionalConnection, requestCache: RequestContextCacheService, translator: TranslatorService);
+    hydrateLocaleStringField<T extends VendureEntity & Translatable & {
+        languageCode?: LanguageCode;
+    }>(ctx: RequestContext, entity: T, fieldName: TranslatableKeys<T> | 'languageCode'): Promise<string>;
     /**
      * Takes a translatable entity and populates all the LocaleString fields
      * by fetching the translations from the database (they will be eagerly loaded).

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js

@@ -13,15 +13,16 @@ exports.LocaleStringHydrator = void 0;
 const common_1 = require("@nestjs/common");
 const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
-const translate_entity_1 = require("../utils/translate-entity");
+const translator_service_1 = require("../translator/translator.service");
 /**
  * This helper class is to be used in GraphQL entity resolvers, to resolve fields which depend on being
  * translated (i.e. the corresponding entity field is of type `LocaleString`).
  */
 let LocaleStringHydrator = class LocaleStringHydrator {
-    constructor(connection, requestCache) {
+    constructor(connection, requestCache, translator) {
         this.connection = connection;
         this.requestCache = requestCache;
+        this.translator = translator;
     }
     async hydrateLocaleStringField(ctx, entity, fieldName) {
         if (entity[fieldName]) {
@@ -54,9 +55,12 @@ let LocaleStringHydrator = class LocaleStringHydrator {
             });
         }
         if (entity.translations.length) {
-            const translated = (0, translate_entity_1.translateDeep)(entity, ctx.languageCode);
+            const translated = this.translator.translate(entity, ctx);
             for (const localeStringProp of Object.keys(entity.translations[0])) {
-                if (localeStringProp === 'base' || localeStringProp === 'languageCode') {
+                if (localeStringProp === 'base' ||
+                    localeStringProp === 'id' ||
+                    localeStringProp === 'createdAt' ||
+                    localeStringProp === 'updatedAt') {
                     continue;
                 }
                 if (localeStringProp === 'customFields') {
@@ -73,7 +77,8 @@ let LocaleStringHydrator = class LocaleStringHydrator {
 LocaleStringHydrator = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
-        request_context_cache_service_1.RequestContextCacheService])
+        request_context_cache_service_1.RequestContextCacheService,
+        translator_service_1.TranslatorService])
 ], LocaleStringHydrator);
 exports.LocaleStringHydrator = LocaleStringHydrator;
 //# sourceMappingURL=locale-string-hydrator.js.map

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"locale-string-hydrator.js","sourceRoot":"","sources":["../../../../src/service/helpers/locale-string-hydrator/locale-string-hydrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,gGAA0F;AAE1F,2FAAuF;AAGvF,gEAA0D;AAE1D;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,YAAwC;QADxC,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAA4B;IACjD,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAC1B,GAAmB,EACnB,MAAS,EACT,SAA8B;QAE9B,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACnB,wCAAwC;YACxC,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;SACnC;QACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;IACpC,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,oBAAoB,CAC9B,GAAmB,EACnB,MAAS;;QAET,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,YAAY,0CAAE,MAAM,CAAA,EAAE;YAC9B,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAyB,GAAG,EAAE,QAAQ,CAAC,CAAC;YAEjF,IAAI,CAAC,aAAa,EAAE;gBAChB,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAI,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;aACvD;YAED,MAAM,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBACxC,iDAAiD;gBACjD,MAAM,CAAC,YAAY,GAAG,gBAAiB,CAAC,YAAY,CAAC;YACzD,CAAC,CAAC,CAAC;SACN;QACD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;YAC5B,MAAM,UAAU,GAAG,IAAA,gCAAa,EAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YAC3D,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;gBAChE,IAAI,gBAAgB,KAAK,MAAM,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpE,SAAS;iBACZ;gBACD,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpC,MAAc,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,MAAM,CAC5C,MAAc,CAAC,gBAAgB,CAAC,EAChC,UAAkB,CAAC,gBAAgB,CAAC,CACxC,CAAC;iBACL;qBAAM;oBACF,MAAc,CAAC,gBAAgB,CAAC,GAAI,UAAkB,CAAC,gBAAgB,CAAC,CAAC;iBAC7E;aACJ;SACJ;QACD,OAAO,MAAuB,CAAC;IACnC,CAAC;CACJ,CAAA;AA/DY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACrB,0DAA0B;GAH3C,oBAAoB,CA+DhC;AA/DY,oDAAoB"}
+{"version":3,"file":"locale-string-hydrator.js","sourceRoot":"","sources":["../../../../src/service/helpers/locale-string-hydrator/locale-string-hydrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,gGAA0F;AAE1F,2FAAuF;AAEvF,yEAAqE;AAErE;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,YAAwC,EACxC,UAA6B;QAF7B,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAA4B;QACxC,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAC1B,GAAmB,EACnB,MAAS,EACT,SAA+C;QAE/C,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACnB,wCAAwC;YACxC,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;SACnC;QACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;IACpC,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,oBAAoB,CAC9B,GAAmB,EACnB,MAAS;;QAET,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,YAAY,0CAAE,MAAM,CAAA,EAAE;YAC9B,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAyB,GAAG,EAAE,QAAQ,CAAC,CAAC;YAEjF,IAAI,CAAC,aAAa,EAAE;gBAChB,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAI,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;aACvD;YAED,MAAM,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBACxC,iDAAiD;gBACjD,MAAM,CAAC,YAAY,GAAG,gBAAiB,CAAC,YAAY,CAAC;YACzD,CAAC,CAAC,CAAC;SACN;QACD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;YAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1D,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;gBAChE,IACI,gBAAgB,KAAK,MAAM;oBAC3B,gBAAgB,KAAK,IAAI;oBACzB,gBAAgB,KAAK,WAAW;oBAChC,gBAAgB,KAAK,WAAW,EAClC;oBACE,SAAS;iBACZ;gBACD,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpC,MAAc,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,MAAM,CAC5C,MAAc,CAAC,gBAAgB,CAAC,EAChC,UAAkB,CAAC,gBAAgB,CAAC,CACxC,CAAC;iBACL;qBAAM;oBACF,MAAc,CAAC,gBAAgB,CAAC,GAAI,UAAkB,CAAC,gBAAgB,CAAC,CAAC;iBAC7E;aACJ;SACJ;QACD,OAAO,MAAuB,CAAC;IACnC,CAAC;CACJ,CAAA;AArEY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACrB,0DAA0B;QAC5B,sCAAiB;GAJhC,oBAAoB,CAqEhC;AArEY,oDAAoB"}

package/dist/service/helpers/order-calculator/order-calculator.d.ts

@@ -8,6 +8,17 @@ import { ShippingMethodService } from '../../services/shipping-method.service';
 import { TaxRateService } from '../../services/tax-rate.service';
 import { ZoneService } from '../../services/zone.service';
 import { ShippingCalculator } from '../shipping-calculator/shipping-calculator';
+/**
+ * @description
+ * This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
+ * including:
+ *
+ * - Promotions
+ * - Taxes
+ * - Shipping
+ *
+ * @docsCategory service-helpers
+ */
 export declare class OrderCalculator {
     private configService;
     private zoneService;
@@ -17,6 +28,7 @@ export declare class OrderCalculator {
     private requestContextCache;
     constructor(configService: ConfigService, zoneService: ZoneService, taxRateService: TaxRateService, shippingMethodService: ShippingMethodService, shippingCalculator: ShippingCalculator, requestContextCache: RequestContextCacheService);
     /**
+     * @description
      * Applies taxes and promotions to an Order. Mutates the order object.
      * Returns an array of any OrderItems which had new adjustments
      * applied, either tax or promotions.
@@ -25,30 +37,36 @@ export declare class OrderCalculator {
         recalculateShipping?: boolean;
     }): Promise<OrderItem[]>;
     /**
+     * @description
      * Applies the correct TaxRate to each OrderItem in the order.
      */
     private applyTaxes;
     /**
+     * @description
      * Applies the correct TaxRate to an OrderLine
      */
     private applyTaxesToOrderLine;
     /**
+     * @description
      * Returns a memoized function for performing an efficient
      * lookup of the correct TaxRate for a given TaxCategory.
      */
     private createTaxRateGetter;
     /**
+     * @description
      * Applies any eligible promotions to each OrderItem in the order. Returns an array of
      * any OrderItems which had their Adjustments modified.
      */
     private applyPromotions;
     /**
+     * @description
      * Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
      * of applying the promotions, and also due to added complexity in the name of performance
      * optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
      */
     private applyOrderItemPromotions;
     /**
+     * @description
      * An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
      * For example, a coupon code might have caused a discount to be applied, and now that code has
      * been removed from the order. The adjustment will still be there on each OrderItem it was applied
@@ -72,4 +90,5 @@ export declare class OrderCalculator {
      * totals.
      */
     calculateOrderTotals(order: Order): void;
+    private addPromotion;
 }

package/dist/service/helpers/order-calculator/order-calculator.js

@@ -23,6 +23,17 @@ const tax_rate_service_1 = require("../../services/tax-rate.service");
 const zone_service_1 = require("../../services/zone.service");
 const shipping_calculator_1 = require("../shipping-calculator/shipping-calculator");
 const prorate_1 = require("./prorate");
+/**
+ * @description
+ * This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
+ * including:
+ *
+ * - Promotions
+ * - Taxes
+ * - Shipping
+ *
+ * @docsCategory service-helpers
+ */
 let OrderCalculator = class OrderCalculator {
     constructor(configService, zoneService, taxRateService, shippingMethodService, shippingCalculator, requestContextCache) {
         this.configService = configService;
@@ -33,12 +44,16 @@ let OrderCalculator = class OrderCalculator {
         this.requestContextCache = requestContextCache;
     }
     /**
+     * @description
      * Applies taxes and promotions to an Order. Mutates the order object.
      * Returns an array of any OrderItems which had new adjustments
      * applied, either tax or promotions.
      */
     async applyPriceAdjustments(ctx, order, promotions, updatedOrderLines = [], options) {
         const { taxZoneStrategy } = this.configService.taxOptions;
+        // We reset the promotions array as all promotions
+        // must be revalidated on any changes to an Order.
+        order.promotions = [];
         const zones = await this.zoneService.findAll(ctx);
         const activeTaxZone = await this.requestContextCache.get(ctx, 'activeTaxZone', () => taxZoneStrategy.determineTaxZone(ctx, zones, ctx.channel, order));
         let taxZoneChanged = false;
@@ -69,15 +84,16 @@ let OrderCalculator = class OrderCalculator {
                 // altered the unit prices, which in turn will alter the tax payable.
                 await this.applyTaxes(ctx, order, activeTaxZone);
             }
-            if ((options === null || options === void 0 ? void 0 : options.recalculateShipping) !== false) {
-                await this.applyShipping(ctx, order);
-                await this.applyShippingPromotions(ctx, order, promotions);
-            }
+        }
+        if ((options === null || options === void 0 ? void 0 : options.recalculateShipping) !== false) {
+            await this.applyShipping(ctx, order);
+            await this.applyShippingPromotions(ctx, order, promotions);
         }
         this.calculateOrderTotals(order);
         return taxZoneChanged ? order.getOrderItems() : Array.from(updatedOrderItems);
     }
     /**
+     * @description
      * Applies the correct TaxRate to each OrderItem in the order.
      */
     async applyTaxes(ctx, order, activeZone) {
@@ -88,6 +104,7 @@ let OrderCalculator = class OrderCalculator {
         this.calculateOrderTotals(order);
     }
     /**
+     * @description
      * Applies the correct TaxRate to an OrderLine
      */
     async applyTaxesToOrderLine(ctx, order, line, activeZone, getTaxRate) {
@@ -104,6 +121,7 @@ let OrderCalculator = class OrderCalculator {
         }
     }
     /**
+     * @description
      * Returns a memoized function for performing an efficient
      * lookup of the correct TaxRate for a given TaxCategory.
      */
@@ -120,6 +138,7 @@ let OrderCalculator = class OrderCalculator {
         };
     }
     /**
+     * @description
      * Applies any eligible promotions to each OrderItem in the order. Returns an array of
      * any OrderItems which had their Adjustments modified.
      */
@@ -134,6 +153,7 @@ let OrderCalculator = class OrderCalculator {
         }
     }
     /**
+     * @description
      * Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
      * of applying the promotions, and also due to added complexity in the name of performance
      * optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
@@ -185,6 +205,7 @@ let OrderCalculator = class OrderCalculator {
                         this.calculateOrderTotals(order);
                         priceAdjusted = false;
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
             const lineNoLongerHasPromotions = !((_d = (_c = line.firstItem) === null || _c === void 0 ? void 0 : _c.adjustments) === null || _d === void 0 ? void 0 : _d.find(a => a.type === generated_types_1.AdjustmentType.PROMOTION));
@@ -202,6 +223,7 @@ let OrderCalculator = class OrderCalculator {
         return Array.from(updatedOrderItems.values());
     }
     /**
+     * @description
      * An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
      * For example, a coupon code might have caused a discount to be applied, and now that code has
      * been removed from the order. The adjustment will still be there on each OrderItem it was applied
@@ -273,6 +295,7 @@ let OrderCalculator = class OrderCalculator {
                         });
                         this.calculateOrderTotals(order);
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
             this.calculateOrderTotals(order);
@@ -295,6 +318,7 @@ let OrderCalculator = class OrderCalculator {
                             shippingLine.addAdjustment(adjustment);
                         }
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
         }
@@ -380,6 +404,11 @@ let OrderCalculator = class OrderCalculator {
         order.shipping = shippingPrice;
         order.shippingWithTax = shippingPriceWithTax;
     }
+    addPromotion(order, promotion) {
+        if (order.promotions && !order.promotions.find(p => (0, utils_1.idsAreEqual)(p.id, promotion.id))) {
+            order.promotions.push(promotion);
+        }
+    }
 };
 OrderCalculator = __decorate([
     (0, common_1.Injectable)(),

package/dist/service/helpers/order-calculator/order-calculator.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/order-calculator/prorate.js

@@ -20,7 +20,7 @@ function prorate(weights, amount) {
     let added = 0;
     let i = 0;
     for (const w of weights) {
-        actual[i] = amount * (w / totalWeight);
+        actual[i] = totalWeight === 0 ? amount / weights.length : amount * (w / totalWeight);
         rounded[i] = Math.floor(actual[i]);
         error[i] = actual[i] - rounded[i];
         added += rounded[i];

package/dist/service/helpers/order-calculator/prorate.js.map

@@ -1 +1 @@
-{"version":3,"file":"prorate.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/prorate.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,SAAgB,OAAO,CAAC,OAAiB,EAAE,MAAc;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACrB,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,IAAI,CAAC,CAAC;KACV;IAED,OAAO,KAAK,GAAG,MAAM,EAAE;QACnB,IAAI,QAAQ,GAAG,GAAG,CAAC;QACnB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE;gBACrB,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,aAAa,GAAG,CAAC,CAAC;aACrB;SACJ;QAED,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE1B,KAAK,IAAI,CAAC,CAAC;KACd;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AApCD,0BAoCC"}
+{"version":3,"file":"prorate.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/prorate.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;GASG;AACH,SAAgB,OAAO,CAAC,OAAiB,EAAE,MAAc;IACrD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACrB,MAAM,CAAC,CAAC,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC;QACrF,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACnC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,IAAI,CAAC,CAAC;KACV;IAED,OAAO,KAAK,GAAG,MAAM,EAAE;QACnB,IAAI,QAAQ,GAAG,GAAG,CAAC;QACnB,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,EAAE;YAC7B,IAAI,KAAK,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE;gBACrB,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACpB,aAAa,GAAG,CAAC,CAAC;aACrB;SACJ;QAED,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE1B,KAAK,IAAI,CAAC,CAAC;KACd;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AApCD,0BAoCC"}

package/dist/service/helpers/order-modifier/order-modifier.d.ts

@@ -18,6 +18,7 @@ import { StockMovementService } from '../../services/stock-movement.service';
 import { CustomFieldRelationService } from '../custom-field-relation/custom-field-relation.service';
 import { EntityHydrator } from '../entity-hydrator/entity-hydrator.service';
 import { OrderCalculator } from '../order-calculator/order-calculator';
+import { TranslatorService } from '../translator/translator.service';
 /**
  * @description
  * This helper is responsible for modifying the contents of an Order.
@@ -28,6 +29,8 @@ import { OrderCalculator } from '../order-calculator/order-calculator';
  * So this helper was mainly extracted to isolate the huge `modifyOrder` method since the
  * OrderService was just growing too large. Future refactoring could improve the organization
  * of these Order-related methods into a more clearly-delineated set of classes.
+ *
+ * @docsCategory service-helpers
  */
 export declare class OrderModifier {
     private connection;
@@ -42,16 +45,24 @@ export declare class OrderModifier {
     private eventBus;
     private entityHydrator;
     private historyService;
-    constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, entityHydrator: EntityHydrator, historyService: HistoryService);
+    private translator;
+    constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, entityHydrator: EntityHydrator, historyService: HistoryService, translator: TranslatorService);
     /**
+     * @description
      * Ensure that the ProductVariant has sufficient saleable stock to add the given
      * quantity to an Order.
      */
     constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingQuantity?: number): Promise<number>;
+    /**
+     * @description
+     * Given a ProductVariant ID and optional custom fields, this method will return an existing OrderLine that
+     * matches, or `undefined` if no match is found.
+     */
     getExistingOrderLine(ctx: RequestContext, order: Order, productVariantId: ID, customFields?: {
         [key: string]: any;
     }): Promise<OrderLine | undefined>;
     /**
+     * @description
      * Returns the OrderLine to which a new OrderItem belongs, creating a new OrderLine
      * if no existing line is found.
      */
@@ -59,6 +70,7 @@ export declare class OrderModifier {
         [key: string]: any;
     }): Promise<OrderLine>;
     /**
+     * @description
      * Updates the quantity of an OrderLine, taking into account the available saleable stock level.
      * Returns the actual quantity that the OrderLine was updated to (which may be less than the
      * `quantity` argument if insufficient stock was available.
@@ -72,5 +84,11 @@ export declare class OrderModifier {
     private getAdjustmentFromNewlyAppliedPromotions;
     private getOrderPayments;
     private customFieldsAreEqual;
+    /**
+     * This function is required because with the MySQL driver, boolean customFields with a default
+     * of `false` were being represented as `0`, thus causing the equality check to fail.
+     * So if it's a boolean, we'll explicitly coerce the value to a boolean.
+     */
+    private coerceValue;
     private getProductVariantOrThrow;
 }