npm - @vendure/core - Versions diffs - 2.2.0-next.6 → 2.2.0-next.8 - Mend

@vendure/core 2.2.0-next.6 → 2.2.0-next.8

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

package/dist/config/job-queue/job-queue-strategy.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import { InjectableStrategy } from '../../common';
-import { JobData } from '../../job-queue';
+import { JobData, JobQueueStrategyJobOptions } from '../../job-queue';
 import { Job } from '../../job-queue';
 /**
  * @description
@@ -21,7 +21,7 @@ export interface JobQueueStrategy extends InjectableStrategy {
      * @description
      * Add a new job to the queue.
      */
-    add<Data extends JobData<Data> = object>(job: Job<Data>): Promise<Job<Data>>;
+    add<Data extends JobData<Data> = object>(job: Job<Data>, jobOptions?: JobQueueStrategyJobOptions<Data>): Promise<Job<Data>>;
     /**
      * @description
      * Start the job queue

package/dist/config/logger/default-logger.js CHANGED Viewed

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultLogger = void 0;
-const chalk_1 = __importDefault(require("chalk"));
+const picocolors_1 = __importDefault(require("picocolors"));
 const vendure_logger_1 = require("./vendure-logger");
 const DEFAULT_CONTEXT = 'Vendure Server';
 /**
@@ -85,39 +85,39 @@ class DefaultLogger {
             return;
         }
         if (this.level >= vendure_logger_1.LogLevel.Error) {
-            this.logMessage(chalk_1.default.red('error'), chalk_1.default.red(this.ensureString(message) + (trace ? `\n${trace}` : '')), context);
+            this.logMessage(picocolors_1.default.red('error'), picocolors_1.default.red(this.ensureString(message) + (trace ? `\n${trace}` : '')), context);
         }
     }
     warn(message, context) {
         if (this.level >= vendure_logger_1.LogLevel.Warn) {
-            this.logMessage(chalk_1.default.yellow('warn'), chalk_1.default.yellow(this.ensureString(message)), context);
+            this.logMessage(picocolors_1.default.yellow('warn'), picocolors_1.default.yellow(this.ensureString(message)), context);
         }
     }
     info(message, context) {
         if (this.level >= vendure_logger_1.LogLevel.Info) {
-            this.logMessage(chalk_1.default.blue('info'), this.ensureString(message), context);
+            this.logMessage(picocolors_1.default.blue('info'), this.ensureString(message), context);
         }
     }
     verbose(message, context) {
         if (this.level >= vendure_logger_1.LogLevel.Verbose) {
-            this.logMessage(chalk_1.default.magenta('verbose'), this.ensureString(message), context);
+            this.logMessage(picocolors_1.default.magenta('verbose'), this.ensureString(message), context);
         }
     }
     debug(message, context) {
         if (this.level >= vendure_logger_1.LogLevel.Debug) {
-            this.logMessage(chalk_1.default.magenta('debug'), this.ensureString(message), context);
+            this.logMessage(picocolors_1.default.magenta('debug'), this.ensureString(message), context);
         }
     }
     logMessage(prefix, message, context) {
         process.stdout.write([prefix, this.logTimestamp(), this.logContext(context), message, '\n'].join(' '));
     }
     logContext(context) {
-        return chalk_1.default.cyan(`[${context || this.defaultContext}]`);
+        return picocolors_1.default.cyan(`[${context || this.defaultContext}]`);
     }
     logTimestamp() {
         if (this.timestamp) {
             const timestamp = new Date(Date.now()).toLocaleString(undefined, this.localeStringOptions);
-            return chalk_1.default.gray(timestamp + ' -');
+            return picocolors_1.default.gray(timestamp + ' -');
         }
         else {
             return '';

package/dist/config/logger/default-logger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"default-logger.js","sourceRoot":"","sources":["../../../src/config/logger/default-logger.ts"],"names":[],"mappings":";;;;;;AAAA,~~kDAA0B~~;~~AAE1B~~,qDAAmE;AAEnE,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEzC;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAa,aAAa;IActB,YAAY,OAAmD;QAb/D,gBAAgB;QAChB,UAAK,GAAa,yBAAQ,CAAC,IAAI,CAAC;QAExB,mBAAc,GAAG,eAAe,CAAC;QACxB,wBAAmB,GAAG;YACnC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,SAAS;YACjB,GAAG,EAAE,SAAS;YACd,KAAK,EAAE,SAAS;SACV,CAAC;QAIP,IAAI,CAAC,KAAK,GAAG,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,yBAAQ,CAAC,IAAI,CAAC;QAC9E,IAAI,CAAC,SAAS,GAAG,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,oBAAoB;QACvB,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAM,CAAC;QAC1B,IAAI,MAAM,YAAY,aAAa,EAAE,CAAC;YAClC,IAAI,MAAM,CAAC,KAAK,KAAK,yBAAQ,CAAC,IAAI,EAAE,CAAC;gBACjC,IAAI,CAAC,gBAAgB,GAAG,yBAAQ,CAAC,IAAI,CAAC;gBACtC,MAAM,CAAC,KAAK,GAAG,yBAAQ,CAAC,IAAI,CAAC;YACjC,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,uBAAuB;QAC1B,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAM,CAAC;QAC1B,IAAI,MAAM,YAAY,aAAa,IAAI,aAAa,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YAClF,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC,gBAAgB,CAAC;QAClD,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,cAAsB;QACpC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,KAA0B;QAC/D,IAAI,OAAO,KAAK,mBAAmB,IAAI,IAAI,CAAC,KAAK,GAAG,yBAAQ,CAAC,OAAO,EAAE,CAAC;YACnE,sEAAsE;YACtE,sEAAsE;YACtE,0EAA0E;YAC1E,uEAAuE;YACvE,mCAAmC;YACnC,OAAO;QACX,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,IAAI,yBAAQ,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,UAAU,CACX,~~eAAK~~,CAAC,GAAG,CAAC,OAAO,CAAC,~~EAClB~~,~~eAAK~~,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,~~EACnE~~,OAAO,CACV,CAAC;QACN,CAAC;IACL,CAAC;IACD,IAAI,CAAC,OAAe,EAAE,OAAgB;QAClC,IAAI,IAAI,CAAC,KAAK,IAAI,yBAAQ,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,CAAC,~~eAAK~~,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,~~eAAK~~,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;~~QAC7F~~,CAAC;IACL,CAAC;IACD,IAAI,CAAC,OAAe,EAAE,OAAgB;QAClC,IAAI,IAAI,CAAC,KAAK,IAAI,yBAAQ,CAAC,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,CAAC,~~eAAK~~,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;~~QAC7E~~,CAAC;IACL,CAAC;IACD,OAAO,CAAC,OAAe,EAAE,OAAgB;QACrC,IAAI,IAAI,CAAC,KAAK,IAAI,yBAAQ,CAAC,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,UAAU,CAAC,~~eAAK~~,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;~~QACnF~~,CAAC;IACL,CAAC;IACD,KAAK,CAAC,OAAe,EAAE,OAAgB;QACnC,IAAI,IAAI,CAAC,KAAK,IAAI,yBAAQ,CAAC,KAAK,EAAE,CAAC;YAC/B,IAAI,CAAC,UAAU,CAAC,~~eAAK~~,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;~~QACjF~~,CAAC;IACL,CAAC;IAEO,UAAU,CAAC,MAAc,EAAE,OAAe,EAAE,OAAgB;QAChE,OAAO,CAAC,MAAM,CAAC,KAAK,CAChB,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CACnF,CAAC;IACN,CAAC;IAEO,UAAU,CAAC,OAAgB;QAC/B,OAAO,~~eAAK~~,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;~~IAC7D~~,CAAC;IAEO,YAAY;QAChB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC3F,OAAO,~~eAAK~~,CAAC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;~~QACxC~~,CAAC;aAAM,CAAC;YACJ,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,OAAgC;QACjD,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACpF,CAAC;CACJ;AArHD,sCAqHC"}
1	+ {"version":3,"file":"default-logger.js","sourceRoot":"","sources":["../../../src/config/logger/default-logger.ts"],"names":[],"mappings":"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"}

package/dist/config/promotion/index.d.ts CHANGED Viewed

@@ -12,42 +12,22 @@ export * from './conditions/contains-products-condition';
 export * from './conditions/customer-group-condition';
 export * from './conditions/buy-x-get-y-free-condition';
 export * from './utils/facet-value-checker';
-export declare const defaultPromotionActions: (import("./promotion-action").PromotionItemAction<{}, import("./promotion-condition").PromotionCondition<{
-    amountX: {
+export declare const defaultPromotionActions: (import("./promotion-action").PromotionOrderAction<{
+    discount: {
         type: "int";
-        defaultValue: number;
-    };
-    variantIdsX: {
-        type: "ID";
-        list: true;
         ui: {
             component: string;
         };
-        label: {
-            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
-            value: string;
-        }[];
-    };
-    amountY: {
-        type: "int";
-        defaultValue: number;
     };
-    variantIdsY: {
-        type: "ID";
-        list: true;
+}, []> | import("./promotion-action").PromotionOrderAction<{
+    discount: {
+        type: "float";
         ui: {
             component: string;
+            suffix: string;
         };
-        label: {
-            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
-            value: string;
-        }[];
-    };
-}, "buy_x_get_y_free", false | {
-    freeItemsPerLine: {
-        [lineId: string]: number;
     };
-}>[]> | import("./promotion-action").PromotionItemAction<{
+}, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "float";
         ui: {
@@ -62,21 +42,6 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
             component: string;
         };
     };
-}, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "int";
-        ui: {
-            component: string;
-        };
-    };
-}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "float";
-        ui: {
-            component: string;
-            suffix: string;
-        };
-    };
 }, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "float";
@@ -96,8 +61,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
             value: string;
         }[];
     };
-}, []>)[];
-export declare const defaultPromotionConditions: (import("./promotion-condition").PromotionCondition<{
+}, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionItemAction<{}, import("./promotion-condition").PromotionCondition<{
     amountX: {
         type: "int";
         defaultValue: number;
@@ -132,7 +96,32 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
     freeItemsPerLine: {
         [lineId: string]: number;
     };
-}> | import("./promotion-condition").PromotionCondition<{
+}>[]>)[];
+export declare const defaultPromotionConditions: (import("./promotion-condition").PromotionCondition<{
+    amount: {
+        type: "int";
+        defaultValue: number;
+        ui: {
+            component: string;
+        };
+    };
+    taxInclusive: {
+        type: "boolean";
+        defaultValue: false;
+    };
+}, "minimum_order_amount", boolean> | import("./promotion-condition").PromotionCondition<{
+    minimum: {
+        type: "int";
+        defaultValue: number;
+    };
+    facets: {
+        type: "ID";
+        list: true;
+        ui: {
+            component: string;
+        };
+    };
+}, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
     minimum: {
         type: "int";
         defaultValue: number;
@@ -160,27 +149,38 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         }[];
     };
 }, "customer_group", boolean> | import("./promotion-condition").PromotionCondition<{
-    minimum: {
+    amountX: {
         type: "int";
         defaultValue: number;
     };
-    facets: {
+    variantIdsX: {
         type: "ID";
         list: true;
         ui: {
             component: string;
         };
+        label: {
+            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
+            value: string;
+        }[];
     };
-}, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
-    amount: {
+    amountY: {
         type: "int";
         defaultValue: number;
+    };
+    variantIdsY: {
+        type: "ID";
+        list: true;
         ui: {
             component: string;
         };
+        label: {
+            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
+            value: string;
+        }[];
     };
-    taxInclusive: {
-        type: "boolean";
-        defaultValue: false;
+}, "buy_x_get_y_free", false | {
+    freeItemsPerLine: {
+        [lineId: string]: number;
     };
-}, "minimum_order_amount", boolean>)[];
+}>)[];

package/dist/connection/connection.module.d.ts CHANGED Viewed

@@ -3,5 +3,5 @@ import { DataSourceOptions } from 'typeorm';
 export declare class ConnectionModule {
     static forRoot(): DynamicModule;
     static forPlugin(): DynamicModule;
-    static getTypeOrmLogger(dbConnectionOptions: DataSourceOptions): import("typeorm").Logger | "debug" | "advanced-console" | "simple-console" | "file";
+    static getTypeOrmLogger(dbConnectionOptions: DataSourceOptions): "debug" | "advanced-console" | "simple-console" | "file" | import("typeorm").Logger;
 }

package/dist/connection/transactional-connection.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import { ID, Type } from '@vendure/common/lib/shared-types';
-import { Connection, EntitySchema, FindOneOptions, ObjectLiteral, ObjectType, Repository } from 'typeorm';
-import { FindManyOptions } from 'typeorm/find-options/FindManyOptions';
+import { DataSource, EntitySchema, FindOneOptions, FindManyOptions, ObjectLiteral, ObjectType, Repository } from 'typeorm';
 import { RequestContext } from '../api/common/request-context';
 import { TransactionIsolationLevel } from '../api/decorators/transaction.decorator';
 import { ChannelAware } from '../common/types/common-types';
@@ -20,16 +19,16 @@ import { GetEntityOrThrowOptions } from './types';
  * @docsCategory data-access
  */
 export declare class TransactionalConnection {
-    private connection;
+    private dataSource;
     private transactionWrapper;
-    constructor(connection: Connection, transactionWrapper: TransactionWrapper);
+    constructor(dataSource: DataSource, transactionWrapper: TransactionWrapper);
     /**
      * @description
      * The plain TypeORM Connection object. Should be used carefully as any operations
      * performed with this connection will not be performed within any outer
      * transactions.
      */
-    get rawConnection(): Connection;
+    get rawConnection(): DataSource;
     /**
      * @description
      * Returns a TypeORM repository. Note that when no RequestContext is supplied, the repository will not

package/dist/connection/transactional-connection.js CHANGED Viewed

@@ -25,11 +25,12 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionalConnection = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
-const typeorm_2 = require("typeorm");
+const typeorm_decorators_1 = require("@nestjs/typeorm/dist/common/typeorm.decorators");
+const typeorm_1 = require("typeorm");
 const request_context_1 = require("../api/common/request-context");
 const constants_1 = require("../common/constants");
 const errors_1 = require("../common/error/errors");
+const tree_relations_qb_joiner_1 = require("../service/helpers/utils/tree-relations-qb-joiner");
 const transaction_wrapper_1 = require("./transaction-wrapper");
 /**
  * @description
@@ -44,8 +45,8 @@ const transaction_wrapper_1 = require("./transaction-wrapper");
  * @docsCategory data-access
  */
 let TransactionalConnection = class TransactionalConnection {
-    constructor(connection, transactionWrapper) {
-        this.connection = connection;
+    constructor(dataSource, transactionWrapper) {
+        this.dataSource = dataSource;
         this.transactionWrapper = transactionWrapper;
     }
     /**
@@ -55,7 +56,7 @@ let TransactionalConnection = class TransactionalConnection {
      * transactions.
      */
     get rawConnection() {
-        return this.connection;
+        return this.dataSource;
     }
     getRepository(ctxOrTarget, maybeTarget) {
         if (ctxOrTarget instanceof request_context_1.RequestContext) {
@@ -182,15 +183,20 @@ let TransactionalConnection = class TransactionalConnection {
      * the given Channel.
      */
     findOneInChannel(ctx, entity, id, channelId, options = {}) {
-        const qb = this.getRepository(ctx, entity).createQueryBuilder('entity').setFindOptions(options);
-        if (options.loadEagerRelations !== false) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            typeorm_2.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
-        }
+        const qb = this.getRepository(ctx, entity).createQueryBuilder('entity');
+        if (Array.isArray(options.relations) && options.relations.length > 0) {
+            const joinedRelations = (0, tree_relations_qb_joiner_1.joinTreeRelationsDynamically)(qb, entity, options.relations);
+            // Remove any relations which are related to the 'collection' tree, as these are handled separately
+            // to avoid duplicate joins.
+            options.relations = options.relations.filter(relationPath => !joinedRelations.has(relationPath));
+        }
+        qb.setFindOptions(Object.assign({ relationLoadStrategy: 'query' }, options));
         qb.leftJoin('entity.channels', '__channel')
             .andWhere('entity.id = :id', { id })
             .andWhere('__channel.id = :channelId', { channelId });
-        return qb.getOne().then(result => result !== null && result !== void 0 ? result : undefined);
+        return qb.getOne().then(result => {
+            return result !== null && result !== void 0 ? result : undefined;
+        });
     }
     /**
      * @description
@@ -203,11 +209,14 @@ let TransactionalConnection = class TransactionalConnection {
         if (ids.length === 0) {
             return Promise.resolve([]);
         }
-        const qb = this.getRepository(ctx, entity).createQueryBuilder('entity').setFindOptions(options);
-        if (options.loadEagerRelations !== false) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            typeorm_2.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
+        const qb = this.getRepository(ctx, entity).createQueryBuilder('entity');
+        if (Array.isArray(options.relations) && options.relations.length > 0) {
+            const joinedRelations = (0, tree_relations_qb_joiner_1.joinTreeRelationsDynamically)(qb, entity, options.relations);
+            // Remove any relations which are related to the 'collection' tree, as these are handled separately
+            // to avoid duplicate joins.
+            options.relations = options.relations.filter(relationPath => !joinedRelations.has(relationPath));
         }
+        qb.setFindOptions(Object.assign({ relationLoadStrategy: 'query' }, options));
         return qb
             .leftJoin('entity.channels', 'channel')
             .andWhere('entity.id IN (:...ids)', { ids })
@@ -221,8 +230,8 @@ let TransactionalConnection = class TransactionalConnection {
 exports.TransactionalConnection = TransactionalConnection;
 exports.TransactionalConnection = TransactionalConnection = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_1.InjectConnection)()),
-    __metadata("design:paramtypes", [typeorm_2.Connection,
+    __param(0, (0, typeorm_decorators_1.InjectDataSource)()),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
         transaction_wrapper_1.TransactionWrapper])
 ], TransactionalConnection);
 //# sourceMappingURL=transactional-connection.js.map

package/dist/connection/transactional-connection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,~~6CAAmD~~;~~AAEnD~~,~~qCASiB~~;~~AAGjB~~,mEAA+D;AAE/D,mDAA8D;AAC9D,mDAA6D;~~AAI7D~~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~~cAAc~~,CAAC,OAAO,CAAC,CAAC~~;QAChG~~,IAAI,OAAO,CAAC,~~kBAAkB~~,~~KAAK~~,~~KAAK~~,EAAE,CAAC;~~YACvC~~,~~oEAAoE;YACpE~~,~~0BAAgB~~,~~CAAC~~,~~kBAAkB~~,~~CAAC~~,EAAE,EAAE,EAAE,CAAC,~~KAAK~~,~~EAAE~~,EAAE,CAAC,~~aAAa~~,CAAC,~~SAAU~~,CAAC,~~QAAQ~~,CAAC,CAAC;~~QAC5F~~,CAAC;QACD,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,WAAW,CAAC;aACtC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,CAAC;aACnC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;QAE1D,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,~~CAAC~~,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,CAAC,CAAC;~~IAC3D~~,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CACd,GAAmB,EACnB,MAAe,EACf,GAAS,EACT,SAAa,EACb,OAA2B;QAE3B,gGAAgG;QAChG,+BAA+B;QAC/B,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,~~cAAc~~,CAAC,OAAO,CAAC,CAAC~~;QAChG~~,IAAI,OAAO,CAAC,~~kBAAkB~~,~~KAAK~~,~~KAAK~~,EAAE,CAAC;~~YACvC~~,~~oEAAoE~~;~~YACpE~~,~~0BAAgB~~,CAAC,~~kBAAkB~~,CAAC,~~EAAE~~,~~EAAE~~,~~EAAE~~,CAAC,~~KAAK~~,~~EAAE~~,EAAE,CAAC,~~aAAa~~,CAAC,~~SAAU~~,CAAC,~~QAAQ~~,CAAC,CAAC;~~QAC5F~~,CAAC;~~QACD~~,OAAO,EAAE;aACJ,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;aACtC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,CAAC;aAC3C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAClD,OAAO,EAAE,CAAC;IACnB,CAAC;IAEO,qBAAqB,CAAC,GAAmB;QAC7C,OAAQ,GAAW,CAAC,mCAAuB,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;~~AA5RY~~,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,~~0BAAgB~~,GAAE,CAAA;qCAAqB,oBAAU;QACtB,wCAAkB;GAHzC,uBAAuB,~~CA4RnC~~"}
1	+ {"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":"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"}

package/dist/entity/register-custom-entity-fields.js CHANGED Viewed

@@ -92,7 +92,7 @@ ctor, translation = false) {
                 }
             }
             const relationFieldsCount = customFields.filter(f => f.type === 'relation').length;
-            const nonLocaleStringFieldsCount = customFields.filter(f => f.type !== 'localeString' && f.type !== 'relation').length;
+            const nonLocaleStringFieldsCount = customFields.filter(f => f.type !== 'localeString' && f.type !== 'localeText' && f.type !== 'relation').length;
             if (0 < relationFieldsCount && nonLocaleStringFieldsCount === 0) {
                 // if (customFields.filter(f => f.type === 'relation').length === customFields.length) {
                 // If there are _only_ relational customFields defined for an Entity, then TypeORM

package/dist/entity/register-custom-entity-fields.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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~~CAC1D~~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"}
1	+ {"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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"}

package/dist/event-bus/event-bus.d.ts CHANGED Viewed

@@ -3,6 +3,44 @@ import { Type } from '@vendure/common/lib/shared-types';
 import { Observable } from 'rxjs';
 import { TransactionSubscriber } from '../connection/transaction-subscriber';
 import { VendureEvent } from './vendure-event';
+/**
+ * @description
+ * Options for registering a blocking event handler.
+ *
+ * @since 2.2.0
+ * @docsCategory events
+ */
+export type BlockingEventHandlerOptions<T extends VendureEvent> = {
+    /**
+     * @description
+     * The event type to which the handler should listen.
+     * Can be a single event type or an array of event types.
+     */
+    event: Type<T> | Array<Type<T>>;
+    /**
+     * @description
+     * The handler function which will be executed when the event is published.
+     * If the handler returns a Promise, the event publishing code will wait for the Promise to resolve
+     * before continuing. Any errors thrown by the handler will cause the event publishing code to fail.
+     */
+    handler: (event: T) => void | Promise<void>;
+    /**
+     * @description
+     * A unique identifier for the handler. This can then be used to specify the order in which
+     * handlers should be executed using the `before` and `after` options in other handlers.
+     */
+    id: string;
+    /**
+     * @description
+     * The ID of another handler which this handler should execute before.
+     */
+    before?: string;
+    /**
+     * @description
+     * The ID of another handler which this handler should execute after.
+     */
+    after?: string;
+};
 /**
  * @description
  * The EventBus is used to globally publish events which can then be subscribed to.
@@ -50,12 +88,18 @@ export declare class EventBus implements OnModuleDestroy {
     private transactionSubscriber;
     private eventStream;
     private destroy$;
+    private blockingEventHandlers;
     constructor(transactionSubscriber: TransactionSubscriber);
     /**
      * @description
      * Publish an event which any subscribers can react to.
+     *
+     * @example
+     * ```ts
+     * await eventBus.publish(new SomeEvent());
+     * ```
      */
-    publish<T extends VendureEvent>(event: T): void;
+    publish<T extends VendureEvent>(event: T): Promise<void>;
     /**
      * @description
      * Returns an RxJS Observable stream of events of the given type.
@@ -76,8 +120,42 @@ export declare class EventBus implements OnModuleDestroy {
      * data related to the event.
      */
     filter<T extends VendureEvent>(predicate: (event: VendureEvent) => boolean): Observable<T>;
+    /**
+     * @description
+     * Register an event handler function which will be executed when an event of the given type is published,
+     * and will block execution of the code which published the event until the handler has completed.
+     *
+     * This is useful when you need assurance that the event handler has successfully completed, and you want
+     * the triggering code to fail if the handler fails.
+     *
+     * ::: warning
+     * This API should be used with caution, as errors or performance issues in the handler can cause the
+     * associated operation to be slow or fail entirely. For this reason, any handler which takes longer than
+     * 100ms to execute will log a warning. Any non-trivial task to be performed in a blocking event handler
+     * should be offloaded to a background job using the {@link JobQueueService}.
+     *
+     * Also, be aware that the handler will be executed in the _same database transaction_ as the code which published
+     * the event (as long as you pass the `ctx` object from the event to any TransactionalConnection calls).
+     * :::
+     *
+     * @example
+     * ```ts
+     * eventBus.registerBlockingEventHandler({
+     *   event: OrderStateTransitionEvent,
+     *   id: 'my-order-state-transition-handler',
+     *   handler: async (event) => {
+     *     // perform some synchronous task
+     *   }
+     * });
+     * ```
+     *
+     * @since 2.2.0
+     */
+    registerBlockingEventHandler<T extends VendureEvent>(handlerOptions: BlockingEventHandlerOptions<T>): void;
     /** @internal */
     onModuleDestroy(): any;
+    private executeBlockingEventHandlers;
+    private orderEventHandlers;
     /**
      * If the Event includes a RequestContext property, we need to check for any active transaction
      * associated with it, and if there is one, we await that transaction to either commit or rollback