@vendure/core 1.4.1 → 1.4.2

package/dist/common/types/entity-relation-paths.d.ts

@@ -19,7 +19,7 @@ import { VendureEntity } from '../../entity/base/base.entity';
  *
  * @docsCategory Common
  */
-export declare type EntityRelationPaths<T extends VendureEntity> = PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
+export declare type EntityRelationPaths<T extends VendureEntity> = `customFields.${string}` | PathsToStringProps1<T> | Join<PathsToStringProps2<T>, '.'> | TripleDotPath;
 export declare type EntityRelationKeys<T extends VendureEntity> = {
     [K in Extract<keyof T, string>]: Required<T>[K] extends VendureEntity ? K : Required<T>[K] extends VendureEntity[] ? K : never;
 }[Extract<keyof T, string>];

package/dist/job-queue/subscribable-job.js

@@ -48,7 +48,7 @@ class SubscribableJob extends job_1.Job {
             // tslint:disable-next-line:no-non-null-assertion
             return rxjs_1.interval(pollInterval).pipe(operators_1.tap(i => {
                 if (timeoutMs < i * pollInterval) {
-                    throw new Error(`Job ${this.id} update polling timed out after ${timeoutMs}ms. The job may still be running.`);
+                    throw new Error(`Job ${this.id} SubscribableJob update polling timed out after ${timeoutMs}ms. The job may still be running.`);
                 }
             }), operators_1.switchMap(() => {
                 const id = this.id;

package/dist/job-queue/subscribable-job.js.map

@@ -1 +1 @@
-{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,mCAAmC,SAAS,mCAAmC,CAChG,CAAC;iBACL;YACL,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACX,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,EAAE;oBACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBAC1E;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,kBAAM,CAAC,iCAAkB,CAAC,EAC1B,gCAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,CAAC,EAC3D,qBAAS,CACL,GAAG,CAAC,EAAE,CACF,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,MAAM;gBAC9B,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS;gBAChC,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EACpC,IAAI,CACP,EACD,eAAG,CAAC,GAAG,CAAC,EAAE;gBACN,IAAI,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,MAAM,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACL,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChF,CAAC;SACL;IACL,CAAC;CACJ;AAjED,0CAiEC"}
+{"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":";;;;;;AAAA,yEAA+D;AAC/D,mDAAgD;AAChD,mEAAsE;AACtE,4CAAoB;AACpB,+BAA4C;AAC5C,8CAA8F;AAE9F,mDAA6D;AAC7D,uGAAmG;AAGnG,+BAA4B;AAe5B;;;;;;;;GAQG;AACH,MAAa,eAA4C,SAAQ,SAAM;IAGnE,YAAY,GAAW,EAAE,gBAAkC;QACvD,MAAM,MAAM,mCACL,GAAG,KACN,KAAK,EAAE,GAAG,CAAC,KAAK,EAChB,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS,GAC1B,CAAC;QACF,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IAC7C,CAAC;IAED;;;;;;;OAOG;IACH,OAAO,CAAC,OAAuD;;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,mCAAI,GAAG,CAAC,CAAC;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,mCAAI,YAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,8DAA6B,CAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,eAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,eAAG,CAAC,CAAC,CAAC,EAAE;gBACJ,IAAI,SAAS,GAAG,CAAC,GAAG,YAAY,EAAE;oBAC9B,MAAM,IAAI,KAAK,CACX,OAAO,IAAI,CAAC,EAAE,mDAAmD,SAAS,mCAAmC,CAChH,CAAC;iBACL;YACL,CAAC,CAAC,EACF,qBAAS,CAAC,GAAG,EAAE;gBACX,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;gBACnB,IAAI,CAAC,EAAE,EAAE;oBACL,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBAC1E;gBACD,OAAO,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,CAAC,EACF,kBAAM,CAAC,iCAAkB,CAAC,EAC1B,gCAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,CAAC,EAC3D,qBAAS,CACL,GAAG,CAAC,EAAE,CACF,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,MAAK,0BAAQ,CAAC,MAAM;gBAC9B,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS;gBAChC,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,SAAS,EACpC,IAAI,CACP,EACD,eAAG,CAAC,GAAG,CAAC,EAAE;gBACN,IAAI,GAAG,CAAC,KAAK,KAAK,0BAAQ,CAAC,MAAM,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC9B;YACL,CAAC,CAAC,EACF,eAAG,CAAC,GAAG,CAAC,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAChF,CAAC;SACL;IACL,CAAC;CACJ;AAjED,0CAiEC"}

package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js

@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
 const rxjs_1 = require("rxjs");
 const config_service_1 = require("../../../config/config.service");
 const inspectable_job_queue_strategy_1 = require("../../../config/job-queue/inspectable-job-queue-strategy");
+const vendure_logger_1 = require("../../../config/logger/vendure-logger");
 const job_queue_service_1 = require("../../../job-queue/job-queue.service");
 const subscribable_job_1 = require("../../../job-queue/subscribable-job");
 const constants_1 = require("../constants");
@@ -52,7 +53,11 @@ let SearchJobBufferService = class SearchJobBufferService {
         const collectionFilterJobs = await this.jobQueueService.flush(this.collectionJobBuffer);
         if (collectionFilterJobs.length && inspectable_job_queue_strategy_1.isInspectableJobQueueStrategy(jobQueueStrategy)) {
             const subscribableCollectionJobs = collectionFilterJobs.map(job => new subscribable_job_1.SubscribableJob(job, jobQueueStrategy));
-            await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs: 3 * 60 * 1000 }))).toPromise();
+            await rxjs_1.forkJoin(...subscribableCollectionJobs.map(sj => sj.updates({ pollInterval: 500, timeoutMs: 15 * 60 * 1000 })))
+                .toPromise()
+                .catch(err => {
+                vendure_logger_1.Logger.error(err.message);
+            });
         }
         await this.jobQueueService.flush(this.searchIndexJobBuffer);
     }

package/dist/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAC9D,CACJ,CAAC,SAAS,EAAE,CAAC;SACjB;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AAjDY,sBAAsB;IADlC,mBAAU,EAAE;IAQJ,WAAA,eAAM,CAAC,uCAA2B,CAAC,CAAA;qCAFX,mCAAe;QACjB,8BAAa;GAN/B,sBAAsB,CAiDlC;AAjDY,wDAAsB"}
+{"version":3,"file":"search-job-buffer.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-job-buffer/search-job-buffer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,+BAAgC;AAEhC,mEAA+D;AAC/D,6GAAyG;AACzG,0EAA+D;AAC/D,4EAAuE;AACvE,0EAAsE;AACtE,4CAA2D;AAE3D,mEAA8D;AAC9D,uEAAiE;AAGjE,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAI/B,YACY,eAAgC,EAChC,aAA4B,EACS,aAAsB;QAF3D,oBAAe,GAAf,eAAe,CAAiB;QAChC,kBAAa,GAAb,aAAa,CAAe;QACS,kBAAa,GAAb,aAAa,CAAS;QAN9D,yBAAoB,GAAG,IAAI,8CAAoB,EAAE,CAAC;QAClD,wBAAmB,GAAG,IAAI,2CAAmB,EAAE,CAAC;IAMtD,CAAC;IAEJ,sBAAsB;QAClB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;YAC7B,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC1D,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC5D;IACL,CAAC;IAED,KAAK,CAAC,uBAAuB;;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO,CAAC,CAAC;SACZ;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACrD,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,mBAAmB,CAC3B,CAAC;QACF,OAAO,CACH,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,GAAG,CAAC,MAAA,WAAW,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,mCAAI,CAAC,CAAC,CACrG,CAAC;IACN,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YACrB,OAAO;SACV;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;QAEhE,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACxF,IAAI,oBAAoB,CAAC,MAAM,IAAI,8DAA6B,CAAC,gBAAgB,CAAC,EAAE;YAChF,MAAM,0BAA0B,GAAG,oBAAoB,CAAC,GAAG,CACvD,GAAG,CAAC,EAAE,CAAC,IAAI,kCAAe,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACpD,CAAC;YACF,MAAM,eAAQ,CACV,GAAG,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CACnC,EAAE,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,CAC/D,CACJ;iBACI,SAAS,EAAE;iBACX,KAAK,CAAC,GAAG,CAAC,EAAE;gBACT,uBAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;SACV;QACD,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IAChE,CAAC;CACJ,CAAA;AArDY,sBAAsB;IADlC,mBAAU,EAAE;IAQJ,WAAA,eAAM,CAAC,uCAA2B,CAAC,CAAA;qCAFX,mCAAe;QACjB,8BAAa;GAN/B,sBAAsB,CAqDlC;AArDY,wDAAsB"}

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

@@ -109,18 +109,18 @@ class MysqlSearchStrategy {
                 .select('si_inner.productId', 'inner_productId')
                 .addSelect('si_inner.productVariantId', 'inner_productVariantId')
                 .addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
-                .addSelect(`(SELECT sku_score) +
-                     MATCH (productName) AGAINST (:term) * 2 +
-                     MATCH (productVariantName) AGAINST (:term) * 1.5 +
-                     MATCH (description) AGAINST (:term)* 1`, 'score')
+                .addSelect(`(SELECT sku_score) +
+                     MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
+                     MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
+                     MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
                 .where(new typeorm_1.Brackets(qb1 => {
                 qb1.where('sku LIKE :like_term')
-                    .orWhere('MATCH (productName) AGAINST (:term)')
-                    .orWhere('MATCH (productVariantName) AGAINST (:term)')
-                    .orWhere('MATCH (description) AGAINST (:term)');
+                    .orWhere('MATCH (productName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE)')
+                    .orWhere('MATCH (description) AGAINST (:term IN BOOLEAN MODE)');
             }))
                 .andWhere('channelId = :channelId')
-                .setParameters({ term, like_term: `%${term}%`, channelId: ctx.channelId });
+                .setParameters({ term: `${term}*`, like_term: `%${term}%`, channelId: ctx.channelId });
             qb.innerJoin(`(${termScoreQuery.getQuery()})`, 'term_result', 'inner_productId = si.productId')
                 .addSelect(input.groupByProduct ? 'MAX(term_result.score)' : 'term_result.score', 'score')
                 .andWhere('term_result.inner_productVariantId = si.productVariantId')

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

@@ -1 +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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"}
+{"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

@@ -106,15 +106,21 @@ class PostgresSearchStrategy {
     applyTermAndFilters(ctx, qb, input, forceGroup = false) {
         const { term, facetValueFilters, facetValueIds, facetValueOperator, collectionId, collectionSlug } = input;
         // join multiple words with the logical AND operator
-        const termLogicalAnd = term ? term.trim().replace(/\s+/g, ' & ') : '';
+        const termLogicalAnd = term
+            ? term
+                .trim()
+                .split(/\s+/g)
+                .map(t => `${t}:*`)
+                .join(' & ')
+            : '';
         qb.where('1 = 1');
         if (term && term.length > this.minTermLength) {
             const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
-            qb.addSelect(`
-                    (ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
-                    ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
-                    ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
-                    ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
+            qb.addSelect(`
+                    (ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
+                    ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
+                    ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
+                    ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
                             `, 'score')
                 .andWhere(new typeorm_1.Brackets(qb1 => {
                 qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')

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

@@ -1 +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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"}
+{"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/service/helpers/entity-hydrator/entity-hydrator.service.d.ts

@@ -11,7 +11,7 @@ import { HydrateOptions } from './entity-hydrator-types';
  *
  * @example
  * ```TypeScript
- * const product = this.productVariantService
+ * const product = await this.productVariantService
  *   .getProductForVariant(ctx, variantId);
  *
  * await this.entityHydrator
@@ -26,6 +26,17 @@ import { HydrateOptions } from './entity-hydrator-types';
  * options is used (see {@link HydrateOptions}), any related ProductVariant will have the correct
  * Channel-specific prices applied to them.
  *
+ * Custom field relations may also be hydrated:
+ *
+ * @example
+ * ```TypeScript
+ * const customer = await this.customerService
+ *   .findOne(ctx, id);
+ *
+ * await this.entityHydrator
+ *   .hydrate(ctx, customer, { relations: ['customFields.avatar' ]});
+ * ```
+ *
  * @docsCategory data-access
  * @since 1.3.0
  */

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js

@@ -26,7 +26,7 @@ const translate_entity_1 = require("../utils/translate-entity");
  *
  * @example
  * ```TypeScript
- * const product = this.productVariantService
+ * const product = await this.productVariantService
  *   .getProductForVariant(ctx, variantId);
  *
  * await this.entityHydrator
@@ -41,6 +41,17 @@ const translate_entity_1 = require("../utils/translate-entity");
  * options is used (see {@link HydrateOptions}), any related ProductVariant will have the correct
  * Channel-specific prices applied to them.
  *
+ * Custom field relations may also be hydrated:
+ *
+ * @example
+ * ```TypeScript
+ * const customer = await this.customerService
+ *   .findOne(ctx, id);
+ *
+ * await this.entityHydrator
+ *   .hydrate(ctx, customer, { relations: ['customFields.avatar' ]});
+ * ```
+ *
  * @docsCategory data-access
  * @since 1.3.0
  */
@@ -134,7 +145,7 @@ let EntityHydrator = class EntityHydrator {
         const missingRelations = [];
         for (const relation of options.relations.slice().sort()) {
             if (typeof relation === 'string') {
-                const parts = relation.split('.');
+                const parts = !relation.startsWith('customFields') ? relation.split('.') : [relation];
                 let entity = target;
                 const path = [];
                 for (const part of parts) {

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map

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

package/dist/service/helpers/order-modifier/order-modifier.js

@@ -141,6 +141,14 @@ let OrderModifier = class OrderModifier {
             orderLine.items = await this.connection
                 .getRepository(ctx, order_item_entity_1.OrderItem)
                 .find({ where: { line: orderLine } });
+            if (!order.active) {
+                await this.stockMovementService.createAllocationsForOrderLines(ctx, [
+                    {
+                        orderLine,
+                        quantity: quantity - currentQuantity,
+                    },
+                ]);
+            }
         }
         else if (quantity < currentQuantity) {
             if (order.active) {
@@ -160,9 +168,9 @@ let OrderModifier = class OrderModifier {
                 // When an Order is not active (i.e. Customer checked out), then we don't want to just
                 // delete the OrderItems - instead we will cancel them
                 const toSetAsCancelled = orderLine.items.filter(i => !i.cancelled).slice(quantity);
-                const soldItems = toSetAsCancelled.filter(i => !!i.fulfillment);
+                const fulfilledItems = toSetAsCancelled.filter(i => !!i.fulfillment);
                 const allocatedItems = toSetAsCancelled.filter(i => !i.fulfillment);
-                await this.stockMovementService.createCancellationsForOrderItems(ctx, soldItems);
+                await this.stockMovementService.createCancellationsForOrderItems(ctx, fulfilledItems);
                 await this.stockMovementService.createReleasesForOrderItems(ctx, allocatedItems);
                 toSetAsCancelled.forEach(i => (i.cancelled = true));
                 await this.connection.getRepository(ctx, order_item_entity_1.OrderItem).save(toSetAsCancelled, { reload: false });

package/dist/service/helpers/order-modifier/order-modifier.js.map

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

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

@@ -337,11 +337,9 @@ let CustomerService = class CustomerService {
      */
     async refreshVerificationToken(ctx, emailAddress) {
         const user = await this.userService.getUserByEmailAddress(ctx, emailAddress);
-        if (user) {
+        if (user && !user.verified) {
             await this.userService.setVerificationToken(ctx, user);
-            if (!user.verified) {
-                this.eventBus.publish(new account_registration_event_1.AccountRegistrationEvent(ctx, user));
-            }
+            this.eventBus.publish(new account_registration_event_1.AccountRegistrationEvent(ctx, user));
         }
     }
     /**

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vendure/core",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "A modern, headless ecommerce framework",
   "repository": {
     "type": "git",
@@ -49,7 +49,7 @@
     "@nestjs/testing": "7.6.17",
     "@nestjs/typeorm": "7.1.5",
     "@types/fs-extra": "^9.0.1",
-    "@vendure/common": "^1.4.1",
+    "@vendure/common": "^1.4.2",
     "apollo-server-express": "2.24.1",
     "bcrypt": "^5.0.0",
     "body-parser": "^1.19.0",
@@ -99,5 +99,5 @@
     "sqlite3": "^5.0.0",
     "typescript": "4.3.5"
   },
-  "gitHead": "d81a3ad010672e2177719a77d4310bf3cbc52c1b"
+  "gitHead": "0418d311a406ce475d83b96ff96c100e8b468cc6"
 }