npm - @vendure/core - Versions diffs - 2.1.6 → 2.1.7 - Mend

@vendure/core 2.1.6 → 2.1.7

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

package/dist/api/resolvers/entity/administrator-entity.resolver.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
+import { TransactionalConnection } from '../../../connection/index';
 import { Administrator } from '../../../entity/administrator/administrator.entity';
 import { User } from '../../../entity/user/user.entity';
-import { UserService } from '../../../service/services/user.service';
 import { RequestContext } from '../../common/request-context';
 export declare class AdministratorEntityResolver {
-    private userService;
-    constructor(userService: UserService);
+    private connection;
+    constructor(connection: TransactionalConnection);
     user(ctx: RequestContext, administrator: Administrator): Promise<User>;
 }

package/dist/api/resolvers/entity/administrator-entity.resolver.js CHANGED Viewed

@@ -14,23 +14,23 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdministratorEntityResolver = void 0;
 const graphql_1 = require("@nestjs/graphql");
-const errors_1 = require("../../../common/error/errors");
+const index_1 = require("../../../connection/index");
 const administrator_entity_1 = require("../../../entity/administrator/administrator.entity");
-const user_service_1 = require("../../../service/services/user.service");
 const request_context_1 = require("../../common/request-context");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 let AdministratorEntityResolver = class AdministratorEntityResolver {
-    constructor(userService) {
-        this.userService = userService;
+    constructor(connection) {
+        this.connection = connection;
     }
     async user(ctx, administrator) {
         if (administrator.user) {
             return administrator.user;
         }
-        const user = await this.userService.getUserByEmailAddress(ctx, administrator.emailAddress);
-        if (!user) {
-            throw new errors_1.EntityNotFoundError('User', '<not found>');
-        }
+        const { user } = await this.connection.getEntityOrThrow(ctx, administrator_entity_1.Administrator, administrator.id, {
+            relations: {
+                user: { roles: true },
+            },
+        });
         return user;
     }
 };
@@ -44,7 +44,7 @@ __decorate([
 ], AdministratorEntityResolver.prototype, "user", null);
 AdministratorEntityResolver = __decorate([
     (0, graphql_1.Resolver)('Administrator'),
-    __metadata("design:paramtypes", [user_service_1.UserService])
+    __metadata("design:paramtypes", [index_1.TransactionalConnection])
 ], AdministratorEntityResolver);
 exports.AdministratorEntityResolver = AdministratorEntityResolver;
 //# sourceMappingURL=administrator-entity.resolver.js.map

package/dist/api/resolvers/entity/administrator-entity.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"administrator-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/administrator-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAEjE,~~yDAAwF~~;~~AACxF~~,6FAAmF;AAEnF,~~yEAAqE;AACrE,~~kEAA8D;AAC9D,0FAAiE;AAG1D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IACpC,YAAoB,~~WAAwB~~;~~QAAxB~~,~~gBAAW~~,~~GAAX~~,~~WAAW~~,~~CAAa~~;IAAG,CAAC;~~IAG1C~~,AAAN,KAAK,CAAC,IAAI,CAAQ,GAAmB,EAAY,aAA4B;QACzE,IAAI,aAAa,CAAC,IAAI,EAAE;YACpB,OAAO,aAAa,CAAC,IAAI,CAAC;SAC7B;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,~~WAAW~~,CAAC,~~qBAAqB~~,CAAC,GAAG,EAAE,aAAa,CAAC,~~YAAY~~,~~CAAC,CAAC~~;~~QAC3F~~,~~IAAI~~,~~CAAC~~,IAAI,EAAE~~;YACP~~,~~MAAM~~,~~IAAI~~,~~4BAAmB~~,~~CAAC~~,~~MAAM,~~EAAE,~~aAAa,~~CAAC,CAAC;~~SACxD;QACD~~,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;~~AAVS~~;IADL,IAAA,sBAAY,GAAE;IACH,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAA2B,oCAAa;;~~uDAS5E~~;~~AAbQ~~,2BAA2B;IADvC,IAAA,kBAAQ,EAAC,eAAe,CAAC;~~qCAEW,0BAAW~~;~~GADnC~~,2BAA2B,~~CAcvC~~;~~AAdY~~,kEAA2B"}
1	+ {"version":3,"file":"administrator-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/administrator-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAEjE,qDAAoE;AACpE,6FAAmF;AAEnF,kEAA8D;AAC9D,0FAAiE;AAG1D,IAAM,2BAA2B,GAAjC,MAAM,2BAA2B;IACpC,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;IAAG,CAAC;IAGrD,AAAN,KAAK,CAAC,IAAI,CAAQ,GAAmB,EAAY,aAA4B;QACzE,IAAI,aAAa,CAAC,IAAI,EAAE;YACpB,OAAO,aAAa,CAAC,IAAI,CAAC;SAC7B;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,EAAE,oCAAa,EAAE,aAAa,CAAC,EAAE,EAAE;YAC1F,SAAS,EAAE;gBACP,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;aACxB;SACJ,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAXS;IADL,IAAA,sBAAY,GAAE;IACH,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAA2B,oCAAa;;uDAU5E;AAdQ,2BAA2B;IADvC,IAAA,kBAAQ,EAAC,eAAe,CAAC;qCAEU,+BAAuB;GAD9C,2BAA2B,CAevC;AAfY,kEAA2B"}

package/dist/api/resolvers/entity/product-variant-entity.resolver.js CHANGED Viewed

@@ -52,7 +52,8 @@ let ProductVariantEntityResolver = class ProductVariantEntityResolver {
         return this.productVariantService.hydratePriceFields(ctx, productVariant, 'taxRateApplied');
     }
     async product(ctx, productVariant) {
-        if (productVariant.product) {
+        var _a;
+        if ((_a = productVariant.product) === null || _a === void 0 ? void 0 : _a.name) {
             return productVariant.product;
         }
         return this.requestContextCache.get(ctx, `ProductVariantEntityResolver.product(${productVariant.productId})`, () => this.productVariantService.getProductForVariant(ctx, productVariant));

package/dist/api/resolvers/entity/product-variant-entity.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"product-variant-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/product-variant-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAuE;AAMvE,2EAA4E;AAG5E,gGAA0F;AAE1F,iDAAoD;AAEpD,mGAAwF;AAExF,mHAA8G;AAC9G,kDAA2D;AAC3D,2EAAuE;AACvE,+FAA0F;AAC1F,6FAAwF;AAExF,kEAA8D;AAC9D,kEAAqD;AACrD,0FAAiE;AAG1D,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IACrC,YACY,qBAA4C,EAC5C,YAA0B,EAC1B,oBAA0C,EAC1C,mBAA+C;QAH/C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,wBAAmB,GAAnB,mBAAmB,CAA4B;IACxD,CAAC;IAGE,AAAN,KAAK,CAAC,IAAI,CAAQ,GAAmB,EAAY,cAA8B;QAC3E,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IAC3F,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACP,GAAmB,EAChB,cAA8B;QAExC,OAAO,IAAI,CAAC,oBAAoB,CAAC,wBAAwB,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IACnG,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,cAA8B;QAC5E,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACP,GAAmB,EAChB,cAA8B;QAExC,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IAC9F,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CACP,GAAmB,EAChB,cAA8B;QAExC,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IAC9F,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CACT,GAAmB,EAChB,cAA8B;QAExC,OAAO,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAChG,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACF,GAAmB,EAChB,cAA8B;QAExC,IAAI,cAAc,CAAC,OAAO,EAAE;~~YACxB~~,OAAO,cAAc,CAAC,OAAO,CAAC;SACjC;~~QACD~~,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAC/B,GAAG,EACH,wCAAwC,cAAc,CAAC,SAAS,GAAG,EACnE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,EAAE,cAAc,CAAC,CAC7E,CAAC;IACN,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CACD,GAAmB,EAChB,cAA8B;QAExC,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAClE,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CACR,GAAmB,EAChB,cAA8B;QAExC,IAAI,cAAc,CAAC,aAAa,EAAE;YAC9B,OAAO,cAAc,CAAC,aAAa,CAAC;SACvC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACnE,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACF,GAAmB,EAChB,cAA8B;QAExC,IAAI,cAAc,CAAC,OAAO,EAAE;YACxB,OAAO,cAAc,CAAC,OAA2C,CAAC;SACrE;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;IACnF,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CACN,GAAmB,EAChB,cAA8B,EACjC,OAAgB;;QAEvB,IAAI,CAAA,MAAA,cAAc,CAAC,WAAW,0CAAE,MAAM,MAAK,CAAC,EAAE;YAC1C,OAAO,EAAE,CAAC;SACb;QACD,IAAI,WAA0C,CAAC;QAC/C,IAAI,MAAA,MAAA,cAAc,CAAC,WAAW,0CAAG,CAAC,CAAC,0CAAE,QAAQ,EAAE;YAC3C,WAAW,GAAG,cAAc,CAAC,WAA4C,CAAC;SAC7E;aAAM;YACH,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC,GAAG,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC;SACnG;QAED,OAAO,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC3B,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE;gBAC1D,OAAO,KAAK,CAAC;aAChB;YACD,IAAI,OAAO,KAAK,MAAM,IAAI,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE;gBAC1C,OAAO,KAAK,CAAC;aAChB;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAQ,GAAmB,EAAY,cAA8B;QACjF,OAAO,IAAI,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;~~AArHS~~;IADL,IAAA,sBAAY,GAAE;IACH,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAA4B,uCAAc;;wDAE9E;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;gEAG3C;AAGK;IADL,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAA4B,uCAAc;;yDAE/E;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;gEAG3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;gEAG3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;kEAG3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;~~2DAU3C~~;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;0DAG3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;iEAM3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCADG,gCAAc;QACA,uCAAc;;2DAM3C;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,mBAAG,GAAE,CAAA;;qCAFM,gCAAc;QACA,uCAAc;;+DAsB3C;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAA4B,uCAAc;;8DAEpF;~~AA7HQ~~,4BAA4B;IADxC,IAAA,kBAAQ,EAAC,gBAAgB,CAAC;qCAGY,+CAAqB;QAC9B,4BAAY;QACJ,6CAAoB;QACrB,0DAA0B;GALlD,4BAA4B,~~CA8HxC~~;~~AA9HY~~,oEAA4B;~~AAiIlC~~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"}
1	+ {"version":3,"file":"product-variant-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/product-variant-entity.resolver.ts"],"names":[],"mappings":"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"}

package/dist/i18n/messages/de.json CHANGED Viewed

@@ -73,10 +73,10 @@
     "ORDER_LIMIT_ERROR": "Der Artikel konnte nicht hinzugefügt werden. Eine Bestellung kann maximal { maxItems } Artikel enthalten",
     "ORDER_MODIFICATION_ERROR": "Der Inhalt der Bestellung kann nur im Status \"AddingItems\" geändert werden",
     "ORDER_PAYMENT_STATE_ERROR": "Eine Zahlung kann nur im Status \"ArrangingPayment\" hinzugefügt werden",
-    "ORDER_STATE_TRANSITION_ERROR": "Der Status der Bestellung kan nicht von \"{ fromState }\" zu \"{ toState }\" geändert werden",
+    "ORDER_STATE_TRANSITION_ERROR": "Der Status der Bestellung kann nicht von \"{ fromState }\" zu \"{ toState }\" geändert werden",
     "PASSWORD_ALREADY_SET_ERROR": "Ein Passwort wurde während der Registrierung bereits festgelegt",
-    "PASSWORD_RESET_TOKEN_EXPIRED_ERROR": "Das Token zum Passwortzurücksetzen ist leider abgelaufen",
-    "PASSWORD_RESET_TOKEN_INVALID_ERROR": "Das Token zum Passwortzurücksetzen ist leider falsch",
+    "PASSWORD_RESET_TOKEN_EXPIRED_ERROR": "Das Token zum Zurücksetzen des Passwortes ist leider abgelaufen",
+    "PASSWORD_RESET_TOKEN_INVALID_ERROR": "Das Token zum Zurücksetzen des Passwortes ist leider falsch",
     "PAYMENT_DECLINED_ERROR": "Die Zahlung wurde abgelehnt",
     "PAYMENT_FAILED_ERROR": "Zahlung fehlgeschlagen",
     "PAYMENT_ORDER_MISMATCH_ERROR": "Die Zahlung und OrderLines gehören nicht zueinander",

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

@@ -1,6 +1,7 @@
 import { ID } from '@vendure/common/lib/shared-types';
 import { InjectableJobQueueStrategy } from './injectable-job-queue-strategy';
 import { Job } from './job';
+import { QueueNameProcessStorage } from './queue-name-process-storage';
 import { JobData } from './types';
 /**
  * @description
@@ -42,6 +43,24 @@ export interface PollingJobQueueStrategyConfig {
      */
     backoffStrategy?: BackoffStrategy;
 }
+declare class ActiveQueue<Data extends JobData<Data> = object> {
+    private readonly queueName;
+    private readonly process;
+    private readonly jobQueueStrategy;
+    private timer;
+    private running;
+    private activeJobs;
+    private errorNotifier$;
+    private queueStopped$;
+    private subscription;
+    private readonly pollInterval;
+    constructor(queueName: string, process: (job: Job<Data>) => Promise<any>, jobQueueStrategy: PollingJobQueueStrategy);
+    start(): void;
+    stop(stopActiveQueueTimeout?: number): Promise<void>;
+    private awaitRunningJobsOrTimeout;
+    private onFailOrComplete;
+    private removeJobFromActive;
+}
 /**
  * @description
  * This class allows easier implementation of {@link JobQueueStrategy} in a polling style.
@@ -57,7 +76,7 @@ export declare abstract class PollingJobQueueStrategy extends InjectableJobQueue
     pollInterval: number | ((queueName: string) => number);
     setRetries: (queueName: string, job: Job) => number;
     backOffStrategy?: BackoffStrategy;
-    private activeQueues;
+    protected activeQueues: QueueNameProcessStorage<ActiveQueue<any>>;
     constructor(config?: PollingJobQueueStrategyConfig);
     constructor(concurrency?: number, pollInterval?: number);
     start<Data extends JobData<Data> = object>(queueName: string, process: (job: Job<Data>) => Promise<any>): Promise<void>;
@@ -81,3 +100,4 @@ export declare abstract class PollingJobQueueStrategy extends InjectableJobQueue
      */
     abstract findOne(id: ID): Promise<Job | undefined>;
 }
+export {};

package/dist/job-queue/polling-job-queue-strategy.js CHANGED Viewed

@@ -61,9 +61,9 @@ class ActiveQueue {
                             nextJob.fail(err);
                         })
                             .finally(() => {
-                            if (!this.running && nextJob.state !== generated_types_1.JobState.PENDING) {
-                                return;
-                            }
+                            // if (!this.running && nextJob.state !== JobState.PENDING) {
+                            //     return;
+                            // }
                             nextJob.off('progress', onProgress);
                             return this.onFailOrComplete(nextJob);
                         })
@@ -85,24 +85,44 @@ class ActiveQueue {
         };
         void runNextJobs();
     }
-    stop() {
+    async stop(stopActiveQueueTimeout = 20000) {
         this.running = false;
-        this.queueStopped$.next(STOP_SIGNAL);
         clearTimeout(this.timer);
+        await this.awaitRunningJobsOrTimeout(stopActiveQueueTimeout);
+        vendure_logger_1.Logger.info(`Stopped queue: ${this.queueName}`);
+        // Allow any job status changes to be persisted
+        // before we permit the application shutdown to continue.
+        // Otherwise, the DB connection will close before our
+        // changes are persisted.
+        await new Promise(resolve => setTimeout(resolve, 1000));
+    }
+    awaitRunningJobsOrTimeout(stopActiveQueueTimeout = 20000) {
         const start = +new Date();
-        // Wait for 2 seconds to allow running jobs to complete
-        const maxTimeout = 2000;
-        let pollTimer;
+        let timeout;
         return new Promise(resolve => {
-            const pollActiveJobs = async () => {
-                const timedOut = +new Date() - start > maxTimeout;
-                if (this.activeJobs.length === 0 || timedOut) {
-                    clearTimeout(pollTimer);
+            let lastStatusUpdate = +new Date();
+            const pollActiveJobs = () => {
+                const now = +new Date();
+                const timedOut = stopActiveQueueTimeout === undefined ? false : now - start > stopActiveQueueTimeout;
+                if (this.activeJobs.length === 0) {
+                    clearTimeout(timeout);
+                    resolve();
+                    return;
+                }
+                if (timedOut) {
+                    vendure_logger_1.Logger.warn(`Timed out (${stopActiveQueueTimeout}ms) waiting for ${this.activeJobs.length} active jobs in queue "${this.queueName}" to complete. Forcing stop...`);
+                    this.queueStopped$.next(STOP_SIGNAL);
+                    clearTimeout(timeout);
                     resolve();
+                    return;
                 }
-                else {
-                    pollTimer = setTimeout(pollActiveJobs, 50);
+                if (this.activeJobs.length > 0) {
+                    if (now - lastStatusUpdate > 2000) {
+                        vendure_logger_1.Logger.info(`Stopping queue: ${this.queueName} - waiting for ${this.activeJobs.length} active jobs to complete...`);
+                        lastStatusUpdate = now;
+                    }
                 }
+                timeout = setTimeout(pollActiveJobs, 200);
             };
             void pollActiveJobs();
         });
@@ -113,7 +133,9 @@ class ActiveQueue {
     }
     removeJobFromActive(job) {
         const index = this.activeJobs.indexOf(job);
-        this.activeJobs.splice(index, 1);
+        if (index !== -1) {
+            this.activeJobs.splice(index, 1);
+        }
     }
 }
 /**

package/dist/job-queue/polling-job-queue-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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~~IAAI~~,~~CAAC~~,IAAI~~,CAAC,OAAO,IAAI,OAAO,CAAC,KAAK,KAAK,0BAAQ,CAAC,OAAO,EAAE~~;~~gCACrD~~,OAAO~~;6BACV;4BACD~~,~~OAAO,~~CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;4BACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;wBAC1C,CAAC,CAAC;6BACD,KAAK,CAAC,CAAC,GAAQ,EAAE,EAAE;4BAChB,uBAAM,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;wBACnE,CAAC,CAAC,CAAC;qBACV;iBACJ;aACJ;YAAC,OAAO,CAAM,EAAE;gBACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;oBACrB,cACI,IAAI,CAAC,SACT,8DAA8D,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;oBACzF,CAAC,CAAC,KAAK;iBACV,CAAC,CAAC;aACN;YACD,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aAC3D;QACL,CAAC,CAAC;QAEF,KAAK,WAAW,EAAE,CAAC;IACvB,CAAC;IAED,IAAI;~~QACA~~,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,~~aAAa~~,CAAC,IAAI,CAAC,~~WAAW~~,CAAC,CAAC;~~QACrC~~,~~YAAY~~,CAAC,IAAI,CAAC,~~KAAK~~,CAAC,CAAC;~~QAEzB~~,MAAM,~~KAAK~~,~~GAAG~~,CAAC,~~IAAI~~,~~IAAI~~,EAAE,CAAC;~~QAC1B~~,~~uDAAuD~~;~~QACvD~~,MAAM,~~UAAU~~,GAAG,IAAI,CAAC;~~QACxB~~,IAAI,~~SAAc~~,CAAC;~~QACnB~~,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YACzB,~~MAAM~~,~~cAAc~~,GAAG,~~KAAK~~,IAAI,EAAE;~~gBAC9B~~,MAAM,~~QAAQ~~,GAAG,CAAC,IAAI,IAAI,EAAE,GAAG,KAAK,GAAG,~~UAAU~~,CAAC;~~gBAClD~~,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,EAAE;~~oBAC1C~~,~~YAAY~~,CAAC,SAAS,CAAC,CAAC;~~oBACxB~~,OAAO,EAAE,CAAC;~~iBACb~~;~~qBAAM~~;~~oBACH~~,SAAS,GAAG,UAAU,CAAC,cAAc,EAAE,~~EAAE~~,CAAC,CAAC;~~iBAC9C;YACL~~,CAAC,CAAC;YACF,KAAK,cAAc,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,GAAc;QACzC,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC;IAEO,mBAAmB,CAAC,GAAc;QACtC,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;~~IACrC~~,CAAC;CACJ;AAED;;;;;;;;;GASG;AACH,MAAsB,uBAAwB,SAAQ,0DAA0B;IAU5E,YAAY,mBAA4D,EAAE,iBAA0B;;QAChG,KAAK,EAAE,CAAC;~~QALJ~~,iBAAY,GAAG,IAAI,oDAAuB,EAAoB,CAAC;~~QAOnE~~,IAAI,mBAAmB,IAAI,IAAA,uBAAQ,EAAC,mBAAmB,CAAC,EAAE;YACtD,IAAI,CAAC,WAAW,GAAG,MAAA,mBAAmB,CAAC,WAAW,mCAAI,CAAC,CAAC;YACxD,IAAI,CAAC,YAAY,GAAG,MAAA,mBAAmB,CAAC,YAAY,mCAAI,GAAG,CAAC;YAC5D,IAAI,CAAC,eAAe,GAAG,MAAA,mBAAmB,CAAC,eAAe,mCAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YAC3E,IAAI,CAAC,UAAU,GAAG,MAAA,mBAAmB,CAAC,UAAU,mCAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACjF;aAAM;YACH,IAAI,CAAC,WAAW,GAAG,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,CAAC,CAAC;YAC5C,IAAI,CAAC,YAAY,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,GAAG,CAAC;YAC7C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC;SAC7C;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CACP,SAAiB,EACjB,OAAyC;QAEzC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACrC,OAAO;SACV;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;YAC3C,OAAO;SACV;QACD,MAAM,MAAM,GAAG,IAAI,WAAW,CAAO,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/D,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,IAAI,CACN,SAAiB,EACjB,OAAyC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE;YACT,OAAO;SACV;QACD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAS;QACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACvB,OAAO,GAAG,CAAC;SACd;IACL,CAAC;CAqBJ;AAhFD,0DAgFC"}
1	+ {"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js CHANGED Viewed

@@ -69,17 +69,18 @@ class MysqlSearchStrategy {
         this.applyTermAndFilters(ctx, qb, input);
         if (sort) {
             if (sort.name) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(si.productName)' : 'si.productName', sort.name);
+                qb.addOrderBy('si_productName', sort.name);
             }
             if (sort.price) {
-                qb.addOrderBy(input.groupByProduct ? 'MIN(si.price)' : 'si.price', sort.price);
+                qb.addOrderBy('si_price', sort.price);
             }
         }
-        else {
-            if (input.term && input.term.length > this.minTermLength) {
-                qb.orderBy('score', 'DESC');
-            }
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('si_productVariantId', 'ASC');
         if (enabledOnly) {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }

package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,mBAAmB;IAAhC;QACqB,kBAAa,GAAG,CAAC,CAAC;~~IAwQvC~~,CAAC;~~IApQG~~,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,kCAAO,KAAK,KAAE,cAAc,EAAE,IAAI,IAAG,CAAC;QACjF,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,mBAAmB,EAAE,0BAA0B,CAAC,CAAC;aACzD,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACpC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACtC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC;iBACpD,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;SAC7D;~~QACD~~,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;~~QACzC~~,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,~~KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,~~gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;~~aAC7F~~;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,~~KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,~~UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;~~aAClF~~;SACJ;aAAM~~;YACH~~,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;~~gBACtD~~,EAAE,CAAC,~~OAAO~~,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;~~aAC/B~~;~~SACJ~~;~~QACD~~,IAAI,WAAW,EAAE;YACb,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC3D;QAED,OAAO,EAAE;aACJ,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,IAAI,CAAC;aACZ,UAAU,EAAE;aACZ,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,yCAAiB,EAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,KAAkB,EAAE,WAAoB;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CACpC,GAAG,EACH,IAAI,CAAC,UAAU;aACV,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,EAC3D,KAAK,CACR,CAAC;QACF,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAChE;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aAC7C,kBAAkB,EAAE;aACpB,MAAM,CAAC,mBAAmB,CAAC;aAC3B,IAAI,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC;aACxC,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5C,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAEO,mBAAmB,CACvB,GAAmB,EACnB,EAAuC,EACvC,KAAkB;QAElB,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,GAC9F,KAAK,CAAC;QAEV,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;YAC1C,MAAM,QAAQ,GAAG,IAAI;iBAChB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;iBACjB,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;iBAClB,IAAI,EAAE;iBACN,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;iBAC1B,IAAI,EAAE,CAAC;YACZ,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU;iBACjC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;iBACnC,kBAAkB,CAAC,UAAU,CAAC;iBAC9B,MAAM,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;iBAC/C,SAAS,CAAC,2BAA2B,EAAE,wBAAwB,CAAC;iBAChE,SAAS,CAAC,0CAA0C,EAAE,WAAW,CAAC;iBAClE,SAAS,CACN;;;sFAGkE,EAClE,OAAO,CACV;iBACA,KAAK,CACF,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC;qBACpC,OAAO,CAAC,8DAA8D,CAAC;qBACvE,OAAO,CAAC,qEAAqE,CAAC;qBAC9E,OAAO,CAAC,8DAA8D,CAAC,CAAC;YACjF,CAAC,CAAC,CACL;iBACA,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,aAAa,CAAC;gBACX,IAAI,EAAE,GAAG,QAAQ,GAAG;gBACpB,SAAS,EAAE,IAAI,QAAQ,GAAG;gBAC1B,SAAS,EAAE,GAAG,CAAC,SAAS;aAC3B,CAAC,CAAC;YAEP,EAAE,CAAC,SAAS,CAAC,IAAI,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE,gCAAgC,CAAC;iBAC1F,SAAS,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,mBAAmB,EAAE,OAAO,CAAC;iBACzF,QAAQ,CAAC,0DAA0D,CAAC;iBACpE,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC;SACtD;aAAM;YACH,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SAC9B;QACD,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE;YACvB,IAAI,KAAK,CAAC,cAAc,EAAE;gBACtB,EAAE,CAAC,QAAQ,CAAC,8BAA8B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aAC3E;iBAAM;gBACH,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;aACpE;SACJ;QACD,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;YACvB,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE;oBAC5B,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;oBAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;oBAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;oBACrC,IAAI,kBAAkB,KAAK,iCAAe,CAAC,GAAG,EAAE;wBAC5C,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAChC;yBAAM;wBACH,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBAC/B;iBACJ;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;YAC3B,EAAE,CAAC,QAAQ,CACP,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;gBACf,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;oBAC9C,GAAG,CAAC,QAAQ,CACR,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;;wBACf,IAAI,gBAAgB,CAAC,GAAG,KAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,CAAA,EAAE;4BACrD,MAAM,IAAI,uBAAc,CAAC,sCAAsC,CAAC,CAAC;yBACpE;wBACD,IAAI,gBAAgB,CAAC,GAAG,EAAE;4BACtB,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;4BAClE,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;4BAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,CAAC;4BACvD,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;yBAC7B;wBACD,IAAI,MAAA,gBAAgB,CAAC,EAAE,0CAAE,MAAM,EAAE;4BAC7B,KAAK,MAAM,EAAE,IAAI,gBAAgB,CAAC,EAAE,EAAE;gCAClC,MAAM,WAAW,GAAG,IAAA,+CAAuB,EAAC,EAAE,CAAC,CAAC;gCAChD,MAAM,MAAM,GAAG,gBAAgB,WAAW,qBAAqB,CAAC;gCAChE,MAAM,MAAM,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC;gCACrC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;6BAC/B;yBACJ;oBACL,CAAC,CAAC,CACL,CAAC;iBACL;YACL,CAAC,CAAC,CACL,CAAC;SACL;QACD,IAAI,YAAY,EAAE;YACd,EAAE,CAAC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;SAClF;QACD,IAAI,cAAc,EAAE;YAChB,EAAE,CAAC,QAAQ,CAAC,mDAAmD,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;SACxF;QAED,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvE,IAAA,gDAAwB,EAAC,EAAE,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEhF,IAAI,KAAK,CAAC,cAAc,KAAK,IAAI,EAAE;YAC/B,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAC;SACxD;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;;;OAIG;IACK,iBAAiB,CAAC,cAAuB;QAC7C,OAAO,IAAA,0CAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;aAClD,GAAG,CAAC,GAAG,CAAC,EAAE;YACP,MAAM,aAAa,GAAG,MAAM,GAAG,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,MAAM,GAAG,EAAE,CAAC;YAC1B,IAAI,cAAc,IAAI,GAAG,KAAK,WAAW,EAAE;gBACvC,IACI,GAAG,KAAK,UAAU;oBAClB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,eAAe;oBACvB,GAAG,KAAK,YAAY,EACtB;oBACE,OAAO,gBAAgB,aAAa,SAAS,KAAK,GAAG,CAAC;iBACzD;qBAAM,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,gBAAgB,EAAE;oBAC3E,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;qBAAM;oBACH,OAAO,OAAO,aAAa,SAAS,KAAK,GAAG,CAAC;iBAChD;aACJ;iBAAM;gBACH,OAAO,GAAG,aAAa,QAAQ,KAAK,GAAG,CAAC;aAC3C;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;CACJ;~~AAzQD~~,~~kDAyQC~~"}
1	+ {"version":3,"file":"mysql-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js CHANGED Viewed

@@ -75,14 +75,12 @@ class PostgresSearchStrategy {
                 qb.addOrderBy('"si_price"', sort.price);
             }
         }
-        else {
-            if (input.term && input.term.length > this.minTermLength) {
-                qb.addOrderBy('score', 'DESC');
-            }
-            else {
-                qb.addOrderBy('"si_productVariantId"', 'ASC');
-            }
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('"si_productVariantId"', 'ASC');
         if (enabledOnly) {
             qb.andWhere('"si"."enabled" = :enabled', { enabled: true });
         }

package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,qEAA6D;AAC7D,mEAMiC;AAEjC;;GAEG;AACH,MAAa,sBAAsB;IAAnC;QACqB,kBAAa,GAAG,CAAC,CAAC;~~IAsQvC~~,CAAC;~~IAlQG~~,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;SACtE;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,kBAAkB,EAAE,8BAA8B,CAAC,CAAC;aAC5D,SAAS,CAAC,wCAAwC,EAAE,aAAa,CAAC,CAAC;QAExE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;SACtE;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SAC1E;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU;aACrB,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACpC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC;iBACtC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC;iBACpD,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC;SAC7D;~~QACD~~,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAEzC,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,EAAE,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAChD;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAC3C;SACJ;aAAM~~;YACH~~,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,EAAE;~~gBACtD~~,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;~~aAClC~~;~~iBAAM~~;~~gBACH~~,EAAE,CAAC,UAAU,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAC;~~aACjD;SACJ;QACD~~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~~AAvQD~~,~~wDAuQC~~"}
1	+ {"version":3,"file":"postgres-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js CHANGED Viewed

@@ -58,13 +58,12 @@ class SqliteSearchStrategy {
         const sort = input.sort;
         const qb = this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).createQueryBuilder('si');
         if (input.groupByProduct) {
-            qb.addSelect('MIN(si.price)', 'minPrice').addSelect('MAX(si.price)', 'maxPrice');
-            qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax').addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
+            qb.addSelect('MIN(si.price)', 'minPrice');
+            qb.addSelect('MAX(si.price)', 'maxPrice');
+            qb.addSelect('MIN(si.priceWithTax)', 'minPriceWithTax');
+            qb.addSelect('MAX(si.priceWithTax)', 'maxPriceWithTax');
         }
         this.applyTermAndFilters(ctx, qb, input);
-        if (input.term && input.term.length > this.minTermLength) {
-            qb.orderBy('score', 'DESC');
-        }
         if (sort) {
             if (sort.name) {
                 // TODO: v3 - set the collation on the SearchIndexItem entity
@@ -74,9 +73,12 @@ class SqliteSearchStrategy {
                 qb.addOrderBy('si.price', sort.price);
             }
         }
-        else {
-            qb.addOrderBy('si.productVariantId', 'ASC');
+        else if (input.term && input.term.length > this.minTermLength) {
+            qb.addOrderBy('score', 'DESC');
         }
+        // Required to ensure deterministic sorting.
+        // E.g. in case of sorting products with duplicate name, price or score results.
+        qb.addOrderBy('si.productVariantId', 'ASC');
         if (enabledOnly) {
             qb.andWhere('si.enabled = :enabled', { enabled: true });
         }

package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,mEAMiC;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IAAjC;QACqB,kBAAa,GAAG,CAAC,CAAC;~~IAwNvC~~,CAAC;~~IApNG~~,KAAK,CAAC,IAAI,CAAC,QAAkB;QACzB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,+BAAmB,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;aAC/C,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,6CAAqB,EAAC,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC;aACnC,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;aAC/C,SAAS,CAAC,gCAAgC,EAAE,aAAa,CAAC,CAAC;QAEhE,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YACvB,aAAa,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SAChD;QACD,IAAI,WAAW,EAAE;YACb,aAAa,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;SACtE;QACD,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAC3D,OAAO,IAAA,kDAA0B,EAAC,iBAAiB,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,KAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,0CAAe,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACxF,IAAI,KAAK,CAAC,cAAc,EAAE;YACtB,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,SAAS,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;~~YACjF~~,EAAE,CAAC,SAAS,CAAC,sBAAsB,EAAE,iBAAiB,CAAC,CAAC~~,SAAS,CAC7D,sBAAsB,EACtB,iBAAiB,CACpB,CAAC~~;~~SACL;QACD~~,~~IAAI~~,CAAC,~~mBAAmB~~,CAAC,~~GAAG~~,EAAE,~~EAAE~~,~~EAAE,KAAK,~~CAAC,CAAC;~~QACzC~~,IAAI,~~KAAK,~~CAAC,~~IAAI~~,~~IAAI,KAAK,~~CAAC,~~IAAI,CAAC,MAAM,~~GAAG,~~IAAI,CAAC,aAAa,~~EAAE~~;YACtD~~,EAAE,~~CAAC,OAAO,CAAC,OAAO,~~EAAE,~~MAAM~~,CAAC,CAAC;~~SAC/B;QACD~~,IAAI,IAAI,EAAE;YACN,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,6DAA6D;gBAC7D,EAAE,CAAC,UAAU,CAAC,+BAA+B,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7D;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,EAAE,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aACzC;SACJ;aAAM;~~YACH~~,EAAE,CAAC,UAAU,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;~~SAC/C;QACD~~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~~AAzND~~,~~oDAyNC~~"}
1	+ {"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/translatable-saver/translatable-saver.js CHANGED Viewed

@@ -85,6 +85,7 @@ let TranslatableSaver = class TranslatableSaver {
         const differ = new translation_differ_1.TranslationDiffer(translationType, this.connection);
         const diff = differ.diff(existingTranslations, input.translations);
         const entity = await differ.applyDiff(ctx, new entityType(Object.assign(Object.assign({}, input), { translations: existingTranslations })), diff);
+        entity.updatedAt = new Date();
         const updatedEntity = (0, patch_entity_1.patchEntity)(entity, (0, omit_1.omit)(input, ['translations']));
         if (typeof beforeSave === 'function') {
             await beforeSave(entity);

package/dist/service/helpers/translatable-saver/translatable-saver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"translatable-saver.js","sourceRoot":"","sources":["../../../../src/service/helpers/translatable-saver/translatable-saver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAgD;AAOhD,2FAAuF;AAGvF,wDAAoD;AAEpD,6DAAyD;AAezD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC1B,YAAoB,UAAmC;QAAnC,eAAU,GAAV,UAAU,CAAyB;IAAG,CAAC;IAE3D;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAyC,OAAqC;QACtF,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QAE/F,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,YAAY,GAA0B,EAAE,CAAC;QAE/C,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,KAAK,MAAM,gBAAgB,IAAI,KAAK,CAAC,YAAY,EAAE;gBAC/C,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,gBAAgB,CAAC,CAAC;gBAC1D,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,WAAkB,CAAC,CAAC;aACtF;SACJ;QAED,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;QACnC,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;YAClC,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;SAC5B;QACD,OAAO,MAAM,IAAI,CAAC,UAAU;aACvB,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC;aAC9B,IAAI,CAAC,MAAa,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAyC,OAAqC;QACtF,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;QAC/F,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC;YACxF,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,EAAE;YACjC,SAAS,EAAE,CAAC,MAAM,CAAC;SACa,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,IAAI,sCAAiB,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACvE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CACjC,GAAG,EACH,IAAI,UAAU,iCAAM,KAAK,KAAE,YAAY,EAAE,oBAAoB,IAAG,EAChE,IAAI,CACP,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,0BAAW,EAAC,MAAa,EAAE,IAAA,WAAI,EAAC,KAAK,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,OAAO,UAAU,KAAK,UAAU,EAAE;YAClC,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC,UAAU;aACjB,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC;aAC9B,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC9D,CAAC;CACJ,CAAA;~~AA1DY~~,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAEuB,kDAAuB;GAD9C,iBAAiB,~~CA0D7B~~;~~AA1DY~~,8CAAiB"}
1	+ {"version":3,"file":"translatable-saver.js","sourceRoot":"","sources":["../../../../src/service/helpers/translatable-saver/translatable-saver.ts"],"names":[],"mappings":"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"}

package/dist/service/services/product-variant.service.js CHANGED Viewed

@@ -241,9 +241,15 @@ let ProductVariantService = class ProductVariantService {
      * page, this method returns only the Product itself.
      */
     async getProductForVariant(ctx, variant) {
-        const product = await this.connection.getEntityOrThrow(ctx, product_entity_1.Product, variant.productId, {
-            includeSoftDeleted: true,
-        });
+        let product;
+        if (!variant.product) {
+            product = await this.connection.getEntityOrThrow(ctx, product_entity_1.Product, variant.productId, {
+                includeSoftDeleted: true,
+            });
+        }
+        else {
+            product = variant.product;
+        }
         return this.translator.translate(product, ctx);
     }
     /**

package/dist/service/services/product-variant.service.js.map CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/core",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "description": "A modern, headless ecommerce framework",
     "repository": {
         "type": "git",
@@ -51,7 +51,7 @@
         "@nestjs/testing": "10.2.1",
         "@nestjs/typeorm": "10.0.0",
         "@types/fs-extra": "^9.0.1",
-        "@vendure/common": "^2.1.6",
+        "@vendure/common": "^2.1.7",
         "bcrypt": "^5.1.1",
         "body-parser": "^1.20.2",
         "chalk": "^4.1.2",
@@ -103,5 +103,5 @@
         "sqlite3": "^5.1.4",
         "typescript": "4.9.5"
     },
-    "gitHead": "fb534984d2fd5b691b31844a1d5b9a4d59d2d307"
+    "gitHead": "7951ed0d3604a1616dd03c118504cccc108c831d"
 }