@vendure/core 1.9.4 → 2.0.0-beta.0

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

@@ -4,7 +4,9 @@ import { AdministratorService } from './services/administrator.service';
 import { ChannelService } from './services/channel.service';
 import { GlobalSettingsService } from './services/global-settings.service';
 import { RoleService } from './services/role.service';
+import { SellerService } from './services/seller.service';
 import { ShippingMethodService } from './services/shipping-method.service';
+import { StockLocationService } from './services/stock-location.service';
 import { TaxRateService } from './services/tax-rate.service';
 import { ZoneService } from './services/zone.service';
 /**
@@ -20,8 +22,10 @@ export declare class InitializerService {
     private shippingMethodService;
     private globalSettingsService;
     private taxRateService;
+    private sellerService;
     private eventBus;
-    constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService, taxRateService: TaxRateService, eventBus: EventBus);
+    private stockLocationService;
+    constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService, taxRateService: TaxRateService, sellerService: SellerService, eventBus: EventBus, stockLocationService: StockLocationService);
     onModuleInit(): Promise<void>;
     /**
      * On the first run of the server & worker, when dbConnectionOptions.synchronize = true, there can be

package/dist/service/initializer.service.js

@@ -20,7 +20,9 @@ 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");
 const role_service_1 = require("./services/role.service");
+const seller_service_1 = require("./services/seller.service");
 const shipping_method_service_1 = require("./services/shipping-method.service");
+const stock_location_service_1 = require("./services/stock-location.service");
 const tax_rate_service_1 = require("./services/tax-rate.service");
 const zone_service_1 = require("./services/zone.service");
 /**
@@ -28,7 +30,7 @@ const zone_service_1 = require("./services/zone.service");
  * sequence on bootstrap.
  */
 let InitializerService = class InitializerService {
-    constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService, taxRateService, eventBus) {
+    constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService, taxRateService, sellerService, eventBus, stockLocationService) {
         this.connection = connection;
         this.zoneService = zoneService;
         this.channelService = channelService;
@@ -37,7 +39,9 @@ let InitializerService = class InitializerService {
         this.shippingMethodService = shippingMethodService;
         this.globalSettingsService = globalSettingsService;
         this.taxRateService = taxRateService;
+        this.sellerService = sellerService;
         this.eventBus = eventBus;
+        this.stockLocationService = stockLocationService;
     }
     async onModuleInit() {
         await this.awaitDbSchemaGeneration();
@@ -49,11 +53,13 @@ let InitializerService = class InitializerService {
         // there is a default Channel to work with.
         await this.zoneService.initZones();
         await this.globalSettingsService.initGlobalSettings();
+        await this.sellerService.initSellers();
         await this.channelService.initChannels();
         await this.roleService.initRoles();
         await this.administratorService.initAdministrators();
         await this.shippingMethodService.initShippingMethods();
         await this.taxRateService.initTaxRates();
+        await this.stockLocationService.initStockLocations();
         this.eventBus.publish(new initializer_event_1.InitializerEvent());
     }
     /**
@@ -79,14 +85,14 @@ let InitializerService = class InitializerService {
                     await new Promise(resolve => setTimeout(resolve, delayMs));
                 }
                 else {
-                    vendure_logger_1.Logger.error(`Timed out when awaiting the DB schema to be ready!`, undefined, e.stack);
+                    vendure_logger_1.Logger.error('Timed out when awaiting the DB schema to be ready!', undefined, e.stack);
                 }
             }
         }
     }
 };
 InitializerService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         zone_service_1.ZoneService,
         channel_service_1.ChannelService,
@@ -95,7 +101,9 @@ InitializerService = __decorate([
         shipping_method_service_1.ShippingMethodService,
         global_settings_service_1.GlobalSettingsService,
         tax_rate_service_1.TaxRateService,
-        event_bus_1.EventBus])
+        seller_service_1.SellerService,
+        event_bus_1.EventBus,
+        stock_location_service_1.StockLocationService])
 ], InitializerService);
 exports.InitializerService = InitializerService;
 //# sourceMappingURL=initializer.service.js.map

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

@@ -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;AAC7E,4CAAwC;AACxC,6EAAyE;AAEzE,4EAAwE;AACxE,gEAA4D;AAC5D,gFAA2E;AAC3E,0DAAsD;AACtD,gFAA2E;AAC3E,kEAA6D;AAC7D,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,cAA8B,EAC9B,QAAkB;QARlB,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,mBAAc,GAAd,cAAc,CAAgB;QAC9B,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,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,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;AAzDY,kBAAkB;IAD9B,mBAAU,EAAE;qCAGe,kDAAuB;QACtB,0BAAW;QACR,gCAAc;QACjB,0BAAW;QACF,4CAAoB;QACnB,+CAAqB;QACrB,+CAAqB;QAC5B,iCAAc;QACpB,oBAAQ;GAVrB,kBAAkB,CAyD9B;AAzDY,gDAAkB"}
+{"version":3,"file":"initializer.service.js","sourceRoot":"","sources":["../../src/service/initializer.service.ts"],"names":[],"mappings":"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"}

package/dist/service/service.module.js

@@ -24,6 +24,7 @@ const locale_string_hydrator_1 = require("./helpers/locale-string-hydrator/local
 const order_calculator_1 = require("./helpers/order-calculator/order-calculator");
 const order_merger_1 = require("./helpers/order-merger/order-merger");
 const order_modifier_1 = require("./helpers/order-modifier/order-modifier");
+const order_splitter_1 = require("./helpers/order-splitter/order-splitter");
 const order_state_machine_1 = require("./helpers/order-state-machine/order-state-machine");
 const password_cipher_1 = require("./helpers/password-cipher/password-cipher");
 const payment_state_machine_1 = require("./helpers/payment-state-machine/payment-state-machine");
@@ -60,8 +61,11 @@ const product_service_1 = require("./services/product.service");
 const promotion_service_1 = require("./services/promotion.service");
 const role_service_1 = require("./services/role.service");
 const search_service_1 = require("./services/search.service");
+const seller_service_1 = require("./services/seller.service");
 const session_service_1 = require("./services/session.service");
 const shipping_method_service_1 = require("./services/shipping-method.service");
+const stock_level_service_1 = require("./services/stock-level.service");
+const stock_location_service_1 = require("./services/stock-location.service");
 const stock_movement_service_1 = require("./services/stock-movement.service");
 const tag_service_1 = require("./services/tag.service");
 const tax_category_service_1 = require("./services/tax-category.service");
@@ -93,8 +97,11 @@ const services = [
     promotion_service_1.PromotionService,
     role_service_1.RoleService,
     search_service_1.SearchService,
+    seller_service_1.SellerService,
     session_service_1.SessionService,
     shipping_method_service_1.ShippingMethodService,
+    stock_level_service_1.StockLevelService,
+    stock_location_service_1.StockLocationService,
     stock_movement_service_1.StockMovementService,
     tag_service_1.TagService,
     tax_category_service_1.TaxCategoryService,
@@ -110,6 +117,7 @@ const helpers = [
     fulfillment_state_machine_1.FulfillmentStateMachine,
     order_merger_1.OrderMerger,
     order_modifier_1.OrderModifier,
+    order_splitter_1.OrderSplitter,
     payment_state_machine_1.PaymentStateMachine,
     list_query_builder_1.ListQueryBuilder,
     shipping_calculator_1.ShippingCalculator,
@@ -134,7 +142,7 @@ const helpers = [
 let ServiceCoreModule = class ServiceCoreModule {
 };
 ServiceCoreModule = __decorate([
-    common_1.Module({
+    (0, common_1.Module)({
         imports: [connection_module_1.ConnectionModule, config_module_1.ConfigModule, event_bus_module_1.EventBusModule, cache_module_1.CacheModule, job_queue_module_1.JobQueueModule],
         providers: [...services, ...helpers, initializer_service_1.InitializerService],
         exports: [...services, ...helpers],
@@ -151,7 +159,7 @@ exports.ServiceCoreModule = ServiceCoreModule;
 let ServiceModule = class ServiceModule {
 };
 ServiceModule = __decorate([
-    common_1.Module({
+    (0, common_1.Module)({
         imports: [ServiceCoreModule],
         exports: [ServiceCoreModule],
     })

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

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

package/dist/service/services/administrator.service.js

@@ -12,13 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdministratorService = void 0;
 const common_1 = require("@nestjs/common");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
+const typeorm_1 = require("typeorm");
 const errors_1 = require("../../common/error/errors");
 const index_1 = require("../../common/index");
 const config_1 = require("../../config");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const administrator_entity_1 = require("../../entity/administrator/administrator.entity");
 const native_authentication_method_entity_1 = require("../../entity/authentication-method/native-authentication-method.entity");
-const index_2 = require("../../entity/index");
+const role_entity_1 = require("../../entity/role/role.entity");
 const user_entity_1 = require("../../entity/user/user.entity");
 const event_bus_1 = require("../../event-bus");
 const administrator_event_1 = require("../../event-bus/events/administrator-event");
@@ -61,7 +62,7 @@ let AdministratorService = class AdministratorService {
         return this.listQueryBuilder
             .build(administrator_entity_1.Administrator, options, {
             relations: relations !== null && relations !== void 0 ? relations : ['user', 'user.roles'],
-            where: { deletedAt: null },
+            where: { deletedAt: (0, typeorm_1.IsNull)() },
             ctx,
         })
             .getManyAndCount()
@@ -75,25 +76,32 @@ let AdministratorService = class AdministratorService {
      * Get an Administrator by id.
      */
     findOne(ctx, administratorId, relations) {
-        return this.connection.getRepository(ctx, administrator_entity_1.Administrator).findOne(administratorId, {
+        return this.connection
+            .getRepository(ctx, administrator_entity_1.Administrator)
+            .findOne({
             relations: relations !== null && relations !== void 0 ? relations : ['user', 'user.roles'],
             where: {
-                deletedAt: null,
+                id: administratorId,
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
-        });
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
      * Get an Administrator based on the User id.
      */
     findOneByUserId(ctx, userId, relations) {
-        return this.connection.getRepository(ctx, administrator_entity_1.Administrator).findOne({
+        return this.connection
+            .getRepository(ctx, administrator_entity_1.Administrator)
+            .findOne({
             relations,
             where: {
                 user: { id: userId },
-                deletedAt: null,
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
-        });
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     /**
      * @description
@@ -102,6 +110,7 @@ let AdministratorService = class AdministratorService {
     async create(ctx, input) {
         await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
         const administrator = new administrator_entity_1.Administrator(input);
+        administrator.emailAddress = (0, index_1.normalizeEmailAddress)(input.emailAddress);
         administrator.user = await this.userService.createAdminUser(ctx, input.emailAddress, input.password);
         let createdAdministrator = await this.connection
             .getRepository(ctx, administrator_entity_1.Administrator)
@@ -125,7 +134,7 @@ let AdministratorService = class AdministratorService {
         if (input.roleIds) {
             await this.checkActiveUserCanGrantRoles(ctx, input.roleIds);
         }
-        let updatedAdministrator = patch_entity_1.patchEntity(administrator, input);
+        let updatedAdministrator = (0, patch_entity_1.patchEntity)(administrator, input);
         await this.connection.getRepository(ctx, administrator_entity_1.Administrator).save(administrator, { reload: false });
         if (input.emailAddress) {
             updatedAdministrator.user.identifier = input.emailAddress;
@@ -143,7 +152,7 @@ let AdministratorService = class AdministratorService {
             const isSoleSuperAdmin = await this.isSoleSuperadmin(ctx, input.id);
             if (isSoleSuperAdmin) {
                 const superAdminRole = await this.roleService.getSuperAdminRole(ctx);
-                if (!input.roleIds.find(id => index_1.idsAreEqual(id, superAdminRole.id))) {
+                if (!input.roleIds.find(id => (0, index_1.idsAreEqual)(id, superAdminRole.id))) {
                     throw new errors_1.InternalServerError('error.superadmin-must-have-superadmin-role');
                 }
             }
@@ -169,10 +178,11 @@ let AdministratorService = class AdministratorService {
      * updating an Administrator.
      */
     async checkActiveUserCanGrantRoles(ctx, roleIds) {
-        const roles = await this.connection
-            .getRepository(ctx, index_2.Role)
-            .findByIds(roleIds, { relations: ['channels'] });
-        const permissionsRequired = get_user_channels_permissions_1.getChannelPermissions(roles);
+        const roles = await this.connection.getRepository(ctx, role_entity_1.Role).find({
+            where: { id: (0, typeorm_1.In)(roleIds) },
+            relations: { channels: true },
+        });
+        const permissionsRequired = (0, get_user_channels_permissions_1.getChannelPermissions)(roles);
         for (const channelPermissions of permissionsRequired) {
             const activeUserHasRequiredPermissions = await this.roleService.userHasAllPermissionsOnChannel(ctx, channelPermissions.id, channelPermissions.permissions);
             if (!activeUserHasRequiredPermissions) {
@@ -210,7 +220,7 @@ let AdministratorService = class AdministratorService {
             throw new errors_1.InternalServerError('error.cannot-delete-sole-superadmin');
         }
         await this.connection.getRepository(ctx, administrator_entity_1.Administrator).update({ id }, { deletedAt: new Date() });
-        // tslint:disable-next-line:no-non-null-assertion
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await this.userService.softDelete(ctx, administrator.user.id);
         this.eventBus.publish(new administrator_event_1.AdministratorEvent(ctx, administrator, 'deleted', id));
         return {
@@ -232,7 +242,7 @@ let AdministratorService = class AdministratorService {
             return false;
         }
         else {
-            return index_1.idsAreEqual(superAdmins[0].id, id);
+            return (0, index_1.idsAreEqual)(superAdmins[0].id, id);
         }
     }
     /**
@@ -268,7 +278,9 @@ let AdministratorService = class AdministratorService {
                 .getRepository(administrator_entity_1.Administrator)
                 .findOne({
                 where: {
-                    user: superAdminUser,
+                    user: {
+                        id: superAdminUser.id,
+                    },
                 },
             });
             if (!superAdministrator) {
@@ -295,7 +307,7 @@ let AdministratorService = class AdministratorService {
     }
 };
 AdministratorService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_1.ConfigService,
         list_query_builder_1.ListQueryBuilder,

package/dist/service/services/administrator.service.js.map

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

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { AssetListOptions, AssignAssetsToChannelInput, CreateAssetInput, CreateAssetResult, DeletionResponse, UpdateAssetInput } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { ReadStream } from 'fs-extra';

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

@@ -23,6 +23,7 @@ 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 typeorm_1 = require("typeorm");
 const StringUtils_1 = require("typeorm/util/StringUtils");
 const request_context_1 = require("../../api/common/request-context");
 const error_result_1 = require("../../common/error/error-result");
@@ -34,8 +35,8 @@ const vendure_logger_1 = require("../../config/logger/vendure-logger");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const asset_entity_1 = require("../../entity/asset/asset.entity");
 const collection_entity_1 = require("../../entity/collection/collection.entity");
-const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
 const product_entity_1 = require("../../entity/product/product.entity");
+const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
 const asset_channel_event_1 = require("../../event-bus/events/asset-channel-event");
 const asset_event_1 = require("../../event-bus/events/asset-event");
@@ -45,7 +46,7 @@ const patch_entity_1 = require("../helpers/utils/patch-entity");
 const channel_service_1 = require("./channel.service");
 const role_service_1 = require("./role.service");
 const tag_service_1 = require("./tag.service");
-// tslint:disable-next-line:no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const sizeOf = require('image-size');
 /**
  * @description
@@ -74,9 +75,11 @@ let AssetService = class AssetService {
         });
     }
     findOne(ctx, id, relations) {
-        return this.connection.findOneInChannel(ctx, asset_entity_1.Asset, id, ctx.channelId, {
+        return this.connection
+            .findOneInChannel(ctx, asset_entity_1.Asset, id, ctx.channelId, {
             relations: relations !== null && relations !== void 0 ? relations : [],
-        });
+        })
+            .then(result => result !== null && result !== void 0 ? result : undefined);
     }
     findAll(ctx, options, relations) {
         var _a;
@@ -93,7 +96,7 @@ let AssetService = class AssetService {
                 .select('asset.id')
                 .from(asset_entity_1.Asset, 'asset')
                 .leftJoin('asset.tags', 'tags')
-                .where(`tags.value IN (:...tags)`);
+                .where('tags.value IN (:...tags)');
             if (operator === generated_types_1.LogicalOperator.AND) {
                 subquery.groupBy('asset.id').having('COUNT(asset.id) = :tagCount');
             }
@@ -118,9 +121,14 @@ let AssetService = class AssetService {
         else {
             entityWithFeaturedAsset = await this.connection
                 .getRepository(ctx, entityType)
-                .findOne(entity.id, {
-                relations: ['featuredAsset'],
-            });
+                .findOne({
+                where: { id: entity.id },
+                relations: {
+                    featuredAsset: true,
+                },
+                // TODO: satisfies
+            })
+                .then(result => result !== null && result !== void 0 ? result : undefined);
         }
         return (entityWithFeaturedAsset && entityWithFeaturedAsset.featuredAsset) || undefined;
     }
@@ -148,7 +156,7 @@ let AssetService = class AssetService {
         else if (0 < orderableAssets.length) {
             // the Assets are already loaded, but we need to limit them by Channel
             if ((_b = orderableAssets[0].asset) === null || _b === void 0 ? void 0 : _b.channels) {
-                orderableAssets = orderableAssets.filter(a => !!a.asset.channels.map(c => c.id).find(id => utils_1.idsAreEqual(id, ctx.channelId)));
+                orderableAssets = orderableAssets.filter(a => !!a.asset.channels.map(c => c.id).find(id => (0, utils_1.idsAreEqual)(id, ctx.channelId)));
             }
             else {
                 const assetsInChannel = await this.connection
@@ -158,7 +166,7 @@ let AssetService = class AssetService {
                     .where('asset.id IN (:...ids)', { ids: orderableAssets.map(a => a.assetId) })
                     .andWhere('asset_channel.id = :channelId', { channelId: ctx.channelId })
                     .getMany();
-                orderableAssets = orderableAssets.filter(oa => !!assetsInChannel.find(a => utils_1.idsAreEqual(a.id, oa.assetId)));
+                orderableAssets = orderableAssets.filter(oa => !!assetsInChannel.find(a => (0, utils_1.idsAreEqual)(a.id, oa.assetId)));
             }
         }
         else {
@@ -193,7 +201,7 @@ let AssetService = class AssetService {
         if (assetIds && assetIds.length) {
             const assets = await this.connection.findByIdsInChannel(ctx, asset_entity_1.Asset, assetIds, ctx.channelId, {});
             const sortedAssets = assetIds
-                .map(id => assets.find(a => utils_1.idsAreEqual(a.id, id)))
+                .map(id => assets.find(a => (0, utils_1.idsAreEqual)(a.id, id)))
                 .filter(shared_utils_1.notNullOrUndefined);
             await this.removeExistingOrderableAssets(ctx, entity);
             entity.assets = await this.createOrderableAssets(ctx, entity, sortedAssets);
@@ -226,7 +234,7 @@ let AssetService = class AssetService {
                 reject(e);
                 return;
             }
-            if (error_result_1.isGraphQlErrorResult(result)) {
+            if ((0, error_result_1.isGraphQlErrorResult)(result)) {
                 resolve(result);
                 return;
             }
@@ -251,7 +259,7 @@ let AssetService = class AssetService {
             input.focalPoint.x = to3dp(input.focalPoint.x);
             input.focalPoint.y = to3dp(input.focalPoint.y);
         }
-        patch_entity_1.patchEntity(asset, omit_1.omit(input, ['tags']));
+        (0, patch_entity_1.patchEntity)(asset, (0, omit_1.omit)(input, ['tags']));
         await this.customFieldRelationService.updateRelations(ctx, asset_entity_1.Asset, input, asset);
         if (input.tags) {
             asset.tags = await this.tagService.valuesToTags(ctx, input.tags);
@@ -271,7 +279,7 @@ let AssetService = class AssetService {
         });
         let channelsOfAssets = [];
         assets.forEach(a => a.channels.forEach(c => channelsOfAssets.push(c.id)));
-        channelsOfAssets = unique_1.unique(channelsOfAssets);
+        channelsOfAssets = (0, unique_1.unique)(channelsOfAssets);
         const usageCount = {
             products: 0,
             variants: 0,
@@ -347,7 +355,7 @@ let AssetService = class AssetService {
             return this.createAssetInternal(ctx, stream, filename, mimetype);
         }
         else {
-            throw new errors_1.InternalServerError(`error.path-should-be-a-string-got-buffer`);
+            throw new errors_1.InternalServerError('error.path-should-be-a-string-got-buffer');
         }
     }
     getMimeType(stream, filename) {
@@ -375,7 +383,7 @@ let AssetService = class AssetService {
                 await this.configService.assetOptions.assetStorageStrategy.deleteFile(asset.preview);
             }
             catch (e) {
-                vendure_logger_1.Logger.error(`error.could-not-delete-asset-file`, undefined, e.stack);
+                vendure_logger_1.Logger.error('error.could-not-delete-asset-file', undefined, e.stack);
             }
             this.eventBus.publish(new asset_event_1.AssetEvent(ctx, deletedAsset, 'deleted', deletedAsset.id));
         }
@@ -395,7 +403,7 @@ let AssetService = class AssetService {
     async createAssetInternal(ctx, stream, filename, mimetype, customFields) {
         const { assetOptions } = this.configService;
         if (!this.validateMimeType(mimetype)) {
-            return new generated_graphql_admin_errors_1.MimeTypeError(filename, mimetype);
+            return new generated_graphql_admin_errors_1.MimeTypeError({ fileName: filename, mimeType: mimetype });
         }
         const { assetPreviewStrategy, assetStorageStrategy } = assetOptions;
         const sourceFileName = await this.getSourceFileName(ctx, filename);
@@ -407,11 +415,12 @@ let AssetService = class AssetService {
             preview = await assetPreviewStrategy.generatePreviewImage(ctx, mimetype, sourceFile);
         }
         catch (e) {
-            vendure_logger_1.Logger.error(`Could not create Asset preview image: ${e.message}`, undefined, e.stack);
+            const message = typeof e.message === 'string' ? e.message : e.message.toString();
+            vendure_logger_1.Logger.error(`Could not create Asset preview image: ${message}`, undefined, e.stack);
             throw e;
         }
         const previewFileIdentifier = await assetStorageStrategy.writeFileFromBuffer(previewFileName, preview);
-        const type = utils_1.getAssetType(mimetype);
+        const type = (0, utils_1.getAssetType)(mimetype);
         const { width, height } = this.getDimensions(type === generated_types_1.AssetType.IMAGE ? sourceFile : preview);
         const asset = new asset_entity_1.Asset({
             type,
@@ -450,7 +459,7 @@ let AssetService = class AssetService {
             return { width, height };
         }
         catch (e) {
-            vendure_logger_1.Logger.error(`Could not determine Asset dimensions: ` + e);
+            vendure_logger_1.Logger.error('Could not determine Asset dimensions: ' + JSON.stringify(e));
             return { width: 0, height: 0 };
         }
     }
@@ -493,7 +502,7 @@ let AssetService = class AssetService {
             case 'Collection':
                 return 'collectionId';
             default:
-                return `${StringUtils_1.camelCase(entityName)}Id`;
+                return `${(0, StringUtils_1.camelCase)(entityName)}Id`;
         }
     }
     validateMimeType(mimeType) {
@@ -512,26 +521,26 @@ let AssetService = class AssetService {
     async findAssetUsages(ctx, asset) {
         const products = await this.connection.getRepository(ctx, product_entity_1.Product).find({
             where: {
-                featuredAsset: asset,
-                deletedAt: null,
+                featuredAsset: { id: asset.id },
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
         });
         const variants = await this.connection.getRepository(ctx, product_variant_entity_1.ProductVariant).find({
             where: {
-                featuredAsset: asset,
-                deletedAt: null,
+                featuredAsset: { id: asset.id },
+                deletedAt: (0, typeorm_1.IsNull)(),
             },
         });
         const collections = await this.connection.getRepository(ctx, collection_entity_1.Collection).find({
             where: {
-                featuredAsset: asset,
+                featuredAsset: { id: asset.id },
             },
         });
         return { products, variants, collections };
     }
 };
 AssetService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_service_1.ConfigService,
         list_query_builder_1.ListQueryBuilder,