@vendure/core 2.2.0-next.7 → 2.2.0-next.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/api-internal-modules.d.ts +2 -2
- package/dist/api/config/generate-resolvers.d.ts +4 -4
- package/dist/api/resolvers/admin/order.resolver.d.ts +1 -1
- package/dist/api/resolvers/shop/shop-order.resolver.js +1 -0
- package/dist/api/resolvers/shop/shop-order.resolver.js.map +1 -1
- package/dist/common/constants.d.ts +6 -0
- package/dist/common/constants.js +7 -1
- package/dist/common/constants.js.map +1 -1
- package/dist/config/entity/entity-duplicators/index.d.ts +4 -4
- package/dist/config/job-queue/job-queue-strategy.d.ts +2 -2
- package/dist/config/logger/default-logger.js +8 -8
- package/dist/config/logger/default-logger.js.map +1 -1
- package/dist/config/promotion/index.d.ts +53 -53
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/job-queue/job-queue.d.ts +2 -2
- package/dist/job-queue/job-queue.js +2 -9
- package/dist/job-queue/job-queue.js.map +1 -1
- package/dist/job-queue/types.d.ts +5 -0
- package/dist/migrate.d.ts +2 -2
- package/dist/migrate.js +54 -27
- package/dist/migrate.js.map +1 -1
- package/dist/plugin/default-job-queue-plugin/sql-job-queue-strategy.d.ts +3 -2
- package/dist/plugin/default-job-queue-plugin/sql-job-queue-strategy.js +24 -21
- package/dist/plugin/default-job-queue-plugin/sql-job-queue-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js +12 -12
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.js +4 -3
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.js +2 -1
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +1 -1
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js +3 -2
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js.map +1 -1
- package/dist/service/services/collection.service.js +5 -5
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/global-settings.service.js +2 -1
- package/dist/service/services/global-settings.service.js.map +1 -1
- package/dist/service/services/order.service.js +5 -2
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/product.service.js +6 -4
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/tax-rate.service.d.ts +3 -1
- package/dist/service/services/tax-rate.service.js +7 -2
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/package.json +4 -4
package/dist/migrate.js
CHANGED
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.generateMigration = exports.revertLastMigration = exports.runMigrations = void 0;
|
|
7
7
|
/* eslint-disable no-console */
|
|
8
|
-
const chalk_1 = __importDefault(require("chalk"));
|
|
9
8
|
const fs_extra_1 = __importDefault(require("fs-extra"));
|
|
10
9
|
const path_1 = __importDefault(require("path"));
|
|
10
|
+
const picocolors_1 = __importDefault(require("picocolors"));
|
|
11
11
|
const typeorm_1 = require("typeorm");
|
|
12
12
|
const MysqlDriver_1 = require("typeorm/driver/mysql/MysqlDriver");
|
|
13
13
|
const StringUtils_1 = require("typeorm/util/StringUtils");
|
|
@@ -23,30 +23,38 @@ const config_helpers_1 = require("./config/config-helpers");
|
|
|
23
23
|
async function runMigrations(userConfig) {
|
|
24
24
|
const config = await (0, bootstrap_1.preBootstrapConfig)(userConfig);
|
|
25
25
|
const connection = await (0, typeorm_1.createConnection)(createConnectionOptions(config));
|
|
26
|
+
const migrationsRan = [];
|
|
26
27
|
try {
|
|
27
28
|
const migrations = await disableForeignKeysForSqLite(connection, () => connection.runMigrations({ transaction: 'each' }));
|
|
28
29
|
for (const migration of migrations) {
|
|
29
|
-
|
|
30
|
+
log(picocolors_1.default.green(`Successfully ran migration: ${migration.name}`));
|
|
31
|
+
migrationsRan.push(migration.name);
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
catch (e) {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
35
|
+
log(picocolors_1.default.red('An error occurred when running migrations:'));
|
|
36
|
+
log(e.message);
|
|
37
|
+
if (isRunningFromVendureCli()) {
|
|
38
|
+
throw e;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
process.exitCode = 1;
|
|
42
|
+
}
|
|
36
43
|
}
|
|
37
44
|
finally {
|
|
38
45
|
await checkMigrationStatus(connection);
|
|
39
46
|
await connection.close();
|
|
40
47
|
(0, config_helpers_1.resetConfig)();
|
|
41
48
|
}
|
|
49
|
+
return migrationsRan;
|
|
42
50
|
}
|
|
43
51
|
exports.runMigrations = runMigrations;
|
|
44
52
|
async function checkMigrationStatus(connection) {
|
|
45
53
|
const builderLog = await connection.driver.createSchemaBuilder().log();
|
|
46
54
|
if (builderLog.upQueries.length) {
|
|
47
|
-
|
|
55
|
+
log(picocolors_1.default.yellow('Your database schema does not match your current configuration. Generate a new migration for the following changes:'));
|
|
48
56
|
for (const query of builderLog.upQueries) {
|
|
49
|
-
|
|
57
|
+
log(' - ' + picocolors_1.default.yellow(query.query));
|
|
50
58
|
}
|
|
51
59
|
}
|
|
52
60
|
}
|
|
@@ -64,9 +72,14 @@ async function revertLastMigration(userConfig) {
|
|
|
64
72
|
await disableForeignKeysForSqLite(connection, () => connection.undoLastMigration({ transaction: 'each' }));
|
|
65
73
|
}
|
|
66
74
|
catch (e) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
75
|
+
log(picocolors_1.default.red('An error occurred when reverting migration:'));
|
|
76
|
+
log(e.message);
|
|
77
|
+
if (isRunningFromVendureCli()) {
|
|
78
|
+
throw e;
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
process.exitCode = 1;
|
|
82
|
+
}
|
|
70
83
|
}
|
|
71
84
|
finally {
|
|
72
85
|
await connection.close();
|
|
@@ -90,6 +103,7 @@ async function generateMigration(userConfig, options) {
|
|
|
90
103
|
const sqlInMemory = await connection.driver.createSchemaBuilder().log();
|
|
91
104
|
const upSqls = [];
|
|
92
105
|
const downSqls = [];
|
|
106
|
+
let migrationName;
|
|
93
107
|
// mysql is exceptional here because it uses ` character in to escape names in queries, that's why for mysql
|
|
94
108
|
// we are using simple quoted string instead of template string syntax
|
|
95
109
|
if (connection.driver instanceof MysqlDriver_1.MysqlDriver) {
|
|
@@ -135,14 +149,16 @@ async function generateMigration(userConfig, options) {
|
|
|
135
149
|
: path_1.default.join(process.cwd(), filename);
|
|
136
150
|
await fs_extra_1.default.ensureFile(outputPath);
|
|
137
151
|
fs_extra_1.default.writeFileSync(outputPath, fileContent);
|
|
138
|
-
|
|
152
|
+
log(picocolors_1.default.green(`Migration ${picocolors_1.default.blue(outputPath)} has been generated successfully.`));
|
|
153
|
+
migrationName = outputPath;
|
|
139
154
|
}
|
|
140
155
|
}
|
|
141
156
|
else {
|
|
142
|
-
|
|
157
|
+
log(picocolors_1.default.yellow('No changes in database schema were found - cannot generate a migration.'));
|
|
143
158
|
}
|
|
144
159
|
await connection.close();
|
|
145
160
|
(0, config_helpers_1.resetConfig)();
|
|
161
|
+
return migrationName;
|
|
146
162
|
}
|
|
147
163
|
exports.generateMigration = generateMigration;
|
|
148
164
|
function createConnectionOptions(userConfig) {
|
|
@@ -174,21 +190,32 @@ async function disableForeignKeysForSqLite(connection, work) {
|
|
|
174
190
|
* Gets contents of the migration file.
|
|
175
191
|
*/
|
|
176
192
|
function getTemplate(name, timestamp, upSqls, downSqls) {
|
|
177
|
-
return `import {MigrationInterface, QueryRunner} from "typeorm";
|
|
178
|
-
|
|
179
|
-
export class ${(0, StringUtils_1.camelCase)(name, true)}${timestamp} implements MigrationInterface {
|
|
180
|
-
|
|
181
|
-
public async up(queryRunner: QueryRunner): Promise<any> {
|
|
182
|
-
${upSqls.join(`
|
|
183
|
-
`)}
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
public async down(queryRunner: QueryRunner): Promise<any> {
|
|
187
|
-
${downSqls.join(`
|
|
188
|
-
`)}
|
|
189
|
-
}
|
|
190
|
-
|
|
191
|
-
}
|
|
193
|
+
return `import {MigrationInterface, QueryRunner} from "typeorm";
|
|
194
|
+
|
|
195
|
+
export class ${(0, StringUtils_1.camelCase)(name, true)}${timestamp} implements MigrationInterface {
|
|
196
|
+
|
|
197
|
+
public async up(queryRunner: QueryRunner): Promise<any> {
|
|
198
|
+
${upSqls.join(`
|
|
199
|
+
`)}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
public async down(queryRunner: QueryRunner): Promise<any> {
|
|
203
|
+
${downSqls.join(`
|
|
204
|
+
`)}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
}
|
|
192
208
|
`;
|
|
193
209
|
}
|
|
210
|
+
function log(message) {
|
|
211
|
+
// If running from within the Vendure CLI, we allow the CLI app
|
|
212
|
+
// to handle the logging.
|
|
213
|
+
if (isRunningFromVendureCli()) {
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
console.log(message);
|
|
217
|
+
}
|
|
218
|
+
function isRunningFromVendureCli() {
|
|
219
|
+
return process.env.VENDURE_RUNNING_IN_CLI != null;
|
|
220
|
+
}
|
|
194
221
|
//# sourceMappingURL=migrate.js.map
|
package/dist/migrate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":";;;;;;AAAA,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../src/migrate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { JobListOptions } from '@vendure/common/lib/generated-types';
|
|
|
2
2
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { Injector } from '../../common/injector';
|
|
4
4
|
import { InspectableJobQueueStrategy } from '../../config';
|
|
5
|
-
import { Job, JobData } from '../../job-queue';
|
|
5
|
+
import { Job, JobData, JobQueueStrategyJobOptions } from '../../job-queue';
|
|
6
6
|
import { PollingJobQueueStrategy } from '../../job-queue/polling-job-queue-strategy';
|
|
7
7
|
/**
|
|
8
8
|
* @description
|
|
@@ -12,11 +12,12 @@ import { PollingJobQueueStrategy } from '../../job-queue/polling-job-queue-strat
|
|
|
12
12
|
* @docsCategory JobQueue
|
|
13
13
|
*/
|
|
14
14
|
export declare class SqlJobQueueStrategy extends PollingJobQueueStrategy implements InspectableJobQueueStrategy {
|
|
15
|
+
private rawConnection;
|
|
15
16
|
private connection;
|
|
16
17
|
private listQueryBuilder;
|
|
17
18
|
init(injector: Injector): void;
|
|
18
19
|
destroy(): void;
|
|
19
|
-
add<Data extends JobData<Data> = object>(job: Job<Data>): Promise<Job<Data>>;
|
|
20
|
+
add<Data extends JobData<Data> = object>(job: Job<Data>, jobOptions?: JobQueueStrategyJobOptions<Data>): Promise<Job<Data>>;
|
|
20
21
|
/**
|
|
21
22
|
* MySQL & MariaDB store job data as a "text" type which has a limit of 64kb. Going over that limit will cause the job to not be stored.
|
|
22
23
|
* In order to try to prevent that, this method will truncate any strings in the `data` object over 2kb in size.
|
|
@@ -18,21 +18,24 @@ const job_record_entity_1 = require("./job-record.entity");
|
|
|
18
18
|
*/
|
|
19
19
|
class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueStrategy {
|
|
20
20
|
init(injector) {
|
|
21
|
-
this.
|
|
21
|
+
this.rawConnection = injector.get(transactional_connection_1.TransactionalConnection).rawConnection;
|
|
22
|
+
this.connection = injector.get(transactional_connection_1.TransactionalConnection);
|
|
22
23
|
this.listQueryBuilder = injector.get(list_query_builder_1.ListQueryBuilder);
|
|
23
24
|
super.init(injector);
|
|
24
25
|
}
|
|
25
26
|
destroy() {
|
|
26
|
-
this.
|
|
27
|
+
this.rawConnection = undefined;
|
|
27
28
|
super.destroy();
|
|
28
29
|
}
|
|
29
|
-
async add(job) {
|
|
30
|
-
if (!this.connectionAvailable(this.
|
|
30
|
+
async add(job, jobOptions) {
|
|
31
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
31
32
|
throw new Error('Connection not available');
|
|
32
33
|
}
|
|
34
|
+
const jobRecordRepository = (jobOptions === null || jobOptions === void 0 ? void 0 : jobOptions.ctx) && this.connection ? this.connection.getRepository(jobOptions.ctx, job_record_entity_1.JobRecord) :
|
|
35
|
+
this.rawConnection.getRepository(job_record_entity_1.JobRecord);
|
|
33
36
|
const constrainedData = this.constrainDataSize(job);
|
|
34
37
|
const newRecord = this.toRecord(job, constrainedData, this.setRetries(job.queueName, job));
|
|
35
|
-
const record = await
|
|
38
|
+
const record = await jobRecordRepository.save(newRecord);
|
|
36
39
|
return this.fromRecord(record);
|
|
37
40
|
}
|
|
38
41
|
/**
|
|
@@ -41,7 +44,7 @@ class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueSt
|
|
|
41
44
|
*/
|
|
42
45
|
constrainDataSize(job) {
|
|
43
46
|
var _a;
|
|
44
|
-
const type = (_a = this.
|
|
47
|
+
const type = (_a = this.rawConnection) === null || _a === void 0 ? void 0 : _a.options.type;
|
|
45
48
|
if (type === 'mysql' || type === 'mariadb') {
|
|
46
49
|
const stringified = JSON.stringify(job.data);
|
|
47
50
|
if (64 * 1024 <= stringified.length) {
|
|
@@ -61,11 +64,11 @@ class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueSt
|
|
|
61
64
|
}
|
|
62
65
|
}
|
|
63
66
|
async next(queueName) {
|
|
64
|
-
if (!this.connectionAvailable(this.
|
|
67
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
65
68
|
throw new Error('Connection not available');
|
|
66
69
|
}
|
|
67
|
-
const connection = this.
|
|
68
|
-
const connectionType = this.
|
|
70
|
+
const connection = this.rawConnection;
|
|
71
|
+
const connectionType = this.rawConnection.options.type;
|
|
69
72
|
const isSQLite = connectionType === 'sqlite' || connectionType === 'sqljs' || connectionType === 'better-sqlite3';
|
|
70
73
|
return new Promise(async (resolve, reject) => {
|
|
71
74
|
if (isSQLite) {
|
|
@@ -132,10 +135,10 @@ class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueSt
|
|
|
132
135
|
}
|
|
133
136
|
}
|
|
134
137
|
async update(job) {
|
|
135
|
-
if (!this.connectionAvailable(this.
|
|
138
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
136
139
|
throw new Error('Connection not available');
|
|
137
140
|
}
|
|
138
|
-
await this.
|
|
141
|
+
await this.rawConnection
|
|
139
142
|
.getRepository(job_record_entity_1.JobRecord)
|
|
140
143
|
.createQueryBuilder('job')
|
|
141
144
|
.update()
|
|
@@ -145,7 +148,7 @@ class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueSt
|
|
|
145
148
|
.execute();
|
|
146
149
|
}
|
|
147
150
|
async findMany(options) {
|
|
148
|
-
if (!this.connectionAvailable(this.
|
|
151
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
149
152
|
throw new Error('Connection not available');
|
|
150
153
|
}
|
|
151
154
|
return this.listQueryBuilder
|
|
@@ -157,35 +160,35 @@ class SqlJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQueueSt
|
|
|
157
160
|
}));
|
|
158
161
|
}
|
|
159
162
|
async findOne(id) {
|
|
160
|
-
if (!this.connectionAvailable(this.
|
|
163
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
161
164
|
throw new Error('Connection not available');
|
|
162
165
|
}
|
|
163
|
-
const record = await this.
|
|
166
|
+
const record = await this.rawConnection.getRepository(job_record_entity_1.JobRecord).findOne({ where: { id } });
|
|
164
167
|
if (record) {
|
|
165
168
|
return this.fromRecord(record);
|
|
166
169
|
}
|
|
167
170
|
}
|
|
168
171
|
async findManyById(ids) {
|
|
169
|
-
if (!this.connectionAvailable(this.
|
|
172
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
170
173
|
throw new Error('Connection not available');
|
|
171
174
|
}
|
|
172
|
-
return this.
|
|
175
|
+
return this.rawConnection
|
|
173
176
|
.getRepository(job_record_entity_1.JobRecord)
|
|
174
177
|
.find({ where: { id: (0, typeorm_1.In)(ids) } })
|
|
175
178
|
.then(records => records.map(this.fromRecord));
|
|
176
179
|
}
|
|
177
180
|
async removeSettledJobs(queueNames = [], olderThan) {
|
|
178
|
-
if (!this.connectionAvailable(this.
|
|
181
|
+
if (!this.connectionAvailable(this.rawConnection)) {
|
|
179
182
|
throw new Error('Connection not available');
|
|
180
183
|
}
|
|
181
184
|
const findOptions = Object.assign(Object.assign({}, (0 < queueNames.length ? { queueName: (0, typeorm_1.In)(queueNames) } : {})), { isSettled: true, settledAt: (0, typeorm_1.LessThan)(olderThan || new Date()) });
|
|
182
|
-
const toDelete = await this.
|
|
183
|
-
const deleteCount = await this.
|
|
184
|
-
await this.
|
|
185
|
+
const toDelete = await this.rawConnection.getRepository(job_record_entity_1.JobRecord).find({ where: findOptions });
|
|
186
|
+
const deleteCount = await this.rawConnection.getRepository(job_record_entity_1.JobRecord).count({ where: findOptions });
|
|
187
|
+
await this.rawConnection.getRepository(job_record_entity_1.JobRecord).delete(findOptions);
|
|
185
188
|
return deleteCount;
|
|
186
189
|
}
|
|
187
190
|
connectionAvailable(connection) {
|
|
188
|
-
return !!this.
|
|
191
|
+
return !!this.rawConnection && this.rawConnection.isConnected;
|
|
189
192
|
}
|
|
190
193
|
toRecord(job, data, retries) {
|
|
191
194
|
return new job_record_entity_1.JobRecord({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql-job-queue-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/sql-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAA+E;AAE/E,qCAA8F;AAI9F,uEAA4D;AAC5D,wFAAoF;AACpF,+
|
|
1
|
+
{"version":3,"file":"sql-job-queue-strategy.js","sourceRoot":"","sources":["../../../src/plugin/default-job-queue-plugin/sql-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAA+E;AAE/E,qCAA8F;AAI9F,uEAA4D;AAC5D,wFAAoF;AACpF,+CAA2E;AAC3E,2FAAqF;AACrF,oGAA+F;AAE/F,2DAAgD;AAEhD;;;;;;GAMG;AACH,MAAa,mBAAoB,SAAQ,oDAAuB;IAK5D,IAAI,CAAC,QAAkB;QACnB,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC,aAAa,CAAC;QACzE,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC;QACxD,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC,GAAG,CAAC,qCAAgB,CAAC,CAAC;QACvD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzB,CAAC;IAED,OAAO;QACH,IAAI,CAAC,aAAa,GAAG,SAAS,CAAC;QAC/B,KAAK,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,GAAG,CAAsC,GAAc,EAAE,UAA6C;QACxG,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,mBAAmB,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,KAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,UAAU,CAAC,GAAG,EAAE,6BAAS,CAAC,CAAC,CAAC;YACvH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3F,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACK,iBAAiB,CAAsC,GAAc;;QACzE,MAAM,IAAI,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,OAAO,CAAC,IAAI,CAAC;QAC9C,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACzC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,EAAE,GAAG,IAAI,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;gBAClC,MAAM,aAAa,GAAyC,EAAE,CAAC;gBAC/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACnD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;wBACnD,aAAa,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;wBAChD,OAAO,2BAA2B,KAAK,CAAC,MAAM,SAAS,CAAC;oBAC5D,CAAC;oBACD,OAAO,KAAK,CAAC;gBACjB,CAAC,CAAC,CAAC;gBACH,uBAAM,CAAC,IAAI,CACP,iBACI,GAAG,CAAC,SACR,mCAAmC,IAAI,YAAY,IAAI,CAAC,KAAK,CACzD,WAAW,CAAC,MAAM,GAAG,IAAI,CAC5B,4CAA4C,aAAa;qBACrD,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,IAAI,SAAS,CAAC;qBAChD,IAAI,CAAC,IAAI,CAAC,EAAE,CACpB,CAAC;gBACF,OAAO,OAAO,CAAC;YACnB,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,SAAiB;QACxB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC;QACtC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,MAAM,QAAQ,GACV,cAAc,KAAK,QAAQ,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,gBAAgB,CAAC;QAErG,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,QAAQ,EAAE,CAAC;gBACX,IAAI,CAAC;oBACD,6GAA6G;oBAC7G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;oBACvF,OAAO,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC;gBAAC,OAAO,CAAM,EAAE,CAAC;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,oEAAoE;gBACpE,yEAAyE;gBACzE,wEAAwE;gBACxE,8BAA8B;gBAC9B,UAAU;qBACL,WAAW,CAAC,KAAK,EAAC,kBAAkB,EAAC,EAAE;oBACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;oBACtF,OAAO,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAChC,OAAsB,EACtB,SAAiB,EACjB,OAAgB,EAChB,gBAAsB,EAAE;QAExB,MAAM,EAAE,GAAG,OAAO;aACb,aAAa,CAAC,6BAAS,CAAC;aACxB,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,KAAK,CAAC,+BAA+B,EAAE,EAAE,SAAS,EAAE,CAAC;aACrD,QAAQ,CACL,IAAI,kBAAQ,CAAC,GAAG,CAAC,EAAE;YACf,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBACjC,OAAO,EAAE,0BAAQ,CAAC,OAAO;aAC5B,CAAC,CAAC,OAAO,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,0BAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CACL;aACA,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAExC,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;YACvB,EAAE,CAAC,QAAQ,CAAC,sCAAsC,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACV,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QACpC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QACjC,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACpC,IAAI,MAAM,CAAC,KAAK,KAAK,0BAAQ,CAAC,QAAQ,IAAI,OAAO,IAAI,CAAC,eAAe,KAAK,UAAU,EAAE,CAAC;gBACnF,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC1D,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAC7E,IAAI,kBAAkB,GAAG,cAAc,EAAE,CAAC;oBACtC,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE;wBAClE,GAAG,aAAa;wBAChB,MAAM,CAAC,EAAE;qBACZ,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YACD,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,MAAM,CAAC,KAAK,GAAG,0BAAQ,CAAC,OAAO,CAAC;YAChC,MAAM,OAAO,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACvE,OAAO,GAAG,CAAC;QACf,CAAC;aAAM,CAAC;YACJ,OAAO;QACX,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAa;QACtB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,IAAI,CAAC,aAAa;aACnB,aAAa,CAAC,6BAAS,CAAC;aACxB,kBAAkB,CAAC,KAAK,CAAC;aACzB,MAAM,EAAE;aACR,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aACvB,KAAK,CAAC,UAAU,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;aACjC,QAAQ,CAAC,mBAAmB,CAAC;aAC7B,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAwB;QACnC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB;aACvB,KAAK,CAAC,6BAAS,EAAE,OAAO,CAAC;aACzB,eAAe,EAAE;aACjB,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5B,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC;YACjC,UAAU;SACb,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAM;QAChB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5F,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAS;QACxB,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC,aAAa;aACpB,aAAa,CAAC,6BAAS,CAAC;aACxB,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,GAAG,CAAC,EAAE,EAAE,CAAC;aAChC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,aAAuB,EAAE,EAAE,SAAgB;QAC/D,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QACD,MAAM,WAAW,mCACV,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAC/D,SAAS,EAAE,IAAI,EACf,SAAS,EAAE,IAAA,kBAAQ,EAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,GAC/C,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAChG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,6BAAS,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtE,OAAO,WAAW,CAAC;IACvB,CAAC;IAEO,mBAAmB,CAAC,UAAkC;QAC1D,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC;IAClE,CAAC;IAEO,QAAQ,CAAC,GAAa,EAAE,IAAU,EAAE,OAAgB;QACxD,OAAO,IAAI,6BAAS,CAAC;YACjB,EAAE,EAAE,GAAG,CAAC,EAAE,IAAI,SAAS;YACvB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,GAAG,CAAC,IAAI;YACtB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,GAAG,CAAC,OAAO;YAC/B,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACzB,CAAC,CAAC;IACP,CAAC;IAEO,UAAU,CAAa,SAAoB;QAC/C,OAAO,IAAI,eAAG,CAAM,SAAS,CAAC,CAAC;IACnC,CAAC;CACJ;AAnOD,kDAmOC"}
|
|
@@ -62,38 +62,38 @@ let SearchIndexService = class SearchIndexService {
|
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
reindex(ctx) {
|
|
65
|
-
return this.updateIndexQueue.add({ type: 'reindex', ctx: ctx.serialize() });
|
|
65
|
+
return this.updateIndexQueue.add({ type: 'reindex', ctx: ctx.serialize() }, { ctx });
|
|
66
66
|
}
|
|
67
67
|
updateProduct(ctx, product) {
|
|
68
68
|
return this.updateIndexQueue.add({
|
|
69
69
|
type: 'update-product',
|
|
70
70
|
ctx: ctx.serialize(),
|
|
71
71
|
productId: product.id,
|
|
72
|
-
});
|
|
72
|
+
}, { ctx });
|
|
73
73
|
}
|
|
74
74
|
updateVariants(ctx, variants) {
|
|
75
75
|
const variantIds = variants.map(v => v.id);
|
|
76
|
-
return this.updateIndexQueue.add({ type: 'update-variants', ctx: ctx.serialize(), variantIds });
|
|
76
|
+
return this.updateIndexQueue.add({ type: 'update-variants', ctx: ctx.serialize(), variantIds }, { ctx });
|
|
77
77
|
}
|
|
78
78
|
deleteProduct(ctx, product) {
|
|
79
79
|
return this.updateIndexQueue.add({
|
|
80
80
|
type: 'delete-product',
|
|
81
81
|
ctx: ctx.serialize(),
|
|
82
82
|
productId: product.id,
|
|
83
|
-
});
|
|
83
|
+
}, { ctx });
|
|
84
84
|
}
|
|
85
85
|
deleteVariant(ctx, variants) {
|
|
86
86
|
const variantIds = variants.map(v => v.id);
|
|
87
|
-
return this.updateIndexQueue.add({ type: 'delete-variant', ctx: ctx.serialize(), variantIds });
|
|
87
|
+
return this.updateIndexQueue.add({ type: 'delete-variant', ctx: ctx.serialize(), variantIds }, { ctx });
|
|
88
88
|
}
|
|
89
89
|
updateVariantsById(ctx, ids) {
|
|
90
|
-
return this.updateIndexQueue.add({ type: 'update-variants-by-id', ctx: ctx.serialize(), ids });
|
|
90
|
+
return this.updateIndexQueue.add({ type: 'update-variants-by-id', ctx: ctx.serialize(), ids }, { ctx });
|
|
91
91
|
}
|
|
92
92
|
updateAsset(ctx, asset) {
|
|
93
|
-
return this.updateIndexQueue.add({ type: 'update-asset', ctx: ctx.serialize(), asset: asset });
|
|
93
|
+
return this.updateIndexQueue.add({ type: 'update-asset', ctx: ctx.serialize(), asset: asset }, { ctx });
|
|
94
94
|
}
|
|
95
95
|
deleteAsset(ctx, asset) {
|
|
96
|
-
return this.updateIndexQueue.add({ type: 'delete-asset', ctx: ctx.serialize(), asset: asset });
|
|
96
|
+
return this.updateIndexQueue.add({ type: 'delete-asset', ctx: ctx.serialize(), asset: asset }, { ctx });
|
|
97
97
|
}
|
|
98
98
|
assignProductToChannel(ctx, productId, channelId) {
|
|
99
99
|
return this.updateIndexQueue.add({
|
|
@@ -101,7 +101,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
101
101
|
ctx: ctx.serialize(),
|
|
102
102
|
productId,
|
|
103
103
|
channelId,
|
|
104
|
-
});
|
|
104
|
+
}, { ctx });
|
|
105
105
|
}
|
|
106
106
|
removeProductFromChannel(ctx, productId, channelId) {
|
|
107
107
|
return this.updateIndexQueue.add({
|
|
@@ -109,7 +109,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
109
109
|
ctx: ctx.serialize(),
|
|
110
110
|
productId,
|
|
111
111
|
channelId,
|
|
112
|
-
});
|
|
112
|
+
}, { ctx });
|
|
113
113
|
}
|
|
114
114
|
assignVariantToChannel(ctx, productVariantId, channelId) {
|
|
115
115
|
return this.updateIndexQueue.add({
|
|
@@ -117,7 +117,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
117
117
|
ctx: ctx.serialize(),
|
|
118
118
|
productVariantId,
|
|
119
119
|
channelId,
|
|
120
|
-
});
|
|
120
|
+
}, { ctx });
|
|
121
121
|
}
|
|
122
122
|
removeVariantFromChannel(ctx, productVariantId, channelId) {
|
|
123
123
|
return this.updateIndexQueue.add({
|
|
@@ -125,7 +125,7 @@ let SearchIndexService = class SearchIndexService {
|
|
|
125
125
|
ctx: ctx.serialize(),
|
|
126
126
|
productVariantId,
|
|
127
127
|
channelId,
|
|
128
|
-
});
|
|
128
|
+
}, { ctx });
|
|
129
129
|
}
|
|
130
130
|
jobWithProgress(job, ob) {
|
|
131
131
|
return new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AAEpE,mEAA+D;AAI/D,0EAA+D;AAM/D,4EAAuE;AAGvE,6DAAyD;AAEzD;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG3B,YAAoB,UAA2B,EAAU,iBAAoC;QAAzE,eAAU,GAAV,UAAU,CAAiB;QAAU,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAEjG,KAAK,CAAC,sBAAsB;QACxB,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;YACtD,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,GAAG,CAAC,EAAE;gBACX,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;gBACtB,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;oBAChB,KAAK,SAAS;wBACV,uBAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;wBACzC,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC1E,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,iBAAiB;wBAClB,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACvD,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,gBAAgB;wBACjB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBACtD,KAAK,uBAAuB;wBACxB,OAAO,IAAI,CAAC,eAAe,CACvB,GAAG,EACH,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,GAAqC,CAAC,CACnF,CAAC;oBACN,KAAK,cAAc;wBACf,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACpD,KAAK,cAAc;wBACf,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;oBACpD,KAAK,2BAA2B;wBAC5B,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAC/D,KAAK,6BAA6B;wBAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;oBACjE,KAAK,2BAA2B;wBAC5B,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;oBAC/D,KAAK,6BAA6B;wBAC9B,OAAO,IAAI,CAAC,iBAAiB,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;oBACjE;wBACI,IAAA,0BAAW,EAAC,IAAI,CAAC,CAAC;wBAClB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBACjC,CAAC;YACL,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,GAAmB;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"search-index.service.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/indexer/search-index.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -197,7 +197,7 @@ let EntityHydrator = class EntityHydrator {
|
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
}
|
|
200
|
-
return (0, unique_1.unique)(missingRelations);
|
|
200
|
+
return (0, unique_1.unique)(missingRelations.filter(relation => !relation.endsWith('.customFields')));
|
|
201
201
|
}
|
|
202
202
|
getRequiredProductVariantRelations(target, missingRelations) {
|
|
203
203
|
const relationsToAdd = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,mEAA4D;AAC5D,uDAAoD;AAIpD,yDAAmE;AACnE,2FAAuF;AAEvF,mGAAwF;AACxF,mGAA8F;AAC9F,yEAAqE;AACrE,gFAAiF;AAIjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YACY,UAAmC,EACnC,sBAA8C,EAC9C,UAA6B;QAF7B,eAAU,GAAV,UAAU,CAAyB;QACnC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAEJ;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,OAAO,CACT,GAAmB,EACnB,MAAc,EACd,OAA+B;QAE/B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAEjE,IAAI,OAAO,CAAC,yBAAyB,KAAK,IAAI,EAAE,CAAC;gBAC7C,MAAM,4BAA4B,GAAG,IAAI,CAAC,kCAAkC,CACxE,MAAM,EACN,gBAAgB,CACnB,CAAC;gBACF,gBAAgB,GAAG,IAAA,eAAM,EAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,4BAA4B,CAAC,CAAC,CAAC;YACtF,CAAC;YAED,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;gBAC1B,MAAM,UAAU,GAA4B,IAAI,CAAC,UAAU;qBACtD,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC;qBACtC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;gBACjD,MAAM,eAAe,GAAG,IAAA,uDAA4B,EAChD,UAAU,EACV,MAAM,CAAC,WAAW,EAClB,gBAAgB,CACnB,CAAC;gBACF,UAAU,CAAC,cAAc,CAAC;oBACtB,oBAAoB,EAAE,OAAO;oBAC7B,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;oBACxB,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;iBACzF,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,eAAe,GAAG,IAAA,eAAM,EAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzF,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;oBAChC,MAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAE,MAAc,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClF,CAAC;gBAED,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBAC5D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACjE,QAAQ;iBACX,CAAC,CAAC,CAAC;gBAEJ,IAAI,OAAO,CAAC,yBAAyB,KAAK,IAAI,EAAE,CAAC;oBAC7C,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;wBACvD,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC;wBAC3C,IAAI,MAAM,EAAE,CAAC;4BACT,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gCACxB,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,uCAAc,EAAE,CAAC;oCACtC,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAClB,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC,EAAE,GAAG,CAAC,CAC9D,CACJ,CAAC;gCACN,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACJ,IAAI,MAAM,YAAY,uCAAc,EAAE,CAAC;oCACnC,MAAM,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gCAC3E,CAAC;4BACL,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;gBAED,MAAM,sBAAsB,GAAG,qBAAqB;qBAC/C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBAChD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBAE3C,IAAI,CAAC,wBAAwB,CACzB,MAAM,EACN,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAa,EAAE,GAAG,EAAE,sBAA6B,CAAC,CAC/E,CAAC;YACN,CAAC;QACL,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAA+B,MAAc,EAAE,MAAc;QACzF,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACvF,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,UAAU,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;gBAC/E,sEAAsE;gBACtE,oCAAoC;gBACpC,oEAAoE;gBACpE,SAAS;YACb,CAAC;YACD,MAAM,CAAC,GAAmB,CAAC,GAAG,MAAM,CAAC,GAAmB,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACK,mBAAmB,CACvB,MAAc,EACd,OAA+B;QAE/B,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YACtD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBAC/B,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACtF,IAAI,MAAM,GAAoC,MAAM,CAAC;gBACrD,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACvB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChB,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;wBACzB,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBAC1E,CAAC;yBAAM,CAAC;wBACJ,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;4BAC1C,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gCACV,OAAO,CAAC,CAAC,CAAC,CAAC;4BACf,CAAC;iCAAM,CAAC;gCACJ,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;4BACjE,CAAC;wBACL,CAAC,EAAE,EAAc,CAAC,CAAC;wBACnB,gBAAgB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;wBACnC,MAAM,GAAG,SAAS,CAAC;oBACvB,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAC;
|
|
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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"}
|
|
@@ -17,11 +17,11 @@ const typeorm_1 = require("typeorm");
|
|
|
17
17
|
const common_2 = require("../../../common");
|
|
18
18
|
const config_1 = require("../../../config");
|
|
19
19
|
const connection_1 = require("../../../connection");
|
|
20
|
+
const tree_relations_qb_joiner_1 = require("../utils/tree-relations-qb-joiner");
|
|
20
21
|
const connection_utils_1 = require("./connection-utils");
|
|
21
22
|
const get_calculated_columns_1 = require("./get-calculated-columns");
|
|
22
23
|
const parse_filter_params_1 = require("./parse-filter-params");
|
|
23
24
|
const parse_sort_params_1 = require("./parse-sort-params");
|
|
24
|
-
const tree_relations_qb_joiner_1 = require("../utils/tree-relations-qb-joiner");
|
|
25
25
|
/**
|
|
26
26
|
* @description
|
|
27
27
|
* This helper class is used when fetching entities the database from queries which return a {@link PaginatedList} type.
|
|
@@ -315,7 +315,7 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
315
315
|
delete customPropertyMap[property];
|
|
316
316
|
return;
|
|
317
317
|
}
|
|
318
|
-
const alias =
|
|
318
|
+
const alias = `${entityMetadata.tableName}_${relationMetadata.propertyName}`;
|
|
319
319
|
if (!this.isRelationAlreadyJoined(qb, alias)) {
|
|
320
320
|
qb.leftJoinAndSelect(`${entityAlias}.${relationMetadata.propertyName}`, alias);
|
|
321
321
|
}
|
|
@@ -453,6 +453,7 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
453
453
|
exports.ListQueryBuilder = ListQueryBuilder;
|
|
454
454
|
exports.ListQueryBuilder = ListQueryBuilder = __decorate([
|
|
455
455
|
(0, common_1.Injectable)(),
|
|
456
|
-
__metadata("design:paramtypes", [connection_1.TransactionalConnection,
|
|
456
|
+
__metadata("design:paramtypes", [connection_1.TransactionalConnection,
|
|
457
|
+
config_1.ConfigService])
|
|
457
458
|
], ListQueryBuilder);
|
|
458
459
|
//# sourceMappingURL=list-query-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|