npm - @vendure/core - Versions diffs - 1.3.3 → 1.4.1 - Mend

@vendure/core 1.3.3 → 1.4.1

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 (290) hide show

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

@@ -26,6 +26,9 @@ const channel_entity_1 = require("../../entity/channel/channel.entity");
 const product_variant_price_entity_1 = require("../../entity/product-variant/product-variant-price.entity");
 const session_entity_1 = require("../../entity/session/session.entity");
 const zone_entity_1 = require("../../entity/zone/zone.entity");
+const event_bus_1 = require("../../event-bus");
+const change_channel_event_1 = require("../../event-bus/events/change-channel-event");
+const channel_event_1 = require("../../event-bus/events/channel-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
 const global_settings_service_1 = require("./global-settings.service");
@@ -36,11 +39,12 @@ const global_settings_service_1 = require("./global-settings.service");
  * @docsCategory services
  */
 let ChannelService = class ChannelService {
-    constructor(connection, configService, globalSettingsService, customFieldRelationService) {
+    constructor(connection, configService, globalSettingsService, customFieldRelationService, eventBus) {
         this.connection = connection;
         this.configService = configService;
         this.globalSettingsService = globalSettingsService;
         this.customFieldRelationService = customFieldRelationService;
+        this.eventBus = eventBus;
     }
     /**
      * When the app is bootstrapped, ensure a default Channel exists and populate the
@@ -65,6 +69,7 @@ let ChannelService = class ChannelService {
         const defaultChannel = await this.getDefaultChannel();
         const channelIds = unique_1.unique([ctx.channelId, defaultChannel.id]);
         entity.channels = channelIds.map(id => ({ id }));
+        this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, [ctx.channelId], 'assigned'));
         return entity;
     }
     /**
@@ -80,6 +85,7 @@ let ChannelService = class ChannelService {
             entity.channels.push(channel);
         }
         await this.connection.getRepository(ctx, entityType).save(entity, { reload: false });
+        this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, channelIds, 'assigned', entityType));
         return entity;
     }
     /**
@@ -97,6 +103,7 @@ let ChannelService = class ChannelService {
             entity.channels = entity.channels.filter(c => !utils_1.idsAreEqual(c.id, id));
         }
         await this.connection.getRepository(ctx, entityType).save(entity, { reload: false });
+        this.eventBus.publish(new change_channel_event_1.ChangeChannelEvent(ctx, entity, channelIds, 'removed', entityType));
         return entity;
     }
     /**
@@ -153,6 +160,7 @@ let ChannelService = class ChannelService {
         const newChannel = await this.connection.getRepository(ctx, channel_entity_1.Channel).save(channel);
         await this.customFieldRelationService.updateRelations(ctx, channel_entity_1.Channel, input, newChannel);
         await this.allChannels.refresh(ctx);
+        this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, newChannel, 'created', input));
         return channel;
     }
     async update(ctx, input) {
@@ -174,15 +182,17 @@ let ChannelService = class ChannelService {
         await this.connection.getRepository(ctx, channel_entity_1.Channel).save(updatedChannel, { reload: false });
         await this.customFieldRelationService.updateRelations(ctx, channel_entity_1.Channel, input, updatedChannel);
         await this.allChannels.refresh(ctx);
+        this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, channel, 'updated', input));
         return utils_1.assertFound(this.findOne(ctx, channel.id));
     }
     async delete(ctx, id) {
-        await this.connection.getEntityOrThrow(ctx, channel_entity_1.Channel, id);
+        const channel = await this.connection.getEntityOrThrow(ctx, channel_entity_1.Channel, id);
         await this.connection.getRepository(ctx, session_entity_1.Session).delete({ activeChannelId: id });
         await this.connection.getRepository(ctx, channel_entity_1.Channel).delete(id);
         await this.connection.getRepository(ctx, product_variant_price_entity_1.ProductVariantPrice).delete({
             channelId: id,
         });
+        this.eventBus.publish(new channel_event_1.ChannelEvent(ctx, channel, 'deleted', id));
         return {
             result: generated_types_1.DeletionResult.DELETED,
         };
@@ -240,7 +250,8 @@ ChannelService = __decorate([
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_service_1.ConfigService,
         global_settings_service_1.GlobalSettingsService,
-        custom_field_relation_service_1.CustomFieldRelationService])
+        custom_field_relation_service_1.CustomFieldRelationService,
+        event_bus_1.EventBus])
 ], ChannelService);
 exports.ChannelService = ChannelService;
 //# sourceMappingURL=channel.service.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAQ6C;AAC7C,2EAA4E;AAE5E,uDAAoD;AAEpD,sEAAkE;AAClE,kEAAyF;AACzF,sDAA2G;AAC3G,sGAA8F;AAC9F,8EAAoG;AAEpG,8CAA8D;AAC9D,gEAA4D;AAC5D,wFAAoF;AAEpF,wEAA8D;AAC9D,4GAAgG;AAChG,wEAA8D;AAC9D,+DAAqD;AACrD,kHAA4G;AAC5G,gEAA4D;AAE5D,uEAAkE;AAElE;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,YACY,UAAmC,EACnC,aAA4B,EAC5B,qBAA4C,EAC5C,0BAAsD;~~QAHtD~~,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,+BAA0B,GAA1B,0BAA0B,CAA4B;~~IAC/D~~,CAAC;IAEJ;;;;;OAKG;IACH,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,MAAM,iDAAyB,CAAC;YAC/C,IAAI,EAAE,4BAA4B;YAClC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,eAAe;YACrD,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,CAAC,gCAAc,CAAC,KAAK,EAAE,CAAC,EAAE;SACnF,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,sBAAsB,~~CAAyB~~,MAAS,~~EAAE~~,GAAmB;~~QAC/E~~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~~QACzD~~,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kDAAmB,CAAC,CAAC,MAAM,CAAC;YACjE,SAAS,EAAE,EAAE;SAChB,CAAC,CAAC;QACH,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAC,MAAqB;QACvC,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;QAC7D,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa;aACjC,WAAW,CAAC,UAAU,CAAC;aACvB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,wBAAO,IAAI,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAClF,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,0BAA0B;QACpC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACnD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE;gBACH,IAAI,EAAE,uCAAoB;aAC7B;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,iBAAiB,GAAG,IAAI,wBAAO,CAAC;gBAClC,IAAI,EAAE,uCAAoB;gBAC1B,mBAAmB,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;gBAC3D,gBAAgB,EAAE,KAAK;gBACvB,YAAY,EAAE,8BAAY,CAAC,GAAG;gBAC9B,KAAK,EAAE,mBAAmB;aAC7B,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SAC3F;aAAM,IAAI,mBAAmB,IAAI,cAAc,CAAC,KAAK,KAAK,mBAAmB,EAAE;YAC5E,cAAc,CAAC,KAAK,GAAG,mBAAmB,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACxF;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACrC,GAAmB,EACnB,KAA8C;QAE9C,IAAI,KAAK,CAAC,mBAAmB,EAAE;YAC3B,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,qBAAqB;iBAC1D,WAAW,CAAC,GAAG,CAAC;iBAChB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACrC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;gBAC7D,OAAO,IAAI,0DAAyB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACnE;SACJ;IACL,CAAC;CACJ,CAAA;~~AA3PY~~,cAAc;IAD1B,mBAAU,EAAE;qCAKe,kDAAuB;QACpB,8BAAa;QACL,+CAAqB;QAChB,0DAA0B;~~GAPzD~~,cAAc,~~CA2P1B~~;~~AA3PY~~,wCAAc"}
1	+ {"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAQ6C;AAC7C,2EAA4E;AAE5E,uDAAoD;AAEpD,sEAAkE;AAClE,kEAAyF;AACzF,sDAA2G;AAC3G,sGAA8F;AAC9F,8EAAoG;AAEpG,8CAA8D;AAC9D,gEAA4D;AAC5D,wFAAoF;AAEpF,wEAA8D;AAC9D,4GAAgG;AAChG,wEAA8D;AAC9D,+DAAqD;AACrD,+CAA2C;AAC3C,sFAAiF;AACjF,wEAAoE;AACpE,kHAA4G;AAC5G,gEAA4D;AAE5D,uEAAkE;AAElE;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IAGvB,YACY,UAAmC,EACnC,aAA4B,EAC5B,qBAA4C,EAC5C,0BAAsD,EACtD,QAAkB;QAJlB,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ;;;;;OAKG;IACH,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QACxC,IAAI,CAAC,WAAW,GAAG,MAAM,iDAAyB,CAAC;YAC/C,IAAI,EAAE,4BAA4B;YAClC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,eAAe;YACrD,OAAO,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,WAAW,EAAE,CAAC,gCAAc,CAAC,KAAK,EAAE,CAAC,EAAE;SACnF,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,sBAAsB,CACxB,MAAS,EACT,GAAmB;QAEnB,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,UAAU,GAAG,eAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAQ,CAAC;QACxD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,yCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACxF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,UAAmB,EACnB,QAAY,EACZ,UAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE;YAC7E,SAAS,EAAE,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;QACH,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,wBAAO,EAAE,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACjC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,yCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;QAC/F,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,kBAAkB,CACpB,GAAmB,EACnB,UAAmB,EACnB,QAAY,EACZ,UAAgB;QAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;YAClF,SAAS,EAAE,CAAC,UAAU,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE;YACT,OAAO;SACV;QACD,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE;YACzB,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,mBAAW,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;SACzE;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,MAAa,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,yCAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;QAC9F,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,KAAa;QACnC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACnD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,EAAE;YAC1C,kDAAkD;YAClD,OAAO,IAAI,CAAC,iBAAiB,EAAE,CAAC;SACnC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,6BAAoB,CAAC,KAAK,CAAC,CAAC;SACzC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACnD,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,uCAAoB,CAAC,CAAC;QAE1F,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,4BAAmB,CAAC,iCAAiC,CAAC,CAAC;SACpE;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,GAAmB;QACvB,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;aAC3B,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CAAC,GAAmB,EAAE,EAAM;QAC/B,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;aAC3B,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,KAAyB;QAEzB,MAAM,OAAO,GAAG,IAAI,wBAAO,CAAC,KAAK,CAAC,CAAC;QACnC,MAAM,+BAA+B,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3F,IAAI,mCAAoB,CAAC,+BAA+B,CAAC,EAAE;YACvD,OAAO,+BAA+B,CAAC;SAC1C;QACD,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACxB,OAAO,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAC3D,GAAG,EACH,kBAAI,EACJ,KAAK,CAAC,gBAAgB,CACzB,CAAC;SACL;QACD,IAAI,KAAK,CAAC,qBAAqB,EAAE;YAC7B,OAAO,CAAC,mBAAmB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAChE,GAAG,EACH,kBAAI,EACJ,KAAK,CAAC,qBAAqB,CAC9B,CAAC;SACL;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnF,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAO,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACvF,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QAC3E,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,KAAyB;QAEzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,4BAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACtD;QACD,MAAM,+BAA+B,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3F,IAAI,mCAAoB,CAAC,+BAA+B,CAAC,EAAE;YACvD,OAAO,+BAA+B,CAAC;SAC1C;QACD,MAAM,cAAc,GAAG,0BAAW,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACnD,IAAI,KAAK,CAAC,gBAAgB,EAAE;YACxB,cAAc,CAAC,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAClE,GAAG,EACH,kBAAI,EACJ,KAAK,CAAC,gBAAgB,CACzB,CAAC;SACL;QACD,IAAI,KAAK,CAAC,qBAAqB,EAAE;YAC7B,cAAc,CAAC,mBAAmB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CACvE,GAAG,EACH,kBAAI,EACJ,KAAK,CAAC,qBAAqB,CAC9B,CAAC;SACL;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,wBAAO,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAC3F,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACpC,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,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,kDAAmB,CAAC,CAAC,MAAM,CAAC;YACjE,SAAS,EAAE,EAAE;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QAErE,OAAO;YACH,MAAM,EAAE,gCAAc,CAAC,OAAO;SACjC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACI,cAAc,CAAC,MAAqB;QACvC,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC;QAC7D,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa;aACjC,WAAW,CAAC,UAAU,CAAC;aACvB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,wBAAO,IAAI,CAAC,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC;IAClF,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,0BAA0B;QACpC,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC;QACnD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE;gBACH,IAAI,EAAE,uCAAoB;aAC7B;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,iBAAiB,GAAG,IAAI,wBAAO,CAAC;gBAClC,IAAI,EAAE,uCAAoB;gBAC1B,mBAAmB,EAAE,IAAI,CAAC,aAAa,CAAC,mBAAmB;gBAC3D,gBAAgB,EAAE,KAAK;gBACvB,YAAY,EAAE,8BAAY,CAAC,GAAG;gBAC9B,KAAK,EAAE,mBAAmB;aAC7B,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SAC3F;aAAM,IAAI,mBAAmB,IAAI,cAAc,CAAC,KAAK,KAAK,mBAAmB,EAAE;YAC5E,cAAc,CAAC,KAAK,GAAG,mBAAmB,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACxF;IACL,CAAC;IAEO,KAAK,CAAC,2BAA2B,CACrC,GAAmB,EACnB,KAA8C;QAE9C,IAAI,KAAK,CAAC,mBAAmB,EAAE;YAC3B,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,qBAAqB;iBAC1D,WAAW,CAAC,GAAG,CAAC;iBAChB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;YACrC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE;gBAC7D,OAAO,IAAI,0DAAyB,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACnE;SACJ;IACL,CAAC;CACJ,CAAA;AAtQY,cAAc;IAD1B,mBAAU,EAAE;qCAKe,kDAAuB;QACpB,8BAAa;QACL,+CAAqB;QAChB,0DAA0B;QAC5C,oBAAQ;GARrB,cAAc,CAsQ1B;AAtQY,wCAAc"}

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

@@ -26,6 +26,7 @@ const collection_translation_entity_1 = require("../../entity/collection/collect
 const collection_entity_1 = require("../../entity/collection/collection.entity");
 const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
+const collection_event_1 = require("../../event-bus/events/collection-event");
 const collection_modification_event_1 = require("../../event-bus/events/collection-modification-event");
 const product_event_1 = require("../../event-bus/events/product-event");
 const product_variant_event_1 = require("../../event-bus/events/product-variant-event");
@@ -226,7 +227,7 @@ let CollectionService = class CollectionService {
         const getChildren = async (id, _descendants = [], depth = 1) => {
             const children = await this.connection
                 .getRepository(ctx, collection_entity_1.Collection)
-                .find({ where: { parent: { id } } });
+                .find({ where: { parent: { id } }, order: { position: 'ASC' } });
             for (const child of children) {
                 _descendants.push(child);
                 if (depth < maxDepth) {
@@ -288,11 +289,12 @@ let CollectionService = class CollectionService {
             },
         });
         await this.assetService.updateEntityAssets(ctx, collection, input);
-        await this.customFieldRelationService.updateRelations(ctx, collection_entity_1.Collection, input, collection);
+        const collectionWithRelations = await this.customFieldRelationService.updateRelations(ctx, collection_entity_1.Collection, input, collection);
         await this.applyFiltersQueue.add({
             ctx: ctx.serialize(),
             collectionIds: [collection.id],
         });
+        this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collectionWithRelations, 'created', input));
         return utils_1.assertFound(this.findOne(ctx, collection.id));
     }
     async update(ctx, input) {
@@ -322,6 +324,7 @@ let CollectionService = class CollectionService {
             const affectedVariantIds = await this.getCollectionProductVariantIds(collection);
             this.eventBus.publish(new collection_modification_event_1.CollectionModificationEvent(ctx, collection, affectedVariantIds));
         }
+        this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collection, 'updated', input));
         return utils_1.assertFound(this.findOne(ctx, collection.id));
     }
     async delete(ctx, id) {
@@ -334,6 +337,7 @@ let CollectionService = class CollectionService {
             await this.connection.getRepository(ctx, collection_entity_1.Collection).remove(coll);
             this.eventBus.publish(new collection_modification_event_1.CollectionModificationEvent(ctx, coll, affectedVariantIds));
         }
+        this.eventBus.publish(new collection_event_1.CollectionEvent(ctx, collection, 'deleted', id));
         return {
             result: generated_types_1.DeletionResult.DELETED,
         };
@@ -500,13 +504,16 @@ let CollectionService = class CollectionService {
             this.rootCollection = translate_entity_1.translateDeep(existingRoot, ctx.languageCode);
             return this.rootCollection;
         }
-        const rootTranslation = await this.connection.getRepository(ctx, collection_translation_entity_1.CollectionTranslation).save(new collection_translation_entity_1.CollectionTranslation({
+        // We purposefully do not use the ctx in saving the new root Collection
+        // so that even if the outer transaction fails, the root collection will still
+        // get persisted.
+        const rootTranslation = await this.connection.getRepository(collection_translation_entity_1.CollectionTranslation).save(new collection_translation_entity_1.CollectionTranslation({
             languageCode: this.configService.defaultLanguageCode,
             name: shared_constants_1.ROOT_COLLECTION_NAME,
             description: 'The root of the Collection tree.',
             slug: shared_constants_1.ROOT_COLLECTION_NAME,
         }));
-        const newRoot = await this.connection.getRepository(ctx, collection_entity_1.Collection).save(new collection_entity_1.Collection({
+        const newRoot = await this.connection.getRepository(collection_entity_1.Collection).save(new collection_entity_1.Collection({
             isRoot: true,
             position: 0,
             translations: [rootTranslation],

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":"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"}
1	+ {"version":3,"file":"collection.service.js","sourceRoot":"","sources":["../../../src/service/services/collection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0D;AAC1D,yEAQ6C;AAC7C,mDAAgD;AAChD,2EAA4E;AAE5E,+BAA6B;AAC7B,8CAA8C;AAE9C,sEAA4F;AAC5F,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,CAAC,aAAa,CAAC,8BAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3E,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;QAEtC,MAAM,SAAS,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAE1D,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,8BAAU,EAAE,OAAO,EAAE;YACxB,SAAS;YACT,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,CAAC,GAAmB,EAAE,YAAgB;QAC/C,MAAM,SAAS,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CACrD,GAAG,EACH,8BAAU,EACV,YAAY,EACZ,GAAG,CAAC,SAAS,EACb;YACI,SAAS;YACT,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,CAAC,GAAmB,EAAE,GAAS;QAC1C,MAAM,SAAS,GAAG,CAAC,eAAe,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,8BAAU,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE;YACxF,SAAS;YACT,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,CAAC,GAAmB,EAAE,IAAY;;QACjD,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,CAAC,CAAC;IAChD,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,8BAAU,CAAC;aACzB,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,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,KAAoD;QAEpD,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,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,CAAC,uCAAc,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAE5F,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,qDAAqB,CAAC,CAAC,IAAI,CACnF,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,8BAAU,CAAC,CAAC,IAAI,CAChE,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;AA5kBY,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,CA4kB7B;AA5kBY,8CAAiB"}

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

@@ -5,9 +5,9 @@ import { ListQueryOptions } from '../../common/types/common-types';
 import { Translated } from '../../common/types/locale-types';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 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 { ZoneService } from './zone.service';
 /**
  * @description
  * Contains methods relating to {@link Country} entities.
@@ -18,8 +18,8 @@ export declare class CountryService {
     private connection;
     private listQueryBuilder;
     private translatableSaver;
-    private zoneService;
-    constructor(connection: TransactionalConnection, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, zoneService: ZoneService);
+    private eventBus;
+    constructor(connection: TransactionalConnection, listQueryBuilder: ListQueryBuilder, translatableSaver: TranslatableSaver, eventBus: EventBus);
     findAll(ctx: RequestContext, options?: ListQueryOptions<Country>): Promise<PaginatedList<Translated<Country>>>;
     findOne(ctx: RequestContext, countryId: ID): Promise<Translated<Country> | undefined>;
     /**

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

@@ -18,10 +18,11 @@ const transactional_connection_1 = require("../../connection/transactional-conne
 const entity_1 = require("../../entity");
 const country_translation_entity_1 = require("../../entity/country/country-translation.entity");
 const country_entity_1 = require("../../entity/country/country.entity");
+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 zone_service_1 = require("./zone.service");
 /**
  * @description
  * Contains methods relating to {@link Country} entities.
@@ -29,11 +30,11 @@ const zone_service_1 = require("./zone.service");
  * @docsCategory services
  */
 let CountryService = class CountryService {
-    constructor(connection, listQueryBuilder, translatableSaver, zoneService) {
+    constructor(connection, listQueryBuilder, translatableSaver, eventBus) {
         this.connection = connection;
         this.listQueryBuilder = listQueryBuilder;
         this.translatableSaver = translatableSaver;
-        this.zoneService = zoneService;
+        this.eventBus = eventBus;
     }
     findAll(ctx, options) {
         return this.listQueryBuilder
@@ -85,6 +86,7 @@ let CountryService = class CountryService {
             entityType: country_entity_1.Country,
             translationType: country_translation_entity_1.CountryTranslation,
         });
+        this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'created', input));
         return utils_1.assertFound(this.findOne(ctx, country.id));
     }
     async update(ctx, input) {
@@ -94,6 +96,7 @@ let CountryService = class CountryService {
             entityType: country_entity_1.Country,
             translationType: country_translation_entity_1.CountryTranslation,
         });
+        this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'updated', input));
         return utils_1.assertFound(this.findOne(ctx, country.id));
     }
     async delete(ctx, id) {
@@ -111,6 +114,7 @@ let CountryService = class CountryService {
         }
         else {
             await this.connection.getRepository(ctx, country_entity_1.Country).remove(country);
+            this.eventBus.publish(new country_event_1.CountryEvent(ctx, country, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
                 message: '',
@@ -123,7 +127,7 @@ CountryService = __decorate([
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         list_query_builder_1.ListQueryBuilder,
         translatable_saver_1.TranslatableSaver,
-        zone_service_1.ZoneService])
+        event_bus_1.EventBus])
 ], 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;AAI7C,sDAA2D;AAG3D,8CAAiD;AACjD,wFAAoF;AACpF,yCAAuC;AACvC,gGAAqF;AACrF,wEAA8D;AAC9D,yFAAoF;AACpF,yFAAqF;AACrF,wEAAkE;~~AAElE,iDAA6C;AAE7C~~;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IACvB,YACY,UAAmC,EACnC,gBAAkC,EAClC,iBAAoC,EACpC,~~WAAwB~~;~~QAHxB~~,eAAU,GAAV,UAAU,CAAyB;QACnC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,~~gBAAW~~,~~GAAX~~,~~WAAW~~,~~CAAa~~;~~IACjC~~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~~AAnGY~~,cAAc;IAD1B,mBAAU,EAAE;qCAGe,kDAAuB;QACjB,qCAAgB;QACf,sCAAiB;~~QACvB~~,~~0BAAW~~;~~GAL3B~~,cAAc,~~CAmG1B~~;~~AAnGY~~,wCAAc"}
1	+ {"version":3,"file":"country.service.js","sourceRoot":"","sources":["../../../src/service/services/country.service.ts"],"names":[],"mappings":"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"}

package/dist/service/services/customer-group.service.js CHANGED Viewed

@@ -18,6 +18,7 @@ const transactional_connection_1 = require("../../connection/transactional-conne
 const customer_group_entity_1 = require("../../entity/customer-group/customer-group.entity");
 const customer_entity_1 = require("../../entity/customer/customer.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
+const customer_group_entity_event_1 = require("../../event-bus/events/customer-group-entity-event");
 const customer_group_event_1 = require("../../event-bus/events/customer-group-event");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const patch_entity_1 = require("../helpers/utils/patch-entity");
@@ -76,18 +77,22 @@ let CustomerGroupService = class CustomerGroupService {
             }
             await this.connection.getRepository(ctx, customer_entity_1.Customer).save(customers);
         }
-        return utils_1.assertFound(this.findOne(ctx, newCustomerGroup.id));
+        const savedCustomerGroup = await utils_1.assertFound(this.findOne(ctx, newCustomerGroup.id));
+        this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, savedCustomerGroup, 'created', input));
+        return savedCustomerGroup;
     }
     async update(ctx, input) {
         const customerGroup = await this.connection.getEntityOrThrow(ctx, customer_group_entity_1.CustomerGroup, input.id);
         const updatedCustomerGroup = patch_entity_1.patchEntity(customerGroup, input);
         await this.connection.getRepository(ctx, customer_group_entity_1.CustomerGroup).save(updatedCustomerGroup, { reload: false });
+        this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, customerGroup, 'updated', input));
         return utils_1.assertFound(this.findOne(ctx, customerGroup.id));
     }
     async delete(ctx, id) {
         const group = await this.connection.getEntityOrThrow(ctx, customer_group_entity_1.CustomerGroup, id);
         try {
             await this.connection.getRepository(ctx, customer_group_entity_1.CustomerGroup).remove(group);
+            this.eventBus.publish(new customer_group_entity_event_1.CustomerGroupEntityEvent(ctx, group, 'deleted', id));
             return {
                 result: generated_types_1.DeletionResult.DELETED,
             };
@@ -117,6 +122,7 @@ let CustomerGroupService = class CustomerGroupService {
         }
         await this.connection.getRepository(ctx, customer_entity_1.Customer).save(customers, { reload: false });
         this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, customers, group, 'assigned'));
+        this.eventBus.publish(new customer_group_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'assigned'));
         return utils_1.assertFound(this.findOne(ctx, group.id));
     }
     async removeCustomersFromGroup(ctx, input) {
@@ -138,6 +144,7 @@ let CustomerGroupService = class CustomerGroupService {
         }
         await this.connection.getRepository(ctx, customer_entity_1.Customer).save(customers, { reload: false });
         this.eventBus.publish(new customer_group_event_1.CustomerGroupEvent(ctx, customers, group, 'removed'));
+        this.eventBus.publish(new customer_group_event_1.CustomerGroupChangeEvent(ctx, customers, group, 'removed'));
         return utils_1.assertFound(this.findOne(ctx, group.id));
     }
     getCustomersFromIds(ctx, ids) {

package/dist/service/services/customer-group.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"customer-group.service.js","sourceRoot":"","sources":["../../../src/service/services/customer-group.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAU6C;AAI7C,sDAA2D;AAC3D,8CAA8D;AAC9D,wFAAoF;AACpF,6FAAkF;AAClF,2EAAiE;AACjE,yDAAqD;AACrD,~~sFAAiF~~;~~AACjF~~,yFAAoF;AACpF,gEAA4D;AAE5D,uDAAmD;AAEnD;;;;;GAKG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,gBAAkC,EAClC,cAA8B,EAC9B,QAAkB;QAHlB,eAAU,GAAV,UAAU,CAAyB;QACnC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ,OAAO,CAAC,GAAmB,EAAE,OAAkC;QAC3D,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,qCAAa,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC;aACtC,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,CAAC,GAAmB,EAAE,eAAmB;QAC5C,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,qCAAa,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtF,CAAC;IAED;;;OAGG;IACH,iBAAiB,CACb,GAAmB,EACnB,eAAmB,EACnB,OAA6B;QAE7B,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,0BAAQ,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC;aACjC,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;aACpC,QAAQ,CAAC,mBAAmB,EAAE,SAAS,CAAC;aACxC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;aAC7D,QAAQ,CAAC,wBAAwB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;aAChE,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAmB,EAAE,KAA+B;QAC7D,MAAM,aAAa,GAAG,IAAI,qCAAa,CAAC,KAAK,CAAC,CAAC;QAE/C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,qCAAa,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrG,IAAI,KAAK,CAAC,WAAW,EAAE;YACnB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;YACzE,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAC9B,QAAQ,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,gBAAgB,CAAC,CAAC;gBACjE,MAAM,IAAI,CAAC,cAAc,CAAC,6BAA6B,CAAC;oBACpD,GAAG;oBACH,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,IAAI,EAAE,kCAAgB,CAAC,uBAAuB;oBAC9C,IAAI,EAAE;wBACF,SAAS,EAAE,aAAa,CAAC,IAAI;qBAChC;iBACJ,CAAC,CAAC;aACN;YACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0BAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACtE;QACD,~~OAAO~~,mBAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC;~~IAC~~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~~AAlJY~~,oBAAoB;IADhC,mBAAU,EAAE;qCAGe,kDAAuB;QACjB,qCAAgB;QAClB,gCAAc;QACpB,oBAAQ;GALrB,oBAAoB,~~CAkJhC~~;~~AAlJY~~,oDAAoB"}
1	+ {"version":3,"file":"customer-group.service.js","sourceRoot":"","sources":["../../../src/service/services/customer-group.service.ts"],"names":[],"mappings":"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"}

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

@@ -27,11 +27,13 @@ const customer_entity_1 = require("../../entity/customer/customer.entity");
 const user_entity_1 = require("../../entity/user/user.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
 const account_registration_event_1 = require("../../event-bus/events/account-registration-event");
+const account_verified_event_1 = require("../../event-bus/events/account-verified-event");
 const customer_address_event_1 = require("../../event-bus/events/customer-address-event");
 const customer_event_1 = require("../../event-bus/events/customer-event");
 const identifier_change_event_1 = require("../../event-bus/events/identifier-change-event");
 const identifier_change_request_event_1 = require("../../event-bus/events/identifier-change-request-event");
 const password_reset_event_1 = require("../../event-bus/events/password-reset-event");
+const password_reset_verified_event_1 = require("../../event-bus/events/password-reset-verified-event");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const address_to_line_1 = require("../helpers/utils/address-to-line");
@@ -219,7 +221,7 @@ let CustomerService = class CustomerService {
                 },
             });
         }
-        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, createdCustomer, 'created'));
+        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, createdCustomer, 'created', input));
         return createdCustomer;
     }
     async update(ctx, input) {
@@ -262,7 +264,7 @@ let CustomerService = class CustomerService {
                 input,
             },
         });
-        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'updated'));
+        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'updated', input));
         return utils_1.assertFound(this.findOne(ctx, customer.id));
     }
     /**
@@ -367,7 +369,9 @@ let CustomerService = class CustomerService {
                 strategy: native_authentication_strategy_1.NATIVE_AUTH_STRATEGY_NAME,
             },
         });
-        return utils_1.assertFound(this.findOneByUserId(ctx, result.id));
+        const user = utils_1.assertFound(this.findOneByUserId(ctx, result.id));
+        this.eventBus.publish(new account_verified_event_1.AccountVerifiedEvent(ctx, customer));
+        return user;
     }
     /**
      * @description
@@ -410,6 +414,7 @@ let CustomerService = class CustomerService {
             type: generated_types_1.HistoryEntryType.CUSTOMER_PASSWORD_RESET_VERIFIED,
             data: {},
         });
+        this.eventBus.publish(new password_reset_verified_event_1.PasswordResetVerifiedEvent(ctx, result));
         return result;
     }
     /**
@@ -523,7 +528,7 @@ let CustomerService = class CustomerService {
         else {
             customer = await this.connection.getRepository(ctx, customer_entity_1.Customer).save(new customer_entity_1.Customer(input));
             await this.channelService.assignToCurrentChannel(customer, ctx);
-            this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'created'));
+            this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'created', input));
         }
         return this.connection.getRepository(ctx, customer_entity_1.Customer).save(customer);
     }
@@ -550,7 +555,7 @@ let CustomerService = class CustomerService {
             type: generated_types_1.HistoryEntryType.CUSTOMER_ADDRESS_CREATED,
             data: { address: address_to_line_1.addressToLine(createdAddress) },
         });
-        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, createdAddress, 'created'));
+        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, createdAddress, 'created', input));
         return createdAddress;
     }
     async updateAddress(ctx, input) {
@@ -580,7 +585,7 @@ let CustomerService = class CustomerService {
                 input,
             },
         });
-        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, updatedAddress, 'updated'));
+        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, updatedAddress, 'updated', input));
         return updatedAddress;
     }
     async deleteAddress(ctx, id) {
@@ -602,7 +607,7 @@ let CustomerService = class CustomerService {
             },
         });
         await this.connection.getRepository(ctx, address_entity_1.Address).remove(address);
-        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, address, 'deleted'));
+        this.eventBus.publish(new customer_address_event_1.CustomerAddressEvent(ctx, address, 'deleted', id));
         return true;
     }
     async softDelete(ctx, customerId) {
@@ -614,7 +619,7 @@ let CustomerService = class CustomerService {
             .update({ id: customerId }, { deletedAt: new Date() });
         // tslint:disable-next-line:no-non-null-assertion
         await this.userService.softDelete(ctx, customer.user.id);
-        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'deleted'));
+        this.eventBus.publish(new customer_event_1.CustomerEvent(ctx, customer, 'deleted', customerId));
         return {
             result: generated_types_1.DeletionResult.DELETED,
         };