npm - @vendure/core - Versions diffs - 2.0.0-next.2 → 2.0.0-next.21 - Mend

@vendure/core 2.0.0-next.2 → 2.0.0-next.21

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

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

@@ -33,8 +33,7 @@ class SubscribableJob extends job_1.Job {
      * Returns an Observable stream of updates to the Job. Works by polling the current JobQueueStrategy's `findOne()` method
      * to obtain updates. If this updates are not subscribed to, then no polling occurs.
      *
-     * The polling interval defaults to 200ms, but can be configured by passing in an options argument. Polling will also timeout
-     * after 1 hour, but this timeout can also be configured by passing the `timeoutMs` option.
+     * Polling interval, timeout and other options may be configured with an options arguments {@link JobUpdateOptions}.
      */
     updates(options) {
         var _a, _b;
@@ -56,10 +55,11 @@ class SubscribableJob extends job_1.Job {
                     throw new Error(`Cannot subscribe to update: Job does not have an ID`);
                 }
                 return strategy.findOne(id);
-            }), (0, operators_1.filter)(shared_utils_1.notNullOrUndefined), (0, operators_1.distinctUntilChanged)((a, b) => (a === null || a === void 0 ? void 0 : a.progress) === (b === null || b === void 0 ? void 0 : b.progress) || (a === null || a === void 0 ? void 0 : a.state) === (b === null || b === void 0 ? void 0 : b.state)), (0, operators_1.takeWhile)(job => (job === null || job === void 0 ? void 0 : job.state) !== generated_types_1.JobState.FAILED &&
+            }), (0, operators_1.filter)(shared_utils_1.notNullOrUndefined), (0, operators_1.distinctUntilChanged)((a, b) => (a === null || a === void 0 ? void 0 : a.progress) === (b === null || b === void 0 ? void 0 : b.progress) && (a === null || a === void 0 ? void 0 : a.state) === (b === null || b === void 0 ? void 0 : b.state)), (0, operators_1.takeWhile)(job => (job === null || job === void 0 ? void 0 : job.state) !== generated_types_1.JobState.FAILED &&
                 job.state !== generated_types_1.JobState.COMPLETED &&
                 job.state !== generated_types_1.JobState.CANCELLED, true), (0, operators_1.tap)(job => {
-                if (job.state === generated_types_1.JobState.FAILED) {
+                var _a;
+                if (job.state === generated_types_1.JobState.FAILED && ((_a = options === null || options === void 0 ? void 0 : options.errorOnFail) !== null && _a !== void 0 ? _a : true)) {
                     throw new Error(job.error);
                 }
             }), (0, operators_1.map)(job => (0, pick_1.pick)(job, ['id', 'state', 'progress', 'result', 'error', 'data'])));

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

	@@ -1 +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,IAAA,YAAE,EAAC,IAAI,CAAC,CAAC,CAAC;QACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC;QACvC,IAAI,CAAC,IAAA,8DAA6B,EAAC,QAAQ,CAAC,EAAE;YAC1C,MAAM,IAAI,4BAAmB,CACzB,oCAAoC,QAAQ,CAAC,WAAW,CAAC,IAAI,8DAA8D,CAC9H,CAAC;SACL;aAAM;YACH,iDAAiD;YACjD,OAAO,IAAA,eAAQ,EAAC,YAAY,CAAC,CAAC,IAAI,CAC9B,IAAA,eAAG,EAAC,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,IAAA,qBAAS,EAAC,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,IAAA,kBAAM,EAAC,iCAAkB,CAAC,EAC1B,IAAA,gCAAoB,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CAAA,IAAI,CAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,OAAK,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,KAAK,CAAA,CAAC,EACpF,IAAA,qBAAS,EACL,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,IAAA,eAAG,EAAC,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,IAAA,eAAG,EAAC,GAAG,CAAC,EAAE,CAAC,IAAA,WAAI,EAAC,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~~"}
1	+ {"version":3,"file":"subscribable-job.js","sourceRoot":"","sources":["../../src/job-queue/subscribable-job.ts"],"names":[],"mappings":"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"}

package/dist/migrate.js CHANGED Viewed

@@ -12,6 +12,7 @@ const typeorm_1 = require("typeorm");
 const MysqlDriver_1 = require("typeorm/driver/mysql/MysqlDriver");
 const StringUtils_1 = require("typeorm/util/StringUtils");
 const bootstrap_1 = require("./bootstrap");
+const config_helpers_1 = require("./config/config-helpers");
 /**
  * @description
  * Runs any pending database migrations. See [TypeORM migration docs](https://typeorm.io/#/migrations)
@@ -34,10 +35,21 @@ async function runMigrations(userConfig) {
         process.exitCode = 1;
     }
     finally {
+        await checkMigrationStatus(connection);
         await connection.close();
+        (0, config_helpers_1.resetConfig)();
     }
 }
 exports.runMigrations = runMigrations;
+async function checkMigrationStatus(connection) {
+    const builderLog = await connection.driver.createSchemaBuilder().log();
+    if (builderLog.upQueries.length) {
+        console.log(chalk_1.default.yellow(`Your database schema does not match your current configuration. Generate a new migration for the following changes:`));
+        for (const query of builderLog.upQueries) {
+            console.log(' - ' + chalk_1.default.yellow(query.query));
+        }
+    }
+}
 /**
  * @description
  * Reverts the last applied database migration. See [TypeORM migration docs](https://typeorm.io/#/migrations)
@@ -58,6 +70,7 @@ async function revertLastMigration(userConfig) {
     }
     finally {
         await connection.close();
+        (0, config_helpers_1.resetConfig)();
     }
 }
 exports.revertLastMigration = revertLastMigration;
@@ -129,6 +142,7 @@ async function generateMigration(userConfig, options) {
         console.log(chalk_1.default.yellow(`No changes in database schema were found - cannot generate a migration.`));
     }
     await connection.close();
+    (0, config_helpers_1.resetConfig)();
 }
 exports.generateMigration = generateMigration;
 function createConnectionOptions(userConfig) {

package/dist/migrate.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,kDAA0B;AAC1B,wDAA0B;AAC1B,gDAAwB;AACxB,qCAA0E;AAC1E,kEAA+D;AAC/D,0DAAqD;AAErD,2CAAiD;~~AAuBjD~~;;;;;;GAMG;AACI,KAAK,UAAU,aAAa,CAAC,UAAkC;IAClE,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAkB,EAAC,UAAU,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3E,IAAI;QACA,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAAC,UAAU,EAAE,GAAG,EAAE,CAClE,UAAU,CAAC,aAAa,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACpD,CAAC;QACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,KAAK,CAAC,+BAA+B,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SAC7E;KACJ;IAAC,OAAO,CAAM,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,4CAA4C,CAAC,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACvB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;KACxB;YAAS;QACN,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;~~KAC5B~~;AACL,CAAC;~~AAjBD~~,~~sCAiBC~~;AAED;;;;;;GAMG;AACI,KAAK,UAAU,mBAAmB,CAAC,UAAkC;IACxE,MAAM,MAAM,GAAG,MAAM,IAAA,8BAAkB,EAAC,UAAU,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3E,IAAI;QACA,MAAM,2BAA2B,CAAC,UAAU,EAAE,GAAG,EAAE,CAC/C,UAAU,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CACxD,CAAC;KACL;IAAC,OAAO,CAAM,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,eAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC,CAAC;QACtE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACvB,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;KACxB;YAAS;QACN,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;~~KAC5B~~;AACL,CAAC;~~AAdD~~,~~kDAcC~~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~~AAC7B~~,CAAC;~~AAtED~~,~~8CAsEC~~;AAED,SAAS,uBAAuB,CAAC,UAAkC;IAC/D,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,CAAC,mBAAmB,EAAE;QAC5F,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,KAAK;QAClB,aAAa,EAAE,KAAK;QACpB,UAAU,EAAE,KAAK;QACjB,MAAM,EAAE,kBAAkB;KAC7B,CAAC,CAAC;AACP,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,2BAA2B,CAAI,UAAsB,EAAE,IAAsB;IACxF,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,IAAI,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,gBAAgB,CAAC;IACtG,IAAI,QAAQ,EAAE;QACV,MAAM,UAAU,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;KACrD;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,EAAE,CAAC;IAC5B,IAAI,QAAQ,EAAE;QACV,MAAM,UAAU,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;KACpD;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,WAAW,CAAC,IAAY,EAAE,SAAiB,EAAE,MAAgB,EAAE,QAAkB;IACtF,OAAO;;eAEI,IAAA,uBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,GAAG,SAAS;;;EAG9C,MAAM,CAAC,IAAI,CAAC;CACb,CAAC;;;;EAIA,QAAQ,CAAC,IAAI,CAAC;CACf,CAAC;;;;CAID,CAAC;AACF,CAAC"}
1	+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.js CHANGED Viewed

@@ -13,14 +13,14 @@ class SqlJobBufferStorageStrategy {
         this.connection = injector.get(transactional_connection_1.TransactionalConnection);
     }
     async add(bufferId, job) {
-        await this.connection.getRepository(job_record_buffer_entity_1.JobRecordBuffer).save(new job_record_buffer_entity_1.JobRecordBuffer({
+        await this.connection.rawConnection.getRepository(job_record_buffer_entity_1.JobRecordBuffer).save(new job_record_buffer_entity_1.JobRecordBuffer({
             bufferId,
             job: this.toJobConfig(job),
         }));
         return job;
     }
     async bufferSize(bufferIds) {
-        const qb = await this.connection
+        const qb = await this.connection.rawConnection
             .getRepository(job_record_buffer_entity_1.JobRecordBuffer)
             .createQueryBuilder('record')
             .select(`COUNT(*)`, 'count')
@@ -37,7 +37,9 @@ class SqlJobBufferStorageStrategy {
         return result;
     }
     async flush(bufferIds) {
-        const selectQb = this.connection.getRepository(job_record_buffer_entity_1.JobRecordBuffer).createQueryBuilder('record');
+        const selectQb = this.connection.rawConnection
+            .getRepository(job_record_buffer_entity_1.JobRecordBuffer)
+            .createQueryBuilder('record');
         if (bufferIds === null || bufferIds === void 0 ? void 0 : bufferIds.length) {
             selectQb.where(`record.bufferId IN (:...bufferIds)`, { bufferIds });
         }

package/dist/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sql-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.ts"],"names":[],"mappings":";;;AACA,wFAAoF;AACpF,6CAA0C;AAI1C,yEAA6D;AAE7D;;;GAGG;AACH,MAAa,2BAA2B;IAGpC,IAAI,CAAC,QAAkB;QACnB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB,EAAE,GAAQ;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC,IAAI,~~CACrD~~,IAAI,0CAAe,CAAC;YAChB,QAAQ;YACR,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;SAC7B,CAAC,CACL,CAAC;QAEF,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAoB;QACjC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU;~~aAC3B~~,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;aAC3B,SAAS,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAE9C,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,EAAE,CAAC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,UAAU,EAAE,CAAC;QAE9D,MAAM,MAAM,GAAmC,EAAE,CAAC;QAClD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,SAAS;gBAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;SACpD;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAoB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,~~CAAC,~~kBAAkB,CAAC,QAAQ,CAAC,CAAC;~~QAC7F~~,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,QAAQ,CAAC,KAAK,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SACvE;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,MAAM,GAAkC,EAAE,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACvB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;aAC7B;YACD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,SAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,0CAAe,CAAC,CAAC;QACnG,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,QAAQ,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SAChE;QACD,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,GAAa;;QAC7B,uCACO,GAAG,KACN,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,MAAA,GAAG,CAAC,EAAE,mCAAI,SAAS,IACzB;IACN,CAAC;CACJ;~~AAlED~~,~~kEAkEC~~"}
1	+ {"version":3,"file":"sql-job-buffer-storage-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.ts"],"names":[],"mappings":";;;AACA,wFAAoF;AACpF,6CAA0C;AAI1C,yEAA6D;AAE7D;;;GAGG;AACH,MAAa,2BAA2B;IAGpC,IAAI,CAAC,QAAkB;QACnB,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,QAAgB,EAAE,GAAQ;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC,IAAI,CACnE,IAAI,0CAAe,CAAC;YAChB,QAAQ;YACR,GAAG,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;SAC7B,CAAC,CACL,CAAC;QAEF,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,SAAoB;QACjC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa;aACzC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;aAC3B,SAAS,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAE9C,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,EAAE,CAAC,QAAQ,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SACpE;QAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,UAAU,EAAE,CAAC;QAE9D,MAAM,MAAM,GAAmC,EAAE,CAAC;QAClD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,SAAS;gBAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC;SACpD;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAoB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa;aACzC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,QAAQ,CAAC,KAAK,CAAC,oCAAoC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SACvE;QACD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtC,MAAM,MAAM,GAAkC,EAAE,CAAC;QACjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACvB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;aAC7B;YACD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,SAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,0CAAe,CAAC,CAAC;QACnG,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE;YACnB,QAAQ,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;SAChE;QACD,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,WAAW,CAAC,GAAa;;QAC7B,uCACO,GAAG,KACN,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,MAAA,GAAG,CAAC,EAAE,mCAAI,SAAS,IACzB;IACN,CAAC;CACJ;AApED,kEAoEC"}

package/dist/plugin/default-search-plugin/default-search-plugin.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { OnApplicationBootstrap } from '@nestjs/common';
+import { OnApplicationBootstrap, OnApplicationShutdown } from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import { SearchReindexResponse } from '@vendure/common/lib/generated-types';
 import { Type } from '@vendure/common/lib/shared-types';
 import { EventBus } from '../../event-bus/event-bus';
@@ -41,16 +42,21 @@ export interface DefaultSearchReindexResponse extends SearchReindexResponse {
  *
  * @docsCategory DefaultSearchPlugin
  */
-export declare class DefaultSearchPlugin implements OnApplicationBootstrap {
+export declare class DefaultSearchPlugin implements OnApplicationBootstrap, OnApplicationShutdown {
     private eventBus;
     private searchIndexService;
     private jobQueueService;
+    private moduleRef;
     static options: DefaultSearchPluginInitOptions;
     /** @internal */
-    constructor(eventBus: EventBus, searchIndexService: SearchIndexService, jobQueueService: JobQueueService);
+    constructor(eventBus: EventBus, searchIndexService: SearchIndexService, jobQueueService: JobQueueService, moduleRef: ModuleRef);
     static init(options: DefaultSearchPluginInitOptions): Type<DefaultSearchPlugin>;
     /** @internal */
     onApplicationBootstrap(): Promise<void>;
+    /** @internal */
+    onApplicationShutdown(signal?: string): Promise<void>;
+    private initSearchStrategy;
+    private destroySearchStrategy;
     /**
      * If the `indexStockStatus` option is set to `true`, we dynamically add a couple of
      * columns to the SearchIndexItem entity. This is done in this way to allow us to add

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

@@ -11,8 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var DefaultSearchPlugin_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultSearchPlugin = void 0;
+const core_1 = require("@nestjs/core");
 const operators_1 = require("rxjs/operators");
 const typeorm_1 = require("typeorm");
+const common_1 = require("../../common");
 const utils_1 = require("../../common/utils");
 const event_bus_1 = require("../../event-bus/event-bus");
 const asset_event_1 = require("../../event-bus/events/asset-event");
@@ -67,10 +69,11 @@ const search_job_buffer_service_1 = require("./search-job-buffer/search-job-buff
  */
 let DefaultSearchPlugin = DefaultSearchPlugin_1 = class DefaultSearchPlugin {
     /** @internal */
-    constructor(eventBus, searchIndexService, jobQueueService) {
+    constructor(eventBus, searchIndexService, jobQueueService, moduleRef) {
         this.eventBus = eventBus;
         this.searchIndexService = searchIndexService;
         this.jobQueueService = jobQueueService;
+        this.moduleRef = moduleRef;
     }
     static init(options) {
         this.options = options;
@@ -145,6 +148,25 @@ let DefaultSearchPlugin = DefaultSearchPlugin_1 = class DefaultSearchPlugin {
                 return this.searchIndexService.reindex(event.ctx);
             }
         });
+        await this.initSearchStrategy();
+    }
+    /** @internal */
+    async onApplicationShutdown(signal) {
+        await this.destroySearchStrategy();
+    }
+    async initSearchStrategy() {
+        const injector = new common_1.Injector(this.moduleRef);
+        const searchService = injector.get(fulltext_search_service_1.FulltextSearchService);
+        if (typeof searchService.searchStrategy.init === 'function') {
+            await searchService.searchStrategy.init(injector);
+        }
+    }
+    async destroySearchStrategy() {
+        const injector = new common_1.Injector(this.moduleRef);
+        const searchService = injector.get(fulltext_search_service_1.FulltextSearchService);
+        if (typeof searchService.searchStrategy.destroy === 'function') {
+            await searchService.searchStrategy.destroy();
+        }
     }
     /**
      * If the `indexStockStatus` option is set to `true`, we dynamically add a couple of
@@ -185,7 +207,8 @@ DefaultSearchPlugin = DefaultSearchPlugin_1 = __decorate([
     }),
     __metadata("design:paramtypes", [event_bus_1.EventBus,
         search_index_service_1.SearchIndexService,
-        job_queue_service_1.JobQueueService])
+        job_queue_service_1.JobQueueService,
+        core_1.ModuleRef])
 ], DefaultSearchPlugin);
 exports.DefaultSearchPlugin = DefaultSearchPlugin;
 //# sourceMappingURL=default-search-plugin.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"default-search-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/default-search-plugin.ts"],"names":[],"mappings":";;;;;;;;;;;;;~~AAGA~~,8CAA0E;AAC1E,qCAAiC;AAEjC,8CAAiD;AACjD,yDAAqD;AACrD,oEAAgE;AAChE,wGAAmG;AACnG,wFAAmF;AACnF,wEAAoE;AACpE,wGAAkG;AAClG,wFAAmF;AACnF,oGAA8F;AAC9F,yEAAoE;AACpE,kEAA6D;AAC7D,sDAAkD;AAElD,yDAA4D;AAC5D,6EAAyG;AACzG,2CAA+E;AAC/E,kFAAsE;AACtE,uEAAkE;AAClE,qEAAiE;AACjE,yEAAoE;AACpE,6FAAuF;AAQvF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AA0BH,IAAa,mBAAmB,2BAAhC,MAAa,mBAAmB;IAG5B,gBAAgB;IAChB,YACY,QAAkB,EAClB,kBAAsC,EACtC,eAAgC;~~QAFhC~~,aAAQ,GAAR,QAAQ,CAAU;QAClB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,oBAAe,GAAf,eAAe,CAAiB;~~IACzC~~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~~IACX~~,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,uBAAuB;QAClC,MAAM,QAAQ,GAAG,IAAI,0CAAe,EAAE,CAAC;QACvC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAChE,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;IAC3E,CAAC;CACJ,CAAA;~~AAnHU~~,2BAAO,GAAmC,EAAG,CAAA;AAD3C,mBAAmB;IAzB/B,IAAA,8BAAa,EAAC;QACX,OAAO,EAAE,CAAC,yCAAkB,CAAC;QAC7B,SAAS,EAAE;YACP,+CAAqB;YACrB,yCAAkB;YAClB,sCAAiB;YACjB,kDAAsB;YACtB,EAAE,OAAO,EAAE,+BAAmB,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,qBAAmB,CAAC,OAAO,EAAE;YAC/E;gBACI,OAAO,EAAE,uCAA2B;gBACpC,UAAU,EAAE,GAAG,EAAE,CAAC,qBAAmB,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI;aACvE;SACJ;QACD,kBAAkB,EAAE;YAChB,MAAM,EAAE,GAAG,EAAE,CACT,qBAAmB,CAAC,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,qCAAoB,CAAC,CAAC,CAAC,SAAS;YAC5F,SAAS,EAAE,CAAC,sDAA2B,CAAC;SAC3C;QACD,iBAAiB,EAAE;YACf,MAAM,EAAE,GAAG,EAAE,CACT,qBAAmB,CAAC,OAAO,CAAC,gBAAgB,KAAK,IAAI,CAAC,CAAC,CAAC,qCAAoB,CAAC,CAAC,CAAC,SAAS;YAC5F,SAAS,EAAE,CAAC,qDAA0B,CAAC;SAC1C;QACD,QAAQ,EAAE,CAAC,0CAAe,CAAC;KAC9B,CAAC;qCAMwB,oBAAQ;QACE,yCAAkB;QACrB,mCAAe;~~GAPnC~~,mBAAmB,~~CAoH~~/B;~~AApHY~~,kDAAmB"}
1	+ {"version":3,"file":"default-search-plugin.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/default-search-plugin.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/fulltext-search.service.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import { FacetValueService } from '../../service/services/facet-value.service';
 import { ProductVariantService } from '../../service/services/product-variant.service';
 import { SearchService } from '../../service/services/search.service';
 import { SearchIndexService } from './indexer/search-index.service';
+import { SearchStrategy } from './search-strategy/search-strategy';
 import { DefaultSearchPluginInitOptions } from './types';
 /**
  * Search indexing and full-text search for supported databases. See the various
@@ -24,7 +25,7 @@ export declare class FulltextSearchService {
     private searchIndexService;
     private searchService;
     private options;
-    private searchStrategy;
+    private _searchStrategy;
     private readonly minTermLength;
     constructor(connection: TransactionalConnection, eventBus: EventBus, facetValueService: FacetValueService, collectionService: CollectionService, productVariantService: ProductVariantService, searchIndexService: SearchIndexService, searchService: SearchService, options: DefaultSearchPluginInitOptions);
     /**
@@ -53,4 +54,5 @@ export declare class FulltextSearchService {
      * Sets the SearchStrategy appropriate to th configured database type.
      */
     private setSearchStrategy;
+    get searchStrategy(): SearchStrategy;
 }

package/dist/plugin/default-search-plugin/fulltext-search.service.js CHANGED Viewed

@@ -17,6 +17,7 @@ const common_1 = require("@nestjs/common");
 const errors_1 = require("../../common/error/errors");
 const transactional_connection_1 = require("../../connection/transactional-connection");
 const event_bus_1 = require("../../event-bus/event-bus");
+const search_event_1 = require("../../event-bus/events/search-event");
 const collection_service_1 = require("../../service/services/collection.service");
 const facet_value_service_1 = require("../../service/services/facet-value.service");
 const product_variant_service_1 = require("../../service/services/product-variant.service");
@@ -48,8 +49,9 @@ let FulltextSearchService = class FulltextSearchService {
      * Perform a fulltext search according to the provided input arguments.
      */
     async search(ctx, input, enabledOnly = false) {
-        const items = await this.searchStrategy.getSearchResults(ctx, input, enabledOnly);
-        const totalItems = await this.searchStrategy.getTotalCount(ctx, input, enabledOnly);
+        const items = await this._searchStrategy.getSearchResults(ctx, input, enabledOnly);
+        const totalItems = await this._searchStrategy.getTotalCount(ctx, input, enabledOnly);
+        this.eventBus.publish(new search_event_1.SearchEvent(ctx, input));
         return {
             items,
             totalItems,
@@ -59,7 +61,7 @@ let FulltextSearchService = class FulltextSearchService {
      * Return a list of all FacetValues which appear in the result set.
      */
     async facetValues(ctx, input, enabledOnly = false) {
-        const facetValueIdsMap = await this.searchStrategy.getFacetValueIds(ctx, input, enabledOnly);
+        const facetValueIdsMap = await this._searchStrategy.getFacetValueIds(ctx, input, enabledOnly);
         const facetValues = await this.facetValueService.findByIds(ctx, Array.from(facetValueIdsMap.keys()));
         return facetValues.map((facetValue, index) => {
             return {
@@ -72,7 +74,7 @@ let FulltextSearchService = class FulltextSearchService {
      * Return a list of all Collections which appear in the result set.
      */
     async collections(ctx, input, enabledOnly = false) {
-        const collectionIdsMap = await this.searchStrategy.getCollectionIds(ctx, input, enabledOnly);
+        const collectionIdsMap = await this._searchStrategy.getCollectionIds(ctx, input, enabledOnly);
         const collections = await this.collectionService.findByIds(ctx, Array.from(collectionIdsMap.keys()));
         return collections.map((collection, index) => {
             return {
@@ -92,22 +94,33 @@ let FulltextSearchService = class FulltextSearchService {
      * Sets the SearchStrategy appropriate to th configured database type.
      */
     setSearchStrategy() {
-        switch (this.connection.rawConnection.options.type) {
-            case 'mysql':
-            case 'mariadb':
-                this.searchStrategy = new mysql_search_strategy_1.MysqlSearchStrategy(this.connection, this.options);
-                break;
-            case 'sqlite':
-            case 'sqljs':
-            case 'better-sqlite3':
-                this.searchStrategy = new sqlite_search_strategy_1.SqliteSearchStrategy(this.connection, this.options);
-                break;
-            case 'postgres':
-                this.searchStrategy = new postgres_search_strategy_1.PostgresSearchStrategy(this.connection, this.options);
-                break;
-            default:
-                throw new errors_1.InternalServerError(`error.database-not-supported-by-default-search-plugin`);
+        if (this.options.searchStategy) {
+            this._searchStrategy = this.options.searchStategy;
         }
+        else {
+            switch (this.connection.rawConnection.options.type) {
+                case 'mysql':
+                case 'mariadb':
+                case 'aurora-data-api':
+                    this._searchStrategy = new mysql_search_strategy_1.MysqlSearchStrategy();
+                    break;
+                case 'sqlite':
+                case 'sqljs':
+                case 'better-sqlite3':
+                    this._searchStrategy = new sqlite_search_strategy_1.SqliteSearchStrategy();
+                    break;
+                case 'postgres':
+                case 'aurora-data-api-pg':
+                case 'cockroachdb':
+                    this._searchStrategy = new postgres_search_strategy_1.PostgresSearchStrategy();
+                    break;
+                default:
+                    throw new errors_1.InternalServerError(`error.database-not-supported-by-default-search-plugin`);
+            }
+        }
+    }
+    get searchStrategy() {
+        return this._searchStrategy;
     }
 };
 FulltextSearchService = __decorate([

package/dist/plugin/default-search-plugin/fulltext-search.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fulltext-search.service.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/fulltext-search.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AAKpD,sDAAgE;AAChE,wFAAoF;AAEpF,yDAAqD;~~AAErD~~,kFAA8E;AAC9E,oFAA+E;AAC/E,4FAAuF;AACvF,0EAAsE;AAEtE,2CAAkD;AAClD,yEAAoE;AACpE,mFAA8E;AAC9E,yFAAoF;AAEpF,qFAAgF;AAGhF;;;GAGG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAI9B,YACY,UAAmC,EACnC,QAAkB,EAClB,iBAAoC,EACpC,iBAAoC,EACpC,qBAA4C,EAC5C,kBAAsC,EACtC,aAA4B,EACC,OAAuC;QAPpE,eAAU,GAAV,UAAU,CAAyB;QACnC,aAAQ,GAAR,QAAQ,CAAU;QAClB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,kBAAa,GAAb,aAAa,CAAe;QACC,YAAO,GAAP,OAAO,CAAgC;QAV/D,kBAAa,GAAG,CAAC,CAAC;QAY/B,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,MAAM,CACR,GAAmB,EACnB,KAAkB,EAClB,cAAuB,KAAK;QAE5B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,~~cAAc~~,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;~~QAClF~~,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,~~cAAc~~,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;~~QACpF~~,OAAO;YACH,KAAK;YACL,UAAU;SACb,CAAC;IACN,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACb,GAAmB,EACnB,KAAkB,EAClB,cAAuB,KAAK;QAE5B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,~~cAAc~~,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;~~QAC7F~~,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACrG,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACzC,OAAO;gBACH,UAAU;gBACV,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAW;aAClE,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CACb,GAAmB,EACnB,KAAkB,EAClB,cAAuB,KAAK;QAE5B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,~~cAAc~~,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;~~QAC7F~~,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACrG,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACzC,OAAO;gBACH,UAAU;gBACV,KAAK,EAAE,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAW;aAClE,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAC,GAAmB;QAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvD,OAAO,GAAU,CAAC;IACtB,CAAC;IAED;;OAEG;IACK,iBAAiB;QACrB,QAAQ,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE;~~YAChD~~,KAAK,OAAO,CAAC;~~YACb~~,KAAK,SAAS;~~gBACV~~,IAAI,CAAC,~~cAAc~~,GAAG,IAAI,2CAAmB,~~CAAC,IAAI,CAAC,UAAU,~~EAAE,~~IAAI,~~CAAC~~,OAAO,CAAC,CAAC~~;~~gBAC7E~~,MAAM;~~YACV~~,KAAK,QAAQ,CAAC;~~YACd~~,KAAK,OAAO,CAAC;~~YACb~~,KAAK,gBAAgB;~~gBACjB~~,IAAI,CAAC,~~cAAc~~,GAAG,IAAI,6CAAoB,CAAC,~~IAAI~~,~~CAAC~~,UAAU,~~EAAE,IAAI,~~CAAC,~~OAAO~~,~~CAAC~~,CAAC;~~gBAC9E~~,~~MAAM;YACV,~~KAAK,~~UAAU~~;~~gBACX~~,IAAI,CAAC,~~cAAc~~,GAAG,IAAI,iDAAsB,~~CAAC~~,~~IAAI,~~CAAC,~~UAAU~~,~~EAAE~~,IAAI,CAAC,~~OAAO~~,CAAC,CAAC;~~gBAChF~~,~~MAAM~~;~~YACV~~;~~gBACI~~,~~MAAM~~,IAAI,~~4BAAmB,~~CAAC,~~uDAAuD~~,CAAC~~,CAAC~~;~~SAC9F;IACL~~,CAAC;CACJ,CAAA;~~AAnGY~~,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAaJ,WAAA,IAAA,eAAM,EAAC,+BAAmB,CAAC,CAAA;qCAPR,kDAAuB;QACzB,oBAAQ;QACC,uCAAiB;QACjB,sCAAiB;QACb,+CAAqB;QACxB,yCAAkB;QACvB,8BAAa;GAX/B,qBAAqB,~~CAmGjC~~;~~AAnGY~~,sDAAqB"}
1	+ {"version":3,"file":"fulltext-search.service.js","sourceRoot":"","sources":["../../../src/plugin/default-search-plugin/fulltext-search.service.ts"],"names":[],"mappings":"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"}

package/dist/plugin/default-search-plugin/indexer/indexer.controller.js CHANGED Viewed

@@ -55,12 +55,12 @@ let IndexerController = class IndexerController {
         const ctx = mutable_request_context_1.MutableRequestContext.deserialize(rawContext);
         return (0, utils_1.asyncObservable)(async (observer) => {
             const timeStart = Date.now();
-            const qb = this.getSearchIndexQueryBuilder(ctx.channelId);
+            const qb = this.getSearchIndexQueryBuilder(ctx, ctx.channelId);
             const count = await qb.getCount();
             vendure_logger_1.Logger.verbose(`Reindexing ${count} variants for channel ${ctx.channel.code}`, exports.workerLoggerCtx);
             const batches = Math.ceil(count / exports.BATCH_SIZE);
             await this.connection
-                .getRepository(search_index_item_entity_1.SearchIndexItem)
+                .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
                 .delete({ languageCode: ctx.languageCode, channelId: ctx.channelId });
             vendure_logger_1.Logger.verbose('Deleted existing index items', exports.workerLoggerCtx);
             for (let i = 0; i < batches; i++) {
@@ -96,7 +96,9 @@ let IndexerController = class IndexerController {
                     const end = begin + exports.BATCH_SIZE;
                     vendure_logger_1.Logger.verbose(`Updating ids from index ${begin} to ${end}`);
                     const batchIds = ids.slice(begin, end);
-                    const batch = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findByIds(batchIds, {
+                    const batch = await this.connection
+                        .getRepository(ctx, product_variant_entity_1.ProductVariant)
+                        .findByIds(batchIds, {
                         relations: exports.variantRelations,
                         where: { deletedAt: null },
                     });
@@ -130,14 +132,14 @@ let IndexerController = class IndexerController {
     }
     async deleteVariant(data) {
         const ctx = mutable_request_context_1.MutableRequestContext.deserialize(data.ctx);
-        const variants = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findByIds(data.variantIds);
+        const variants = await this.connection.getRepository(ctx, product_variant_entity_1.ProductVariant).findByIds(data.variantIds);
         if (variants.length) {
             const languageVariants = (0, unique_1.unique)([
                 ...variants
                     .reduce((vt, v) => [...vt, ...v.translations], [])
                     .map(t => t.languageCode),
             ]);
-            await this.removeSearchIndexItems(ctx.channelId, variants.map(v => v.id), languageVariants);
+            await this.removeSearchIndexItems(ctx, ctx.channelId, variants.map(v => v.id), languageVariants);
         }
         return true;
     }
@@ -156,41 +158,45 @@ let IndexerController = class IndexerController {
     async removeVariantFromChannel(data) {
         var _a;
         const ctx = mutable_request_context_1.MutableRequestContext.deserialize(data.ctx);
-        const variant = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findOne(data.productVariantId);
+        const variant = await this.connection
+            .getRepository(ctx, product_variant_entity_1.ProductVariant)
+            .findOne(data.productVariantId);
         const languageVariants = (_a = variant === null || variant === void 0 ? void 0 : variant.translations.map(t => t.languageCode)) !== null && _a !== void 0 ? _a : [];
-        await this.removeSearchIndexItems(data.channelId, [data.productVariantId], languageVariants);
+        await this.removeSearchIndexItems(ctx, data.channelId, [data.productVariantId], languageVariants);
         return true;
     }
     async updateAsset(data) {
         const id = data.asset.id;
+        const ctx = mutable_request_context_1.MutableRequestContext.deserialize(data.ctx);
         function getFocalPoint(point) {
             return point && point.x && point.y ? point : null;
         }
         const focalPoint = getFocalPoint(data.asset.focalPoint);
         await this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .update({ productAssetId: id }, { productPreviewFocalPoint: focalPoint });
         await this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .update({ productVariantAssetId: id }, { productVariantPreviewFocalPoint: focalPoint });
         return true;
     }
     async deleteAsset(data) {
         const id = data.asset.id;
+        const ctx = mutable_request_context_1.MutableRequestContext.deserialize(data.ctx);
         await this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .update({ productAssetId: id }, { productAssetId: null });
         await this.connection
-            .getRepository(search_index_item_entity_1.SearchIndexItem)
+            .getRepository(ctx, search_index_item_entity_1.SearchIndexItem)
             .update({ productVariantAssetId: id }, { productVariantAssetId: null });
         return true;
     }
     async updateProductInChannel(ctx, productId, channelId) {
-        const product = await this.connection.getRepository(product_entity_1.Product).findOne(productId, {
+        const product = await this.connection.getRepository(ctx, product_entity_1.Product).findOne(productId, {
             relations: ['variants'],
         });
         if (product) {
-            const updatedVariants = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findByIds(product.variants.map(v => v.id), {
+            const updatedVariants = await this.connection.getRepository(ctx, product_variant_entity_1.ProductVariant).findByIds(product.variants.map(v => v.id), {
                 relations: exports.variantRelations,
                 where: { deletedAt: null },
             });
@@ -211,7 +217,7 @@ let IndexerController = class IndexerController {
         return true;
     }
     async updateVariantsInChannel(ctx, variantIds, channelId) {
-        const variants = await this.connection.getRepository(product_variant_entity_1.ProductVariant).findByIds(variantIds, {
+        const variants = await this.connection.getRepository(ctx, product_variant_entity_1.ProductVariant).findByIds(variantIds, {
             relations: exports.variantRelations,
             where: { deletedAt: null },
         });
@@ -222,7 +228,7 @@ let IndexerController = class IndexerController {
         return true;
     }
     async deleteProductInChannel(ctx, productId, channelId) {
-        const product = await this.connection.getRepository(product_entity_1.Product).findOne(productId, {
+        const product = await this.connection.getRepository(ctx, product_entity_1.Product).findOne(productId, {
             relations: ['variants'],
         });
         if (product) {
@@ -234,13 +240,13 @@ let IndexerController = class IndexerController {
             ]);
             const removedVariantIds = product.variants.map(v => v.id);
             if (removedVariantIds.length) {
-                await this.removeSearchIndexItems(channelId, removedVariantIds, languageVariants);
+                await this.removeSearchIndexItems(ctx, channelId, removedVariantIds, languageVariants);
             }
         }
         return true;
     }
-    getSearchIndexQueryBuilder(channelId) {
-        const qb = this.connection.getRepository(product_variant_entity_1.ProductVariant).createQueryBuilder('variants');
+    getSearchIndexQueryBuilder(ctx, channelId) {
+        const qb = this.connection.getRepository(ctx, product_variant_entity_1.ProductVariant).createQueryBuilder('variants');
         FindOptionsUtils_1.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, {
             relations: exports.variantRelations,
         });
@@ -254,7 +260,7 @@ let IndexerController = class IndexerController {
     }
     async saveVariants(ctx, variants) {
         const items = [];
-        await this.removeSyntheticVariants(variants);
+        await this.removeSyntheticVariants(ctx, variants);
         const productMap = new Map();
         for (const variant of variants) {
             let product = productMap.get(variant.productId);
@@ -323,7 +329,7 @@ let IndexerController = class IndexerController {
                 }
             }
         }
-        await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).save(items, { chunk: 2500 }));
+        await this.queue.push(() => this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).save(items, { chunk: 2500 }));
     }
     /**
      * If a Product has no variants, we create a synthetic variant for the purposes
@@ -357,15 +363,15 @@ let IndexerController = class IndexerController {
             collectionIds: [],
             collectionSlugs: [],
         });
-        await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).save(item));
+        await this.queue.push(() => this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).save(item));
     }
     /**
      * Removes any synthetic variants for the given product
      */
-    async removeSyntheticVariants(variants) {
+    async removeSyntheticVariants(ctx, variants) {
         const prodIds = (0, unique_1.unique)(variants.map(v => v.productId));
         for (const productId of prodIds) {
-            await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).delete({
+            await this.queue.push(() => this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).delete({
                 productId,
                 sku: '',
                 price: 0,
@@ -392,7 +398,7 @@ let IndexerController = class IndexerController {
     /**
      * Remove items from the search index
      */
-    async removeSearchIndexItems(channelId, variantIds, languageCodes) {
+    async removeSearchIndexItems(ctx, channelId, variantIds, languageCodes) {
         const keys = [];
         for (const productVariantId of variantIds) {
             for (const languageCode of languageCodes) {
@@ -403,7 +409,7 @@ let IndexerController = class IndexerController {
                 });
             }
         }
-        await this.queue.push(() => this.connection.getRepository(search_index_item_entity_1.SearchIndexItem).delete(keys));
+        await this.queue.push(() => this.connection.getRepository(ctx, search_index_item_entity_1.SearchIndexItem).delete(keys));
     }
     /**
      * Prevent postgres errors from too-long indices