@vendure/core 2.0.0-next.1 → 2.0.0-next.10

package/dist/config/system/health-check-strategy.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=health-check-strategy.js.map

package/dist/config/system/health-check-strategy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"health-check-strategy.js","sourceRoot":"","sources":["../../../src/config/system/health-check-strategy.ts"],"names":[],"mappings":""}

package/dist/config/vendure-config.d.ts

@@ -7,6 +7,7 @@ import { ConnectionOptions } from 'typeorm';
 import { Middleware } from '../common';
 import { PermissionDefinition } from '../common/permission-definition';
 import { JobBufferStorageStrategy } from '../job-queue/job-buffer/job-buffer-storage-strategy';
+import { AssetImportStrategy } from './asset-import-strategy/asset-import-strategy';
 import { AssetNamingStrategy } from './asset-naming-strategy/asset-naming-strategy';
 import { AssetPreviewStrategy } from './asset-preview-strategy/asset-preview-strategy';
 import { AssetStorageStrategy } from './asset-storage-strategy/asset-storage-strategy';
@@ -18,6 +19,7 @@ import { ProductVariantPriceCalculationStrategy } from './catalog/product-varian
 import { StockDisplayStrategy } from './catalog/stock-display-strategy';
 import { CustomFields } from './custom-field/custom-field-types';
 import { EntityIdStrategy } from './entity-id-strategy/entity-id-strategy';
+import { EntityMetadataModifier } from './entity-metadata/entity-metadata-modifier';
 import { CustomFulfillmentProcess } from './fulfillment/custom-fulfillment-process';
 import { FulfillmentHandler } from './fulfillment/fulfillment-handler';
 import { JobQueueStrategy } from './job-queue/job-queue-strategy';
@@ -38,6 +40,7 @@ import { PromotionCondition } from './promotion/promotion-condition';
 import { SessionCacheStrategy } from './session-cache/session-cache-strategy';
 import { ShippingCalculator } from './shipping-method/shipping-calculator';
 import { ShippingEligibilityChecker } from './shipping-method/shipping-eligibility-checker';
+import { HealthCheckStrategy } from './system/health-check-strategy';
 import { TaxLineCalculationStrategy } from './tax/tax-line-calculation-strategy';
 import { TaxZoneStrategy } from './tax/tax-zone-strategy';
 /**
@@ -174,6 +177,26 @@ export interface ApiOptions {
      * @default []
      */
     apolloServerPlugins?: PluginDefinition[];
+    /**
+     * @description
+     * Controls whether introspection of the GraphQL APIs is enabled. For production, it is recommended to disable
+     * introspection, since exposing your entire schema can allow an attacker to trivially learn all operations
+     * and much more easily find any potentially exploitable queries.
+     *
+     * **Note:** when introspection is disabled, tooling which relies on it for things like autocompletion
+     * will not work.
+     *
+     * @example
+     * ```TypeScript
+     * {
+     *   introspection: process.env.NODE_ENV !== 'production'
+     * }
+     * ```
+     *
+     * @default true
+     * @since 1.5.0
+     */
+    introspection?: boolean;
 }
 /**
  * @description
@@ -725,6 +748,14 @@ export interface ImportExportOptions {
      * @default __dirname
      */
     importAssetsDir?: string;
+    /**
+     * @description
+     * This strategy determines how asset files get imported based on the path given in the
+     * import CSV or via the {@link AssetImporter} `getAssets()` method.
+     *
+     * @since 1.7.0
+     */
+    assetImportStrategy?: AssetImportStrategy;
 }
 /**
  * @description
@@ -772,6 +803,8 @@ export interface JobQueueOptions {
      *
      * For example, we might have a staging and a production deployment in the same account/project and
      * each one will need its own task queue. We can achieve this with a prefix.
+     *
+     * @since 1.5.0
      */
     prefix?: string;
 }
@@ -816,6 +849,35 @@ export interface EntityOptions {
      * @default 30000
      */
     zoneCacheTtl?: number;
+    /**
+     * @description
+     * Allows the metadata of the built-in TypeORM entities to be manipulated. This allows you
+     * to do things like altering data types, adding indices etc. This is an advanced feature
+     * which should be used with some caution as it will result in DB schema changes. For examples
+     * see {@link EntityMetadataModifier}.
+     *
+     * @since 1.6.0
+     * @default []
+     */
+    metadataModifiers?: EntityMetadataModifier[];
+}
+/**
+ * @description
+ * Options relating to system functions.
+ *
+ * @since 1.6.0
+ * @docsCategory configuration
+ */
+export interface SystemOptions {
+    /**
+     * @description
+     * Defines an array of {@link HealthCheckStrategy} instances which are used by the `/health` endpoint to verify
+     * that any critical systems which the Vendure server depends on are also healthy.
+     *
+     * @default [TypeORMHealthCheckStrategy]
+     * @since 1.6.0
+     */
+    healthChecks?: HealthCheckStrategy[];
 }
 /**
  * @description
@@ -938,6 +1000,13 @@ export interface VendureConfig {
      * Configures how the job queue is persisted and processed.
      */
     jobQueueOptions?: JobQueueOptions;
+    /**
+     * @description
+     * Configures system options
+     *
+     * @since 1.6.0
+     */
+    systemOptions?: SystemOptions;
 }
 /**
  * @description
@@ -959,6 +1028,7 @@ export interface RuntimeVendureConfig extends Required<VendureConfig> {
     promotionOptions: Required<PromotionOptions>;
     shippingOptions: Required<ShippingOptions>;
     taxOptions: Required<TaxOptions>;
+    systemOptions: Required<SystemOptions>;
 }
 declare type DeepPartialSimple<T> = {
     [P in keyof T]?: null | (T[P] extends Array<infer U> ? Array<DeepPartialSimple<U>> : T[P] extends ReadonlyArray<infer X> ? ReadonlyArray<DeepPartialSimple<X>> : T[P] extends Type<any> ? T[P] : DeepPartialSimple<T[P]>);

package/dist/connection/transaction-subscriber.d.ts

@@ -3,7 +3,19 @@ import { EntityManager } from 'typeorm/entity-manager/EntityManager';
 import { QueryRunner } from 'typeorm/query-runner/QueryRunner';
 import { TransactionCommitEvent } from 'typeorm/subscriber/event/TransactionCommitEvent';
 import { TransactionRollbackEvent } from 'typeorm/subscriber/event/TransactionRollbackEvent';
+/**
+ * This error should be thrown by an event subscription if types do not match
+ *
+ * @internal
+ */
+export declare class TransactionSubscriberError extends Error {
+}
+export declare type TransactionSubscriberEventType = 'commit' | 'rollback';
 export interface TransactionSubscriberEvent {
+    /**
+     * Event type. Either commit or rollback.
+     */
+    type: TransactionSubscriberEventType;
     /**
      * Connection used in the event.
      */
@@ -28,10 +40,12 @@ export interface TransactionSubscriberEvent {
  */
 export declare class TransactionSubscriber implements EntitySubscriberInterface {
     private connection;
-    private commit$;
-    private rollback$;
+    private subject$;
     constructor(connection: Connection);
     afterTransactionCommit(event: TransactionCommitEvent): void;
     afterTransactionRollback(event: TransactionRollbackEvent): void;
+    awaitCommit(queryRunner: QueryRunner): Promise<QueryRunner>;
+    awaitRollback(queryRunner: QueryRunner): Promise<QueryRunner>;
     awaitRelease(queryRunner: QueryRunner): Promise<QueryRunner>;
+    private awaitTransactionEvent;
 }

package/dist/connection/transaction-subscriber.js

@@ -13,12 +13,20 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 var TransactionSubscriber_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TransactionSubscriber = void 0;
+exports.TransactionSubscriber = exports.TransactionSubscriberError = void 0;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const typeorm_2 = require("typeorm");
+/**
+ * This error should be thrown by an event subscription if types do not match
+ *
+ * @internal
+ */
+class TransactionSubscriberError extends Error {
+}
+exports.TransactionSubscriberError = TransactionSubscriberError;
 /**
  * This subscriber listens to all transaction commit/rollback events emitted by TypeORM
  * so that we can be notified as soon as a particular queryRunner's transactions ends.
@@ -29,21 +37,34 @@ const typeorm_2 = require("typeorm");
 let TransactionSubscriber = TransactionSubscriber_1 = class TransactionSubscriber {
     constructor(connection) {
         this.connection = connection;
-        this.commit$ = new rxjs_1.Subject();
-        this.rollback$ = new rxjs_1.Subject();
+        this.subject$ = new rxjs_1.Subject();
         if (!connection.subscribers.find(subscriber => subscriber.constructor === TransactionSubscriber_1)) {
             connection.subscribers.push(this);
         }
     }
     afterTransactionCommit(event) {
-        this.commit$.next(event);
+        this.subject$.next(Object.assign({ type: 'commit' }, event));
     }
     afterTransactionRollback(event) {
-        this.rollback$.next(event);
+        this.subject$.next(Object.assign({ type: 'rollback' }, event));
+    }
+    awaitCommit(queryRunner) {
+        return this.awaitTransactionEvent(queryRunner, 'commit');
+    }
+    awaitRollback(queryRunner) {
+        return this.awaitTransactionEvent(queryRunner, 'rollback');
     }
     awaitRelease(queryRunner) {
+        return this.awaitTransactionEvent(queryRunner);
+    }
+    awaitTransactionEvent(queryRunner, type) {
         if (queryRunner.isTransactionActive) {
-            return (0, rxjs_1.lastValueFrom)((0, rxjs_1.merge)(this.commit$, this.rollback$).pipe((0, operators_1.filter)(event => event.queryRunner === queryRunner), (0, operators_1.take)(1), (0, operators_1.map)(event => event.queryRunner), 
+            return (0, rxjs_1.lastValueFrom)(this.subject$
+                .pipe((0, operators_1.filter)(event => !event.queryRunner.isTransactionActive && event.queryRunner === queryRunner), (0, operators_1.take)(1), (0, operators_1.tap)(event => {
+                if (type && event.type !== type) {
+                    throw new TransactionSubscriberError(`Unexpected event type: ${event.type}. Expected ${type}.`);
+                }
+            }), (0, operators_1.map)(event => event.queryRunner), 
             // This `delay(0)` call appears to be necessary with the upgrade to TypeORM
             // v0.2.41, otherwise an active queryRunner can still get picked up in an event
             // subscriber function. This is manifested by the e2e test

package/dist/connection/transaction-subscriber.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-subscriber.js","sourceRoot":"","sources":["../../src/connection/transaction-subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+BAAqD;AACrD,8CAA0D;AAC1D,qCAAgE;AAuBhE;;;;;;GAMG;AAEH,IAAa,qBAAqB,6BAAlC,MAAa,qBAAqB;IAI9B,YAAwC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAHtD,YAAO,GAAG,IAAI,cAAO,EAA8B,CAAC;QACpD,cAAS,GAAG,IAAI,cAAO,EAA8B,CAAC;QAG1D,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,KAAK,uBAAqB,CAAC,EAAE;YAC9F,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACL,CAAC;IAED,sBAAsB,CAAC,KAA6B;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,wBAAwB,CAAC,KAA+B;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,YAAY,CAAC,WAAwB;QACjC,IAAI,WAAW,CAAC,mBAAmB,EAAE;YACjC,OAAO,IAAA,oBAAa,EAChB,IAAA,YAAK,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CACpC,IAAA,kBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,KAAK,WAAW,CAAC,EAClD,IAAA,gBAAI,EAAC,CAAC,CAAC,EACP,IAAA,eAAG,EAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC;YAC/B,2EAA2E;YAC3E,+EAA+E;YAC/E,0DAA0D;YAC1D,0EAA0E;YAC1E,wEAAwE;YACxE,mEAAmE;YACnE,IAAA,iBAAK,EAAC,CAAC,CAAC,CACX,CACJ,CAAC;SACL;aAAM;YACH,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;CACJ,CAAA;AAtCY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAKI,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCAAqB,oBAAU;GAJrD,qBAAqB,CAsCjC;AAtCY,sDAAqB"}
+{"version":3,"file":"transaction-subscriber.js","sourceRoot":"","sources":["../../src/connection/transaction-subscriber.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,+BAAsE;AACtE,8CAA+D;AAC/D,qCAAgE;AAMhE;;;;GAIG;AACH,MAAa,0BAA2B,SAAQ,KAAK;CAAG;AAAxD,gEAAwD;AA0BxD;;;;;;GAMG;AAEH,IAAa,qBAAqB,6BAAlC,MAAa,qBAAqB;IAG9B,YAAwC,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QAFtD,aAAQ,GAAG,IAAI,cAAO,EAA8B,CAAC;QAGzD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,KAAK,uBAAqB,CAAC,EAAE;YAC9F,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACL,CAAC;IAED,sBAAsB,CAAC,KAA6B;QAChD,IAAI,CAAC,QAAQ,CAAC,IAAI,iBACd,IAAI,EAAE,QAAQ,IACX,KAAK,EACV,CAAC;IACP,CAAC;IAED,wBAAwB,CAAC,KAA+B;QACpD,IAAI,CAAC,QAAQ,CAAC,IAAI,iBACd,IAAI,EAAE,UAAU,IACb,KAAK,EACV,CAAC;IACP,CAAC;IAED,WAAW,CAAC,WAAwB;QAChC,OAAO,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,aAAa,CAAC,WAAwB;QAClC,OAAO,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC/D,CAAC;IAED,YAAY,CAAC,WAAwB;QACjC,OAAO,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAEO,qBAAqB,CACzB,WAAwB,EACxB,IAAqC;QAErC,IAAI,WAAW,CAAC,mBAAmB,EAAE;YACjC,OAAO,IAAA,oBAAa,EAAC,IAAI,CAAC,QAAQ;iBAC7B,IAAI,CACD,IAAA,kBAAM,EACF,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,mBAAmB,IAAI,KAAK,CAAC,WAAW,KAAK,WAAW,CACvF,EACD,IAAA,gBAAI,EAAC,CAAC,CAAC,EACP,IAAA,eAAG,EAAC,KAAK,CAAC,EAAE;gBACR,IAAI,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;oBAC7B,MAAM,IAAI,0BAA0B,CAAC,0BAA0B,KAAK,CAAC,IAAI,cAAc,IAAI,GAAG,CAAC,CAAC;iBACnG;YACL,CAAC,CAAC,EACF,IAAA,eAAG,EAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC;YAC/B,2EAA2E;YAC3E,+EAA+E;YAC/E,0DAA0D;YAC1D,0EAA0E;YAC1E,wEAAwE;YACxE,mEAAmE;YACnE,IAAA,iBAAK,EAAC,CAAC,CAAC,CACX,CACJ,CAAC;SACL;aAAM;YACH,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;SACvC;IACL,CAAC;CACJ,CAAA;AAjEY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAII,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCAAqB,oBAAU;GAHrD,qBAAqB,CAiEjC;AAjEY,sDAAqB"}

package/dist/connection/transaction-wrapper.d.ts

@@ -13,8 +13,12 @@ export declare class TransactionWrapper {
      * Executes the `work` function within the context of a transaction. If the `work` function
      * resolves / completes, then all the DB operations it contains will be committed. If it
      * throws an error or rejects, then all DB operations will be rolled back.
+     *
+     * @note
+     * This function does not mutate your context. Instead, this function makes a copy and passes
+     * context to work function.
      */
-    executeInTransaction<T>(ctx: RequestContext, work: () => Observable<T> | Promise<T>, mode: TransactionMode, connection: Connection): Promise<T>;
+    executeInTransaction<T>(originalCtx: RequestContext, work: (ctx: RequestContext) => Observable<T> | Promise<T>, mode: TransactionMode, connection: Connection): Promise<T>;
     /**
      * Attempts to start a DB transaction, with retry logic in the case that a transaction
      * is already started for the connection (which is mainly a problem with SQLite/Sql.js)

package/dist/connection/transaction-wrapper.js

@@ -16,23 +16,23 @@ class TransactionWrapper {
      * Executes the `work` function within the context of a transaction. If the `work` function
      * resolves / completes, then all the DB operations it contains will be committed. If it
      * throws an error or rejects, then all DB operations will be rolled back.
+     *
+     * @note
+     * This function does not mutate your context. Instead, this function makes a copy and passes
+     * context to work function.
      */
-    async executeInTransaction(ctx, work, mode, connection) {
-        const queryRunnerExists = !!ctx[constants_1.TRANSACTION_MANAGER_KEY];
-        if (queryRunnerExists) {
-            // If a QueryRunner already exists on the RequestContext, there must be an existing
-            // outer transaction in progress. In that case, we just execute the work function
-            // as usual without needing to further wrap in a transaction.
-            return (0, rxjs_1.lastValueFrom)((0, rxjs_1.from)(work()));
-        }
-        const queryRunner = connection.createQueryRunner();
+    async executeInTransaction(originalCtx, work, mode, connection) {
+        // Copy to make sure original context will remain valid after transaction completes
+        const ctx = originalCtx.copy();
+        const entityManager = ctx[constants_1.TRANSACTION_MANAGER_KEY];
+        const queryRunner = (entityManager === null || entityManager === void 0 ? void 0 : entityManager.queryRunner) || connection.createQueryRunner();
         if (mode === 'auto') {
             await this.startTransaction(queryRunner);
         }
         ctx[constants_1.TRANSACTION_MANAGER_KEY] = queryRunner.manager;
         try {
             const maxRetries = 5;
-            const result = await (0, rxjs_1.lastValueFrom)((0, rxjs_1.from)(work()).pipe((0, operators_1.retryWhen)(errors => errors.pipe((0, operators_1.tap)(err => {
+            const result = await (0, rxjs_1.lastValueFrom)((0, rxjs_1.from)(work(ctx)).pipe((0, operators_1.retryWhen)(errors => errors.pipe((0, operators_1.tap)(err => {
                 if (!this.isRetriableError(err)) {
                     throw err;
                 }
@@ -49,7 +49,10 @@ class TransactionWrapper {
             throw error;
         }
         finally {
-            if ((queryRunner === null || queryRunner === void 0 ? void 0 : queryRunner.isReleased) === false) {
+            if (!queryRunner.isTransactionActive
+                && queryRunner.isReleased === false) {
+                // There is a check for an active transaction
+                // because this could be a nested transaction (savepoint).
                 await queryRunner.release();
             }
         }

package/dist/connection/transaction-wrapper.js.map

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

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

@@ -33,6 +33,8 @@ export declare class TransactionalConnection {
      * Returns a TypeORM repository. Note that when no RequestContext is supplied, the repository will not
      * be aware of any existing transaction. Therefore calling this method without supplying a RequestContext
      * is discouraged without a deliberate reason.
+     *
+     * @deprecated since 1.7.0: Use {@link TransactionalConnection.rawConnection rawConnection.getRepository()} function instead.
      */
     getRepository<Entity>(target: ObjectType<Entity> | EntitySchema<Entity> | string): Repository<Entity>;
     /**
@@ -58,16 +60,20 @@ export declare class TransactionalConnection {
      * of Vendure internal services.
      *
      * If there is already a {@link RequestContext} object available, you should pass it in as the first
-     * argument in order to add a new transaction to it. If not, omit the first argument and an empty
+     * argument in order to create transactional context as the copy. If not, omit the first argument and an empty
      * RequestContext object will be created, which is then used to propagate the transaction to
      * all inner method calls.
      *
      * @example
      * ```TypeScript
-     * private async transferCredit(fromId: ID, toId: ID, amount: number) {
-     *   await this.connection.withTransaction(ctx => {
+     * private async transferCredit(outerCtx: RequestContext, fromId: ID, toId: ID, amount: number) {
+     *   await this.connection.withTransaction(outerCtx, ctx => {
      *     await this.giftCardService.updateCustomerCredit(fromId, -amount);
      *
+     *     // Note you must not use outerCtx here, instead use ctx. Otherwise this query
+     *     // will be executed outside of transaction
+     *     await this.connection.getRepository(ctx, GiftCard).update(fromId, { transferred: true })
+     *
      *     // If some intermediate logic here throws an Error,
      *     // then all DB transactions will be rolled back and neither Customer's
      *     // credit balance will have changed.

package/dist/connection/transactional-connection.js

@@ -58,20 +58,20 @@ let TransactionalConnection = class TransactionalConnection {
         return this.connection;
     }
     getRepository(ctxOrTarget, maybeTarget) {
-        var _a;
         if (ctxOrTarget instanceof request_context_1.RequestContext) {
             const transactionManager = this.getTransactionManager(ctxOrTarget);
-            if (transactionManager && maybeTarget && !((_a = transactionManager.queryRunner) === null || _a === void 0 ? void 0 : _a.isReleased)) {
+            if (transactionManager) {
+                // tslint:disable-next-line:no-non-null-assertion
                 return transactionManager.getRepository(maybeTarget);
             }
             else {
                 // tslint:disable-next-line:no-non-null-assertion
-                return (0, typeorm_2.getRepository)(maybeTarget);
+                return this.rawConnection.getRepository(maybeTarget);
             }
         }
         else {
             // tslint:disable-next-line:no-non-null-assertion
-            return (0, typeorm_2.getRepository)(ctxOrTarget !== null && ctxOrTarget !== void 0 ? ctxOrTarget : maybeTarget);
+            return this.rawConnection.getRepository(ctxOrTarget !== null && ctxOrTarget !== void 0 ? ctxOrTarget : maybeTarget);
         }
     }
     async withTransaction(ctxOrWork, maybeWork) {
@@ -86,7 +86,7 @@ let TransactionalConnection = class TransactionalConnection {
             ctx = request_context_1.RequestContext.empty();
             work = ctxOrWork;
         }
-        return this.transactionWrapper.executeInTransaction(ctx, () => work(ctx), 'auto', this.rawConnection);
+        return this.transactionWrapper.executeInTransaction(ctx, work, 'auto', this.rawConnection);
     }
     /**
      * @description

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

@@ -1 +1 @@
-{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AAEnD,qCAQiB;AAEjB,mEAA+D;AAC/D,mDAA8D;AAC9D,mDAA6D;AAI7D,+DAA2D;AAG3D;;;;;;;;;;;GAWG;AAEH,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAChC,YACgC,UAAsB,EAC1C,kBAAsC;QADlB,eAAU,GAAV,UAAU,CAAY;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;IAC/C,CAAC;IAEJ;;;;;OAKG;IACH,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAqBD,aAAa,CACT,WAA4F,EAC5F,WAAgE;QAEhE,IAAI,WAAW,YAAY,gCAAc,EAAE;YACvC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,kBAAkB,EAAE;gBACpB,iDAAiD;gBACjD,OAAO,kBAAkB,CAAC,aAAa,CAAC,WAAY,CAAC,CAAC;aACzD;iBAAM;gBACH,iDAAiD;gBACjD,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,WAAY,CAAC,CAAC;aACzD;SACJ;aAAM;YACH,iDAAiD;YACjD,OAAO,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,WAAY,CAAC,CAAC;SACxE;IACL,CAAC;IA6CD,KAAK,CAAC,eAAe,CACjB,SAAiE,EACjE,SAA+C;QAE/C,IAAI,GAAmB,CAAC;QACxB,IAAI,IAAyC,CAAC;QAC9C,IAAI,SAAS,YAAY,gCAAc,EAAE;YACrC,GAAG,GAAG,SAAS,CAAC;YAChB,iDAAiD;YACjD,IAAI,GAAG,SAAU,CAAC;SACrB;aAAM;YACH,GAAG,GAAG,gCAAc,CAAC,KAAK,EAAE,CAAC;YAC7B,IAAI,GAAG,SAAS,CAAC;SACpB;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/F,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAAC,GAAmB;;QACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,MAAK,KAAK,EAAE;YAChE,MAAM,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;SAC3D;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAmB;;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,EAAE;YACtD,MAAM,kBAAkB,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;SAC5D;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,mBAAmB,CAAC,GAAmB;;QACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,EAAE;YACtD,MAAM,kBAAkB,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;SAC9D;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,UAAmB,EACnB,EAAM,EACN,UAAsC,EAAE;QAExC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACxC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACtE;aAAM;YACH,IAAI,GAAQ,CAAC;YACb,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACvD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,OAAO,EAAE,EAAE;gBACnD,IAAI;oBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;oBACjF,OAAO,MAAM,CAAC;iBACjB;gBAAC,OAAO,CAAM,EAAE;oBACb,GAAG,GAAG,CAAC,CAAC;oBACR,IAAI,OAAO,GAAG,UAAU,GAAG,CAAC,EAAE;wBAC1B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;qBAC5D;iBACJ;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAClC,GAAmB,EACnB,UAAmB,EACnB,EAAM,EACN,UAAmC,EAAE;QAErC,IAAI,MAAqB,CAAC;QAC1B,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE;YAC3B,MAAM,EAAE,SAAS,KAAiC,OAAO,EAAnC,uBAAuB,UAAK,OAAO,EAAnD,aAAyC,CAAU,CAAC;YAC1D,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAChC,GAAG,EACH,UAAoC,EACpC,EAAE,EACF,OAAO,CAAC,SAAS,EACjB,uBAAuB,CAC1B,CAAC;SACL;aAAM;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,OAAyB,CAAC,CAAC;SAC7F;QACD,IACI,CAAC,MAAM;YACP,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC;gBAC9B,MAA4B,CAAC,SAAS,KAAK,IAAI;gBAChD,OAAO,CAAC,kBAAkB,KAAK,IAAI,CAAC,EAC1C;YACE,MAAM,IAAI,4BAAmB,CAAC,UAAU,CAAC,IAAW,EAAE,EAAE,CAAC,CAAC;SAC7D;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CACZ,GAAmB,EACnB,MAAe,EACf,EAAM,EACN,SAAa,EACb,UAA0B,EAAE;QAE5B,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxE,0BAAgB,CAAC,8CAA8C,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,IAAI,OAAO,CAAC,kBAAkB,KAAK,KAAK,EAAE;YACtC,iDAAiD;YACjD,0BAAgB,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC;SAC3F;QACD,OAAO,EAAE;aACJ,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;aACtC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,CAAC;aACnC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAClD,MAAM,EAAE,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CACd,GAAmB,EACnB,MAAe,EACf,GAAS,EACT,SAAa,EACb,OAAuB;QAEvB,gGAAgG;QAChG,+BAA+B;QAC/B,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC9B;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxE,0BAAgB,CAAC,8CAA8C,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,IAAI,OAAO,CAAC,kBAAkB,KAAK,KAAK,EAAE;YACtC,iDAAiD;YACjD,0BAAgB,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC;SAC3F;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;AAnRY,uBAAuB;IADnC,IAAA,mBAAU,GAAE;IAGJ,WAAA,IAAA,0BAAgB,GAAE,CAAA;qCAAqB,oBAAU;QACtB,wCAAkB;GAHzC,uBAAuB,CAmRnC;AAnRY,0DAAuB"}

package/dist/data-import/providers/asset-importer/asset-importer.js

@@ -8,14 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetImporter = void 0;
 const common_1 = require("@nestjs/common");
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
+const index_1 = require("../../../common/index");
 const config_service_1 = require("../../../config/config.service");
 const asset_service_1 = require("../../../service/services/asset.service");
 /**
@@ -41,7 +37,7 @@ let AssetImporter = class AssetImporter {
     async getAssets(assetPaths, ctx) {
         const assets = [];
         const errors = [];
-        const { importAssetsDir } = this.configService.importExportOptions;
+        const { assetImportStrategy } = this.configService.importExportOptions;
         const uniqueAssetPaths = new Set(assetPaths);
         for (const assetPath of uniqueAssetPaths.values()) {
             const cachedAsset = this.assetMap.get(assetPath);
@@ -49,23 +45,21 @@ let AssetImporter = class AssetImporter {
                 assets.push(cachedAsset);
             }
             else {
-                const filename = path_1.default.join(importAssetsDir, assetPath);
-                if (fs_extra_1.default.existsSync(filename)) {
-                    const fileStat = fs_extra_1.default.statSync(filename);
-                    if (fileStat.isFile()) {
-                        try {
-                            const stream = fs_extra_1.default.createReadStream(filename);
-                            const asset = (await this.assetService.createFromFileStream(stream, ctx));
+                try {
+                    const stream = await assetImportStrategy.getStreamFromPath(assetPath);
+                    if (stream) {
+                        const asset = await this.assetService.createFromFileStream(stream, assetPath, ctx);
+                        if ((0, index_1.isGraphQlErrorResult)(asset)) {
+                            errors.push(asset.message);
+                        }
+                        else {
                             this.assetMap.set(assetPath, asset);
                             assets.push(asset);
                         }
-                        catch (err) {
-                            errors.push(err.toString());
-                        }
                     }
                 }
-                else {
-                    errors.push(`File "${filename}" does not exist`);
+                catch (e) {
+                    errors.push(e.message);
                 }
             }
         }

package/dist/data-import/providers/asset-importer/asset-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"asset-importer.js","sourceRoot":"","sources":["../../../../src/data-import/providers/asset-importer/asset-importer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,wDAA0B;AAC1B,gDAAwB;AAGxB,mEAA+D;AAE/D,2EAAuE;AAEvE;;;;;;;GAOG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAa;IAGtB,gBAAgB;IAChB,YAAoB,aAA4B,EAAU,YAA0B;QAAhE,kBAAa,GAAb,aAAa,CAAe;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAH5E,aAAQ,GAAG,IAAI,GAAG,EAAiB,CAAC;IAG2C,CAAC;IAExF;;;;OAIG;IACH,KAAK,CAAC,SAAS,CACX,UAAoB,EACpB,GAAoB;QAEpB,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;QACnE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QAC7C,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5B;iBAAM;gBACH,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;gBAEvD,IAAI,kBAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;oBACzB,MAAM,QAAQ,GAAG,kBAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;oBACvC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;wBACnB,IAAI;4BACA,MAAM,MAAM,GAAG,kBAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;4BAC7C,MAAM,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CACvD,MAAM,EACN,GAAG,CACN,CAAU,CAAC;4BACZ,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;4BACpC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;yBACtB;wBAAC,OAAO,GAAQ,EAAE;4BACf,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;yBAC/B;qBACJ;iBACJ;qBAAM;oBACH,MAAM,CAAC,IAAI,CAAC,SAAS,QAAQ,kBAAkB,CAAC,CAAC;iBACpD;aACJ;SACJ;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAA;AAhDY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAK0B,8BAAa,EAAwB,4BAAY;GAJ3E,aAAa,CAgDzB;AAhDY,sCAAa"}
+{"version":3,"file":"asset-importer.js","sourceRoot":"","sources":["../../../../src/data-import/providers/asset-importer/asset-importer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,iDAA6D;AAC7D,mEAA+D;AAE/D,2EAAuE;AAEvE;;;;;;;GAOG;AAEH,IAAa,aAAa,GAA1B,MAAa,aAAa;IAGtB,gBAAgB;IAChB,YAAoB,aAA4B,EAAU,YAA0B;QAAhE,kBAAa,GAAb,aAAa,CAAe;QAAU,iBAAY,GAAZ,YAAY,CAAc;QAH5E,aAAQ,GAAG,IAAI,GAAG,EAAiB,CAAC;IAG2C,CAAC;IAExF;;;;OAIG;IACH,KAAK,CAAC,SAAS,CACX,UAAoB,EACpB,GAAoB;QAEpB,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;QACvE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;QAC7C,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,MAAM,EAAE,EAAE;YAC/C,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACjD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC5B;iBAAM;gBACH,IAAI;oBACA,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;oBACtE,IAAI,MAAM,EAAE;wBACR,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;wBACnF,IAAI,IAAA,4BAAoB,EAAC,KAAK,CAAC,EAAE;4BAC7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;yBAC9B;6BAAM;4BACH,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,KAAc,CAAC,CAAC;4BAC7C,MAAM,CAAC,IAAI,CAAC,KAAc,CAAC,CAAC;yBAC/B;qBACJ;iBACJ;gBAAC,OAAO,CAAM,EAAE;oBACb,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;iBAC1B;aACJ;SACJ;QACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;CACJ,CAAA;AA1CY,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAK0B,8BAAa,EAAwB,4BAAY;GAJ3E,aAAa,CA0CzB;AA1CY,sCAAa"}

package/dist/data-import/providers/importer/fast-importer.service.js

@@ -63,7 +63,7 @@ let FastImporterService = class FastImporterService {
                 channelOrToken: channel,
             })
             : request_context_1.RequestContext.empty();
-        this.defaultChannel = await this.channelService.getDefaultChannel();
+        this.defaultChannel = await this.channelService.getDefaultChannel(this.importCtx);
     }
     async createProduct(input) {
         this.ensureInitialized();
@@ -88,7 +88,9 @@ let FastImporterService = class FastImporterService {
                 productId: product.id,
                 position: i,
             }));
-            await this.connection.getRepository(product_asset_entity_1.ProductAsset).save(productAssets, { reload: false });
+            await this.connection
+                .getRepository(this.importCtx, product_asset_entity_1.ProductAsset)
+                .save(productAssets, { reload: false });
         }
         return product.id;
     }
@@ -116,7 +118,7 @@ let FastImporterService = class FastImporterService {
     async addOptionGroupToProduct(productId, optionGroupId) {
         this.ensureInitialized();
         await this.connection
-            .getRepository(product_entity_1.Product)
+            .getRepository(this.importCtx, product_entity_1.Product)
             .createQueryBuilder()
             .relation('optionGroups')
             .of(productId)
@@ -159,7 +161,9 @@ let FastImporterService = class FastImporterService {
                 productVariantId: createdVariant.id,
                 position: i,
             }));
-            await this.connection.getRepository(product_variant_asset_entity_1.ProductVariantAsset).save(variantAssets, { reload: false });
+            await this.connection
+                .getRepository(this.importCtx, product_variant_asset_entity_1.ProductVariantAsset)
+                .save(variantAssets, { reload: false });
         }
         if (input.stockOnHand != null && input.stockOnHand !== 0) {
             await this.stockMovementService.adjustProductVariantStock(this.importCtx, createdVariant.id, 0, input.stockOnHand);
@@ -171,7 +175,9 @@ let FastImporterService = class FastImporterService {
                 channelId,
             });
             variantPrice.variant = createdVariant;
-            await this.connection.getRepository(product_variant_price_entity_1.ProductVariantPrice).save(variantPrice, { reload: false });
+            await this.connection
+                .getRepository(this.importCtx, product_variant_price_entity_1.ProductVariantPrice)
+                .save(variantPrice, { reload: false });
         }
         return createdVariant.id;
     }

package/dist/data-import/providers/importer/fast-importer.service.js.map

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

package/dist/data-import/providers/importer/importer.d.ts

@@ -9,7 +9,7 @@ import { FacetValueService } from '../../../service/services/facet-value.service
 import { FacetService } from '../../../service/services/facet.service';
 import { TaxCategoryService } from '../../../service/services/tax-category.service';
 import { AssetImporter } from '../asset-importer/asset-importer';
-import { ImportParser } from '../import-parser/import-parser';
+import { ImportParser, ParsedProductWithVariants } from '../import-parser/import-parser';
 import { FastImporterService } from './fast-importer.service';
 export interface ImportProgress extends ImportInfo {
     currentProduct: string;
@@ -50,9 +50,10 @@ export declare class Importer {
     private doParseAndImport;
     private getRequestContext;
     /**
+     * @description
      * Imports the products specified in the rows object. Return an array of error messages.
      */
-    private importProducts;
+    importProducts(ctx: RequestContext, rows: ParsedProductWithVariants[], onProgress: OnProgressFn): Promise<string[]>;
     private getFacetValueIds;
     private processCustomFieldValues;
     /**