@medusajs/medusa 1.3.2 → 1.3.3

package/dist/services/shipping-option.js

@@ -72,109 +72,83 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
+var interfaces_1 = require("../interfaces");
+var utils_1 = require("../utils");
 /**
  * Provides layer to manipulate profiles.
- * @extends BaseService
  */
 var ShippingOptionService = /** @class */ (function (_super) {
     __extends(ShippingOptionService, _super);
     function ShippingOptionService(_a) {
         var manager = _a.manager, shippingOptionRepository = _a.shippingOptionRepository, shippingOptionRequirementRepository = _a.shippingOptionRequirementRepository, shippingMethodRepository = _a.shippingMethodRepository, fulfillmentProviderService = _a.fulfillmentProviderService, regionService = _a.regionService;
-        var _this = _super.call(this) || this;
-        /** @private @const {EntityManager} */
+        var _this = 
+        // eslint-disable-next-line prefer-rest-params
+        _super.call(this, arguments[0]) || this;
         _this.manager_ = manager;
-        /** @private @const {ShippingOptionRepository} */
         _this.optionRepository_ = shippingOptionRepository;
-        /** @private @const {ShippingMethodRepository} */
         _this.methodRepository_ = shippingMethodRepository;
-        /** @private @const {ShippingOptionRequirementRepository} */
         _this.requirementRepository_ = shippingOptionRequirementRepository;
-        /** @private @const {ProductService} */
         _this.providerService_ = fulfillmentProviderService;
-        /** @private @const {RegionService} */
         _this.regionService_ = regionService;
         return _this;
     }
-    ShippingOptionService.prototype.withTransaction = function (transactionManager) {
-        if (!transactionManager) {
-            return this;
-        }
-        var cloned = new ShippingOptionService({
-            manager: transactionManager,
-            shippingOptionRepository: this.optionRepository_,
-            shippingMethodRepository: this.methodRepository_,
-            shippingOptionRequirementRepository: this.requirementRepository_,
-            fulfillmentProviderService: this.providerService_,
-            regionService: this.regionService_,
-        });
-        cloned.transactionManager_ = transactionManager;
-        return cloned;
-    };
     /**
      * Validates a requirement
-     * @param {ShippingRequirement} requirement - the requirement to validate
+     * @param {ShippingOptionRequirement} requirement - the requirement to validate
      * @param {string} optionId - the id to validate the requirement
-     * @return {ShippingRequirement} a validated shipping requirement
+     * @return {ShippingOptionRequirement} a validated shipping requirement
      */
     ShippingOptionService.prototype.validateRequirement_ = function (requirement, optionId) {
+        if (optionId === void 0) { optionId = undefined; }
         return __awaiter(this, void 0, void 0, function () {
-            var reqRepo, existingReq, req, created;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        if (!requirement.type) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A Shipping Requirement must have a type field");
-                        }
-                        if (requirement.type !== "min_subtotal" &&
-                            requirement.type !== "max_subtotal") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Requirement type must be one of min_subtotal, max_subtotal");
-                        }
-                        reqRepo = this.manager_.getCustomRepository(this.requirementRepository_);
-                        return [4 /*yield*/, reqRepo.findOne({
-                                where: { id: requirement.id },
-                            })];
-                    case 1:
-                        existingReq = _a.sent();
-                        if (!existingReq && requirement.id) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "ID does not exist");
-                        }
-                        // If no option id is provided, we are currently in the process of creating
-                        // a new shipping option. Therefore, simply return the requirement, such
-                        // that the cascading will take care of the creation of the requirement.
-                        if (!optionId) {
-                            return [2 /*return*/, requirement];
-                        }
-                        if (!existingReq) return [3 /*break*/, 3];
-                        return [4 /*yield*/, reqRepo.save(__assign(__assign({}, existingReq), requirement))];
-                    case 2:
-                        req = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 3:
-                        created = reqRepo.create(__assign({ shipping_option_id: optionId }, requirement));
-                        return [4 /*yield*/, reqRepo.save(created)];
-                    case 4:
-                        req = _a.sent();
-                        _a.label = 5;
-                    case 5: return [2 /*return*/, req];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var reqRepo, existingReq, req, created;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (!requirement.type) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A Shipping Requirement must have a type field");
+                                        }
+                                        if (requirement.type !== "min_subtotal" &&
+                                            requirement.type !== "max_subtotal") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Requirement type must be one of min_subtotal, max_subtotal");
+                                        }
+                                        reqRepo = manager.getCustomRepository(this.requirementRepository_);
+                                        return [4 /*yield*/, reqRepo.findOne({
+                                                where: { id: requirement.id },
+                                            })];
+                                    case 1:
+                                        existingReq = _a.sent();
+                                        if (!existingReq && requirement.id) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "ID does not exist");
+                                        }
+                                        // If no option id is provided, we are currently in the process of creating
+                                        // a new shipping option. Therefore, simply return the requirement, such
+                                        // that the cascading will take care of the creation of the requirement.
+                                        if (!optionId) {
+                                            return [2 /*return*/, requirement];
+                                        }
+                                        if (!existingReq) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, reqRepo.save(__assign(__assign({}, existingReq), requirement))];
+                                    case 2:
+                                        req = _a.sent();
+                                        return [3 /*break*/, 5];
+                                    case 3:
+                                        created = reqRepo.create(__assign(__assign({}, requirement), { shipping_option_id: optionId }));
+                                        return [4 /*yield*/, reqRepo.save(created)];
+                                    case 4:
+                                        req = _a.sent();
+                                        _a.label = 5;
+                                    case 5: return [2 /*return*/, req];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -187,11 +161,19 @@ var ShippingOptionService = /** @class */ (function (_super) {
     ShippingOptionService.prototype.list = function (selector, config) {
         if (config === void 0) { config = { skip: 0, take: 50 }; }
         return __awaiter(this, void 0, void 0, function () {
-            var optRepo, query;
+            var _this = this;
             return __generator(this, function (_a) {
-                optRepo = this.manager_.getCustomRepository(this.optionRepository_);
-                query = this.buildQuery_(selector, config);
-                return [2 /*return*/, optRepo.find(query)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var optRepo, query;
+                            return __generator(this, function (_a) {
+                                optRepo = transactionManager.getCustomRepository(this.optionRepository_);
+                                query = (0, utils_1.buildQuery)(selector, config);
+                                return [2 /*return*/, optRepo.find(query)];
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -203,13 +185,21 @@ var ShippingOptionService = /** @class */ (function (_super) {
     ShippingOptionService.prototype.listAndCount = function (selector, config) {
         if (config === void 0) { config = { skip: 0, take: 50 }; }
         return __awaiter(this, void 0, void 0, function () {
-            var optRepo, query;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        optRepo = this.manager_.getCustomRepository(this.optionRepository_);
-                        query = this.buildQuery_(selector, config);
-                        return [4 /*yield*/, optRepo.findAndCount(query)];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var optRepo, query;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        optRepo = transactionManager.getCustomRepository(this.optionRepository_);
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, optRepo.findAndCount(query)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -225,28 +215,35 @@ var ShippingOptionService = /** @class */ (function (_super) {
     ShippingOptionService.prototype.retrieve = function (optionId, options) {
         if (options === void 0) { options = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var soRepo, validatedId, query, option;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        soRepo = this.manager_.getCustomRepository(this.optionRepository_);
-                        validatedId = this.validateId_(optionId);
-                        query = {
-                            where: { id: validatedId },
-                        };
-                        if (options.select) {
-                            query.select = options.select;
-                        }
-                        if (options.relations) {
-                            query.relations = options.relations;
-                        }
-                        return [4 /*yield*/, soRepo.findOne(query)];
-                    case 1:
-                        option = _a.sent();
-                        if (!option) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Shipping Option with ".concat(optionId, " was not found"));
-                        }
-                        return [2 /*return*/, option];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var soRepo, query, option;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        soRepo = transactionManager.getCustomRepository(this.optionRepository_);
+                                        query = {
+                                            where: { id: optionId },
+                                        };
+                                        if (options.select) {
+                                            query.select = options.select;
+                                        }
+                                        if (options.relations) {
+                                            query.relations = options.relations;
+                                        }
+                                        return [4 /*yield*/, soRepo.findOne(query)];
+                                    case 1:
+                                        option = _a.sent();
+                                        if (!option) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Shipping Option with ".concat(optionId, " was not found"));
+                                        }
+                                        return [2 /*return*/, option];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -262,52 +259,70 @@ var ShippingOptionService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var methodRepo, method;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    methodRepo = manager.getCustomRepository(this.methodRepository_);
-                                    return [4 /*yield*/, methodRepo.findOne({ where: { id: id } })];
-                                case 1:
-                                    method = _a.sent();
-                                    if ("return_id" in update) {
-                                        method.return_id = update.return_id;
-                                    }
-                                    if ("swap_id" in update) {
-                                        method.swap_id = update.swap_id;
-                                    }
-                                    if ("order_id" in update) {
-                                        method.order_id = update.order_id;
-                                    }
-                                    if ("claim_order_id" in update) {
-                                        method.claim_order_id = update.claim_order_id;
-                                    }
-                                    return [2 /*return*/, methodRepo.save(method)];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var methodRepo, method, _a, _b, key;
+                            var e_1, _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0:
+                                        methodRepo = manager.getCustomRepository(this.methodRepository_);
+                                        return [4 /*yield*/, methodRepo.findOne({ where: { id: id } })];
+                                    case 1:
+                                        method = _d.sent();
+                                        if (!method) {
+                                            return [2 /*return*/, undefined];
+                                        }
+                                        try {
+                                            for (_a = __values(Object.keys(update).filter(function (k) { return typeof update[k] !== "undefined"; })), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                                key = _b.value;
+                                                method[key] = update[key];
+                                            }
+                                        }
+                                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                                        finally {
+                                            try {
+                                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                            }
+                                            finally { if (e_1) throw e_1.error; }
+                                        }
+                                        return [2 /*return*/, methodRepo.save(method)];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     /**
      * Removes a given shipping method
      * @param {ShippingMethod | Array<ShippingMethod>} shippingMethods - the shipping method to remove
+     * @returns removed shipping methods
      */
     ShippingOptionService.prototype.deleteShippingMethods = function (shippingMethods) {
         return __awaiter(this, void 0, void 0, function () {
+            var removeEntities;
             var _this = this;
             return __generator(this, function (_a) {
-                if (!Array.isArray(shippingMethods)) {
-                    shippingMethods = [shippingMethods];
+                switch (_a.label) {
+                    case 0:
+                        removeEntities = Array.isArray(shippingMethods)
+                            ? shippingMethods
+                            : [shippingMethods];
+                        return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                                var methodRepo;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            methodRepo = manager.getCustomRepository(this.methodRepository_);
+                                            return [4 /*yield*/, methodRepo.remove(removeEntities)];
+                                        case 1: return [2 /*return*/, _a.sent()];
+                                    }
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var methodRepo;
-                        return __generator(this, function (_a) {
-                            methodRepo = manager.getCustomRepository(this.methodRepository_);
-                            return [2 /*return*/, methodRepo.remove(shippingMethods)];
-                        });
-                    }); })];
             });
         });
     };
@@ -322,69 +337,69 @@ var ShippingOptionService = /** @class */ (function (_super) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var option, methodRepo, validatedData, methodPrice, toCreate, method, created;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(optionId, {
-                                        relations: ["requirements"],
-                                    })];
-                                case 1:
-                                    option = _a.sent();
-                                    methodRepo = manager.getCustomRepository(this.methodRepository_);
-                                    if ("cart" in config) {
-                                        this.validateCartOption(option, config.cart || {});
-                                    }
-                                    return [4 /*yield*/, this.providerService_.validateFulfillmentData(option, data, config.cart || {})];
-                                case 2:
-                                    validatedData = _a.sent();
-                                    if (!(typeof config.price === "number")) return [3 /*break*/, 3];
-                                    methodPrice = config.price;
-                                    return [3 /*break*/, 5];
-                                case 3: return [4 /*yield*/, this.getPrice_(option, validatedData, config.cart)];
-                                case 4:
-                                    methodPrice = _a.sent();
-                                    _a.label = 5;
-                                case 5:
-                                    toCreate = {
-                                        shipping_option_id: option.id,
-                                        data: validatedData,
-                                        price: methodPrice,
-                                    };
-                                    if (config.order) {
-                                        toCreate.order_id = config.order.id;
-                                    }
-                                    if (config.cart) {
-                                        toCreate.cart_id = config.cart.id;
-                                    }
-                                    if (config.cart_id) {
-                                        toCreate.cart_id = config.cart_id;
-                                    }
-                                    if (config.return_id) {
-                                        toCreate.return_id = config.return_id;
-                                    }
-                                    if (config.order_id) {
-                                        toCreate.order_id = config.order_id;
-                                    }
-                                    if (config.claim_order_id) {
-                                        toCreate.claim_order_id = config.claim_order_id;
-                                    }
-                                    if (config.draft_order_id) {
-                                        toCreate.draft_order_id = config.draft_order_id;
-                                    }
-                                    return [4 /*yield*/, methodRepo.create(toCreate)];
-                                case 6:
-                                    method = _a.sent();
-                                    return [4 /*yield*/, methodRepo.save(method)];
-                                case 7:
-                                    created = _a.sent();
-                                    return [2 /*return*/, methodRepo.findOne({
-                                            where: { id: created.id },
-                                            relations: ["shipping_option"],
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var option, methodRepo, validatedData, methodPrice, toCreate, method, created;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(optionId, {
+                                            relations: ["requirements"],
                                         })];
-                            }
-                        });
-                    }); })];
+                                    case 1:
+                                        option = _a.sent();
+                                        methodRepo = manager.getCustomRepository(this.methodRepository_);
+                                        if (typeof config.cart !== "undefined") {
+                                            this.validateCartOption(option, config.cart);
+                                        }
+                                        return [4 /*yield*/, this.providerService_.validateFulfillmentData(option, data, config.cart || {})];
+                                    case 2:
+                                        validatedData = _a.sent();
+                                        if (!(typeof config.price === "number")) return [3 /*break*/, 3];
+                                        methodPrice = config.price;
+                                        return [3 /*break*/, 5];
+                                    case 3: return [4 /*yield*/, this.getPrice_(option, validatedData, config.cart)];
+                                    case 4:
+                                        methodPrice = _a.sent();
+                                        _a.label = 5;
+                                    case 5:
+                                        toCreate = {
+                                            shipping_option_id: option.id,
+                                            data: validatedData,
+                                            price: methodPrice,
+                                        };
+                                        if (config.order) {
+                                            toCreate.order_id = config.order.id;
+                                        }
+                                        if (config.cart) {
+                                            toCreate.cart_id = config.cart.id;
+                                        }
+                                        if (config.cart_id) {
+                                            toCreate.cart_id = config.cart_id;
+                                        }
+                                        if (config.return_id) {
+                                            toCreate.return_id = config.return_id;
+                                        }
+                                        if (config.order_id) {
+                                            toCreate.order_id = config.order_id;
+                                        }
+                                        if (config.claim_order_id) {
+                                            toCreate.claim_order_id = config.claim_order_id;
+                                        }
+                                        return [4 /*yield*/, methodRepo.create(toCreate)];
+                                    case 6:
+                                        method = _a.sent();
+                                        return [4 /*yield*/, methodRepo.save(method)];
+                                    case 7:
+                                        created = _a.sent();
+                                        return [2 /*return*/, methodRepo.findOne({
+                                                where: { id: created.id },
+                                                relations: ["shipping_option"],
+                                            })];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -431,22 +446,23 @@ var ShippingOptionService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var optionRepo, option, region, _a, isValid, acc, _loop_1, this_1, _b, _c, r, e_1_1, result;
-                        var e_1, _d;
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
+                        var optionRepo, option, region, _a, isValid, acc, _loop_1, this_1, _b, _c, r, e_2_1, result;
+                        var e_2, _d;
+                        var _e;
+                        return __generator(this, function (_f) {
+                            switch (_f.label) {
                                 case 0:
                                     optionRepo = manager.getCustomRepository(this.optionRepository_);
                                     return [4 /*yield*/, optionRepo.create(data)];
                                 case 1:
-                                    option = _e.sent();
+                                    option = _f.sent();
                                     return [4 /*yield*/, this.regionService_
                                             .withTransaction(manager)
                                             .retrieve(option.region_id, {
                                             relations: ["fulfillment_providers"],
                                         })];
                                 case 2:
-                                    region = _e.sent();
+                                    region = _f.sent();
                                     if (!region.fulfillment_providers.find(function (_a) {
                                         var id = _a.id;
                                         return id === option.provider_id;
@@ -456,23 +472,24 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     _a = option;
                                     return [4 /*yield*/, this.validatePriceType_(data.price_type, option)];
                                 case 3:
-                                    _a.price_type = _e.sent();
-                                    option.amount = data.price_type === "calculated" ? null : data.amount;
+                                    _a.price_type = _f.sent();
+                                    option.amount =
+                                        data.price_type === "calculated" ? null : (_e = data.amount) !== null && _e !== void 0 ? _e : null;
                                     return [4 /*yield*/, this.providerService_.validateOption(option)];
                                 case 4:
-                                    isValid = _e.sent();
+                                    isValid = _f.sent();
                                     if (!isValid) {
                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The fulfillment provider cannot validate the shipping option");
                                     }
-                                    if (!("requirements" in data)) return [3 /*break*/, 12];
+                                    if (!(typeof data.requirements !== "undefined")) return [3 /*break*/, 12];
                                     acc = [];
                                     _loop_1 = function (r) {
                                         var validated;
-                                        return __generator(this, function (_f) {
-                                            switch (_f.label) {
+                                        return __generator(this, function (_g) {
+                                            switch (_g.label) {
                                                 case 0: return [4 /*yield*/, this_1.validateRequirement_(r)];
                                                 case 1:
-                                                    validated = _f.sent();
+                                                    validated = _g.sent();
                                                     if (acc.find(function (raw) { return raw.type === validated.type; })) {
                                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Only one requirement of each type is allowed");
                                                     }
@@ -489,35 +506,35 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                         });
                                     };
                                     this_1 = this;
-                                    _e.label = 5;
+                                    _f.label = 5;
                                 case 5:
-                                    _e.trys.push([5, 10, 11, 12]);
+                                    _f.trys.push([5, 10, 11, 12]);
                                     _b = __values(data.requirements), _c = _b.next();
-                                    _e.label = 6;
+                                    _f.label = 6;
                                 case 6:
                                     if (!!_c.done) return [3 /*break*/, 9];
                                     r = _c.value;
                                     return [5 /*yield**/, _loop_1(r)];
                                 case 7:
-                                    _e.sent();
-                                    _e.label = 8;
+                                    _f.sent();
+                                    _f.label = 8;
                                 case 8:
                                     _c = _b.next();
                                     return [3 /*break*/, 6];
                                 case 9: return [3 /*break*/, 12];
                                 case 10:
-                                    e_1_1 = _e.sent();
-                                    e_1 = { error: e_1_1 };
+                                    e_2_1 = _f.sent();
+                                    e_2 = { error: e_2_1 };
                                     return [3 /*break*/, 12];
                                 case 11:
                                     try {
                                         if (_c && !_c.done && (_d = _b.return)) _d.call(_b);
                                     }
-                                    finally { if (e_1) throw e_1.error; }
+                                    finally { if (e_2) throw e_2.error; }
                                     return [7 /*endfinally*/];
                                 case 12: return [4 /*yield*/, optionRepo.save(option)];
                                 case 13:
-                                    result = _e.sent();
+                                    result = _f.sent();
                                     return [2 /*return*/, result];
                             }
                         });
@@ -525,16 +542,11 @@ var ShippingOptionService = /** @class */ (function (_super) {
             });
         });
     };
-    /**
-     * @typedef ShippingOptionPrice
-     * @property {string} type - one of flat_rate, calculated
-     * @property {number} value - the value if available
-     */
     /**
      * Validates a shipping option price
-     * @param {ShippingOptionPrice} priceType - the price to validate
+     * @param {ShippingOptionPriceType} priceType - the price to validate
      * @param {ShippingOption} option - the option to validate against
-     * @return {Promise<ShippingOptionPrice>} the validated price
+     * @return {Promise<ShippingOptionPriceType>} the validated price
      */
     ShippingOptionService.prototype.validatePriceType_ = function (priceType, option) {
         return __awaiter(this, void 0, void 0, function () {
@@ -573,8 +585,8 @@ var ShippingOptionService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var option, _a, acc, _loop_2, this_2, _b, _c, r, e_2_1, accReqs_1, toRemove, _d, optionRepo, result;
-                        var e_2, _e;
+                        var option, _a, acc, _loop_2, this_2, _b, _c, r, e_3_1, accReqs_1, toRemove, _d, optionRepo;
+                        var e_3, _e;
                         var _this = this;
                         return __generator(this, function (_f) {
                             switch (_f.label) {
@@ -583,9 +595,9 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     })];
                                 case 1:
                                     option = _f.sent();
-                                    if (!("metadata" in update)) return [3 /*break*/, 3];
+                                    if (!(typeof update.metadata !== "undefined")) return [3 /*break*/, 3];
                                     _a = option;
-                                    return [4 /*yield*/, this.setMetadata_(option, update.metadata)];
+                                    return [4 /*yield*/, (0, utils_1.setMetadata)(option, update.metadata)];
                                 case 2:
                                     _a.metadata = _f.sent();
                                     _f.label = 3;
@@ -593,10 +605,10 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     if (update.region_id || update.provider_id || update.data) {
                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Region and Provider cannot be updated after creation");
                                     }
-                                    if ("is_return" in update) {
+                                    if (typeof update.is_return !== "undefined") {
                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "is_return cannot be changed after creation");
                                     }
-                                    if (!("requirements" in update)) return [3 /*break*/, 14];
+                                    if (!(typeof update.requirements !== "undefined")) return [3 /*break*/, 14];
                                     acc = [];
                                     _loop_2 = function (r) {
                                         var validated;
@@ -638,14 +650,14 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     return [3 /*break*/, 5];
                                 case 8: return [3 /*break*/, 11];
                                 case 9:
-                                    e_2_1 = _f.sent();
-                                    e_2 = { error: e_2_1 };
+                                    e_3_1 = _f.sent();
+                                    e_3 = { error: e_3_1 };
                                     return [3 /*break*/, 11];
                                 case 10:
                                     try {
                                         if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
                                     }
-                                    finally { if (e_2) throw e_2.error; }
+                                    finally { if (e_3) throw e_3.error; }
                                     return [7 /*endfinally*/];
                                 case 11:
                                     if (!option.requirements) return [3 /*break*/, 13];
@@ -668,7 +680,7 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     option.requirements = acc;
                                     _f.label = 14;
                                 case 14:
-                                    if (!("price_type" in update)) return [3 /*break*/, 16];
+                                    if (!(typeof update.price_type !== "undefined")) return [3 /*break*/, 16];
                                     _d = option;
                                     return [4 /*yield*/, this.validatePriceType_(update.price_type, option)];
                                 case 15:
@@ -678,20 +690,19 @@ var ShippingOptionService = /** @class */ (function (_super) {
                                     }
                                     _f.label = 16;
                                 case 16:
-                                    if ("amount" in update && option.price_type !== "calculated") {
+                                    if (typeof update.amount !== "undefined" &&
+                                        option.price_type !== "calculated") {
                                         option.amount = update.amount;
                                     }
-                                    if ("name" in update) {
+                                    if (typeof update.name !== "undefined") {
                                         option.name = update.name;
                                     }
-                                    if ("admin_only" in update) {
+                                    if (typeof update.admin_only !== "undefined") {
                                         option.admin_only = update.admin_only;
                                     }
                                     optionRepo = manager.getCustomRepository(this.optionRepository_);
                                     return [4 /*yield*/, optionRepo.save(option)];
-                                case 17:
-                                    result = _f.sent();
-                                    return [2 /*return*/, result];
+                                case 17: return [2 /*return*/, _f.sent()];
                             }
                         });
                     }); })];
@@ -706,35 +717,38 @@ var ShippingOptionService = /** @class */ (function (_super) {
      */
     ShippingOptionService.prototype.delete = function (optionId) {
         return __awaiter(this, void 0, void 0, function () {
-            var option, optionRepo, error_1;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.retrieve(optionId)];
-                    case 1:
-                        option = _a.sent();
-                        optionRepo = this.manager_.getCustomRepository(this.optionRepository_);
-                        return [2 /*return*/, optionRepo.softRemove(option)];
-                    case 2:
-                        error_1 = _a.sent();
-                        // Delete is idempotent, but we return a promise to allow then-chaining
-                        return [2 /*return*/, Promise.resolve()];
-                    case 3: return [2 /*return*/];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var option, optionRepo, error_1;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.retrieve(optionId)];
+                                    case 1:
+                                        option = _a.sent();
+                                        optionRepo = manager.getCustomRepository(this.optionRepository_);
+                                        return [2 /*return*/, optionRepo.softRemove(option)];
+                                    case 2:
+                                        error_1 = _a.sent();
+                                        // Delete is idempotent, but we return a promise to allow then-chaining
+                                        return [2 /*return*/];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
-    /**
-     * @typedef ShippingRequirement
-     * @property {string} type - one of max_subtotal, min_subtotal
-     * @property {number} amount - the value to match against
-     */
     /**
      * Adds a requirement to a shipping option. Only 1 requirement of each type
      * is allowed.
      * @param {string} optionId - the option to add the requirement to.
-     * @param {ShippingRequirement} requirement - the requirement for the option.
+     * @param {ShippingOptionRequirement} requirement - the requirement for the option.
      * @return {Promise} the result of update
      */
     ShippingOptionService.prototype.addRequirement = function (optionId, requirement) {
@@ -773,93 +787,32 @@ var ShippingOptionService = /** @class */ (function (_super) {
     ShippingOptionService.prototype.removeRequirement = function (requirementId) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var reqRepo, requirement, result, error_2;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    _a.trys.push([0, 3, , 4]);
-                                    reqRepo = manager.getCustomRepository(this.requirementRepository_);
-                                    return [4 /*yield*/, reqRepo.findOne({
-                                            where: { id: requirementId },
-                                        })];
-                                case 1:
-                                    requirement = _a.sent();
-                                    return [4 /*yield*/, reqRepo.softRemove(requirement)];
-                                case 2:
-                                    result = _a.sent();
-                                    return [2 /*return*/, result];
-                                case 3:
-                                    error_2 = _a.sent();
-                                    // Delete is idempotent, but we return a promise to allow then-chaining
-                                    return [2 /*return*/, Promise.resolve()];
-                                case 4: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    /**
-     * Decorates a shipping option.
-     * @param {ShippingOption} optionId - the shipping option to decorate using optionId.
-     * @param {string[]} fields - the fields to include.
-     * @param {string[]} expandFields - fields to expand.
-     * @return {ShippingOption} the decorated ShippingOption.
-     */
-    ShippingOptionService.prototype.decorate = function (optionId, fields, expandFields) {
-        if (fields === void 0) { fields = []; }
-        if (expandFields === void 0) { expandFields = []; }
-        return __awaiter(this, void 0, void 0, function () {
-            var requiredFields, option;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        requiredFields = ["id", "metadata"];
-                        fields = fields.concat(requiredFields);
-                        return [4 /*yield*/, this.retrieve(optionId, {
-                                select: fields,
-                                relations: expandFields,
-                            })];
-                    case 1:
-                        option = _a.sent();
-                        return [2 /*return*/, option];
-                }
-            });
-        });
-    };
-    /**
-     * Dedicated method to set metadata for a shipping option.
-     * @param {object} option - the option to set metadata for.
-     * @param {object} metadata - object for metadata field
-     * @return {Promise} resolves to the updated result.
-     */
-    ShippingOptionService.prototype.setMetadata_ = function (option, metadata) {
-        return __awaiter(this, void 0, void 0, function () {
-            var existing, newData, _a, _b, _c, key, value, updated;
-            var e_3, _d;
-            return __generator(this, function (_e) {
-                existing = option.metadata || {};
-                newData = {};
-                try {
-                    for (_a = __values(Object.entries(metadata)), _b = _a.next(); !_b.done; _b = _a.next()) {
-                        _c = __read(_b.value, 2), key = _c[0], value = _c[1];
-                        if (typeof key !== "string") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
-                        }
-                        newData[key] = value;
-                    }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
-                    try {
-                        if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                    }
-                    finally { if (e_3) throw e_3.error; }
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var reqRepo, requirement;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        reqRepo = manager.getCustomRepository(this.requirementRepository_);
+                                        return [4 /*yield*/, reqRepo.findOne({
+                                                where: { id: requirementId },
+                                            })
+                                            // Delete is idempotent, but we return a promise to allow then-chaining
+                                        ];
+                                    case 1:
+                                        requirement = _a.sent();
+                                        // Delete is idempotent, but we return a promise to allow then-chaining
+                                        if (typeof requirement === "undefined") {
+                                            return [2 /*return*/, Promise.resolve()];
+                                        }
+                                        return [4 /*yield*/, reqRepo.softRemove(requirement)];
+                                    case 2: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
-                updated = __assign(__assign({}, existing), newData);
-                return [2 /*return*/, updated];
             });
         });
     };
@@ -885,6 +838,6 @@ var ShippingOptionService = /** @class */ (function (_super) {
         });
     };
     return ShippingOptionService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = ShippingOptionService;
 //# sourceMappingURL=shipping-option.js.map