@porulle/core 0.8.0 → 0.10.0
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/auth/middleware.d.ts.map +1 -1
- package/dist/auth/middleware.js +26 -7
- package/dist/auth/setup.d.ts.map +1 -1
- package/dist/auth/setup.js +7 -5
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +3 -1
- package/dist/config/types.d.ts +13 -3
- package/dist/config/types.d.ts.map +1 -1
- package/dist/generated/plugin-manifest.d.ts +3 -0
- package/dist/generated/plugin-manifest.d.ts.map +1 -1
- package/dist/generated/plugin-manifest.js +1 -0
- package/dist/hooks/checkout-completion.d.ts.map +1 -1
- package/dist/hooks/checkout-completion.js +2 -2
- package/dist/hooks/checkout.d.ts.map +1 -1
- package/dist/hooks/checkout.js +1 -1
- package/dist/index.d.ts +5 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/interfaces/rest/router.d.ts.map +1 -1
- package/dist/interfaces/rest/router.js +2 -0
- package/dist/interfaces/rest/routes/admin/staff.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/admin/staff.js +37 -3
- package/dist/interfaces/rest/routes/checkout.d.ts +9 -0
- package/dist/interfaces/rest/routes/checkout.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/checkout.js +82 -22
- package/dist/interfaces/rest/routes/inventory.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/inventory.js +13 -0
- package/dist/interfaces/rest/routes/orders.d.ts.map +1 -1
- package/dist/interfaces/rest/routes/orders.js +13 -0
- package/dist/interfaces/rest/schemas/catalog.d.ts +391 -0
- package/dist/interfaces/rest/schemas/catalog.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/orders.js +2 -2
- package/dist/interfaces/rest/schemas/responses.d.ts +85 -0
- package/dist/interfaces/rest/schemas/responses.d.ts.map +1 -1
- package/dist/interfaces/rest/schemas/search.d.ts +17 -0
- package/dist/interfaces/rest/schemas/search.d.ts.map +1 -1
- package/dist/kernel/database/scoped-db.d.ts +2 -1
- package/dist/kernel/database/scoped-db.d.ts.map +1 -1
- package/dist/kernel/database/scoped-db.js +74 -15
- package/dist/kernel/errors.d.ts +12 -0
- package/dist/kernel/errors.d.ts.map +1 -1
- package/dist/kernel/errors.js +16 -0
- package/dist/kernel/jobs/adapter.d.ts +27 -8
- package/dist/kernel/jobs/adapter.d.ts.map +1 -1
- package/dist/kernel/jobs/adapter.js +1 -2
- package/dist/kernel/jobs/drizzle-adapter.d.ts +13 -3
- package/dist/kernel/jobs/drizzle-adapter.d.ts.map +1 -1
- package/dist/kernel/jobs/drizzle-adapter.js +46 -5
- package/dist/kernel/jobs/runner.d.ts +2 -1
- package/dist/kernel/jobs/runner.d.ts.map +1 -1
- package/dist/kernel/jobs/runner.js +100 -15
- package/dist/kernel/jobs/types.d.ts +13 -0
- package/dist/kernel/jobs/types.d.ts.map +1 -1
- package/dist/kernel/plugin/manifest.d.ts +5 -0
- package/dist/kernel/plugin/manifest.d.ts.map +1 -1
- package/dist/kernel/plugin/manifest.js +9 -0
- package/dist/modules/analytics/drizzle-adapter.d.ts.map +1 -1
- package/dist/modules/analytics/drizzle-adapter.js +16 -3
- package/dist/modules/cart/service.d.ts.map +1 -1
- package/dist/modules/cart/service.js +3 -2
- package/dist/modules/catalog/entity-service.d.ts +1 -0
- package/dist/modules/catalog/entity-service.d.ts.map +1 -1
- package/dist/modules/catalog/entity-service.js +49 -3
- package/dist/modules/catalog/repository/index.d.ts +2 -2
- package/dist/modules/catalog/repository/index.d.ts.map +1 -1
- package/dist/modules/catalog/repository/index.js +9 -1
- package/dist/modules/catalog/schema.d.ts +51 -0
- package/dist/modules/catalog/schema.d.ts.map +1 -1
- package/dist/modules/catalog/schema.js +12 -1
- package/dist/modules/catalog/schemas.d.ts +3 -1
- package/dist/modules/catalog/schemas.d.ts.map +1 -1
- package/dist/modules/channels/adapter.d.ts +117 -0
- package/dist/modules/channels/adapter.d.ts.map +1 -0
- package/dist/modules/channels/adapter.js +3 -0
- package/dist/modules/customers/service.d.ts.map +1 -1
- package/dist/modules/customers/service.js +6 -0
- package/dist/modules/inventory/repository/index.js +4 -4
- package/dist/modules/inventory/service.d.ts.map +1 -1
- package/dist/modules/inventory/service.js +7 -3
- package/dist/modules/orders/schema.d.ts +17 -0
- package/dist/modules/orders/schema.d.ts.map +1 -1
- package/dist/modules/orders/schema.js +4 -0
- package/dist/modules/orders/service.d.ts +16 -2
- package/dist/modules/orders/service.d.ts.map +1 -1
- package/dist/modules/orders/service.js +226 -26
- package/dist/modules/orders/stale-order-cleanup.d.ts.map +1 -1
- package/dist/modules/orders/stale-order-cleanup.js +37 -16
- package/dist/modules/pricing/service.d.ts.map +1 -1
- package/dist/modules/pricing/service.js +5 -5
- package/dist/modules/promotions/repository/index.d.ts +1 -1
- package/dist/modules/promotions/repository/index.d.ts.map +1 -1
- package/dist/modules/promotions/repository/index.js +6 -3
- package/dist/modules/promotions/service.d.ts +1 -0
- package/dist/modules/promotions/service.d.ts.map +1 -1
- package/dist/modules/promotions/service.js +1 -1
- package/dist/modules/webhooks/repository/index.d.ts +1 -1
- package/dist/modules/webhooks/repository/index.d.ts.map +1 -1
- package/dist/modules/webhooks/repository/index.js +16 -10
- package/dist/runtime/kernel.d.ts.map +1 -1
- package/dist/runtime/kernel.js +14 -2
- package/dist/runtime/server.d.ts +1 -4
- package/dist/runtime/server.d.ts.map +1 -1
- package/dist/runtime/server.js +16 -34
- package/dist/test-utils/create-test-config.d.ts.map +1 -1
- package/dist/test-utils/create-test-config.js +2 -0
- package/dist/test-utils/order-test-helpers.d.ts +12 -0
- package/dist/test-utils/order-test-helpers.d.ts.map +1 -0
- package/dist/test-utils/order-test-helpers.js +18 -0
- package/dist/test-utils/rest-api-test-utils.d.ts.map +1 -1
- package/dist/test-utils/rest-api-test-utils.js +1 -0
- package/dist/test-utils/test-actors.js +1 -1
- package/dist/testing.d.ts +1 -0
- package/dist/testing.d.ts.map +1 -1
- package/dist/testing.js +1 -0
- package/package.json +1 -1
- package/src/auth/middleware.ts +26 -7
- package/src/auth/setup.ts +10 -4
- package/src/config/defaults.ts +3 -1
- package/src/config/types.ts +16 -3
- package/src/generated/plugin-capabilities.d.ts +1 -0
- package/src/generated/plugin-manifest.ts +1 -0
- package/src/generated/plugin-repositories.d.ts +1 -0
- package/src/hooks/checkout-completion.ts +22 -16
- package/src/hooks/checkout.ts +11 -8
- package/src/index.ts +31 -1
- package/src/interfaces/rest/router.ts +2 -0
- package/src/interfaces/rest/routes/admin/staff.ts +45 -3
- package/src/interfaces/rest/routes/checkout.ts +94 -28
- package/src/interfaces/rest/routes/inventory.ts +14 -0
- package/src/interfaces/rest/routes/orders.ts +11 -0
- package/src/interfaces/rest/schemas/orders.ts +2 -2
- package/src/kernel/database/scoped-db.ts +83 -15
- package/src/kernel/errors.ts +20 -0
- package/src/kernel/jobs/adapter.ts +39 -8
- package/src/kernel/jobs/drizzle-adapter.ts +72 -9
- package/src/kernel/jobs/runner.ts +194 -72
- package/src/kernel/jobs/types.ts +25 -0
- package/src/kernel/plugin/manifest.ts +15 -0
- package/src/modules/analytics/drizzle-adapter.ts +19 -3
- package/src/modules/cart/service.ts +3 -2
- package/src/modules/catalog/entity-service.ts +37 -2
- package/src/modules/catalog/repository/index.ts +13 -3
- package/src/modules/catalog/schema.ts +33 -18
- package/src/modules/catalog/schemas.ts +3 -1
- package/src/modules/channels/adapter.ts +139 -0
- package/src/modules/customers/service.ts +6 -0
- package/src/modules/inventory/repository/index.ts +4 -4
- package/src/modules/inventory/service.ts +12 -2
- package/src/modules/orders/schema.ts +4 -0
- package/src/modules/orders/service.ts +404 -64
- package/src/modules/orders/stale-order-cleanup.ts +52 -27
- package/src/modules/pricing/service.ts +5 -6
- package/src/modules/promotions/repository/index.ts +6 -2
- package/src/modules/promotions/service.ts +2 -0
- package/src/modules/webhooks/repository/index.ts +16 -14
- package/src/runtime/kernel.ts +16 -2
- package/src/runtime/server.ts +22 -42
- package/src/test-utils/create-test-config.ts +2 -0
- package/src/test-utils/order-test-helpers.ts +26 -0
- package/src/test-utils/rest-api-test-utils.ts +1 -0
- package/src/test-utils/test-actors.ts +1 -1
- package/src/testing.ts +1 -0
|
@@ -1,5 +1,34 @@
|
|
|
1
1
|
import { eq, and, sql } from "drizzle-orm";
|
|
2
2
|
import { commerceJobs } from "./schema.js";
|
|
3
|
+
function isExclusiveTask(task) {
|
|
4
|
+
return Boolean(task?.concurrency && task.concurrency.exclusive !== false);
|
|
5
|
+
}
|
|
6
|
+
function compareByProcessingOrder(processingOrder) {
|
|
7
|
+
if (typeof processingOrder === "function") {
|
|
8
|
+
return (left, right) => processingOrder({
|
|
9
|
+
...left,
|
|
10
|
+
input: left.input,
|
|
11
|
+
}, {
|
|
12
|
+
...right,
|
|
13
|
+
input: right.input,
|
|
14
|
+
});
|
|
15
|
+
}
|
|
16
|
+
const field = processingOrder?.field ?? "createdAt";
|
|
17
|
+
const direction = processingOrder?.direction === "desc" ? -1 : 1;
|
|
18
|
+
return (left, right) => {
|
|
19
|
+
const leftValue = left[field];
|
|
20
|
+
const rightValue = right[field];
|
|
21
|
+
const compared = leftValue instanceof Date && rightValue instanceof Date
|
|
22
|
+
? leftValue.getTime() - rightValue.getTime()
|
|
23
|
+
: typeof leftValue === "number" && typeof rightValue === "number"
|
|
24
|
+
? leftValue - rightValue
|
|
25
|
+
: String(leftValue).localeCompare(String(rightValue));
|
|
26
|
+
if (compared !== 0)
|
|
27
|
+
return compared * direction;
|
|
28
|
+
return (left.createdAt.getTime() - right.createdAt.getTime() ||
|
|
29
|
+
left.id.localeCompare(right.id));
|
|
30
|
+
};
|
|
31
|
+
}
|
|
3
32
|
/**
|
|
4
33
|
* Claims and processes pending jobs from the `commerce_jobs` table.
|
|
5
34
|
*
|
|
@@ -9,18 +38,38 @@ import { commerceJobs } from "./schema.js";
|
|
|
9
38
|
* claim transaction.
|
|
10
39
|
*/
|
|
11
40
|
export async function runPendingJobs(args) {
|
|
12
|
-
const { db, tasks, queue = "default", limit = 10, logger, services, } = args;
|
|
13
|
-
let processed = 0;
|
|
14
|
-
let failed = 0;
|
|
41
|
+
const { db, tasks, queue = "default", limit = 10, processingOrder, logger, services, } = args;
|
|
15
42
|
// Phase 1: Claim jobs atomically
|
|
16
43
|
const claimed = await db.transaction(async (tx) => {
|
|
17
|
-
const
|
|
44
|
+
const processing = await tx
|
|
45
|
+
.select({ concurrencyKey: commerceJobs.concurrencyKey })
|
|
46
|
+
.from(commerceJobs)
|
|
47
|
+
.where(eq(commerceJobs.status, "processing"));
|
|
48
|
+
const processingKeys = new Set(processing.flatMap((job) => job.concurrencyKey ? [job.concurrencyKey] : []));
|
|
49
|
+
const candidates = await tx
|
|
18
50
|
.select()
|
|
19
51
|
.from(commerceJobs)
|
|
20
52
|
.where(and(eq(commerceJobs.status, "pending"), eq(commerceJobs.queue, queue), sql `(${commerceJobs.waitUntil} IS NULL OR ${commerceJobs.waitUntil} <= now())`))
|
|
21
|
-
.orderBy(commerceJobs.createdAt)
|
|
22
|
-
|
|
23
|
-
|
|
53
|
+
.orderBy(commerceJobs.createdAt);
|
|
54
|
+
candidates.sort(compareByProcessingOrder(processingOrder));
|
|
55
|
+
const pending = [];
|
|
56
|
+
for (const candidate of candidates) {
|
|
57
|
+
if (pending.length >= limit)
|
|
58
|
+
break;
|
|
59
|
+
if (candidate.concurrencyKey &&
|
|
60
|
+
isExclusiveTask(tasks.get(candidate.taskSlug)) &&
|
|
61
|
+
processingKeys.has(candidate.concurrencyKey)) {
|
|
62
|
+
continue;
|
|
63
|
+
}
|
|
64
|
+
const [locked] = await tx
|
|
65
|
+
.select()
|
|
66
|
+
.from(commerceJobs)
|
|
67
|
+
.where(and(eq(commerceJobs.id, candidate.id), eq(commerceJobs.status, "pending")))
|
|
68
|
+
.limit(1)
|
|
69
|
+
.for("update", { skipLocked: true });
|
|
70
|
+
if (locked)
|
|
71
|
+
pending.push(locked);
|
|
72
|
+
}
|
|
24
73
|
for (const job of pending) {
|
|
25
74
|
await tx
|
|
26
75
|
.update(commerceJobs)
|
|
@@ -31,10 +80,42 @@ export async function runPendingJobs(args) {
|
|
|
31
80
|
})
|
|
32
81
|
.where(eq(commerceJobs.id, job.id));
|
|
33
82
|
}
|
|
34
|
-
|
|
83
|
+
const oldestByKey = new Map();
|
|
84
|
+
const jobsToRun = [];
|
|
85
|
+
const jobsToRelease = [];
|
|
86
|
+
for (const job of pending) {
|
|
87
|
+
if (!job.concurrencyKey || !isExclusiveTask(tasks.get(job.taskSlug))) {
|
|
88
|
+
jobsToRun.push(job);
|
|
89
|
+
continue;
|
|
90
|
+
}
|
|
91
|
+
const oldest = oldestByKey.get(job.concurrencyKey);
|
|
92
|
+
if (!oldest) {
|
|
93
|
+
oldestByKey.set(job.concurrencyKey, job);
|
|
94
|
+
continue;
|
|
95
|
+
}
|
|
96
|
+
if (job.createdAt < oldest.createdAt) {
|
|
97
|
+
oldestByKey.set(job.concurrencyKey, job);
|
|
98
|
+
jobsToRelease.push(oldest);
|
|
99
|
+
}
|
|
100
|
+
else {
|
|
101
|
+
jobsToRelease.push(job);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
jobsToRun.push(...oldestByKey.values());
|
|
105
|
+
for (const job of jobsToRelease) {
|
|
106
|
+
await tx
|
|
107
|
+
.update(commerceJobs)
|
|
108
|
+
.set({
|
|
109
|
+
status: "pending",
|
|
110
|
+
processingStartedAt: null,
|
|
111
|
+
updatedAt: new Date(),
|
|
112
|
+
})
|
|
113
|
+
.where(eq(commerceJobs.id, job.id));
|
|
114
|
+
}
|
|
115
|
+
return jobsToRun.sort(compareByProcessingOrder(processingOrder));
|
|
35
116
|
});
|
|
36
117
|
// Phase 2: Execute each claimed job outside the claim transaction
|
|
37
|
-
|
|
118
|
+
const outcomes = await Promise.all(claimed.map(async (job) => {
|
|
38
119
|
const task = tasks.get(job.taskSlug);
|
|
39
120
|
if (!task) {
|
|
40
121
|
logger.warn("Unknown task slug — job marked as failed. Register the task handler in config.jobs.tasks.", {
|
|
@@ -50,8 +131,7 @@ export async function runPendingJobs(args) {
|
|
|
50
131
|
completedAt: new Date(),
|
|
51
132
|
})
|
|
52
133
|
.where(eq(commerceJobs.id, job.id));
|
|
53
|
-
failed
|
|
54
|
-
continue;
|
|
134
|
+
return "failed";
|
|
55
135
|
}
|
|
56
136
|
try {
|
|
57
137
|
const result = await task.handler({
|
|
@@ -72,7 +152,7 @@ export async function runPendingJobs(args) {
|
|
|
72
152
|
completedAt: new Date(),
|
|
73
153
|
})
|
|
74
154
|
.where(eq(commerceJobs.id, job.id));
|
|
75
|
-
processed
|
|
155
|
+
return "processed";
|
|
76
156
|
}
|
|
77
157
|
catch (err) {
|
|
78
158
|
logger.error("Job handler failed", {
|
|
@@ -93,7 +173,7 @@ export async function runPendingJobs(args) {
|
|
|
93
173
|
completedAt: new Date(),
|
|
94
174
|
})
|
|
95
175
|
.where(eq(commerceJobs.id, job.id));
|
|
96
|
-
failed
|
|
176
|
+
return "failed";
|
|
97
177
|
}
|
|
98
178
|
else {
|
|
99
179
|
// Compute backoff delay
|
|
@@ -108,11 +188,16 @@ export async function runPendingJobs(args) {
|
|
|
108
188
|
error: err instanceof Error ? err.message : String(err),
|
|
109
189
|
attempts,
|
|
110
190
|
waitUntil: new Date(Date.now() + delay),
|
|
191
|
+
processingStartedAt: null,
|
|
111
192
|
updatedAt: new Date(),
|
|
112
193
|
})
|
|
113
194
|
.where(eq(commerceJobs.id, job.id));
|
|
195
|
+
return "retrying";
|
|
114
196
|
}
|
|
115
197
|
}
|
|
116
|
-
}
|
|
117
|
-
return {
|
|
198
|
+
}));
|
|
199
|
+
return {
|
|
200
|
+
processed: outcomes.filter((outcome) => outcome === "processed").length,
|
|
201
|
+
failed: outcomes.filter((outcome) => outcome === "failed").length,
|
|
202
|
+
};
|
|
118
203
|
}
|
|
@@ -16,6 +16,19 @@ export interface TaskRetryConfig {
|
|
|
16
16
|
delay: number;
|
|
17
17
|
};
|
|
18
18
|
}
|
|
19
|
+
export interface JobProcessingOrderRecord {
|
|
20
|
+
id: string;
|
|
21
|
+
taskSlug: string;
|
|
22
|
+
input: Record<string, unknown>;
|
|
23
|
+
attempts: number;
|
|
24
|
+
createdAt: Date;
|
|
25
|
+
updatedAt: Date;
|
|
26
|
+
}
|
|
27
|
+
export type JobProcessingOrderField = "createdAt" | "updatedAt" | "attempts" | "taskSlug";
|
|
28
|
+
export type JobProcessingOrder = {
|
|
29
|
+
field: JobProcessingOrderField;
|
|
30
|
+
direction?: "asc" | "desc";
|
|
31
|
+
} | ((left: JobProcessingOrderRecord, right: JobProcessingOrderRecord) => number);
|
|
19
32
|
/** Present when the handler is invoked by `runPendingJobs` (not for ad-hoc calls). */
|
|
20
33
|
export interface TaskJobMeta {
|
|
21
34
|
attemptNumber: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/kernel/jobs/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,eAAO,MAAM,sBAAsB;;;CAGzB,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5D;AAED,sFAAsF;AACtF,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc,CAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEjE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,WAAW,CAAC;QACjB,GAAG,CAAC,EAAE,WAAW,CAAC;KACnB,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;QAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;CACH"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/kernel/jobs/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,eAAO,MAAM,sBAAsB;;;CAGzB,CAAC;AAEX,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE;QAAE,IAAI,EAAE,OAAO,GAAG,aAAa,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5D;AAED,MAAM,WAAW,wBAAwB;IACvC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,MAAM,MAAM,uBAAuB,GAC/B,WAAW,GACX,WAAW,GACX,UAAU,GACV,UAAU,CAAC;AAEf,MAAM,MAAM,kBAAkB,GAC1B;IACE,KAAK,EAAE,uBAAuB,CAAC;IAC/B,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,GACD,CAAC,CACC,IAAI,EAAE,wBAAwB,EAC9B,KAAK,EAAE,wBAAwB,KAC5B,MAAM,CAAC,CAAC;AAEjB,sFAAsF;AACtF,MAAM,WAAW,WAAW;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc,CAC7B,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChE,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAEjE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,CAAC,IAAI,EAAE;QACd,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,WAAW,CAAC;QACjB,GAAG,CAAC,EAAE,WAAW,CAAC;KACnB,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,WAAW,CAAC,EAAE;QACZ,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;QAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;CACH"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { RouteConfig } from "@hono/zod-openapi";
|
|
2
2
|
import type { PluginDb } from "../database/plugin-types.js";
|
|
3
3
|
import type { CommerceConfig, CommercePlugin, PluginPermission } from "../../config/types.js";
|
|
4
|
+
import type { TaskDefinition } from "../jobs/types.js";
|
|
4
5
|
export interface PluginLogger {
|
|
5
6
|
info(message: string, data?: unknown): void;
|
|
6
7
|
warn(message: string, data?: unknown): void;
|
|
@@ -76,6 +77,7 @@ export interface CommercePluginManifest {
|
|
|
76
77
|
hooks?: () => PluginHookRegistration[];
|
|
77
78
|
routes?: (ctx: PluginContext) => PluginRouteRegistration[];
|
|
78
79
|
analyticsModels?: () => unknown[];
|
|
80
|
+
jobs?: () => TaskDefinition[];
|
|
79
81
|
/**
|
|
80
82
|
* Named API-key scopes this plugin mints credentials under (issue #51),
|
|
81
83
|
* merged into `config.auth.apiKeyScopes`. User-defined scopes with the
|
|
@@ -90,6 +92,9 @@ export interface CommercePluginManifest {
|
|
|
90
92
|
minExpiresIn?: number;
|
|
91
93
|
maxExpiresIn?: number;
|
|
92
94
|
};
|
|
95
|
+
/** Better Auth ownership model for keys minted under this scope. */
|
|
96
|
+
references?: "user" | "organization";
|
|
97
|
+
enableMetadata?: boolean;
|
|
93
98
|
}>;
|
|
94
99
|
}
|
|
95
100
|
export declare const _registeredPlugins: Set<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/kernel/plugin/manifest.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAS5D,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"manifest.d.ts","sourceRoot":"","sources":["../../../src/kernel/plugin/manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -206,6 +206,15 @@ export function defineCommercePlugin(manifest) {
|
|
|
206
206
|
},
|
|
207
207
|
};
|
|
208
208
|
}
|
|
209
|
+
if (manifest.jobs) {
|
|
210
|
+
result = {
|
|
211
|
+
...result,
|
|
212
|
+
jobs: {
|
|
213
|
+
...(result.jobs ?? {}),
|
|
214
|
+
tasks: [...(result.jobs?.tasks ?? []), ...manifest.jobs()],
|
|
215
|
+
},
|
|
216
|
+
};
|
|
217
|
+
}
|
|
209
218
|
return result;
|
|
210
219
|
};
|
|
211
220
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drizzle-adapter.d.ts","sourceRoot":"","sources":["../../../src/modules/analytics/drizzle-adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAEhB,aAAa,EACb,cAAc,EAEd,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,YAAY,CAAC;AAiJpB,qBAAa,uBAAwB,YAAW,gBAAgB;IAGlD,OAAO,CAAC,EAAE;IAFtB,OAAO,CAAC,MAAM,CAAqC;gBAE/B,EAAE,EAAE,eAAe;IAEvC,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI;IAIpC,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"drizzle-adapter.d.ts","sourceRoot":"","sources":["../../../src/modules/analytics/drizzle-adapter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAE3E,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAEhB,aAAa,EACb,cAAc,EAEd,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,YAAY,CAAC;AAiJpB,qBAAa,uBAAwB,YAAW,gBAAgB;IAGlD,OAAO,CAAC,EAAE;IAFtB,OAAO,CAAC,MAAM,CAAqC;gBAE/B,EAAE,EAAE,eAAe;IAEvC,aAAa,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI;IAIpC,KAAK,CAAC,MAAM,EAAE,oBAAoB,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IA2EjG,OAAO,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YAyBvD,YAAY;CA6K3B"}
|
|
@@ -178,6 +178,14 @@ export class DrizzleAnalyticsAdapter {
|
|
|
178
178
|
return Err(new CommerceValidationError(`Unknown dimension: "${dim}". Available dimensions for ${cubeName}: ${available}`));
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
|
+
// Validate that requested time dimensions exist in the cube
|
|
182
|
+
for (const td of params.timeDimensions ?? []) {
|
|
183
|
+
const shortName = td.dimension.split(".")[1];
|
|
184
|
+
if (shortName && !cube.dimensions[shortName]) {
|
|
185
|
+
const available = Object.keys(cube.dimensions).map((d) => `${cubeName}.${d}`).join(", ");
|
|
186
|
+
return Err(new CommerceValidationError(`Unknown time dimension: "${td.dimension}". Available dimensions for ${cubeName}: ${available}`));
|
|
187
|
+
}
|
|
188
|
+
}
|
|
181
189
|
try {
|
|
182
190
|
const rows = await this.executeQuery(cube, params, scope);
|
|
183
191
|
return Ok({
|
|
@@ -276,13 +284,16 @@ export class DrizzleAnalyticsAdapter {
|
|
|
276
284
|
const dimDef = cube.dimensions[shortName];
|
|
277
285
|
if (!dimDef)
|
|
278
286
|
continue;
|
|
279
|
-
|
|
287
|
+
const alias = `${cube.name}.${shortName}`;
|
|
288
|
+
selectParts.push(sql.raw(`${dimDef.sql} AS "${alias}"`));
|
|
280
289
|
groupByParts.push(sql.raw(dimDef.sql));
|
|
281
290
|
}
|
|
282
291
|
// Time dimensions → SELECT + GROUP BY + WHERE (dateRange)
|
|
283
292
|
for (const td of params.timeDimensions ?? []) {
|
|
293
|
+
const shortName = td.dimension.split(".")[1];
|
|
284
294
|
const selectExpr = compileTimeDimensionSelect(cube, td);
|
|
285
|
-
|
|
295
|
+
const alias = `${cube.name}.${shortName}`;
|
|
296
|
+
selectParts.push(sql `${selectExpr} AS ${sql.raw(`"${alias}"`)}`);
|
|
286
297
|
groupByParts.push(selectExpr);
|
|
287
298
|
// Date range filter
|
|
288
299
|
if (td.dateRange) {
|
|
@@ -298,7 +309,9 @@ export class DrizzleAnalyticsAdapter {
|
|
|
298
309
|
}
|
|
299
310
|
// Measures → SELECT
|
|
300
311
|
for (const measure of params.measures) {
|
|
301
|
-
|
|
312
|
+
const shortName = measure.split(".")[1];
|
|
313
|
+
const alias = `${cube.name}.${shortName}`;
|
|
314
|
+
selectParts.push(sql `${compileMeasure(cube, measure)} AS ${sql.raw(`"${alias}"`)}`);
|
|
302
315
|
}
|
|
303
316
|
// If no select parts (shouldn't happen with validation), bail
|
|
304
317
|
if (selectParts.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/cart/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAc5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,KAAK,IAAI,EAAE,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAExE,YAAY,EACV,eAAe,EACf,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EACV,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAE5E,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,cAAc,CAAC;IAC3B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,YAAY,CAAC;IACpB,MAAM,EAAE,cAAc,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,EAAE,eAAe,CAAC;IAC1B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AA6BD,qBAAa,WAAW;IAIV,OAAO,CAAC,IAAI;IAHxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAE5B,IAAI,EAAE,eAAe;IAKnC,MAAM,CACV,KAAK,EAAE,eAAe,EACtB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAwElB,OAAO,CACX,EAAE,EAAE,MAAM,EACV,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG;QAAE,SAAS,EAAE,YAAY,EAAE,CAAA;KAAE,CAAC,CAAC;IA6BlD,OAAO,CACX,KAAK,EAAE,gBAAgB,EACvB,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,EACpB,GAAG,CAAC,EAAE,SAAS,GACd,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/modules/cart/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -136,8 +136,9 @@ export class CartService {
|
|
|
136
136
|
if (quantity <= 0) {
|
|
137
137
|
return Err(new CommerceValidationError("Quantity must be greater than zero."));
|
|
138
138
|
}
|
|
139
|
-
// Validate entity exists
|
|
140
|
-
|
|
139
|
+
// Validate entity exists AND belongs to the actor's org (org-scoped lookup
|
|
140
|
+
// so another tenant's entity id cannot be added to this cart).
|
|
141
|
+
const entity = await this.catalogRepo.findEntityById(input.entityId, ctx, orgId);
|
|
141
142
|
if (!entity)
|
|
142
143
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
143
144
|
// Check if entity has variants
|
|
@@ -8,6 +8,7 @@ export declare class EntityService {
|
|
|
8
8
|
constructor(deps: CatalogServiceDeps);
|
|
9
9
|
private get repo();
|
|
10
10
|
private assertSameOrg;
|
|
11
|
+
private assertEntityWritable;
|
|
11
12
|
private validateAndCreateCustomFields;
|
|
12
13
|
private hydrateEntity;
|
|
13
14
|
create(input: CreateEntityInput, actor: Actor | null, ctx?: TxContext): Promise<Result<CatalogEntityHydrated>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-service.d.ts","sourceRoot":"","sources":["../../../src/modules/catalog/entity-service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAkBjD,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,sBAAsB,EACtB,kBAAkB,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAEV,iBAAiB,EAGjB,UAAU,EACV,WAAW,EACX,OAAO,EACR,MAAM,uBAAuB,CAAC;AAsC/B,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,kBAAkB;IAErD,OAAO,KAAK,IAAI,GAEf;IAED,OAAO,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"entity-service.d.ts","sourceRoot":"","sources":["../../../src/modules/catalog/entity-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,10 @@ export class EntityService {
|
|
|
45
45
|
throw new CommerceNotFoundError("Entity not found.");
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
|
+
assertEntityWritable(entity, actor) {
|
|
49
|
+
if (entity.sourceStoreId != null)
|
|
50
|
+
assertPermission(actor, "catalog:sync");
|
|
51
|
+
}
|
|
48
52
|
async validateAndCreateCustomFields(entityId, entityType, customFields, ctx) {
|
|
49
53
|
if (!customFields)
|
|
50
54
|
return Ok(undefined);
|
|
@@ -162,7 +166,9 @@ export class EntityService {
|
|
|
162
166
|
const afterHooks = this.deps.hooks.resolve("catalog.afterCreate");
|
|
163
167
|
const context = createHookContext({ actor, tx: ctx?.tx ?? null, logger: createLogger("catalog.create"), services: this.deps.services, context: { moduleName: "catalog" }, ...hookDatabaseArg(this.deps.database) });
|
|
164
168
|
const processedInput = await runBeforeHooks(beforeHooks, input, "create", context);
|
|
165
|
-
|
|
169
|
+
if (processedInput.sourceStoreId != null)
|
|
170
|
+
assertPermission(actor, "catalog:sync");
|
|
171
|
+
const entity = await this.repo.createEntity({ organizationId: orgId, type: processedInput.type, slug: processedInput.slug, status: "draft", isVisible: false, ...(processedInput.sourceStoreId !== undefined ? { sourceStoreId: processedInput.sourceStoreId } : {}), ...(processedInput.taxClass !== undefined ? { taxClass: processedInput.taxClass } : {}), metadata: processedInput.metadata ?? {} }, ctx);
|
|
166
172
|
if (processedInput.attributes) {
|
|
167
173
|
await this.repo.createAttribute({ entityId: entity.id, locale: processedInput.attributes.locale ?? "en", title: processedInput.attributes.title, subtitle: processedInput.attributes.subtitle, description: processedInput.attributes.description, richDescription: processedInput.attributes.richDescription, seoTitle: processedInput.attributes.seoTitle, seoDescription: processedInput.attributes.seoDescription }, ctx);
|
|
168
174
|
}
|
|
@@ -184,6 +190,7 @@ export class EntityService {
|
|
|
184
190
|
if (!existing)
|
|
185
191
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
186
192
|
this.assertSameOrg(existing, actor);
|
|
193
|
+
this.assertEntityWritable(existing, actor);
|
|
187
194
|
const beforeHooks = this.deps.hooks.resolve("catalog.beforeUpdate");
|
|
188
195
|
const afterHooks = this.deps.hooks.resolve("catalog.afterUpdate");
|
|
189
196
|
const context = createHookContext({ actor, tx: ctx?.tx ?? null, logger: createLogger("catalog.update"), services: this.deps.services, context: { moduleName: "catalog" }, ...hookDatabaseArg(this.deps.database) });
|
|
@@ -206,6 +213,7 @@ export class EntityService {
|
|
|
206
213
|
if (!existing)
|
|
207
214
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
208
215
|
this.assertSameOrg(existing, actor);
|
|
216
|
+
this.assertEntityWritable(existing, actor);
|
|
209
217
|
await this.repo.deleteAttributesByEntityId(id, ctx);
|
|
210
218
|
await this.repo.deleteCustomFieldsByEntityId(id, ctx);
|
|
211
219
|
await this.repo.deleteEntityCategoriesByEntityId(id, ctx);
|
|
@@ -238,8 +246,13 @@ export class EntityService {
|
|
|
238
246
|
entity = refetched;
|
|
239
247
|
}
|
|
240
248
|
}
|
|
241
|
-
|
|
242
|
-
|
|
249
|
+
const resolvedActor = actor ?? ctx?.actor ?? null;
|
|
250
|
+
try {
|
|
251
|
+
this.assertSameOrg(entity, resolvedActor);
|
|
252
|
+
}
|
|
253
|
+
catch (error) {
|
|
254
|
+
return Err(toCommerceError(error));
|
|
255
|
+
}
|
|
243
256
|
const result = await this.hydrateEntity(entity, processed.options ?? options, ctx);
|
|
244
257
|
const entityAfterHooks = this.deps.hooks.resolve(`catalog.${entity.type}.afterRead`);
|
|
245
258
|
const report = mergeHookReports(await runAfterHooks(globalAfterHooks, null, result, "read", context), await runAfterHooks(entityAfterHooks, null, result, "read", context));
|
|
@@ -364,6 +377,12 @@ export class EntityService {
|
|
|
364
377
|
catch (error) {
|
|
365
378
|
return Err(toCommerceError(error));
|
|
366
379
|
}
|
|
380
|
+
try {
|
|
381
|
+
this.assertEntityWritable(entity, actor);
|
|
382
|
+
}
|
|
383
|
+
catch (error) {
|
|
384
|
+
return Err(toCommerceError(error));
|
|
385
|
+
}
|
|
367
386
|
const updateData = { status };
|
|
368
387
|
if (status === "active") {
|
|
369
388
|
updateData.publishedAt = new Date();
|
|
@@ -407,6 +426,12 @@ export class EntityService {
|
|
|
407
426
|
const entity = await this.repo.findEntityById(input.entityId, ctx);
|
|
408
427
|
if (!entity)
|
|
409
428
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
429
|
+
try {
|
|
430
|
+
this.assertSameOrg(entity, actor);
|
|
431
|
+
}
|
|
432
|
+
catch (error) {
|
|
433
|
+
return Err(toCommerceError(error));
|
|
434
|
+
}
|
|
410
435
|
const optionType = await this.repo.createOptionType({ entityId: input.entityId, name: input.name, displayName: input.name, sortOrder: 0 }, ctx);
|
|
411
436
|
if (input.values) {
|
|
412
437
|
for (const value of input.values) {
|
|
@@ -420,6 +445,15 @@ export class EntityService {
|
|
|
420
445
|
const optionType = await this.repo.findOptionTypeById(input.optionTypeId, ctx);
|
|
421
446
|
if (!optionType)
|
|
422
447
|
return Err(new CommerceNotFoundError("Option type not found."));
|
|
448
|
+
const entity = await this.repo.findEntityById(optionType.entityId, ctx);
|
|
449
|
+
if (!entity)
|
|
450
|
+
return Err(new CommerceNotFoundError("Entity not found."));
|
|
451
|
+
try {
|
|
452
|
+
this.assertSameOrg(entity, actor);
|
|
453
|
+
}
|
|
454
|
+
catch (error) {
|
|
455
|
+
return Err(toCommerceError(error));
|
|
456
|
+
}
|
|
423
457
|
return Ok(await this.repo.createOptionValue({ optionTypeId: input.optionTypeId, value: input.value, displayValue: input.value, sortOrder: 0, metadata: {} }, ctx));
|
|
424
458
|
}
|
|
425
459
|
async createVariant(input, actor, ctx) {
|
|
@@ -427,6 +461,12 @@ export class EntityService {
|
|
|
427
461
|
const entity = await this.repo.findEntityById(input.entityId, ctx);
|
|
428
462
|
if (!entity)
|
|
429
463
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
464
|
+
try {
|
|
465
|
+
this.assertSameOrg(entity, actor);
|
|
466
|
+
}
|
|
467
|
+
catch (error) {
|
|
468
|
+
return Err(toCommerceError(error));
|
|
469
|
+
}
|
|
430
470
|
const entityOptionTypes = await this.repo.findOptionTypesByEntityId(input.entityId, ctx);
|
|
431
471
|
const optionValueIds = [];
|
|
432
472
|
for (const [optName, optVal] of Object.entries(input.options)) {
|
|
@@ -461,6 +501,12 @@ export class EntityService {
|
|
|
461
501
|
const entity = await this.repo.findEntityById(entityId, ctx);
|
|
462
502
|
if (!entity)
|
|
463
503
|
return Err(new CommerceNotFoundError("Entity not found."));
|
|
504
|
+
try {
|
|
505
|
+
this.assertSameOrg(entity, actor);
|
|
506
|
+
}
|
|
507
|
+
catch (error) {
|
|
508
|
+
return Err(toCommerceError(error));
|
|
509
|
+
}
|
|
464
510
|
const entityOptionTypes = await this.repo.findOptionTypesByEntityId(entityId, ctx);
|
|
465
511
|
const sortedOptionTypes = entityOptionTypes.sort((a, b) => a.sortOrder - b.sortOrder);
|
|
466
512
|
const optionValueGroups = [];
|
|
@@ -95,8 +95,8 @@ export declare class CatalogRepository {
|
|
|
95
95
|
findVariantById(id: string, ctx?: TxContext): Promise<Variant | undefined>;
|
|
96
96
|
findVariantBySku(sku: string, ctx?: TxContext): Promise<Variant | undefined>;
|
|
97
97
|
findVariantByBarcode(barcode: string, ctx?: TxContext): Promise<Variant | undefined>;
|
|
98
|
-
createVariant(data: VariantInsert, ctx?: TxContext): Promise<Variant>;
|
|
99
|
-
updateVariant(id: string, data: Partial<Omit<VariantInsert, "id">>, ctx?: TxContext): Promise<Variant | undefined>;
|
|
98
|
+
createVariant(data: Omit<VariantInsert, "organizationId" | "sourceStoreId">, ctx?: TxContext): Promise<Variant>;
|
|
99
|
+
updateVariant(id: string, data: Partial<Omit<VariantInsert, "id" | "organizationId" | "sourceStoreId">>, ctx?: TxContext): Promise<Variant | undefined>;
|
|
100
100
|
deleteVariantsByEntityId(entityId: string, ctx?: TxContext): Promise<void>;
|
|
101
101
|
findVariantOptionValues(variantId: string, ctx?: TxContext): Promise<VariantOptionValue[]>;
|
|
102
102
|
createVariantOptionValues(data: VariantOptionValueInsert[], ctx?: TxContext): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/catalog/repository/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/modules/catalog/repository/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { eq, and, inArray } from "drizzle-orm";
|
|
2
|
+
import { CommerceNotFoundError } from "../../../kernel/errors.js";
|
|
2
3
|
import { sellableEntities, sellableAttributes, sellableCustomFields, categories, entityCategories, brands, entityBrands, optionTypes, optionValues, variants, variantOptionValues, } from "../schema.js";
|
|
3
4
|
/**
|
|
4
5
|
* CatalogRepository provides type-safe database operations for catalog entities.
|
|
@@ -407,7 +408,14 @@ export class CatalogRepository {
|
|
|
407
408
|
}
|
|
408
409
|
async createVariant(data, ctx) {
|
|
409
410
|
const db = this.getDb(ctx);
|
|
410
|
-
const
|
|
411
|
+
const entity = await this.findEntityById(data.entityId, ctx);
|
|
412
|
+
if (!entity)
|
|
413
|
+
throw new CommerceNotFoundError("Entity not found.");
|
|
414
|
+
const rows = await db.insert(variants).values({
|
|
415
|
+
...data,
|
|
416
|
+
organizationId: entity.organizationId,
|
|
417
|
+
sourceStoreId: entity.sourceStoreId,
|
|
418
|
+
}).returning();
|
|
411
419
|
return rows[0];
|
|
412
420
|
}
|
|
413
421
|
async updateVariant(id, data, ctx) {
|
|
@@ -36,6 +36,23 @@ export declare const sellableEntities: import("drizzle-orm/pg-core").PgTableWith
|
|
|
36
36
|
identity: undefined;
|
|
37
37
|
generated: undefined;
|
|
38
38
|
}, {}, {}>;
|
|
39
|
+
sourceStoreId: import("drizzle-orm/pg-core").PgColumn<{
|
|
40
|
+
name: "source_store_id";
|
|
41
|
+
tableName: "sellable_entities";
|
|
42
|
+
dataType: "string";
|
|
43
|
+
columnType: "PgText";
|
|
44
|
+
data: string;
|
|
45
|
+
driverParam: string;
|
|
46
|
+
notNull: false;
|
|
47
|
+
hasDefault: false;
|
|
48
|
+
isPrimaryKey: false;
|
|
49
|
+
isAutoincrement: false;
|
|
50
|
+
hasRuntimeDefault: false;
|
|
51
|
+
enumValues: [string, ...string[]];
|
|
52
|
+
baseColumn: never;
|
|
53
|
+
identity: undefined;
|
|
54
|
+
generated: undefined;
|
|
55
|
+
}, {}, {}>;
|
|
39
56
|
type: import("drizzle-orm/pg-core").PgColumn<{
|
|
40
57
|
name: "type";
|
|
41
58
|
tableName: "sellable_entities";
|
|
@@ -1093,6 +1110,40 @@ export declare const variants: import("drizzle-orm/pg-core").PgTableWithColumns<
|
|
|
1093
1110
|
identity: undefined;
|
|
1094
1111
|
generated: undefined;
|
|
1095
1112
|
}, {}, {}>;
|
|
1113
|
+
organizationId: import("drizzle-orm/pg-core").PgColumn<{
|
|
1114
|
+
name: "organization_id";
|
|
1115
|
+
tableName: "variants";
|
|
1116
|
+
dataType: "string";
|
|
1117
|
+
columnType: "PgText";
|
|
1118
|
+
data: string;
|
|
1119
|
+
driverParam: string;
|
|
1120
|
+
notNull: true;
|
|
1121
|
+
hasDefault: false;
|
|
1122
|
+
isPrimaryKey: false;
|
|
1123
|
+
isAutoincrement: false;
|
|
1124
|
+
hasRuntimeDefault: false;
|
|
1125
|
+
enumValues: [string, ...string[]];
|
|
1126
|
+
baseColumn: never;
|
|
1127
|
+
identity: undefined;
|
|
1128
|
+
generated: undefined;
|
|
1129
|
+
}, {}, {}>;
|
|
1130
|
+
sourceStoreId: import("drizzle-orm/pg-core").PgColumn<{
|
|
1131
|
+
name: "source_store_id";
|
|
1132
|
+
tableName: "variants";
|
|
1133
|
+
dataType: "string";
|
|
1134
|
+
columnType: "PgText";
|
|
1135
|
+
data: string;
|
|
1136
|
+
driverParam: string;
|
|
1137
|
+
notNull: false;
|
|
1138
|
+
hasDefault: false;
|
|
1139
|
+
isPrimaryKey: false;
|
|
1140
|
+
isAutoincrement: false;
|
|
1141
|
+
hasRuntimeDefault: false;
|
|
1142
|
+
enumValues: [string, ...string[]];
|
|
1143
|
+
baseColumn: never;
|
|
1144
|
+
identity: undefined;
|
|
1145
|
+
generated: undefined;
|
|
1146
|
+
}, {}, {}>;
|
|
1096
1147
|
sku: import("drizzle-orm/pg-core").PgColumn<{
|
|
1097
1148
|
name: "sku";
|
|
1098
1149
|
tableName: "variants";
|