npm - @vendure/core - Versions diffs - 1.6.5 → 1.7.0 - Mend

@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.

Files changed (204) hide show

package/dist/service/initializer.service.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { TransactionalConnection } from '../connection/transactional-connection';
+import { EventBus } from '../event-bus';
 import { AdministratorService } from './services/administrator.service';
 import { ChannelService } from './services/channel.service';
 import { GlobalSettingsService } from './services/global-settings.service';
@@ -17,7 +18,8 @@ export declare class InitializerService {
     private administratorService;
     private shippingMethodService;
     private globalSettingsService;
-    constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService);
+    private eventBus;
+    constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService, eventBus: EventBus);
     onModuleInit(): Promise<void>;
     /**
      * On the first run of the server & worker, when dbConnectionOptions.synchronize = true, there can be

package/dist/service/initializer.service.js CHANGED Viewed

@@ -14,6 +14,8 @@ const common_1 = require("@nestjs/common");
 const vendure_logger_1 = require("../config/logger/vendure-logger");
 const transactional_connection_1 = require("../connection/transactional-connection");
 const administrator_entity_1 = require("../entity/administrator/administrator.entity");
+const event_bus_1 = require("../event-bus");
+const initializer_event_1 = require("../event-bus/events/initializer-event");
 const administrator_service_1 = require("./services/administrator.service");
 const channel_service_1 = require("./services/channel.service");
 const global_settings_service_1 = require("./services/global-settings.service");
@@ -25,7 +27,7 @@ const zone_service_1 = require("./services/zone.service");
  * sequence on bootstrap.
  */
 let InitializerService = class InitializerService {
-    constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService) {
+    constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService, eventBus) {
         this.connection = connection;
         this.zoneService = zoneService;
         this.channelService = channelService;
@@ -33,6 +35,7 @@ let InitializerService = class InitializerService {
         this.administratorService = administratorService;
         this.shippingMethodService = shippingMethodService;
         this.globalSettingsService = globalSettingsService;
+        this.eventBus = eventBus;
     }
     async onModuleInit() {
         await this.awaitDbSchemaGeneration();
@@ -48,6 +51,7 @@ let InitializerService = class InitializerService {
         await this.roleService.initRoles();
         await this.administratorService.initAdministrators();
         await this.shippingMethodService.initShippingMethods();
+        this.eventBus.publish(new initializer_event_1.InitializerEvent());
     }
     /**
      * On the first run of the server & worker, when dbConnectionOptions.synchronize = true, there can be
@@ -86,7 +90,8 @@ InitializerService = __decorate([
         role_service_1.RoleService,
         administrator_service_1.AdministratorService,
         shipping_method_service_1.ShippingMethodService,
-        global_settings_service_1.GlobalSettingsService])
+        global_settings_service_1.GlobalSettingsService,
+        event_bus_1.EventBus])
 ], InitializerService);
 exports.InitializerService = InitializerService;
 //# sourceMappingURL=initializer.service.js.map

package/dist/service/initializer.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"initializer.service.js","sourceRoot":"","sources":["../../src/service/initializer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oEAAyD;AACzD,qFAAiF;AACjF,uFAA6E;~~AAE7E~~,4EAAwE;AACxE,gEAA4D;AAC5D,gFAA2E;AAC3E,0DAAsD;AACtD,gFAA2E;AAC3E,0DAAsD;AAEtD;;;GAGG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,UAAmC,EACnC,WAAwB,EACxB,cAA8B,EAC9B,WAAwB,EACxB,oBAA0C,EAC1C,qBAA4C,EAC5C,qBAA4C;~~QAN5C~~,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,0BAAqB,GAArB,qBAAqB,CAAuB;~~IACrD~~,CAAC;IAEJ,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,iFAAiF;QACjF,6EAA6E;QAC7E,iFAAiF;QACjF,uEAAuE;QACvE,uFAAuF;QACvF,2CAA2C;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,EAAE,CAAC;~~IAC3D~~,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,uBAAuB;QACjC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC;QACpB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE;YAChD,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,EAAE,CAAC;gBACvF,OAAO;aACV;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,OAAO,GAAG,OAAO,GAAG,CAAC,EAAE;oBACvB,uBAAM,CAAC,IAAI,CAAC,2CAA2C,OAAO,GAAG,CAAC,CAAC;oBACnE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC9D;qBAAM;oBACH,uBAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;iBAC1F;aACJ;SACJ;IACL,CAAC;CACJ,CAAA;~~AArDY~~,kBAAkB;IAD9B,mBAAU,EAAE;qCAGe,kDAAuB;QACtB,0BAAW;QACR,gCAAc;QACjB,0BAAW;QACF,4CAAoB;QACnB,+CAAqB;QACrB,+CAAqB;~~GAR/C~~,kBAAkB,~~CAqD9B~~;~~AArDY~~,gDAAkB"}
1	+ {"version":3,"file":"initializer.service.js","sourceRoot":"","sources":["../../src/service/initializer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oEAAyD;AACzD,qFAAiF;AACjF,uFAA6E;AAC7E,4CAAwC;AACxC,6EAAyE;AAEzE,4EAAwE;AACxE,gEAA4D;AAC5D,gFAA2E;AAC3E,0DAAsD;AACtD,gFAA2E;AAC3E,0DAAsD;AAEtD;;;GAGG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,UAAmC,EACnC,WAAwB,EACxB,cAA8B,EAC9B,WAAwB,EACxB,oBAA0C,EAC1C,qBAA4C,EAC5C,qBAA4C,EAC5C,QAAkB;QAPlB,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,iFAAiF;QACjF,6EAA6E;QAC7E,iFAAiF;QACjF,uEAAuE;QACvE,uFAAuF;QACvF,2CAA2C;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,EAAE,CAAC;QACvD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oCAAgB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,uBAAuB;QACjC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC;QACpB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE;YAChD,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,EAAE,CAAC;gBACvF,OAAO;aACV;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,OAAO,GAAG,OAAO,GAAG,CAAC,EAAE;oBACvB,uBAAM,CAAC,IAAI,CAAC,2CAA2C,OAAO,GAAG,CAAC,CAAC;oBACnE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC9D;qBAAM;oBACH,uBAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;iBAC1F;aACJ;SACJ;IACL,CAAC;CACJ,CAAA;AAvDY,kBAAkB;IAD9B,mBAAU,EAAE;qCAGe,kDAAuB;QACtB,0BAAW;QACR,gCAAc;QACjB,0BAAW;QACF,4CAAoB;QACnB,+CAAqB;QACrB,+CAAqB;QAClC,oBAAQ;GATrB,kBAAkB,CAuD9B;AAvDY,gDAAkB"}

package/dist/service/service.module.js CHANGED Viewed

@@ -33,6 +33,7 @@ const request_context_service_1 = require("./helpers/request-context/request-con
 const shipping_calculator_1 = require("./helpers/shipping-calculator/shipping-calculator");
 const slug_validator_1 = require("./helpers/slug-validator/slug-validator");
 const translatable_saver_1 = require("./helpers/translatable-saver/translatable-saver");
+const translator_service_1 = require("./helpers/translator/translator.service");
 const verification_token_generator_1 = require("./helpers/verification-token-generator/verification-token-generator");
 const initializer_service_1 = require("./initializer.service");
 const administrator_service_1 = require("./services/administrator.service");
@@ -123,6 +124,7 @@ const helpers = [
     product_price_applicator_1.ProductPriceApplicator,
     entity_hydrator_service_1.EntityHydrator,
     request_context_service_1.RequestContextService,
+    translator_service_1.TranslatorService,
 ];
 /**
  * The ServiceCoreModule is imported internally by the ServiceModule. It is arranged in this way so that

package/dist/service/service.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"service.module.js","sourceRoot":"","sources":["../../src/service/service.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AAExC,wDAAoD;AACpD,2DAAuD;AACvD,uEAAmE;AACnE,oEAA+D;AAC/D,oEAA+D;AAE/D,sFAAiF;AACjF,gFAA2E;AAC3E,iHAA2G;AAC3G,+FAAmF;AACnF,uHAAkH;AAClH,6GAAwG;AACxG,wFAAmF;AACnF,oGAA+F;AAC/F,kFAA8E;AAC9E,sEAAkE;AAClE,4EAAwE;AACxE,2FAAsF;AACtF,+EAA2E;AAC3E,iGAA4F;AAC5F,0GAAqG;AACrG,8FAAyF;AACzF,+FAA0F;AAC1F,2FAAuF;AACvF,4EAAwE;AACxE,wFAAoF;AACpF,sHAAiH;AACjH,+DAA2D;AAC3D,4EAAwE;AACxE,4DAAwD;AACxD,0DAAsD;AACtD,gEAA4D;AAC5D,sEAAkE;AAClE,gEAA4D;AAC5D,8EAAyE;AACzE,kEAA8D;AAC9D,wEAAmE;AACnE,4DAAwD;AACxD,wEAAoE;AACpE,gFAA2E;AAC3E,gEAA4D;AAC5D,4EAAuE;AACvE,4DAAwD;AACxD,8EAAyE;AACzE,gEAA4D;AAC5D,0FAAoF;AACpF,8EAAyE;AACzE,gFAA2E;AAC3E,gEAA4D;AAC5D,oEAAgE;AAChE,0DAAsD;AACtD,8DAA0D;AAC1D,gEAA4D;AAC5D,gFAA2E;AAC3E,8EAAyE;AACzE,wDAAoD;AACpD,0EAAqE;AACrE,kEAA6D;AAC7D,0DAAsD;AACtD,0DAAsD;AAEtD,MAAM,QAAQ,GAAG;IACb,4CAAoB;IACpB,4BAAY;IACZ,0BAAW;IACX,gCAAc;IACd,sCAAiB;IACjB,gCAAc;IACd,6CAAoB;IACpB,kCAAe;IACf,4BAAY;IACZ,uCAAiB;IACjB,wCAAkB;IAClB,+CAAqB;IACrB,gCAAc;IACd,4BAAY;IACZ,2CAAmB;IACnB,gCAAc;IACd,6CAAoB;IACpB,wDAAyB;IACzB,6CAAoB;IACpB,gCAAc;IACd,+CAAqB;IACrB,oCAAgB;IAChB,0BAAW;IACX,8BAAa;IACb,gCAAc;IACd,+CAAqB;IACrB,6CAAoB;IACpB,wBAAU;IACV,yCAAkB;IAClB,iCAAc;IACd,0BAAW;IACX,0BAAW;CACd,CAAC;AAEF,MAAM,OAAO,GAAG;IACZ,sCAAiB;IACjB,gCAAc;IACd,kCAAe;IACf,uCAAiB;IACjB,mDAAuB;IACvB,0BAAW;IACX,8BAAa;IACb,2CAAmB;IACnB,qCAAgB;IAChB,wCAAkB;IAClB,yDAA0B;IAC1B,yCAAkB;IAClB,qCAAgB;IAChB,8BAAa;IACb,+DAA6B;IAC7B,0DAA0B;IAC1B,6CAAoB;IACpB,yCAAkB;IAClB,iDAAsB;IACtB,wCAAc;IACd,+CAAqB;~~CACxB~~,CAAC;AAEF;;;;GAIG;AAMH,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;CAAG,CAAA;AAApB,iBAAiB;IAL7B,eAAM,CAAC;QACJ,OAAO,EAAE,CAAC,oCAAgB,EAAE,4BAAY,EAAE,iCAAc,EAAE,0BAAW,EAAE,iCAAc,CAAC;QACtF,SAAS,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,EAAE,wCAAkB,CAAC;QACxD,OAAO,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;KACrC,CAAC;GACW,iBAAiB,CAAG;AAApB,8CAAiB;AAE9B;;;;;;GAMG;AAKH,IAAa,aAAa,GAA1B,MAAa,aAAa;CAAG,CAAA;AAAhB,aAAa;IAJzB,eAAM,CAAC;QACJ,OAAO,EAAE,CAAC,iBAAiB,CAAC;QAC5B,OAAO,EAAE,CAAC,iBAAiB,CAAC;KAC/B,CAAC;GACW,aAAa,CAAG;AAAhB,sCAAa"}
1	+ {"version":3,"file":"service.module.js","sourceRoot":"","sources":["../../src/service/service.module.ts"],"names":[],"mappings":"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"}

package/dist/service/services/asset.service.d.ts CHANGED Viewed

@@ -98,7 +98,8 @@ export declare class AssetService {
      * Create an Asset from a file stream, for example to create an Asset during data import.
      */
     createFromFileStream(stream: ReadStream, ctx?: RequestContext): Promise<CreateAssetResult>;
-    createFromFileStream(stream: Readable, filePath: string): Promise<CreateAssetResult>;
+    createFromFileStream(stream: Readable, filePath: string, ctx?: RequestContext): Promise<CreateAssetResult>;
+    private getMimeType;
     /**
      * @description
      * Unconditionally delete given assets.

package/dist/service/services/asset.service.js CHANGED Viewed

@@ -20,6 +20,7 @@ const shared_utils_1 = require("@vendure/common/lib/shared-utils");
 const unique_1 = require("@vendure/common/lib/unique");
 const fs_1 = require("fs");
 const fs_extra_1 = require("fs-extra");
+const http_1 = require("http");
 const mime_types_1 = __importDefault(require("mime-types"));
 const path_1 = __importDefault(require("path"));
 const StringUtils_1 = require("typeorm/util/StringUtils");
@@ -331,19 +332,33 @@ let AssetService = class AssetService {
         }));
         return this.connection.findByIdsInChannel(ctx, asset_entity_1.Asset, assets.map(a => a.id), ctx.channelId, {});
     }
-    async createFromFileStream(stream, maybeFilePathOrCtx) {
+    async createFromFileStream(stream, maybeFilePathOrCtx, maybeCtx) {
+        const { assetImportStrategy } = this.configService.importExportOptions;
         const filePathFromArgs = maybeFilePathOrCtx instanceof request_context_1.RequestContext ? undefined : maybeFilePathOrCtx;
         const filePath = stream instanceof fs_extra_1.ReadStream || stream instanceof fs_1.ReadStream ? stream.path : filePathFromArgs;
         if (typeof filePath === 'string') {
-            const filename = path_1.default.basename(filePath);
-            const mimetype = mime_types_1.default.lookup(filename) || 'application/octet-stream';
-            const ctx = maybeFilePathOrCtx instanceof request_context_1.RequestContext ? maybeFilePathOrCtx : request_context_1.RequestContext.empty();
+            const filename = path_1.default.basename(filePath).split('?')[0];
+            const mimetype = this.getMimeType(stream, filename);
+            const ctx = maybeFilePathOrCtx instanceof request_context_1.RequestContext
+                ? maybeFilePathOrCtx
+                : maybeCtx instanceof request_context_1.RequestContext
+                    ? maybeCtx
+                    : request_context_1.RequestContext.empty();
             return this.createAssetInternal(ctx, stream, filename, mimetype);
         }
         else {
             throw new errors_1.InternalServerError(`error.path-should-be-a-string-got-buffer`);
         }
     }
+    getMimeType(stream, filename) {
+        if (stream instanceof http_1.IncomingMessage) {
+            const contentType = stream.headers['content-type'];
+            if (contentType) {
+                return contentType;
+            }
+        }
+        return mime_types_1.default.lookup(filename) || 'application/octet-stream';
+    }
     /**
      * @description
      * Unconditionally delete given assets.

package/dist/service/services/asset.service.js.map CHANGED Viewed

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

package/dist/service/services/collection.service.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ import { CustomFieldRelationService } from '../helpers/custom-field-relation/cus
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { SlugValidator } from '../helpers/slug-validator/slug-validator';
 import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
+import { TranslatorService } from '../helpers/translator/translator.service';
 import { AssetService } from './asset.service';
 import { ChannelService } from './channel.service';
 import { FacetValueService } from './facet-value.service';
@@ -43,9 +44,10 @@ export declare class CollectionService implements OnModuleInit {
     private slugValidator;
     private configArgService;
     private customFieldRelationService;
+    private translator;
     private rootCollection;
     private applyFiltersQueue;
-    constructor(connection: TransactionalConnection, channelService: ChannelService, assetService: AssetService, facetValueService: FacetValueService, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus, jobQueueService: JobQueueService, configService: ConfigService, slugValidator: SlugValidator, configArgService: ConfigArgService, customFieldRelationService: CustomFieldRelationService);
+    constructor(connection: TransactionalConnection, channelService: ChannelService, assetService: AssetService, facetValueService: FacetValueService, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus, jobQueueService: JobQueueService, configService: ConfigService, slugValidator: SlugValidator, configArgService: ConfigArgService, customFieldRelationService: CustomFieldRelationService, translator: TranslatorService);
     /**
      * @internal
      */

package/dist/service/services/collection.service.js CHANGED Viewed

@@ -36,8 +36,8 @@ const custom_field_relation_service_1 = require("../helpers/custom-field-relatio
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const slug_validator_1 = require("../helpers/slug-validator/slug-validator");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
+const translator_service_1 = require("../helpers/translator/translator.service");
 const move_to_index_1 = require("../helpers/utils/move-to-index");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
 const asset_service_1 = require("./asset.service");
 const channel_service_1 = require("./channel.service");
 const facet_value_service_1 = require("./facet-value.service");
@@ -48,7 +48,7 @@ const facet_value_service_1 = require("./facet-value.service");
  * @docsCategory services
  */
 let CollectionService = class CollectionService {
-    constructor(connection, channelService, assetService, facetValueService, listQueryBuilder, translatableSaver, eventBus, jobQueueService, configService, slugValidator, configArgService, customFieldRelationService) {
+    constructor(connection, channelService, assetService, facetValueService, listQueryBuilder, translatableSaver, eventBus, jobQueueService, configService, slugValidator, configArgService, customFieldRelationService, translator) {
         this.connection = connection;
         this.channelService = channelService;
         this.assetService = assetService;
@@ -61,6 +61,7 @@ let CollectionService = class CollectionService {
         this.slugValidator = slugValidator;
         this.configArgService = configArgService;
         this.customFieldRelationService = customFieldRelationService;
+        this.translator = translator;
     }
     /**
      * @internal
@@ -71,8 +72,7 @@ let CollectionService = class CollectionService {
         rxjs_1.merge(productEvents$, variantEvents$)
             .pipe(operators_1.debounceTime(50))
             .subscribe(async (event) => {
-            const collections = await this.connection
-                .rawConnection
+            const collections = await this.connection.rawConnection
                 .getRepository(collection_entity_1.Collection)
                 .createQueryBuilder('collection')
                 .select('collection.id', 'id')
@@ -120,7 +120,7 @@ let CollectionService = class CollectionService {
         })
             .getManyAndCount()
             .then(async ([collections, totalItems]) => {
-            const items = collections.map(collection => translate_entity_1.translateDeep(collection, ctx.languageCode, ['parent']));
+            const items = collections.map(collection => this.translator.translate(collection, ctx, ['parent']));
             return {
                 items,
                 totalItems,
@@ -135,14 +135,14 @@ let CollectionService = class CollectionService {
         if (!collection) {
             return;
         }
-        return translate_entity_1.translateDeep(collection, ctx.languageCode, ['parent']);
+        return this.translator.translate(collection, ctx, ['parent']);
     }
     async findByIds(ctx, ids, relations) {
         const collections = this.connection.findByIdsInChannel(ctx, collection_entity_1.Collection, ids, ctx.channelId, {
             relations: relations !== null && relations !== void 0 ? relations : ['featuredAsset', 'assets', 'channels', 'parent'],
             loadEagerRelations: true,
         });
-        return collections.then(values => values.map(collection => translate_entity_1.translateDeep(collection, ctx.languageCode, ['parent'])));
+        return collections.then(values => values.map(collection => this.translator.translate(collection, ctx, ['parent'])));
     }
     async findOneBySlug(ctx, slug, relations) {
         var _a, _b;
@@ -178,7 +178,7 @@ let CollectionService = class CollectionService {
             .where('child.id = :id', { id: collectionId })
             .getQuery()}`)
             .getOne();
-        return parent && translate_entity_1.translateDeep(parent, ctx.languageCode);
+        return parent && this.translator.translate(parent, ctx);
     }
     /**
      * @description
@@ -218,7 +218,7 @@ let CollectionService = class CollectionService {
             qb.andWhere('collection.isPrivate = :isPrivate', { isPrivate: false });
         }
         const result = await qb.getMany();
-        return result.map(collection => translate_entity_1.translateDeep(collection, ctx.languageCode));
+        return result.map(collection => this.translator.translate(collection, ctx));
     }
     /**
      * @description
@@ -239,7 +239,7 @@ let CollectionService = class CollectionService {
             return _descendants;
         };
         const descendants = await getChildren(rootId);
-        return descendants.map(c => translate_entity_1.translateDeep(c, ctx.languageCode));
+        return descendants.map(c => this.translator.translate(c, ctx));
     }
     async getAncestors(collectionId, ctx) {
         const getParent = async (id, _ancestors = []) => {
@@ -266,7 +266,7 @@ let CollectionService = class CollectionService {
             ancestors.forEach(a => {
                 const category = categories.find(c => c.id === a.id);
                 if (category) {
-                    resultCategories.push(ctx ? translate_entity_1.translateDeep(category, ctx.languageCode) : category);
+                    resultCategories.push(ctx ? this.translator.translate(category, ctx) : category);
                 }
             });
             return resultCategories;
@@ -431,8 +431,7 @@ let CollectionService = class CollectionService {
         ]);
         const postIds = collection.productVariants.map(v => v.id);
         try {
-            await this.connection
-                .rawConnection
+            await this.connection.rawConnection
                 .getRepository(collection_entity_1.Collection)
                 // Only update the exact changed properties, to avoid VERY hard-to-debug
                 // non-deterministic race conditions e.g. when the "position" is changed
@@ -535,7 +534,7 @@ let CollectionService = class CollectionService {
             .andWhere('channel.id = :channelId', { channelId: ctx.channelId })
             .getOne();
         if (existingRoot) {
-            this.rootCollection = translate_entity_1.translateDeep(existingRoot, ctx.languageCode);
+            this.rootCollection = this.translator.translate(existingRoot, ctx);
             return this.rootCollection;
         }
         // We purposefully do not use the ctx in saving the new root Collection
@@ -554,7 +553,7 @@ let CollectionService = class CollectionService {
             channels: [ctx.channel],
             filters: [],
         }));
-        this.rootCollection = translate_entity_1.translateDeep(newRoot, ctx.languageCode);
+        this.rootCollection = this.translator.translate(newRoot, ctx);
         return this.rootCollection;
     }
 };
@@ -571,7 +570,8 @@ CollectionService = __decorate([
         config_service_1.ConfigService,
         slug_validator_1.SlugValidator,
         config_arg_service_1.ConfigArgService,
-        custom_field_relation_service_1.CustomFieldRelationService])
+        custom_field_relation_service_1.CustomFieldRelationService,
+        translator_service_1.TranslatorService])
 ], CollectionService);
 exports.CollectionService = CollectionService;
 //# sourceMappingURL=collection.service.js.map

package/dist/service/services/collection.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,yEAS6C;AAC7C,mDAAgD;AAChD,2EAA4E;AAE5E,+BAA6B;AAC7B,8CAA8C;AAE9C,sEAA4F;AAE5F,sDAAkE;AAGlE,8CAA8D;AAC9D,gEAA4D;AAC5D,uEAA4D;AAC5D,wFAAoF;AAEpF,yGAA8F;AAC9F,iFAAuE;AACvE,gGAAqF;AACrF,yDAAqD;AACrD,8EAA0E;AAC1E,wGAAmG;AACnG,wEAAoE;AACpE,wFAAmF;AAEnF,yEAAoE;AACpE,iFAA4E;AAC5E,kHAA4G;AAC5G,yFAAoF;AACpF,6EAAyE;AACzE,yFAAqF;AACrF,kEAA6D;AAC7D,wEAAkE;AAElE,mDAA+C;AAC/C,uDAAmD;AACnD,+DAA0D;AAQ1D;;;;;GAKG;AAEH,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAI1B,YACY,UAAmC,EACnC,cAA8B,EAC9B,YAA0B,EAC1B,iBAAoC,EACpC,gBAAkC,EAClC,iBAAoC,EACpC,QAAkB,EAClB,eAAgC,EAChC,aAA4B,EAC5B,aAA4B,EAC5B,gBAAkC,EAClC,0BAAsD;QAXtD,eAAU,GAAV,UAAU,CAAyB;QACnC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,aAAQ,GAAR,QAAQ,CAAU;QAClB,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,+BAA0B,GAA1B,0BAA0B,CAA4B;IAC/D,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,YAAY;QACd,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,4BAAY,CAAC,CAAC;QAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,2CAAmB,CAAC,CAAC;QAEjE,YAAK,CAAC,cAAc,EAAE,cAAc,CAAC;aAChC,IAAI,CAAC,wBAAY,CAAC,EAAE,CAAC,CAAC;aACtB,SAAS,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE;YACrB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU;iBACpC,aAAa;iBACb,aAAa,CAAC,8BAAU,CAAC;iBACzB,kBAAkB,CAAC,YAAY,CAAC;iBAChC,MAAM,CAAC,eAAe,EAAE,IAAI,CAAC;iBAC7B,UAAU,EAAE,CAAC;YAClB,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;gBAC7B,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE;gBAC1B,aAAa,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5C,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEP,IAAI,CAAC,iBAAiB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;YAC5D,IAAI,EAAE,0BAA0B;YAChC,OAAO,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;gBACjB,MAAM,GAAG,GAAG,gCAAc,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAErD,uBAAM,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,cAAc,CAAC,CAAC;gBAC1E,IAAI,SAAS,GAAG,CAAC,CAAC;gBAClB,KAAK,MAAM,YAAY,IAAI,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE;oBAC/C,IAAI,UAAkC,CAAC;oBACvC,IAAI;wBACA,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,8BAAU,EAAE,YAAY,EAAE;4BAC/E,OAAO,EAAE,CAAC;4BACV,UAAU,EAAE,EAAE;yBACjB,CAAC,CAAC;qBACN;oBAAC,OAAO,GAAG,EAAE;wBACV,uBAAM,CAAC,IAAI,CAAC,qCAAqC,YAAY,YAAY,CAAC,CAAC;qBAC9E;oBACD,SAAS,EAAE,CAAC;oBACZ,IAAI,UAAU,EAAE;wBACZ,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAChE,UAAU,EACV,GAAG,CAAC,IAAI,CAAC,0BAA0B,CACtC,CAAC;wBACF,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;wBAC9E,IAAI,CAAC,QAAQ,CAAC,OAAO,CACjB,IAAI,2DAA2B,CAAC,GAAG,EAAE,UAAU,EAAE,kBAAkB,CAAC,CACvE,CAAC;qBACL;iBACJ;YACL,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAmB,EACnB,OAAsC,EACtC,SAAqC;QAErC,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,8BAAU,EAAE,OAAO,EAAE;YACxB,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC;YAC/D,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;YACxB,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;YAC5B,GAAG;SACN,CAAC;aACD,eAAe,EAAE;aACjB,IAAI,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE;YACtC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CACvC,gCAAa,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,CAAC,CAC1D,CAAC;YACF,OAAO;gBACH,KAAK;gBACL,UAAU;aACb,CAAC;QACN,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAmB,EACnB,YAAgB,EAChB,SAAqC;QAErC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CACrD,GAAG,EACH,8BAAU,EACV,YAAY,EACZ,GAAG,CAAC,SAAS,EACb;YACI,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC;YACzE,kBAAkB,EAAE,IAAI;SAC3B,CACJ,CAAC;QACF,IAAI,CAAC,UAAU,EAAE;YACb,OAAO;SACV;QACD,OAAO,gCAAa,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,SAAS,CACX,GAAmB,EACnB,GAAS,EACT,SAAqC;QAErC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,8BAAU,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;YACxF,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC;YACzE,kBAAkB,EAAE,IAAI;SAC3B,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,gCAAa,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CACpF,CAAC;IACN,CAAC;IAED,KAAK,CAAC,aAAa,CACf,GAAmB,EACnB,IAAY,EACZ,SAAqC;;QAErC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,qDAAqB,CAAC,CAAC,IAAI,CAAC;YACtF,SAAS,EAAE,CAAC,MAAM,CAAC;YACnB,KAAK,EAAE,EAAE,IAAI,EAAE;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAA,EAAE;YACvB,OAAO;SACV;QACD,MAAM,SAAS,GACX,MAAA,MAAA,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,YAAY,CAAC,mCAC3D,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,mCAC1E,YAAY,CAAC,CAAC,CAAC,CAAC;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,GAAmB;QACnC,OAAO,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAmB,EAAE,YAAgB;QACjD,MAAM,cAAc,GAChB,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU;YACrD,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,gBAAgB,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,iBAAiB,CAAC,yBAAyB,EAAE,aAAa,CAAC;aAC3D,KAAK,CACF,EAAE,CAAC,EAAE,CACD,mBAAmB,EAAE;aAChB,QAAQ,EAAE;aACV,MAAM,CAAC,cAAc,CAAC;aACtB,IAAI,CAAC,8BAAU,EAAE,OAAO,CAAC;aACzB,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,CAAC;aAC7C,QAAQ,EAAE,EAAE,CACxB;aACA,MAAM,EAAE,CAAC;QAEd,OAAO,MAAM,IAAI,gCAAa,CAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAC7D,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,CAAC,GAAmB,EAAE,YAAgB;QACnD,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc,CAChB,GAAmB,EACnB,UAAsB;QAEtB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,mBAAW,CAAC,UAAU,CAAC,EAAE,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE;YAC/C,OAAO,CAAC,WAAI,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;SACzD;QACD,MAAM,SAAS,GAAG,WAAI,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9D,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IACrG,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,yBAAyB,CAC3B,GAAmB,EACnB,SAAa,EACb,UAAmB;QAEnB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,iBAAiB,CAAC,yBAAyB,EAAE,aAAa,CAAC;aAC3D,QAAQ,CAAC,4BAA4B,EAAE,SAAS,CAAC;aACjD,KAAK,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,CAAC;aACpD,OAAO,CAAC,+BAA+B,CAAC;aACxC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;QAErC,IAAI,UAAU,EAAE;YACZ,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;QAElC,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,gCAAa,CAAC,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,cAAc,CAChB,GAAmB,EACnB,MAAU,EACV,WAAmB,MAAM,CAAC,gBAAgB;QAE1C,MAAM,WAAW,GAAG,KAAK,EAAE,EAAM,EAAE,eAA6B,EAAE,EAAE,KAAK,GAAG,CAAC,EAAE,EAAE;YAC7E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;iBACjC,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;iBAC9B,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACrE,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;gBAC1B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACzB,IAAI,KAAK,GAAG,QAAQ,EAAE;oBAClB,MAAM,WAAW,CAAC,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;iBACtD;aACJ;YACD,OAAO,YAAY,CAAC;QACxB,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9C,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gCAAa,CAAC,CAAC,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,CAAC;IASD,KAAK,CAAC,YAAY,CACd,YAAgB,EAChB,GAAoB;QAEpB,MAAM,SAAS,GAAG,KAAK,EAAE,EAAM,EAAE,aAA2B,EAAE,EAAyB,EAAE;YACrF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;iBAC/B,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;iBAC9B,kBAAkB,EAAE;iBACpB,QAAQ,CAAC,8BAAU,EAAE,QAAQ,CAAC;iBAC9B,EAAE,CAAC,EAAE,CAAC;iBACN,OAAO,EAAE,CAAC;YACf,IAAI,MAAM,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;oBAChB,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACxB,OAAO,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;iBAC3C;aACJ;YACD,OAAO,UAAU,CAAC;QACtB,CAAC,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;QAEhD,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACnC,IAAI,CAAC,UAAU,CAAC,EAAE;YACf,MAAM,gBAAgB,GAA+C,EAAE,CAAC;YACxE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBAClB,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;gBACrD,IAAI,QAAQ,EAAE;oBACV,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,gCAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;iBACrF;YACL,CAAC,CAAC,CAAC;YACH,OAAO,gBAAgB,CAAC;QAC5B,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,GAAmB,EACnB,KAAqC,EACrC,OAA0C,EAC1C,SAAqC;;QAErC,MAAM,iBAAiB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,MAAM,aAAa,GAAG,MAAA,MAAA,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,0CAAE,OAAO,mCAAI,EAAE,CAAC;YACnF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAC7E,SAAS,CAAC,MAAM,CACZ,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,EACpD,EAA6B,CAChC,CACJ,CAAC;YACF,iBAAiB,CAAC,IAAI,CAAC,GAAG,aAAa,EAAE,GAAG,eAAe,CAAC,CAAC;SAChE;QACD,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,uCAAc,EAAE,OAAO,EAAE;YAC1D,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,aAAa,CAAC;YACvC,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1B,GAAG;YACH,WAAW,EAAE,gBAAgB;SAChC,CAAC,CAAC;QAEH,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QAChE,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;YACxC,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;YAChF,IAAI,aAAa,CAAC,MAAM,EAAE;gBACtB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;oBAChC,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;iBAC1C;aACJ;SACJ;QACD,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YACvD,KAAK;YACL,UAAU;SACb,CAAC,CAAC,CAAC;IACR,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAA4B;QAC1D,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,qDAAqB,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACnD,GAAG;YACH,KAAK;YACL,UAAU,EAAE,8BAAU;YACtB,eAAe,EAAE,qDAAqB;YACtC,UAAU,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBACrB,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACnE,IAAI,MAAM,EAAE;oBACR,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;iBACxB;gBACD,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC;gBACrF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YAClE,CAAC;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACnE,MAAM,uBAAuB,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CACjF,GAAG,EACH,8BAAU,EACV,KAAK,EACL,UAAU,CACb,CAAC;QACF,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;YAC7B,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;YACpB,aAAa,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,uBAAuB,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3F,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAA4B;QAC1D,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,qDAAqB,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YACnD,GAAG;YACH,KAAK;YACL,UAAU,EAAE,8BAAU;YACtB,eAAe,EAAE,qDAAqB;YACtC,UAAU,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBACrB,IAAI,KAAK,CAAC,OAAO,EAAE;oBACf,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;iBAC5D;gBACD,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;gBAC9D,MAAM,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACjE,CAAC;SACJ,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,8BAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAC1F,IAAI,KAAK,CAAC,OAAO,EAAE;YACf,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;gBAC7B,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;gBACpB,aAAa,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,0BAA0B,EAAE,KAAK;aACpC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,UAAU,CAAC,CAAC;YACjF,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2DAA2B,CAAC,GAAG,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC;SAC/F;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAC9E,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,EAAM;QACpC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,8BAAU,EAAE,EAAE,EAAE;YAC3E,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC;QAClE,KAAK,MAAM,IAAI,IAAI,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,EAAE,UAAU,CAAC,EAAE;YACvD,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;YAC3E,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2DAA2B,CAAC,GAAG,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC;SACzF;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAC3E,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,GAAmB,EAAE,KAA0B;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,8BAAU,EAAE,KAAK,CAAC,YAAY,EAAE;YACvF,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,CAAC,QAAQ,CAAC;SACxB,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QAEvE,IACI,mBAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACtC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,mBAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAC9D;YACE,MAAM,IAAI,8BAAqB,CAAC,wCAAwC,CAAC,CAAC;SAC7E;QAED,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC;aACvC,KAAK,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;aAChD,OAAO,EAAE,CAAC;QAEf,IAAI,CAAC,mBAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE;YAChD,MAAM,CAAC,MAAM,GAAG,IAAI,8BAAU,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC1D;QACD,QAAQ,GAAG,2BAAW,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEtD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACpE,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;YAC7B,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;YACpB,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;SAC7B,CAAC,CAAC;QACH,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,6BAA6B,CACjC,KAAqF;QAErF,MAAM,OAAO,GAA4B,EAAE,CAAC;QAC5C,IAAI,KAAK,CAAC,OAAO,EAAE;YACf,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE;gBAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,CAAC;aAC9E;SACJ;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACK,KAAK,CAAC,8BAA8B,CACxC,UAAsB,EACtB,0BAA0B,GAAG,IAAI;QAEjC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAC5E,SAAS,CAAC,MAAM,CACZ,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,EAClD,EAA6B,CAChC,CACJ,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,UAAU,CAAC,CAAC;QACrE,UAAU,CAAC,eAAe,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC;YAC/D,GAAG,eAAe;YAClB,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC;SAChC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI;YACA,MAAM,IAAI,CAAC,UAAU;iBAChB,aAAa;iBACb,aAAa,CAAC,8BAAU,CAAC;gBAC1B,wEAAwE;gBACxE,wEAAwE;gBACxE,uEAAuE;gBACvE,oBAAoB;iBACnB,IAAI,CAAC,WAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,EAAE;gBAC/C,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,GAAG,GAAG,CAAC;gBACzD,MAAM,EAAE,KAAK;aAChB,CAAC,CAAC;SACV;QAAC,OAAO,CAAC,EAAE;YACR,uBAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACnB;QACD,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAEpC,IAAI,0BAA0B,EAAE;YAC5B,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SACrG;aAAM;YACH,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;SACpE;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,0BAA0B,CAAC,OAAgC;QACrE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,EAAE,CAAC;SACb;QACD,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QAChE,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aACjC,aAAa,CAAC,uCAAc,CAAC;aAC7B,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE1C,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE;YACxC,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;YACtE,IAAI,aAAa,CAAC,MAAM,EAAE;gBACtB,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE;oBAChC,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;iBAC1C;aACJ;SACJ;QAED,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,8BAA8B,CAAC,UAAsB,EAAE,GAAoB;QAC7E,IAAI,UAAU,CAAC,eAAe,EAAE;YAC5B,OAAO,UAAU,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACpD;aAAM;YACH,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU;iBACxC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC;iBAClC,kBAAkB,CAAC,SAAS,CAAC;iBAC7B,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC;iBAC1B,SAAS,CAAC,qBAAqB,EAAE,YAAY,EAAE,qBAAqB,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;iBAC5F,UAAU,EAAE,CAAC;YAElB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SACzC;IACL,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,uBAAuB,CAAC,GAAmB,EAAE,aAAkB;QACzE,MAAM,QAAQ,GAAG,aAAa,IAAI,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU;aAC/B,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,CAAC;aACvC,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC;aAC3C,KAAK,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;aAC1C,SAAS,EAAE,CAAC;QACjB,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC7B,GAAmB,EACnB,QAAoB;QAEpB,IAAI,QAAQ,EAAE;YACV,OAAO,IAAI,CAAC,UAAU;iBACjB,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;iBAC9B,kBAAkB,CAAC,YAAY,CAAC;iBAChC,QAAQ,CAAC,qBAAqB,EAAE,SAAS,CAAC;iBAC1C,KAAK,CAAC,qBAAqB,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;iBAC9C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;iBACjE,MAAM,EAAE,CAAC;SACjB;aAAM;YACH,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;SACtC;IACL,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,GAAmB;QAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC;QAEvC,IAAI,UAAU,EAAE;YACZ,OAAO,UAAU,CAAC;SACrB;QAED,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;aACrC,aAAa,CAAC,GAAG,EAAE,8BAAU,CAAC;aAC9B,kBAAkB,CAAC,YAAY,CAAC;aAChC,QAAQ,CAAC,qBAAqB,EAAE,SAAS,CAAC;aAC1C,iBAAiB,CAAC,yBAAyB,EAAE,aAAa,CAAC;aAC3D,KAAK,CAAC,6BAA6B,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;aACtD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;aACjE,MAAM,EAAE,CAAC;QAEd,IAAI,YAAY,EAAE;YACd,IAAI,CAAC,cAAc,GAAG,gCAAa,CAAC,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC,cAAc,CAAC;SAC9B;QAED,uEAAuE;QACvE,8EAA8E;QAC9E,iBAAiB;QACjB,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,qDAAqB,CAAC,CAAC,IAAI,CACjG,IAAI,qDAAqB,CAAC;YACtB,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;YACpD,IAAI,EAAE,uCAAoB;YAC1B,WAAW,EAAE,kCAAkC;YAC/C,IAAI,EAAE,uCAAoB;SAC7B,CAAC,CACL,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,8BAAU,CAAC,CAAC,IAAI,CAC9E,IAAI,8BAAU,CAAC;YACX,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,CAAC,eAAe,CAAC;YAC/B,QAAQ,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;YACvB,OAAO,EAAE,EAAE;SACd,CAAC,CACL,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,gCAAa,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;CACJ,CAAA;AAroBY,iBAAiB;IAD7B,mBAAU,EAAE;qCAMe,kDAAuB;QACnB,gCAAc;QAChB,4BAAY;QACP,uCAAiB;QAClB,qCAAgB;QACf,sCAAiB;QAC1B,oBAAQ;QACD,mCAAe;QACjB,8BAAa;QACb,8BAAa;QACV,qCAAgB;QACN,0DAA0B;GAhBzD,iBAAiB,CAqoB7B;AAroBY,8CAAiB"}
1	+ {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/country.service.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ import { Country } from '../../entity/country/country.entity';
 import { EventBus } from '../../event-bus';
 import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
 import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
+import { TranslatorService } from '../helpers/translator/translator.service';
 /**
  * @description
  * Contains methods relating to {@link Country} entities.
@@ -20,7 +21,8 @@ export declare class CountryService {
     private listQueryBuilder;
     private translatableSaver;
     private eventBus;
-    constructor(connection: TransactionalConnection, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus);
+    private translator;
+    constructor(connection: TransactionalConnection, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus, translator: TranslatorService);
     findAll(ctx: RequestContext, options?: ListQueryOptions<Country>, relations?: RelationPaths<Country>): Promise<PaginatedList<Translated<Country>>>;
     findOne(ctx: RequestContext, countryId: ID, relations?: RelationPaths<Country>): Promise<Translated<Country> | undefined>;
     /**

package/dist/service/services/country.service.js CHANGED Viewed

@@ -22,7 +22,7 @@ const event_bus_1 = require("../../event-bus");
 const country_event_1 = require("../../event-bus/events/country-event");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
-const translate_entity_1 = require("../helpers/utils/translate-entity");
+const translator_service_1 = require("../helpers/translator/translator.service");
 /**
  * @description
  * Contains methods relating to {@link Country} entities.
@@ -30,18 +30,19 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
  * @docsCategory services
  */
 let CountryService = class CountryService {
-    constructor(connection, listQueryBuilder, translatableSaver, eventBus) {
+    constructor(connection, listQueryBuilder, translatableSaver, eventBus, translator) {
         this.connection = connection;
         this.listQueryBuilder = listQueryBuilder;
         this.translatableSaver = translatableSaver;
         this.eventBus = eventBus;
+        this.translator = translator;
     }
     findAll(ctx, options, relations = []) {
         return this.listQueryBuilder
             .build(country_entity_1.Country, options, { ctx, relations })
             .getManyAndCount()
             .then(([countries, totalItems]) => {
-            const items = countries.map(country => translate_entity_1.translateDeep(country, ctx.languageCode));
+            const items = countries.map(country => this.translator.translate(country, ctx));
             return {
                 items,
                 totalItems,
@@ -52,7 +53,7 @@ let CountryService = class CountryService {
         return this.connection
             .getRepository(ctx, country_entity_1.Country)
             .findOne(countryId, { relations })
-            .then(country => country && translate_entity_1.translateDeep(country, ctx.languageCode));
+            .then(country => country && this.translator.translate(country, ctx));
     }
     /**
      * @description
@@ -62,7 +63,7 @@ let CountryService = class CountryService {
         return this.connection
             .getRepository(ctx, country_entity_1.Country)
             .find({ where: { enabled: true } })
-            .then(items => items.map(country => translate_entity_1.translateDeep(country, ctx.languageCode)));
+            .then(items => items.map(country => this.translator.translate(country, ctx)));
     }
     /**
      * @description
@@ -77,7 +78,7 @@ let CountryService = class CountryService {
         if (!country) {
             throw new errors_1.UserInputError('error.country-code-not-valid', { countryCode });
         }
-        return translate_entity_1.translateDeep(country, ctx.languageCode);
+        return this.translator.translate(country, ctx);
     }
     async create(ctx, input) {
         const country = await this.translatableSaver.create({
@@ -127,7 +128,8 @@ CountryService = __decorate([
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         list_query_builder_1.ListQueryBuilder,
         translatable_saver_1.TranslatableSaver,
-        event_bus_1.EventBus])
+        event_bus_1.EventBus,
+        translator_service_1.TranslatorService])
 ], CountryService);
 exports.CountryService = CountryService;
 //# sourceMappingURL=country.service.js.map

package/dist/service/services/country.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"country.service.js","sourceRoot":"","sources":["../../../src/service/services/country.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAK6C;AAK7C,sDAA2D;AAG3D,8CAAiD;AACjD,wFAAoF;AACpF,yCAAuC;AACvC,gGAAqF;AACrF,wEAA8D;AAC9D,+CAA2C;AAC3C,wEAAoE;AACpE,yFAAoF;AACpF,yFAAqF;AACrF,~~wEAAkE~~;~~AAElE~~;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IACvB,YACY,UAAmC,EACnC,gBAAkC,EAClC,iBAAoC,EACpC,QAAkB;~~QAHlB~~,eAAU,GAAV,UAAU,CAAyB;QACnC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,aAAQ,GAAR,QAAQ,CAAU;~~IAC3B~~,CAAC;IAEJ,OAAO,CACH,GAAmB,EACnB,OAAmC,EACnC,YAAoC,EAAE;QAEtC,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,wBAAO,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;aAC3C,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,EAAE;YAC9B,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,~~gCAAa~~,CAAC,OAAO,EAAE,GAAG,CAAC,~~YAAY,~~CAAC,CAAC~~,CAAC~~;~~YACjF~~,OAAO;gBACH,KAAK;gBACL,UAAU;aACb,CAAC;QACN,CAAC,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CACH,GAAmB,EACnB,SAAa,EACb,YAAoC,EAAE;QAEtC,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;aAC3B,OAAO,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,CAAC;aACjC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,IAAI,~~gCAAa~~,CAAC,OAAO,EAAE,GAAG,CAAC,~~YAAY,~~CAAC,CAAC~~,CAAC~~;~~IAC9E~~,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,GAAmB;QAChC,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;aAC3B,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;aAClC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,~~gCAAa~~,CAAC,OAAO,EAAE,GAAG,CAAC,~~YAAY,~~CAAC,CAAC,CAAC~~,CAAC~~;~~IACvF~~,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,WAAmB;QACxD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE;gBACH,IAAI,EAAE,WAAW;aACpB;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,uBAAc,CAAC,8BAA8B,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SAC7E;QACD,OAAO,~~gCAAa~~,CAAC,OAAO,EAAE,GAAG,CAAC,~~YAAY,~~CAAC~~,CAAC~~;~~IACpD~~,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAyB;QACvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YAChD,GAAG;YACH,KAAK;YACL,UAAU,EAAE,wBAAO;YACnB,eAAe,EAAE,+CAAkB;SACtC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAAyB;QACvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;YAChD,GAAG;YACH,KAAK;YACL,UAAU,EAAE,wBAAO;YACnB,eAAe,EAAE,+CAAkB;SACtC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACxE,OAAO,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,EAAM;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,EAAE,CAAC,CAAC;QACzE,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,UAAU;aAC9C,aAAa,CAAC,GAAG,EAAE,gBAAO,CAAC;aAC3B,kBAAkB,CAAC,SAAS,CAAC;aAC7B,KAAK,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,CAAC;aACtC,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC,GAAG,qBAAqB,EAAE;YAC3B,OAAO;gBACH,MAAM,EAAE,gCAAc,CAAC,WAAW;gBAClC,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,mCAAmC,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;aAChG,CAAC;SACL;aAAM;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAClE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO;gBACH,MAAM,EAAE,gCAAc,CAAC,OAAO;gBAC9B,OAAO,EAAE,EAAE;aACd,CAAC;SACL;IACL,CAAC;CACJ,CAAA;~~AA3GY~~,cAAc;IAD1B,mBAAU,EAAE;qCAGe,kDAAuB;QACjB,qCAAgB;QACf,sCAAiB;QAC1B,oBAAQ;~~GALrB~~,cAAc,~~CA2G1B~~;~~AA3GY~~,wCAAc"}
1	+ {"version":3,"file":"country.service.js","sourceRoot":"","sources":["../../../src/service/services/country.service.ts"],"names":[],"mappings":"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"}