@mercurjs/core 2.3.7-canary.1 → 2.3.8-canary.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.
Files changed (51) hide show
  1. package/.medusa/server/src/api/admin/order-groups/helpers.js +9 -3
  2. package/.medusa/server/src/api/admin/order-groups/validators.d.ts +1 -0
  3. package/.medusa/server/src/api/admin/order-groups/validators.js +2 -1
  4. package/.medusa/server/src/api/utils/index.d.ts +1 -0
  5. package/.medusa/server/src/api/utils/index.js +2 -1
  6. package/.medusa/server/src/api/utils/restrict-vendor-fields.d.ts +12 -0
  7. package/.medusa/server/src/api/utils/restrict-vendor-fields.js +29 -0
  8. package/.medusa/server/src/api/vendor/inventory-items/[id]/location-levels/[location_id]/route.js +10 -6
  9. package/.medusa/server/src/api/vendor/inventory-items/[id]/location-levels/batch/route.js +10 -3
  10. package/.medusa/server/src/api/vendor/inventory-items/[id]/location-levels/route.js +9 -5
  11. package/.medusa/server/src/api/vendor/inventory-items/helpers.d.ts +2 -0
  12. package/.medusa/server/src/api/vendor/inventory-items/helpers.js +35 -8
  13. package/.medusa/server/src/api/vendor/inventory-items/location-levels/batch/route.js +8 -1
  14. package/.medusa/server/src/api/vendor/members/middlewares.js +4 -1
  15. package/.medusa/server/src/api/vendor/middlewares.js +2 -1
  16. package/.medusa/server/src/api/vendor/offers/[id]/inventory-items/batch/route.js +10 -4
  17. package/.medusa/server/src/api/vendor/offers/[id]/route.js +2 -1
  18. package/.medusa/server/src/api/vendor/offers/batch/route.js +3 -1
  19. package/.medusa/server/src/api/vendor/offers/route.js +3 -1
  20. package/.medusa/server/src/api/vendor/payments/[id]/capture/route.js +4 -2
  21. package/.medusa/server/src/api/vendor/payments/helpers.d.ts +3 -1
  22. package/.medusa/server/src/api/vendor/payments/helpers.js +10 -6
  23. package/.medusa/server/src/api/vendor/products/helpers.d.ts +4 -0
  24. package/.medusa/server/src/api/vendor/products/helpers.js +12 -2
  25. package/.medusa/server/src/api/vendor/products/middlewares.js +32 -2
  26. package/.medusa/server/src/api/vendor/sellers/middlewares.js +13 -1
  27. package/.medusa/server/src/api/vendor/stock-locations/helpers.d.ts +1 -0
  28. package/.medusa/server/src/api/vendor/stock-locations/helpers.js +16 -8
  29. package/.medusa/server/src/modules/seller/repositories/order-group.js +113 -3
  30. package/.medusa/server/src/patches/manifest.js +11 -1
  31. package/.medusa/server/src/patches/patches/@medusajs+core-flows@2.21.2-seller-promotion-scope.patch +62 -0
  32. package/.medusa/server/src/workflows/cart/steps/get-promotion-seller-ids.d.ts +5 -0
  33. package/.medusa/server/src/workflows/cart/steps/get-promotion-seller-ids.js +12 -0
  34. package/.medusa/server/src/workflows/cart/steps/index.d.ts +1 -0
  35. package/.medusa/server/src/workflows/cart/steps/index.js +2 -1
  36. package/.medusa/server/src/workflows/cart/utils/index.d.ts +1 -0
  37. package/.medusa/server/src/workflows/cart/utils/index.js +2 -1
  38. package/.medusa/server/src/workflows/cart/utils/seller-promotion-scope.d.ts +12 -0
  39. package/.medusa/server/src/workflows/cart/utils/seller-promotion-scope.js +28 -0
  40. package/.medusa/server/src/workflows/cart/workflows/complete-cart-with-split-orders.js +14 -4
  41. package/.medusa/server/src/workflows/cart/workflows/update-cart-seller-promotions.js +2 -3
  42. package/.medusa/server/src/workflows/offer/workflows/create-offers.js +16 -2
  43. package/.medusa/server/src/workflows/offer/workflows/delete-offers.d.ts +10 -6
  44. package/.medusa/server/src/workflows/offer/workflows/delete-offers.js +8 -2
  45. package/.medusa/server/src/workflows/offer/workflows/update-offers.d.ts +3 -0
  46. package/.medusa/server/src/workflows/offer/workflows/update-offers.js +10 -1
  47. package/.medusa/server/src/workflows/offer/workflows/upsert-offer-prices.d.ts +26 -2
  48. package/.medusa/server/src/workflows/offer/workflows/upsert-offer-prices.js +84 -14
  49. package/package.json +3 -3
  50. package/.medusa/server/src/workflows/cart/steps/prepare-adjustments-from-promotion-actions.d.ts +0 -6
  51. package/.medusa/server/src/workflows/cart/steps/prepare-adjustments-from-promotion-actions.js +0 -104
@@ -1,14 +1,38 @@
1
- import { UpsertOfferPriceDTO } from "@mercurjs/types";
1
+ import { type Hook, type ReturnWorkflow } from "@medusajs/framework/workflows-sdk";
2
+ import { OfferPriceDTO, UpsertOfferPriceDTO } from "@mercurjs/types";
3
+ import { type AddOfferPricesStepOutput } from "../steps";
2
4
  export type UpsertOfferPricesWorkflowInput = {
3
5
  offers: {
4
6
  id: string;
5
7
  prices: UpsertOfferPriceDTO[];
6
8
  }[];
9
+ updated_by?: string;
7
10
  };
11
+ export type OfferPricesUpsertedHookOffer = {
12
+ offer_id: string;
13
+ previous_prices: OfferPriceDTO[];
14
+ prices: OfferPriceDTO[];
15
+ created: string[];
16
+ updated: string[];
17
+ deleted: string[];
18
+ };
19
+ export type UpsertOfferPricesWorkflowHooks = [
20
+ Hook<"offerPricesUpserted", {
21
+ offers: OfferPricesUpsertedHookOffer[];
22
+ updated_by: string | null;
23
+ }, unknown>
24
+ ];
25
+ export declare const OFFER_PRICE_FIELDS: readonly ["prices.id", "prices.amount", "prices.currency_code", "prices.min_quantity", "prices.max_quantity", "prices.price_rules.attribute", "prices.price_rules.value"];
26
+ type LoadedOfferPrices = {
27
+ id: string;
28
+ prices?: Array<OfferPriceDTO | null> | null;
29
+ };
30
+ export declare const pickOfferPrices: (offer: LoadedOfferPrices) => OfferPriceDTO[];
8
31
  export declare const upsertOfferPricesWorkflowId = "upsert-offer-prices";
9
32
  /**
10
33
  * Replaces each offer's own prices. Offers on the same variant share its
11
34
  * PriceSet, so prices are upserted by id instead of rewriting the set, which
12
35
  * would drop the prices of every other offer on the variant.
13
36
  */
14
- export declare const upsertOfferPricesWorkflow: import("@medusajs/framework/workflows-sdk").ReturnWorkflow<UpsertOfferPricesWorkflowInput, import("../steps").AddOfferPricesStepOutput, []>;
37
+ export declare const upsertOfferPricesWorkflow: ReturnWorkflow<UpsertOfferPricesWorkflowInput, AddOfferPricesStepOutput, UpsertOfferPricesWorkflowHooks>;
38
+ export {};
@@ -1,12 +1,33 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.upsertOfferPricesWorkflow = exports.upsertOfferPricesWorkflowId = void 0;
3
+ exports.upsertOfferPricesWorkflow = exports.upsertOfferPricesWorkflowId = exports.pickOfferPrices = exports.OFFER_PRICE_FIELDS = void 0;
4
4
  const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
5
5
  const core_flows_1 = require("@medusajs/medusa/core-flows");
6
6
  const utils_1 = require("@medusajs/framework/utils");
7
7
  const types_1 = require("@mercurjs/types");
8
8
  const steps_1 = require("../steps");
9
9
  const utils_2 = require("../utils");
10
+ exports.OFFER_PRICE_FIELDS = [
11
+ "prices.id",
12
+ "prices.amount",
13
+ "prices.currency_code",
14
+ "prices.min_quantity",
15
+ "prices.max_quantity",
16
+ "prices.price_rules.attribute",
17
+ "prices.price_rules.value",
18
+ ];
19
+ const pickOfferPrices = (offer) => (offer.prices ?? []).filter((p) => !!p?.id);
20
+ exports.pickOfferPrices = pickOfferPrices;
21
+ const serializeRules = (rules) => rules
22
+ .map((r) => `${r.attribute}=${r.value}`)
23
+ .sort()
24
+ .join(",");
25
+ const serializePrice = (amount, min_quantity, max_quantity, rules) => JSON.stringify({
26
+ amount: Number(amount),
27
+ min_quantity: min_quantity ?? null,
28
+ max_quantity: max_quantity ?? null,
29
+ rules: serializeRules(rules),
30
+ });
10
31
  exports.upsertOfferPricesWorkflowId = "upsert-offer-prices";
11
32
  /**
12
33
  * Replaces each offer's own prices. Offers on the same variant share its
@@ -21,13 +42,7 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
21
42
  "id",
22
43
  "variant_id",
23
44
  "product_variant.price_set.id",
24
- "prices.id",
25
- "prices.amount",
26
- "prices.currency_code",
27
- "prices.min_quantity",
28
- "prices.max_quantity",
29
- "prices.price_rules.attribute",
30
- "prices.price_rules.value",
45
+ ...exports.OFFER_PRICE_FIELDS,
31
46
  ],
32
47
  filters: { id: offerIds },
33
48
  }).config({ name: "get-offer-prices" });
@@ -36,6 +51,7 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
36
51
  const addPricesPayload = [];
37
52
  const toRemoveIds = [];
38
53
  const removedLinks = [];
54
+ const changes = [];
39
55
  for (const offer of input.offers) {
40
56
  const loaded = offerById.get(offer.id);
41
57
  if (!loaded) {
@@ -48,9 +64,9 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
48
64
  // `prices` comes through the offer <-> price link, so a link row
49
65
  // whose price no longer resolves yields a null element. Such a
50
66
  // dangling link takes no part in the diff.
51
- const ownedIds = new Set((loaded.prices ?? [])
52
- .filter((p) => !!p?.id)
53
- .map((p) => p.id));
67
+ const previousPrices = (0, exports.pickOfferPrices)(loaded);
68
+ const ownedById = new Map(previousPrices.map((p) => [p.id, p]));
69
+ const ownedIds = new Set(ownedById.keys());
54
70
  const incomingIds = offer.prices
55
71
  .map((p) => p.id)
56
72
  .filter((id) => !!id);
@@ -59,22 +75,38 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
59
75
  price_ids: incomingIds,
60
76
  owned_price_ids: ownedIds,
61
77
  });
78
+ const deleted = [];
62
79
  const keepIds = new Set(incomingIds);
63
80
  for (const ownedId of ownedIds) {
64
81
  if (!keepIds.has(ownedId)) {
65
82
  toRemoveIds.push(ownedId);
83
+ deleted.push(ownedId);
66
84
  removedLinks.push({
67
85
  [types_1.MercurModules.OFFER]: { offer_id: offer.id },
68
86
  [utils_1.Modules.PRICING]: { price_id: ownedId },
69
87
  });
70
88
  }
71
89
  }
90
+ const updated = [];
72
91
  const upsertPrices = offer.prices.map((p) => {
92
+ const rules = { ...(p.rules ?? {}), offer_id: offer.id };
93
+ const ruleRows = Object.entries(rules).map(([attribute, value]) => ({ attribute, value }));
94
+ const existing = p.id ? ownedById.get(p.id) : undefined;
95
+ const rulesUnchanged = !!existing &&
96
+ serializeRules(existing.price_rules ?? []) ===
97
+ serializeRules(ruleRows);
73
98
  const base = {
74
99
  amount: p.amount,
75
100
  currency_code: p.currency_code,
76
- rules: { ...(p.rules ?? {}), offer_id: offer.id },
77
101
  };
102
+ // Medusa matches an incoming row to an existing price by a hash of
103
+ // its bounds and rules and, on a match, feeds the serialized
104
+ // existing rule rows back into its upsert, which never completes.
105
+ // Leaving `rules` out of an unchanged-rules update skips that
106
+ // match and keeps the stored rule rows as they are.
107
+ if (!rulesUnchanged) {
108
+ base.rules = rules;
109
+ }
78
110
  if (p.id) {
79
111
  base.id = p.id;
80
112
  }
@@ -84,6 +116,13 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
84
116
  if (p.max_quantity !== undefined && p.max_quantity !== null) {
85
117
  base.max_quantity = p.max_quantity;
86
118
  }
119
+ if (existing) {
120
+ const before = serializePrice(existing.amount, existing.min_quantity, existing.max_quantity, existing.price_rules ?? []);
121
+ const after = serializePrice(p.amount, p.min_quantity, p.max_quantity, ruleRows);
122
+ if (before !== after || existing.currency_code !== p.currency_code) {
123
+ updated.push(existing.id);
124
+ }
125
+ }
87
126
  return base;
88
127
  });
89
128
  if (upsertPrices.length) {
@@ -92,11 +131,18 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
92
131
  prices: upsertPrices,
93
132
  });
94
133
  }
134
+ changes.push({
135
+ offer_id: offer.id,
136
+ previous_prices: previousPrices,
137
+ updated,
138
+ deleted,
139
+ });
95
140
  }
96
141
  return {
97
142
  addPricesPayload,
98
143
  toRemoveIds,
99
144
  removedLinks,
145
+ changes,
100
146
  };
101
147
  });
102
148
  const toRemoveIds = (0, workflows_sdk_1.transform)({ pricingDiff }, ({ pricingDiff }) => pricingDiff.toRemoveIds);
@@ -125,6 +171,30 @@ exports.upsertOfferPricesWorkflow = (0, workflows_sdk_1.createWorkflow)(exports.
125
171
  (0, core_flows_1.createRemoteLinkStep)(newLinks).config({
126
172
  name: "create-new-offer-price-links",
127
173
  });
128
- return new workflows_sdk_1.WorkflowResponse(addedPrices);
174
+ const { data: updatedOfferRows } = (0, core_flows_1.useQueryGraphStep)({
175
+ entity: "offer",
176
+ fields: ["id", ...exports.OFFER_PRICE_FIELDS],
177
+ filters: { id: offerIds },
178
+ }).config({ name: "get-offer-prices-after-upsert" });
179
+ const hookOffers = (0, workflows_sdk_1.transform)({ pricingDiff, addedPrices, updatedOfferRows }, ({ pricingDiff, addedPrices, updatedOfferRows }) => {
180
+ const createdByOffer = new Map(addedPrices.map((entry) => [entry.offer_id, entry.price_ids]));
181
+ const afterById = new Map(updatedOfferRows.map((o) => [o.id, o]));
182
+ return pricingDiff.changes.map((change) => {
183
+ const after = afterById.get(change.offer_id);
184
+ return {
185
+ ...change,
186
+ prices: after ? (0, exports.pickOfferPrices)(after) : [],
187
+ created: createdByOffer.get(change.offer_id) ?? [],
188
+ };
189
+ });
190
+ });
191
+ const updatedBy = (0, workflows_sdk_1.transform)({ input }, ({ input }) => input.updated_by ?? null);
192
+ const offerPricesUpserted = (0, workflows_sdk_1.createHook)("offerPricesUpserted", {
193
+ offers: hookOffers,
194
+ updated_by: updatedBy,
195
+ });
196
+ return new workflows_sdk_1.WorkflowResponse(addedPrices, {
197
+ hooks: [offerPricesUpserted],
198
+ });
129
199
  });
130
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBzZXJ0LW9mZmVyLXByaWNlcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3NyYy93b3JrZmxvd3Mvb2ZmZXIvd29ya2Zsb3dzL3Vwc2VydC1vZmZlci1wcmljZXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEscUVBSzBDO0FBRTFDLDREQUlvQztBQUNwQyxxREFBZ0U7QUFDaEUsMkNBQW9FO0FBRXBFLG9DQUlpQjtBQUNqQixvQ0FBb0Q7QUFTdkMsUUFBQSwyQkFBMkIsR0FBRyxxQkFBcUIsQ0FBQTtBQUVoRTs7OztHQUlHO0FBQ1UsUUFBQSx5QkFBeUIsR0FBRyxJQUFBLDhCQUFjLEVBQ3JELG1DQUEyQixFQUMzQixVQUFVLEtBQW1EO0lBQzNELE1BQU0sUUFBUSxHQUFHLElBQUEseUJBQVMsRUFBQyxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQ2xELEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQzlCLENBQUE7SUFFRCxNQUFNLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxHQUFHLElBQUEsOEJBQWlCLEVBQUM7UUFDNUMsTUFBTSxFQUFFLE9BQU87UUFDZixNQUFNLEVBQUU7WUFDTixJQUFJO1lBQ0osWUFBWTtZQUNaLDhCQUE4QjtZQUM5QixXQUFXO1lBQ1gsZUFBZTtZQUNmLHNCQUFzQjtZQUN0QixxQkFBcUI7WUFDckIscUJBQXFCO1lBQ3JCLDhCQUE4QjtZQUM5QiwwQkFBMEI7U0FDM0I7UUFDRCxPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsUUFBUSxFQUFFO0tBQzFCLENBQUMsQ0FBQyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFBO0lBRXZDLE1BQU0sV0FBVyxHQUFHLElBQUEseUJBQVMsRUFDM0IsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEVBQ3BCLENBQUMsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLEVBQUUsRUFBRTtRQUN2QixNQUFNLFNBQVMsR0FBRyxJQUFJLEdBQUcsQ0FDdEIsU0FPRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQzFCLENBQUE7UUFFRCxNQUFNLGdCQUFnQixHQUE0QixFQUFFLENBQUE7UUFDcEQsTUFBTSxXQUFXLEdBQWEsRUFBRSxDQUFBO1FBQ2hDLE1BQU0sWUFBWSxHQUFxQixFQUFFLENBQUE7UUFFekMsS0FBSyxNQUFNLEtBQUssSUFBSSxLQUFLLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDakMsTUFBTSxNQUFNLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDdEMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO2dCQUNaLE1BQU0sSUFBSSxtQkFBVyxDQUNuQixtQkFBVyxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQzNCLFNBQVMsS0FBSyxDQUFDLEVBQUUsZ0JBQWdCLENBQ2xDLENBQUE7WUFDSCxDQUFDO1lBQ0QsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLGVBQWUsRUFBRSxTQUFTLEVBQUUsRUFBRSxDQUFBO1lBQ3hELElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztnQkFDaEIsTUFBTSxJQUFJLG1CQUFXLENBQ25CLG1CQUFXLENBQUMsS0FBSyxDQUFDLFlBQVksRUFDOUIsV0FBVyxNQUFNLENBQUMsVUFBVSxrQkFBa0IsQ0FDL0MsQ0FBQTtZQUNILENBQUM7WUFFRCxpRUFBaUU7WUFDakUsK0RBQStEO1lBQy9ELDJDQUEyQztZQUMzQyxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FDdEIsQ0FBQyxNQUFNLENBQUMsTUFBTSxJQUFJLEVBQUUsQ0FBQztpQkFDbEIsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUF1QixFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7aUJBQzNDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUNwQixDQUFBO1lBQ0QsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLE1BQU07aUJBQzdCLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztpQkFDaEIsTUFBTSxDQUFDLENBQUMsRUFBRSxFQUFnQixFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBRXJDLElBQUEsaUNBQXlCLEVBQUM7Z0JBQ3hCLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBRTtnQkFDbEIsU0FBUyxFQUFFLFdBQVc7Z0JBQ3RCLGVBQWUsRUFBRSxRQUFRO2FBQzFCLENBQUMsQ0FBQTtZQUVGLE1BQU0sT0FBTyxHQUFHLElBQUksR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFBO1lBQ3BDLEtBQUssTUFBTSxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7Z0JBQy9CLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7b0JBQzFCLFdBQVcsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUE7b0JBQ3pCLFlBQVksQ0FBQyxJQUFJLENBQUM7d0JBQ2hCLENBQUMscUJBQWEsQ0FBQyxLQUFLLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFO3dCQUM3QyxDQUFDLGVBQU8sQ0FBQyxPQUFPLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxPQUFPLEVBQUU7cUJBQ3pDLENBQUMsQ0FBQTtnQkFDSixDQUFDO1lBQ0gsQ0FBQztZQUVELE1BQU0sWUFBWSxHQUVkLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7Z0JBQ3pCLE1BQU0sSUFBSSxHQUFtRDtvQkFDM0QsTUFBTSxFQUFFLENBQUMsQ0FBQyxNQUFNO29CQUNoQixhQUFhLEVBQUUsQ0FBQyxDQUFDLGFBQWE7b0JBQzlCLEtBQUssRUFBRSxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQyxFQUFFLFFBQVEsRUFBRSxLQUFLLENBQUMsRUFBRSxFQUFFO2lCQUNsRCxDQUFBO2dCQUNELElBQUksQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO29CQUNULElBQUksQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtnQkFDaEIsQ0FBQztnQkFDRCxJQUFJLENBQUMsQ0FBQyxZQUFZLEtBQUssU0FBUyxJQUFJLENBQUMsQ0FBQyxZQUFZLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQzVELElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDLFlBQVksQ0FBQTtnQkFDcEMsQ0FBQztnQkFDRCxJQUFJLENBQUMsQ0FBQyxZQUFZLEtBQUssU0FBUyxJQUFJLENBQUMsQ0FBQyxZQUFZLEtBQUssSUFBSSxFQUFFLENBQUM7b0JBQzVELElBQUksQ0FBQyxZQUFZLEdBQUcsQ0FBQyxDQUFDLFlBQVksQ0FBQTtnQkFDcEMsQ0FBQztnQkFDRCxPQUFPLElBQUksQ0FBQTtZQUNiLENBQUMsQ0FBQyxDQUFBO1lBRUYsSUFBSSxZQUFZLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3hCLGdCQUFnQixDQUFDLElBQUksQ0FBQztvQkFDcEIsVUFBVTtvQkFDVixNQUFNLEVBQUUsWUFBWTtpQkFDckIsQ0FBQyxDQUFBO1lBQ0osQ0FBQztRQUNILENBQUM7UUFFRCxPQUFPO1lBQ0wsZ0JBQWdCO1lBQ2hCLFdBQVc7WUFDWCxZQUFZO1NBQ2IsQ0FBQTtJQUNILENBQUMsQ0FDRixDQUFBO0lBRUQsTUFBTSxXQUFXLEdBQUcsSUFBQSx5QkFBUyxFQUMzQixFQUFFLFdBQVcsRUFBRSxFQUNmLENBQUMsRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FDN0MsQ0FBQTtJQUVELE1BQU0sWUFBWSxHQUFHLElBQUEseUJBQVMsRUFDNUIsRUFBRSxXQUFXLEVBQUUsRUFDZixDQUFDLEVBQUUsV0FBVyxFQUFFLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxZQUFZLENBQzlDLENBQUE7SUFDRCwwRUFBMEU7SUFDMUUseUVBQXlFO0lBQ3pFLDBDQUEwQztJQUMxQyxJQUFBLGtDQUFxQixFQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUN6QyxJQUFJLEVBQUUsbUNBQW1DO0tBQzFDLENBQUMsQ0FBQTtJQUVGLElBQUEsNkJBQXFCLEVBQUMsV0FBVyxDQUFDLENBQUE7SUFFbEMsTUFBTSxnQkFBZ0IsR0FBRyxJQUFBLHlCQUFTLEVBQ2hDLEVBQUUsV0FBVyxFQUFFLEVBQ2YsQ0FBQyxFQUFFLFdBQVcsRUFBRSxFQUFFLEVBQUUsQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQ2xELENBQUE7SUFFRCxNQUFNLFdBQVcsR0FBRyxJQUFBLDBCQUFrQixFQUFDLGdCQUFnQixDQUFDLENBQUE7SUFFeEQsTUFBTSxRQUFRLEdBQUcsSUFBQSx5QkFBUyxFQUN4QixFQUFFLFdBQVcsRUFBRSxFQUNmLENBQUMsRUFBRSxXQUFXLEVBQUUsRUFBRSxFQUFFO1FBQ2xCLE1BQU0sS0FBSyxHQUFxQixFQUFFLENBQUE7UUFDbEMsS0FBSyxNQUFNLEtBQUssSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUNoQyxLQUFLLE1BQU0sT0FBTyxJQUFJLEtBQUssQ0FBQyxTQUFTLEVBQUUsQ0FBQztnQkFDdEMsS0FBSyxDQUFDLElBQUksQ0FBQztvQkFDVCxDQUFDLHFCQUFhLENBQUMsS0FBSyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVEsRUFBRTtvQkFDbkQsQ0FBQyxlQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFO2lCQUN6QyxDQUFDLENBQUE7WUFDSixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFBO0lBQ2QsQ0FBQyxDQUNGLENBQUE7SUFFRCxJQUFBLGlDQUFvQixFQUFDLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQztRQUNwQyxJQUFJLEVBQUUsOEJBQThCO0tBQ3JDLENBQUMsQ0FBQTtJQUVGLE9BQU8sSUFBSSxnQ0FBZ0IsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUMxQyxDQUFDLENBQ0YsQ0FBQSJ9
200
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upsert-offer-prices.js","sourceRoot":"","sources":["../../../../../../src/workflows/offer/workflows/upsert-offer-prices.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mercurjs/core",
3
- "version": "2.3.7-canary.1",
3
+ "version": "2.3.8-canary.0",
4
4
  "repository": {
5
5
  "type": "git",
6
6
  "url": "https://github.com/mercurjs/mercur",
@@ -61,7 +61,7 @@
61
61
  "@medusajs/medusa": "2.21.2",
62
62
  "@medusajs/test-utils": "2.21.2",
63
63
  "@medusajs/ui": "4.2.3",
64
- "@mercurjs/types": "2.3.7-canary.1",
64
+ "@mercurjs/types": "2.3.8-canary.0",
65
65
  "@swc/core": "^1.7.28",
66
66
  "@types/cors": "^2.8.17",
67
67
  "@types/express": "^4.17.21",
@@ -81,7 +81,7 @@
81
81
  "multer": "^2.0.2",
82
82
  "http-proxy-middleware": "^3.0.3",
83
83
  "jsonwebtoken": "^9.0.3",
84
- "@mercurjs/cli": "2.3.7-canary.1"
84
+ "@mercurjs/cli": "2.3.8-canary.0"
85
85
  },
86
86
  "peerDependencies": {
87
87
  "@medusajs/admin-sdk": ">=2.21.0",
@@ -1,6 +0,0 @@
1
- import { ComputeActions } from "@medusajs/framework/types";
2
- import { PrepareAdjustmentsFromPromotionActionsStepOutput } from "@medusajs/medusa/core-flows";
3
- export interface PrepareSellerAdjustmentsFromPromotionActionsStepInput {
4
- actions: ComputeActions[];
5
- }
6
- export declare const prepareSellerAdjustmentsFromPromotionActionsStep: import("@medusajs/framework/workflows-sdk").StepFunction<PrepareSellerAdjustmentsFromPromotionActionsStepInput, PrepareAdjustmentsFromPromotionActionsStepOutput>;
@@ -1,104 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.prepareSellerAdjustmentsFromPromotionActionsStep = void 0;
4
- const utils_1 = require("@medusajs/framework/utils");
5
- const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
6
- exports.prepareSellerAdjustmentsFromPromotionActionsStep = (0, workflows_sdk_1.createStep)("prepare-seller-adjustments-from-promotion-actions", async (data, { container }) => {
7
- const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
8
- const { actions = [] } = data;
9
- if (!actions.length) {
10
- return new workflows_sdk_1.StepResponse({
11
- lineItemAdjustmentsToCreate: [],
12
- lineItemAdjustmentIdsToRemove: [],
13
- shippingMethodAdjustmentsToCreate: [],
14
- shippingMethodAdjustmentIdsToRemove: [],
15
- computedPromotionCodes: [],
16
- skippedPromoCodes: [],
17
- });
18
- }
19
- const [{ data: promotions }, { data: lineItems }, { data: shippingMethods }] = await (0, utils_1.promiseAll)([query.graph({
20
- entity: "promotion",
21
- fields: ["id", "code", 'seller.id'],
22
- filters: { code: actions.map((a) => a.code) },
23
- }, { cache: { enable: true } }), query.graph({
24
- entity: "line_item",
25
- fields: ['id', 'offer.seller_id', 'variant.product.seller.id'],
26
- filters: { id: actions.filter((a) => a.action === utils_1.ComputedActions.ADD_ITEM_ADJUSTMENT).map((a) => a.item_id) },
27
- }, { cache: { enable: true } }), query.graph({
28
- entity: "shipping_method",
29
- fields: ['id', 'shipping_option_id'],
30
- filters: { id: actions.filter((a) => a.action === utils_1.ComputedActions.ADD_SHIPPING_METHOD_ADJUSTMENT).map((a) => a.shipping_method_id) },
31
- }, { cache: { enable: true } })]);
32
- const { data: shippingOptions } = await query.graph({
33
- entity: "shipping_option",
34
- fields: ['id', 'seller.id'],
35
- filters: { id: shippingMethods.map((sm) => sm.shipping_option_id) },
36
- }, { cache: { enable: true } });
37
- const promotionsMap = new Map(promotions.map((promotion) => [promotion.code, promotion]));
38
- const shippingMethodsMap = new Map(shippingMethods.map((shippingMethod) => [shippingMethod.id, shippingMethod]));
39
- const shippingOptionsMap = new Map(shippingOptions.map((shippingOption) => [shippingOption.id, shippingOption]));
40
- const lineItemsMap = new Map(lineItems.map((lineItem) => [lineItem.id, lineItem]));
41
- const lineItemAdjustmentsToCreate = [];
42
- const lineItemAdjustmentIdsToRemove = [];
43
- const shippingMethodAdjustmentsToCreate = [];
44
- const shippingMethodAdjustmentIdsToRemove = [];
45
- for (const action of actions) {
46
- switch (action.action) {
47
- case utils_1.ComputedActions.ADD_ITEM_ADJUSTMENT:
48
- const itemAction = action;
49
- const promotion = promotionsMap.get(itemAction.code);
50
- const lineItem = lineItemsMap.get(itemAction.item_id);
51
- if (promotion && lineItem) {
52
- const promotionSellerId = promotion.seller?.id;
53
- const itemSellerId = lineItem.offer?.seller_id;
54
- if (!promotionSellerId || promotionSellerId === itemSellerId) {
55
- lineItemAdjustmentsToCreate.push({
56
- code: action.code,
57
- amount: itemAction.amount,
58
- is_tax_inclusive: itemAction.is_tax_inclusive,
59
- item_id: itemAction.item_id,
60
- promotion_id: promotion.id,
61
- });
62
- }
63
- }
64
- break;
65
- case utils_1.ComputedActions.REMOVE_ITEM_ADJUSTMENT:
66
- lineItemAdjustmentIdsToRemove.push(action.adjustment_id);
67
- break;
68
- case utils_1.ComputedActions.ADD_SHIPPING_METHOD_ADJUSTMENT:
69
- const shippingAction = action;
70
- const shippingMethod = shippingMethodsMap.get(shippingAction.shipping_method_id);
71
- const shippingOption = shippingOptionsMap.get(shippingMethod?.shipping_option_id);
72
- const shippingPromotion = promotionsMap.get(action.code);
73
- if (shippingMethod && shippingPromotion) {
74
- const promotionSellerId = shippingPromotion.seller?.id;
75
- const shippingMethodSellerId = shippingOption?.seller?.id;
76
- if (!promotionSellerId || promotionSellerId === shippingMethodSellerId) {
77
- shippingMethodAdjustmentsToCreate.push({
78
- code: action.code,
79
- amount: shippingAction.amount,
80
- shipping_method_id: shippingAction.shipping_method_id,
81
- promotion_id: shippingPromotion.id,
82
- });
83
- }
84
- }
85
- break;
86
- case utils_1.ComputedActions.REMOVE_SHIPPING_METHOD_ADJUSTMENT:
87
- shippingMethodAdjustmentIdsToRemove.push(action.adjustment_id);
88
- break;
89
- }
90
- }
91
- const computedPromotionCodes = [
92
- ...lineItemAdjustmentsToCreate,
93
- ...shippingMethodAdjustmentsToCreate,
94
- ].map((adjustment) => adjustment.code);
95
- return new workflows_sdk_1.StepResponse({
96
- lineItemAdjustmentsToCreate,
97
- lineItemAdjustmentIdsToRemove,
98
- shippingMethodAdjustmentsToCreate,
99
- shippingMethodAdjustmentIdsToRemove,
100
- computedPromotionCodes,
101
- skippedPromoCodes: [],
102
- });
103
- });
104
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJlcGFyZS1hZGp1c3RtZW50cy1mcm9tLXByb21vdGlvbi1hY3Rpb25zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vc3JjL3dvcmtmbG93cy9jYXJ0L3N0ZXBzL3ByZXBhcmUtYWRqdXN0bWVudHMtZnJvbS1wcm9tb3Rpb24tYWN0aW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFTQSxxREFJa0M7QUFDbEMscUVBQTRFO0FBUS9ELFFBQUEsZ0RBQWdELEdBQUcsSUFBQSwwQkFBVSxFQUN0RSxtREFBbUQsRUFDbkQsS0FBSyxFQUNELElBQTJELEVBQzNELEVBQUUsU0FBUyxFQUFFLEVBQ2YsRUFBRTtJQUNBLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxPQUFPLENBQVEsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFdkUsTUFBTSxFQUFFLE9BQU8sR0FBRyxFQUFFLEVBQUUsR0FBRyxJQUFJLENBQUE7SUFFN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUNsQixPQUFPLElBQUksNEJBQVksQ0FBQztZQUNwQiwyQkFBMkIsRUFBRSxFQUFFO1lBQy9CLDZCQUE2QixFQUFFLEVBQUU7WUFDakMsaUNBQWlDLEVBQUUsRUFBRTtZQUNyQyxtQ0FBbUMsRUFBRSxFQUFFO1lBQ3ZDLHNCQUFzQixFQUFFLEVBQUU7WUFDMUIsaUJBQWlCLEVBQUUsRUFBRTtTQUM0QixDQUFDLENBQUE7SUFDMUQsQ0FBQztJQUVELE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxlQUFlLEVBQUUsQ0FBQyxHQUFHLE1BQU0sSUFBQSxrQkFBVSxFQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FDeEc7WUFDSSxNQUFNLEVBQUUsV0FBVztZQUNuQixNQUFNLEVBQUUsQ0FBQyxJQUFJLEVBQUUsTUFB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