@vendure/core 3.7.4-master-202609290215 → 3.7.4-master-202610010222
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/entity/customer-group/customer-group.entity.js +1 -1
- package/dist/entity/customer-group/customer-group.entity.js.map +1 -1
- package/dist/job-queue/in-memory-job-queue-strategy.d.ts +24 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js +75 -3
- package/dist/job-queue/in-memory-job-queue-strategy.js.map +1 -1
- package/dist/job-queue/polling-job-queue-strategy.js +2 -1
- package/dist/job-queue/polling-job-queue-strategy.js.map +1 -1
- package/dist/service/services/stock-level.service.js +2 -2
- package/dist/service/services/stock-level.service.js.map +1 -1
- package/package.json +2 -2
|
@@ -41,7 +41,7 @@ __decorate([
|
|
|
41
41
|
__metadata("design:type", custom_entity_fields_1.CustomCustomerGroupFields)
|
|
42
42
|
], CustomerGroup.prototype, "customFields", void 0);
|
|
43
43
|
__decorate([
|
|
44
|
-
(0, typeorm_1.OneToMany)(type => tax_rate_entity_1.TaxRate, taxRate => taxRate.
|
|
44
|
+
(0, typeorm_1.OneToMany)(type => tax_rate_entity_1.TaxRate, taxRate => taxRate.customerGroup),
|
|
45
45
|
__metadata("design:type", Array)
|
|
46
46
|
], CustomerGroup.prototype, "taxRates", void 0);
|
|
47
47
|
exports.CustomerGroup = CustomerGroup = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer-group.entity.js","sourceRoot":"","sources":["../../../src/entity/customer-group/customer-group.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAgE;AAGhE,qDAAoD;AACpD,kEAAoE;AACpE,iEAAuD;AACvD,iEAAsD;AAEtD;;;;;;GAMG;AAEI,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,2BAAa;IAC5C,YAAY,KAAkC;QAC1C,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAYJ,CAAA;AAfY,sCAAa;AAKZ;IAAT,IAAA,gBAAM,GAAE;;2CAAc;AAGvB;IADC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;;gDACpC;AAGtB;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,gDAAyB,CAAC;8BAC5B,gDAAyB;mDAAC;AAGxC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"customer-group.entity.js","sourceRoot":"","sources":["../../../src/entity/customer-group/customer-group.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAAgE;AAGhE,qDAAoD;AACpD,kEAAoE;AACpE,iEAAuD;AACvD,iEAAsD;AAEtD;;;;;;GAMG;AAEI,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,2BAAa;IAC5C,YAAY,KAAkC;QAC1C,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAYJ,CAAA;AAfY,sCAAa;AAKZ;IAAT,IAAA,gBAAM,GAAE;;2CAAc;AAGvB;IADC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;;gDACpC;AAGtB;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,gDAAyB,CAAC;8BAC5B,gDAAyB;mDAAC;AAGxC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC;;+CACzC;wBAdX,aAAa;IADzB,IAAA,gBAAM,GAAE;;GACI,aAAa,CAezB"}
|
|
@@ -45,7 +45,31 @@ export declare class InMemoryJobQueueStrategy extends PollingJobQueueStrategy im
|
|
|
45
45
|
findManyById(ids: ID[]): Promise<Job[]>;
|
|
46
46
|
next(queueName: string, waitingJobs?: Job[]): Promise<Job | undefined>;
|
|
47
47
|
update(job: Job): Promise<void>;
|
|
48
|
+
/**
|
|
49
|
+
* The inherited implementation cancels the Job returned by `findOne()`, which is now a
|
|
50
|
+
* snapshot, so CANCELLED only reaches the store. `ActiveQueue` does poll the store and
|
|
51
|
+
* cancel the live job once it reads that state, but it also registers a `progress` listener
|
|
52
|
+
* which writes the live job back on every `setProgress()`: one progress report from a job
|
|
53
|
+
* which has not yet been polled reverts the store to RUNNING, the poll never sees the
|
|
54
|
+
* cancellation, and the job settles as COMPLETED. Cancelling the stored instance reaches the
|
|
55
|
+
* live job immediately, so no later progress update can revert it.
|
|
56
|
+
*/
|
|
57
|
+
cancelJob(jobId: ID): Promise<Job | undefined>;
|
|
48
58
|
removeSettledJobs(queueNames?: string[], olderThan?: Date): Promise<number>;
|
|
59
|
+
/**
|
|
60
|
+
* Returns a copy of the given Job. The jobs held in this strategy's store are mutated in
|
|
61
|
+
* place as they are processed (see `next()` and {@link Job} `start()`, `setProgress()`,
|
|
62
|
+
* `complete()` etc.), so returning the stored instance from the `findOne()`/`findMany()`
|
|
63
|
+
* family would hand out a reference whose state changes underneath the caller. The
|
|
64
|
+
* database-backed strategies already build a fresh Job from the persisted record on every
|
|
65
|
+
* read; this brings the in-memory strategy in line with them.
|
|
66
|
+
*
|
|
67
|
+
* The copy is shallow: every field which changes as a job is processed is copied by value,
|
|
68
|
+
* but `result`, `error` and the Date fields are shared with the stored job, so mutating a
|
|
69
|
+
* snapshot's `result` object in place would also mutate the stored one.
|
|
70
|
+
*/
|
|
71
|
+
private snapshot;
|
|
72
|
+
private removeFromUnsettled;
|
|
49
73
|
private applySort;
|
|
50
74
|
private applyFilters;
|
|
51
75
|
private applyPagination;
|
|
@@ -5,6 +5,7 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
|
5
5
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
6
6
|
const vendure_logger_1 = require("../config/logger/vendure-logger");
|
|
7
7
|
const process_context_1 = require("../process-context/process-context");
|
|
8
|
+
const job_1 = require("./job");
|
|
8
9
|
const polling_job_queue_strategy_1 = require("./polling-job-queue-strategy");
|
|
9
10
|
/**
|
|
10
11
|
* @description
|
|
@@ -70,7 +71,8 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
70
71
|
return job;
|
|
71
72
|
}
|
|
72
73
|
async findOne(id) {
|
|
73
|
-
|
|
74
|
+
const job = this.jobs.get(id);
|
|
75
|
+
return job && this.snapshot(job);
|
|
74
76
|
}
|
|
75
77
|
async findMany(options) {
|
|
76
78
|
let items = [...this.jobs.values()];
|
|
@@ -89,12 +91,15 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
89
91
|
items = this.applyPagination(items, options.skip, options.take);
|
|
90
92
|
}
|
|
91
93
|
return {
|
|
92
|
-
items,
|
|
94
|
+
items: items.map(job => this.snapshot(job)),
|
|
93
95
|
totalItems,
|
|
94
96
|
};
|
|
95
97
|
}
|
|
96
98
|
async findManyById(ids) {
|
|
97
|
-
return ids
|
|
99
|
+
return ids
|
|
100
|
+
.map(id => this.jobs.get(id))
|
|
101
|
+
.filter(shared_utils_1.notNullOrUndefined)
|
|
102
|
+
.map(job => this.snapshot(job));
|
|
98
103
|
}
|
|
99
104
|
async next(queueName, waitingJobs = []) {
|
|
100
105
|
var _a, _b, _c;
|
|
@@ -118,12 +123,40 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
118
123
|
}
|
|
119
124
|
}
|
|
120
125
|
async update(job) {
|
|
126
|
+
// `findOne()` etc. hand out snapshots, so the job being updated is not necessarily the
|
|
127
|
+
// instance held in `unsettledJobs`. Drop any existing entry for it first, otherwise
|
|
128
|
+
// cancelling a job which is still PENDING would leave the original PENDING instance
|
|
129
|
+
// queued, and `next()` would run it despite the cancellation.
|
|
130
|
+
//
|
|
131
|
+
// The store is last-write-wins: whichever instance is passed here becomes the stored one.
|
|
132
|
+
// A snapshot written back while a job is RUNNING therefore displaces the live instance
|
|
133
|
+
// until the processing loop writes it back on its next progress report or on settlement.
|
|
134
|
+
// Cancel a running job via `cancelJob()`, which reaches the stored instance directly.
|
|
135
|
+
this.removeFromUnsettled(job);
|
|
121
136
|
if (job.state === generated_types_1.JobState.RETRYING || job.state === generated_types_1.JobState.PENDING) {
|
|
122
137
|
this.unsettledJobs[job.queueName].unshift({ job, updatedAt: new Date() });
|
|
123
138
|
}
|
|
124
139
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
125
140
|
this.jobs.set(job.id, job);
|
|
126
141
|
}
|
|
142
|
+
/**
|
|
143
|
+
* The inherited implementation cancels the Job returned by `findOne()`, which is now a
|
|
144
|
+
* snapshot, so CANCELLED only reaches the store. `ActiveQueue` does poll the store and
|
|
145
|
+
* cancel the live job once it reads that state, but it also registers a `progress` listener
|
|
146
|
+
* which writes the live job back on every `setProgress()`: one progress report from a job
|
|
147
|
+
* which has not yet been polled reverts the store to RUNNING, the poll never sees the
|
|
148
|
+
* cancellation, and the job settles as COMPLETED. Cancelling the stored instance reaches the
|
|
149
|
+
* live job immediately, so no later progress update can revert it.
|
|
150
|
+
*/
|
|
151
|
+
async cancelJob(jobId) {
|
|
152
|
+
const job = this.jobs.get(jobId);
|
|
153
|
+
if (!job) {
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
job.cancel();
|
|
157
|
+
await this.update(job);
|
|
158
|
+
return this.snapshot(job);
|
|
159
|
+
}
|
|
127
160
|
async removeSettledJobs(queueNames = [], olderThan) {
|
|
128
161
|
let removed = 0;
|
|
129
162
|
for (const job of this.jobs.values()) {
|
|
@@ -147,6 +180,45 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
147
180
|
}
|
|
148
181
|
return removed;
|
|
149
182
|
}
|
|
183
|
+
/**
|
|
184
|
+
* Returns a copy of the given Job. The jobs held in this strategy's store are mutated in
|
|
185
|
+
* place as they are processed (see `next()` and {@link Job} `start()`, `setProgress()`,
|
|
186
|
+
* `complete()` etc.), so returning the stored instance from the `findOne()`/`findMany()`
|
|
187
|
+
* family would hand out a reference whose state changes underneath the caller. The
|
|
188
|
+
* database-backed strategies already build a fresh Job from the persisted record on every
|
|
189
|
+
* read; this brings the in-memory strategy in line with them.
|
|
190
|
+
*
|
|
191
|
+
* The copy is shallow: every field which changes as a job is processed is copied by value,
|
|
192
|
+
* but `result`, `error` and the Date fields are shared with the stored job, so mutating a
|
|
193
|
+
* snapshot's `result` object in place would also mutate the stored one.
|
|
194
|
+
*/
|
|
195
|
+
snapshot(job) {
|
|
196
|
+
var _a;
|
|
197
|
+
return new job_1.Job({
|
|
198
|
+
id: (_a = job.id) !== null && _a !== void 0 ? _a : undefined,
|
|
199
|
+
queueName: job.queueName,
|
|
200
|
+
data: job.data,
|
|
201
|
+
retries: job.retries,
|
|
202
|
+
attempts: job.attempts,
|
|
203
|
+
state: job.state,
|
|
204
|
+
progress: job.progress,
|
|
205
|
+
result: job.result,
|
|
206
|
+
error: job.error,
|
|
207
|
+
createdAt: job.createdAt,
|
|
208
|
+
startedAt: job.startedAt,
|
|
209
|
+
settledAt: job.settledAt,
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
removeFromUnsettled(job) {
|
|
213
|
+
const queued = this.unsettledJobs[job.queueName];
|
|
214
|
+
if (!queued) {
|
|
215
|
+
return;
|
|
216
|
+
}
|
|
217
|
+
const index = queued.findIndex(item => item.job.id === job.id);
|
|
218
|
+
if (index !== -1) {
|
|
219
|
+
queued.splice(index, 1);
|
|
220
|
+
}
|
|
221
|
+
}
|
|
150
222
|
applySort(items, sort) {
|
|
151
223
|
for (const [prop, direction] of Object.entries(sort)) {
|
|
152
224
|
const key = prop;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAQ6C;AAE7C,mEAAsE;AAItE,oEAAyD;AACzD,wEAAoE;
|
|
1
|
+
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -69,7 +69,8 @@ class ActiveQueue {
|
|
|
69
69
|
if (result === STOP_SIGNAL) {
|
|
70
70
|
nextJob.defer();
|
|
71
71
|
}
|
|
72
|
-
else if (
|
|
72
|
+
else if (nextJob.state === generated_types_1.JobState.CANCELLED ||
|
|
73
|
+
(result instanceof job_1.Job && result.state === generated_types_1.JobState.CANCELLED)) {
|
|
73
74
|
nextJob.cancel();
|
|
74
75
|
}
|
|
75
76
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"polling-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/polling-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,8 +110,8 @@ let StockLevelService = class StockLevelService {
|
|
|
110
110
|
productVariantIds: this.uniqueIds(ids),
|
|
111
111
|
})
|
|
112
112
|
.andWhere('channel.id = :channelId', { channelId: ctx.channelId })
|
|
113
|
-
//
|
|
114
|
-
//
|
|
113
|
+
// An IN (...) query gives no row order guarantee, so sort to keep the order of
|
|
114
|
+
// `stockLevels` stable for API clients.
|
|
115
115
|
.orderBy('stockLevel.stockLocationId', 'ASC')
|
|
116
116
|
.getMany();
|
|
117
117
|
return this.groupByVariantId(ids, stockLevels);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stock-level.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-level.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"stock-level.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-level.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "3.7.4-master-
|
|
3
|
+
"version": "3.7.4-master-202610010222",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@nestjs/platform-express": "^11.0.12",
|
|
52
52
|
"@nestjs/typeorm": "^11.0.0",
|
|
53
53
|
"@types/express": "^5.0.1",
|
|
54
|
-
"@vendure/common": "^3.7.4-master-
|
|
54
|
+
"@vendure/common": "^3.7.4-master-202610010222",
|
|
55
55
|
"bcrypt": "^6.0.0",
|
|
56
56
|
"cookie-session": "^2.1.0",
|
|
57
57
|
"cron-time-generator": "^2.0.3",
|