@kaspernj/api-maker 1.0.2054 → 1.0.2055

package/build/base-model.js

@@ -1,106 +1,21 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var attribute_1 = __importDefault(require("./base-model/attribute"));
-var attribute_not_loaded_error_1 = __importDefault(require("./attribute-not-loaded-error"));
-var cache_key_generator_1 = __importDefault(require("./cache-key-generator"));
-var collection_js_1 = __importDefault(require("./collection.js"));
-var commands_pool_js_1 = __importDefault(require("./commands-pool.js"));
-var config_js_1 = __importDefault(require("./config.js"));
-var custom_error_js_1 = __importDefault(require("./custom-error.js"));
-var diggerize_1 = require("diggerize");
-var form_data_objectizer_1 = __importDefault(require("form-data-objectizer"));
-var inflection = __importStar(require("inflection"));
-var model_name_1 = __importDefault(require("./model-name"));
-var not_loaded_error_1 = __importDefault(require("./not-loaded-error"));
-var object_to_formdata_1 = __importDefault(require("object-to-formdata"));
-var reflection_1 = __importDefault(require("./base-model/reflection"));
-var scope_1 = __importDefault(require("./base-model/scope"));
-var services_js_1 = __importDefault(require("./services.js"));
-var validation_error_js_1 = __importDefault(require("./validation-error.js"));
-var validation_errors_js_1 = require("./validation-errors.js");
+import Attribute from "./base-model/attribute";
+import AttributeNotLoadedError from "./attribute-not-loaded-error";
+import CacheKeyGenerator from "./cache-key-generator";
+import Collection from "./collection.js";
+import CommandsPool from "./commands-pool.js";
+import Config from "./config.js";
+import CustomError from "./custom-error.js";
+import { digg } from "diggerize";
+import FormDataObjectizer from "form-data-objectizer";
+import * as inflection from "inflection";
+import ModelName from "./model-name";
+import NotLoadedError from "./not-loaded-error";
+import objectToFormData from "object-to-formdata";
+import Reflection from "./base-model/reflection";
+import Scope from "./base-model/scope";
+import Services from "./services.js";
+import ValidationError from "./validation-error.js";
+import { ValidationErrors } from "./validation-errors.js";
 /**
  * @typedef {object} ModelClassDataType
  * @property {import("./base-model/attribute.js").AttributeArgType[]} attributes
@@ -116,62 +31,47 @@ var validation_errors_js_1 = require("./validation-errors.js");
  * @property {boolean} [throwValidationError]
  */
 function objectToUnderscore(object) {
-    var newObject = {};
-    for (var key in object) {
-        var underscoreKey = inflection.underscore(key);
+    const newObject = {};
+    for (const key in object) {
+        const underscoreKey = inflection.underscore(key);
         newObject[underscoreKey] = object[key];
     }
     return newObject;
 }
-var BaseModel = /** @class */ (function () {
-    function BaseModel(args) {
-        if (args === void 0) { args = {}; }
-        this._callMemberCommand = function (args, commandArgs) { return commands_pool_js_1.default.addCommand(args, commandArgs); };
-        this.changes = {};
-        this.newRecord = args.isNewRecord;
-        this.relationshipsCache = {};
-        this.relationships = {};
-        if (args && args.data && args.data.a) {
-            this._readModelDataFromArgs(args);
-        }
-        else if (args.a) {
-            this.abilities = args.b || {};
-            this.modelData = objectToUnderscore(args.a);
-        }
-        else if (args) {
-            this.abilities = {};
-            this.modelData = objectToUnderscore(args);
-        }
-        else {
-            this.abilities = {};
-            this.modelData = {};
-        }
-    }
+export default class BaseModel {
+    static apiMakerType = "BaseModel";
     /** @returns {Attribute[]} */
-    BaseModel.attributes = function () {
-        var attributes = this.modelClassData().attributes;
-        var result = [];
-        for (var attributeKey in attributes) {
-            var attributeData = attributes[attributeKey];
-            var attribute = new attribute_1.default(attributeData);
+    static attributes() {
+        const attributes = this.modelClassData().attributes;
+        const result = [];
+        for (const attributeKey in attributes) {
+            const attributeData = attributes[attributeKey];
+            const attribute = new Attribute(attributeData);
             result.push(attribute);
         }
         return result;
-    };
+    }
     /** @returns {boolean} */
-    BaseModel.hasAttribute = function (attributeName) {
-        var attributes = (0, diggerize_1.digg)(this.modelClassData(), "attributes");
-        var lowerCaseAttributeName = inflection.underscore(attributeName);
+    static hasAttribute(attributeName) {
+        const attributes = digg(this.modelClassData(), "attributes");
+        const lowerCaseAttributeName = inflection.underscore(attributeName);
         if (lowerCaseAttributeName in attributes)
             return true;
         return false;
-    };
+    }
     /**
      * @interface
      * @returns {ModelClassDataType}
      */
-    BaseModel.modelClassData = function () {
+    static modelClassData() {
         throw new Error("modelClassData should be overriden by child");
+    }
+    /**
+     * @param {ValidationErrors} validationErrors
+     * @returns {CustomEvent}
+     */
+    static newCustomEvent = (validationErrors) => {
+        return new CustomEvent("validation-errors", { detail: validationErrors });
     };
     /**
      * @param {ValidationErrors} validationErrors
@@ -179,165 +79,161 @@ var BaseModel = /** @class */ (function () {
      * @param {object} [options.form]
      * @param {boolean} [options.throwValidationError]
      */
-    BaseModel.sendValidationErrorsEvent = function (validationErrors, options) {
+    static sendValidationErrorsEvent(validationErrors, options) {
         if (options && options.form) {
-            var event_1 = BaseModel.newCustomEvent(validationErrors);
-            options.form.dispatchEvent(event_1);
+            const event = BaseModel.newCustomEvent(validationErrors);
+            options.form.dispatchEvent(event);
         }
-    };
+    }
     /**
      * @template {typeof BaseModel} T
      * @this {T}
      * @param {number | string} id
      * @returns {Promise<InstanceType<T>>}
      */
-    BaseModel.find = function (id) {
-        return __awaiter(this, void 0, void 0, function () {
-            var query, model;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        query = {};
-                        query["".concat(this.primaryKey(), "_eq")] = id;
-                        return [4 /*yield*/, this.ransack(query).first()];
-                    case 1:
-                        model = (_a.sent());
-                        if (model) {
-                            return [2 /*return*/, model];
-                        }
-                        else {
-                            throw new custom_error_js_1.default("Record not found");
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    static async find(id) {
+        /** @type {Record<string, any>} */
+        const query = {};
+        query[`${this.primaryKey()}_eq`] = id;
+        const model = /** @type {InstanceType<T>} */ (await this.ransack(query).first());
+        if (model) {
+            return model;
+        }
+        else {
+            throw new CustomError("Record not found");
+        }
+    }
     /**
      * @template {typeof BaseModel} T
      * @this {T}
      * @param {Record<string, any>} findOrCreateByArgs
      * @returns {Promise<InstanceType<T>>}
      */
-    BaseModel.findOrCreateBy = function (findOrCreateByArgs_1) {
-        return __awaiter(this, arguments, void 0, function (findOrCreateByArgs, args) {
-            var result, model;
-            if (args === void 0) { args = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, services_js_1.default.current().sendRequest("Models::FindOrCreateBy", {
-                            additional_data: args.additionalData,
-                            find_or_create_by_args: findOrCreateByArgs,
-                            resource_name: (0, diggerize_1.digg)(this.modelClassData(), "name")
-                        })];
-                    case 1:
-                        result = _a.sent();
-                        model = ((0, diggerize_1.digg)(result, "model"));
-                        return [2 /*return*/, model];
-                }
-            });
+    static async findOrCreateBy(findOrCreateByArgs, args = {}) {
+        const result = await Services.current().sendRequest("Models::FindOrCreateBy", {
+            additional_data: args.additionalData,
+            find_or_create_by_args: findOrCreateByArgs,
+            resource_name: digg(this.modelClassData(), "name")
         });
-    };
+        const model = /** @type {InstanceType<T>} */ (digg(result, "model"));
+        return model;
+    }
     /** @returns {ModelName} */
-    BaseModel.modelName = function () {
-        return new model_name_1.default({ modelClassData: this.modelClassData() });
-    };
+    static modelName() {
+        return new ModelName({ modelClassData: this.modelClassData() });
+    }
     /** @returns {string} */
-    BaseModel.primaryKey = function () {
-        return (0, diggerize_1.digg)(this.modelClassData(), "primaryKey");
-    };
+    static primaryKey() {
+        return digg(this.modelClassData(), "primaryKey");
+    }
     /**
      * @template {typeof BaseModel} MC
      * @this {MC}
      * @param {Record<string, any>} [query]
      * @returns {import("./collection.js").default<MC>}
      */
-    BaseModel.ransack = function (query) {
-        if (query === void 0) { query = {}; }
-        var ModelClass = /** @type {MC} */ (this);
-        return new collection_js_1.default({ modelClass: ModelClass }, { ransack: query });
-    };
+    static ransack(query = {}) {
+        const ModelClass = /** @type {MC} */ (this);
+        return new Collection({ modelClass: ModelClass }, { ransack: query });
+    }
     /**
      * @template {typeof BaseModel} MC
      * @this {MC}
      * @param {Record<string, any>} [select]
      * @returns {import("./collection.js").default<MC>}
      */
-    BaseModel.select = function (select) {
+    static select(select) {
         return this.ransack().select(select);
-    };
+    }
     /** @returns {Reflection[]} */
-    BaseModel.ransackableAssociations = function () {
-        var relationships = (0, diggerize_1.digg)(this.modelClassData(), "ransackable_associations");
-        var reflections = [];
-        for (var _i = 0, relationships_1 = relationships; _i < relationships_1.length; _i++) {
-            var relationshipData = relationships_1[_i];
-            reflections.push(new reflection_1.default(relationshipData));
+    static ransackableAssociations() {
+        const relationships = digg(this.modelClassData(), "ransackable_associations");
+        const reflections = [];
+        for (const relationshipData of relationships) {
+            reflections.push(new Reflection(relationshipData));
         }
         return reflections;
-    };
+    }
     /** @returns {Attribute[]} */
-    BaseModel.ransackableAttributes = function () {
-        var attributes = this.modelClassData().ransackable_attributes;
-        var result = [];
-        for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
-            var attributeData = attributes_1[_i];
-            result.push(new attribute_1.default(attributeData));
+    static ransackableAttributes() {
+        const attributes = this.modelClassData().ransackable_attributes;
+        const result = [];
+        for (const attributeData of attributes) {
+            result.push(new Attribute(attributeData));
         }
         return result;
-    };
+    }
     /** @returns {Scope[]} */
-    BaseModel.ransackableScopes = function () {
-        var ransackableScopes = (0, diggerize_1.digg)(this.modelClassData(), "ransackable_scopes");
-        var result = [];
-        for (var _i = 0, ransackableScopes_1 = ransackableScopes; _i < ransackableScopes_1.length; _i++) {
-            var scopeData = ransackableScopes_1[_i];
-            var scope = new scope_1.default(scopeData);
+    static ransackableScopes() {
+        const ransackableScopes = digg(this.modelClassData(), "ransackable_scopes");
+        const result = [];
+        for (const scopeData of ransackableScopes) {
+            const scope = new Scope(scopeData);
             result.push(scope);
         }
         return result;
-    };
+    }
     /** @returns {Reflection[]} */
-    BaseModel.reflections = function () {
-        var relationships = (0, diggerize_1.digg)(this.modelClassData(), "relationships");
-        var reflections = [];
-        for (var _i = 0, relationships_2 = relationships; _i < relationships_2.length; _i++) {
-            var relationshipData = relationships_2[_i];
-            var reflection = new reflection_1.default(relationshipData);
+    static reflections() {
+        const relationships = digg(this.modelClassData(), "relationships");
+        const reflections = [];
+        for (const relationshipData of relationships) {
+            const reflection = new Reflection(relationshipData);
             reflections.push(reflection);
         }
         return reflections;
-    };
+    }
     /** @returns {Reflection} */
-    BaseModel.reflection = function (name) {
-        var foundReflection = this.reflections().find(function (reflection) { return reflection.name() == name; });
+    static reflection(name) {
+        const foundReflection = this.reflections().find((reflection) => reflection.name() == name);
         if (!foundReflection) {
-            throw new Error("No such reflection: ".concat(name, " in ").concat(this.reflections().map(function (reflection) { return reflection.name(); }).join(", ")));
+            throw new Error(`No such reflection: ${name} in ${this.reflections().map((reflection) => reflection.name()).join(", ")}`);
         }
         return foundReflection;
-    };
+    }
     /**
      * @returns {string}
      */
-    BaseModel._token = function () {
-        var csrfTokenElement = document.querySelector("meta[name='csrf-token']");
+    static _token() {
+        const csrfTokenElement = document.querySelector("meta[name='csrf-token']");
         if (csrfTokenElement) {
             return csrfTokenElement.getAttribute("content");
         }
-    };
+    }
+    constructor(args = {}) {
+        this.changes = {};
+        this.newRecord = args.isNewRecord;
+        this.relationshipsCache = {};
+        this.relationships = {};
+        if (args && args.data && args.data.a) {
+            this._readModelDataFromArgs(args);
+        }
+        else if (args.a) {
+            this.abilities = args.b || {};
+            this.modelData = objectToUnderscore(args.a);
+        }
+        else if (args) {
+            this.abilities = {};
+            this.modelData = objectToUnderscore(args);
+        }
+        else {
+            this.abilities = {};
+            this.modelData = {};
+        }
+    }
     /**
      * @param {Record<string, any>} newAttributes
      * @returns {void}
      */
-    BaseModel.prototype.assignAttributes = function (newAttributes) {
-        for (var key in newAttributes) {
-            var newValue = newAttributes[key];
-            var attributeUnderscore = inflection.underscore(key);
-            var applyChange = true;
-            var deleteChange = false;
+    assignAttributes(newAttributes) {
+        for (const key in newAttributes) {
+            const newValue = newAttributes[key];
+            const attributeUnderscore = inflection.underscore(key);
+            let applyChange = true;
+            let deleteChange = false;
             if (this.isAttributeLoaded(key)) {
-                var oldValue = this.readAttribute(key);
-                var originalValue = this.modelData[attributeUnderscore];
+                const oldValue = this.readAttribute(key);
+                const originalValue = this.modelData[attributeUnderscore];
                 if (newValue == oldValue) {
                     applyChange = false;
                 }
@@ -353,86 +249,86 @@ var BaseModel = /** @class */ (function () {
                 delete this.changes[attributeUnderscore];
             }
         }
-    };
+    }
     /** @returns {Record<string, any>} */
-    BaseModel.prototype.attributes = function () {
-        var result = {};
-        for (var key in this.modelData) {
+    attributes() {
+        const result = {};
+        for (const key in this.modelData) {
             result[key] = this.modelData[key];
         }
-        for (var key in this.changes) {
+        for (const key in this.changes) {
             result[key] = this.changes[key];
         }
         return result;
-    };
+    }
     /**
      * @param {string} givenAbilityName
      * @returns {boolean}
      */
-    BaseModel.prototype.can = function (givenAbilityName) {
-        var abilityName = inflection.underscore(givenAbilityName);
+    can(givenAbilityName) {
+        const abilityName = inflection.underscore(givenAbilityName);
         if (!(abilityName in this.abilities)) {
-            throw new Error("Ability ".concat(abilityName, " hasn't been loaded for ").concat((0, diggerize_1.digg)(this.modelClassData(), "name")));
+            throw new Error(`Ability ${abilityName} hasn't been loaded for ${digg(this.modelClassData(), "name")}`);
         }
         return this.abilities[abilityName];
-    };
+    }
     /**
      * @template {BaseModel} Self
      * @this {Self}
      * @returns {Self}
      */
-    BaseModel.prototype.clone = function () {
-        var ModelClass = /** @type {new (...args: any[]) => Self} */ (this.constructor);
-        var clone = new ModelClass();
-        clone.abilities = __assign({}, this.abilities);
-        clone.modelData = __assign({}, this.modelData);
-        clone.relationships = __assign({}, this.relationships);
-        clone.relationshipsCache = __assign({}, this.relationshipsCache);
+    clone() {
+        const ModelClass = /** @type {new (...args: any[]) => Self} */ (this.constructor);
+        const clone = new ModelClass();
+        clone.abilities = { ...this.abilities };
+        clone.modelData = { ...this.modelData };
+        clone.relationships = { ...this.relationships };
+        clone.relationshipsCache = { ...this.relationshipsCache };
         return clone;
-    };
+    }
     /** @returns {number | string} */
-    BaseModel.prototype.cacheKey = function () {
+    cacheKey() {
         if (this.isPersisted()) {
-            var keyParts = [
+            const keyParts = [
                 this.modelClassData().paramKey,
                 this.primaryKey()
             ];
             if ("updated_at" in this.modelData) {
                 // @ts-expect-error
-                var updatedAt = this.updatedAt();
+                const updatedAt = this.updatedAt();
                 if (typeof updatedAt != "object") {
-                    throw new Error("updatedAt wasn't an object: ".concat(typeof updatedAt));
+                    throw new Error(`updatedAt wasn't an object: ${typeof updatedAt}`);
                 }
                 else if (!("getTime" in updatedAt)) {
-                    throw new Error("updatedAt didn't support getTime with class: ".concat(updatedAt.constructor && updatedAt.constructor.name));
+                    throw new Error(`updatedAt didn't support getTime with class: ${updatedAt.constructor && updatedAt.constructor.name}`);
                 }
                 // @ts-expect-error
-                keyParts.push("updatedAt-".concat(this.updatedAt().getTime()));
+                keyParts.push(`updatedAt-${this.updatedAt().getTime()}`);
             }
             return keyParts.join("-");
         }
         else {
             return this.uniqueKey();
         }
-    };
+    }
     /** @returns {string} */
-    BaseModel.prototype.localCacheKey = function () {
-        var cacheKeyGenerator = new cache_key_generator_1.default(this);
+    localCacheKey() {
+        const cacheKeyGenerator = new CacheKeyGenerator(this);
         return cacheKeyGenerator.local();
-    };
+    }
     /** @returns {string} */
-    BaseModel.prototype.fullCacheKey = function () {
-        var cacheKeyGenerator = new cache_key_generator_1.default(this);
+    fullCacheKey() {
+        const cacheKeyGenerator = new CacheKeyGenerator(this);
         return cacheKeyGenerator.cacheKey();
-    };
+    }
     /**
      * @template {typeof BaseModel} MC
      * @this {MC}
      * @returns {Collection<MC>}
      */
-    BaseModel.all = function () {
+    static all() {
         return this.ransack();
-    };
+    }
     /**
      * @param {Record<string, any>} [attributes]
      * @param {object} [options]
@@ -441,260 +337,215 @@ var BaseModel = /** @class */ (function () {
      *   response: object
      * }>}
      */
-    BaseModel.prototype.create = function (attributes, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var paramKey, modelData, dataToUse, response, error_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (attributes)
-                            this.assignAttributes(attributes);
-                        paramKey = this.modelClassData().paramKey;
-                        modelData = this.getAttributes();
-                        dataToUse = {};
-                        dataToUse[paramKey] = modelData;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                                args: {
-                                    save: dataToUse
-                                },
-                                command: "".concat(this.modelClassData().collectionName, "-create"),
-                                collectionName: this.modelClassData().collectionName,
-                                primaryKey: this.primaryKey(),
-                                type: "create"
-                            }, {})];
-                    case 2:
-                        response = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_1 = _a.sent();
-                        BaseModel.parseValidationErrors({ error: error_1, model: this, options: options });
-                        throw error_1;
-                    case 4:
-                        if (response.model) {
-                            this._refreshModelFromResponse(response);
-                            this.changes = {};
-                        }
-                        return [2 /*return*/, { model: this, response: response }];
-                }
-            });
-        });
-    };
+    async create(attributes, options) {
+        if (attributes)
+            this.assignAttributes(attributes);
+        const paramKey = this.modelClassData().paramKey;
+        const modelData = this.getAttributes();
+        const dataToUse = {};
+        dataToUse[paramKey] = modelData;
+        let response;
+        try {
+            response = await CommandsPool.addCommand({
+                args: {
+                    save: dataToUse
+                },
+                command: `${this.modelClassData().collectionName}-create`,
+                collectionName: this.modelClassData().collectionName,
+                primaryKey: this.primaryKey(),
+                type: "create"
+            }, {});
+        }
+        catch (error) {
+            BaseModel.parseValidationErrors({ error, model: this, options });
+            throw error;
+        }
+        if (response.model) {
+            this._refreshModelFromResponse(response);
+            this.changes = {};
+        }
+        return { model: this, response };
+    }
     /**
      * @param {FormData | Record<string, any>} rawData
      * @param {object} [options]
      */
-    BaseModel.prototype.createRaw = function (rawData_1) {
-        return __awaiter(this, arguments, void 0, function (rawData, options) {
-            var objectData, response, error_2;
-            if (options === void 0) { options = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        objectData = BaseModel._objectDataFromGivenRawData(rawData, options);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                                args: {
-                                    save: objectData
-                                },
-                                command: "".concat(this.modelClassData().collectionName, "-create"),
-                                collectionName: this.modelClassData().collectionName,
-                                primaryKey: this.primaryKey(),
-                                type: "create"
-                            }, {})];
-                    case 2:
-                        response = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_2 = _a.sent();
-                        BaseModel.parseValidationErrors({ error: error_2, model: this, options: options });
-                        throw error_2;
-                    case 4:
-                        if (response.model) {
-                            this._refreshModelDataFromResponse(response);
-                            this.changes = {};
-                        }
-                        return [2 /*return*/, { model: this, response: response }];
-                }
-            });
-        });
-    };
+    async createRaw(rawData, options = {}) {
+        const objectData = BaseModel._objectDataFromGivenRawData(rawData, options);
+        let response;
+        try {
+            response = await CommandsPool.addCommand({
+                args: {
+                    save: objectData
+                },
+                command: `${this.modelClassData().collectionName}-create`,
+                collectionName: this.modelClassData().collectionName,
+                primaryKey: this.primaryKey(),
+                type: "create"
+            }, {});
+        }
+        catch (error) {
+            BaseModel.parseValidationErrors({ error, model: this, options });
+            throw error;
+        }
+        if (response.model) {
+            this._refreshModelDataFromResponse(response);
+            this.changes = {};
+        }
+        return { model: this, response };
+    }
     /** @returns {Promise<{model: BaseModel, response: object}>} */
-    BaseModel.prototype.destroy = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                            args: { query_params: this.collection && this.collection.params() },
-                            command: "".concat(this.modelClassData().collectionName, "-destroy"),
-                            collectionName: this.modelClassData().collectionName,
-                            primaryKey: this.primaryKey(),
-                            type: "destroy"
-                        }, {})];
-                    case 1:
-                        response = _a.sent();
-                        if (response.success) {
-                            if (response.model) {
-                                this._refreshModelDataFromResponse(response);
-                                this.changes = {};
-                            }
-                            return [2 /*return*/, { model: this, response: response }];
-                        }
-                        else {
-                            this.handleResponseError(response);
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BaseModel.prototype.ensureAbilities = function (listOfAbilities) {
-        return __awaiter(this, void 0, void 0, function () {
-            var abilitiesToLoad, _i, listOfAbilities_1, abilityInList, primaryKeyName, ransackParams, abilitiesParams, anotherModel, newAbilities, newAbility;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        abilitiesToLoad = [];
-                        for (_i = 0, listOfAbilities_1 = listOfAbilities; _i < listOfAbilities_1.length; _i++) {
-                            abilityInList = listOfAbilities_1[_i];
-                            if (!(abilityInList in this.abilities)) {
-                                abilitiesToLoad.push(abilityInList);
-                            }
-                        }
-                        if (!(abilitiesToLoad.length > 0)) return [3 /*break*/, 2];
-                        primaryKeyName = this.modelClass().primaryKey();
-                        ransackParams = {};
-                        ransackParams["".concat(primaryKeyName, "_eq")] = this.primaryKey();
-                        abilitiesParams = {};
-                        abilitiesParams[(0, diggerize_1.digg)(this.modelClassData(), "name")] = abilitiesToLoad;
-                        return [4 /*yield*/, this.modelClass()
-                                .ransack(ransackParams)
-                                .abilities(abilitiesParams)
-                                .first()];
-                    case 1:
-                        anotherModel = _a.sent();
-                        if (!anotherModel) {
-                            throw new Error("Could not look up the same model ".concat(this.primaryKey(), " with abilities: ").concat(abilitiesToLoad.join(", ")));
-                        }
-                        newAbilities = anotherModel.abilities;
-                        for (newAbility in newAbilities) {
-                            this.abilities[newAbility] = newAbilities[newAbility];
-                        }
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async destroy() {
+        const response = await CommandsPool.addCommand({
+            args: { query_params: this.collection && this.collection.params() },
+            command: `${this.modelClassData().collectionName}-destroy`,
+            collectionName: this.modelClassData().collectionName,
+            primaryKey: this.primaryKey(),
+            type: "destroy"
+        }, {});
+        if (response.success) {
+            if (response.model) {
+                this._refreshModelDataFromResponse(response);
+                this.changes = {};
+            }
+            return { model: this, response };
+        }
+        else {
+            this.handleResponseError(response);
+        }
+    }
+    async ensureAbilities(listOfAbilities) {
+        // Populate an array with a list of abilities currently not loaded
+        const abilitiesToLoad = [];
+        for (const abilityInList of listOfAbilities) {
+            if (!(abilityInList in this.abilities)) {
+                abilitiesToLoad.push(abilityInList);
+            }
+        }
+        // Load the missing abilities if any
+        if (abilitiesToLoad.length > 0) {
+            const primaryKeyName = this.modelClass().primaryKey();
+            const ransackParams = {};
+            ransackParams[`${primaryKeyName}_eq`] = this.primaryKey();
+            const abilitiesParams = {};
+            abilitiesParams[digg(this.modelClassData(), "name")] = abilitiesToLoad;
+            const anotherModel = await this.modelClass()
+                .ransack(ransackParams)
+                .abilities(abilitiesParams)
+                .first();
+            if (!anotherModel) {
+                throw new Error(`Could not look up the same model ${this.primaryKey()} with abilities: ${abilitiesToLoad.join(", ")}`);
+            }
+            const newAbilities = anotherModel.abilities;
+            for (const newAbility in newAbilities) {
+                this.abilities[newAbility] = newAbilities[newAbility];
+            }
+        }
+    }
     /**
      * @returns {Record<string, any>}
      */
-    BaseModel.prototype.getAttributes = function () { return Object.assign(this.modelData, this.changes); };
-    BaseModel.prototype.handleResponseError = function (response) {
+    getAttributes() { return Object.assign(this.modelData, this.changes); }
+    asd;
+    handleResponseError(response) {
         // @ts-expect-error
-        BaseModel.parseValidationErrors({ model: this, response: response });
-        throw new custom_error_js_1.default("Response wasn't successful", { model: this, response: response });
-    };
+        BaseModel.parseValidationErrors({ model: this, response });
+        throw new CustomError("Response wasn't successful", { model: this, response });
+    }
     /**
      * @returns {number | string}
      */
-    BaseModel.prototype.identifierKey = function () {
+    identifierKey() {
         if (!this._identifierKey)
             this._identifierKey = this.isPersisted() ? this.primaryKey() : this.uniqueKey();
         return this._identifierKey;
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isAssociationLoaded = function (associationName) { return this.isAssociationLoadedUnderscore(inflection.underscore(associationName)); };
+    isAssociationLoaded(associationName) { return this.isAssociationLoadedUnderscore(inflection.underscore(associationName)); }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isAssociationLoadedUnderscore = function (associationNameUnderscore) {
+    isAssociationLoadedUnderscore(associationNameUnderscore) {
         if (associationNameUnderscore in this.relationshipsCache)
             return true;
         return false;
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isAssociationPresent = function (associationName) {
+    isAssociationPresent(associationName) {
         if (this.isAssociationLoaded(associationName))
             return true;
         if (associationName in this.relationships)
             return true;
         return false;
-    };
+    }
     /**
      * @param {object} args
      * @param {any} args.error
      * @param {BaseModel} [args.model]
      * @param {ParseValidationErrorsOptions} args.options
      */
-    BaseModel.parseValidationErrors = function (_a) {
-        var error = _a.error, model = _a.model, options = _a.options;
-        if (!(error instanceof validation_error_js_1.default))
+    static parseValidationErrors({ error, model, options }) {
+        if (!(error instanceof ValidationError))
             return;
         if (!error.args.response.validation_errors)
             return;
-        var validationErrors = new validation_errors_js_1.ValidationErrors({
-            model: model,
-            validationErrors: (0, diggerize_1.digg)(error, "args", "response", "validation_errors")
+        const validationErrors = new ValidationErrors({
+            model,
+            validationErrors: digg(error, "args", "response", "validation_errors")
         });
         BaseModel.sendValidationErrorsEvent(validationErrors, options);
         if (!options || options.throwValidationError != false) {
             throw error;
         }
-    };
-    BaseModel.humanAttributeName = function (attributeName) {
-        var keyName = (0, diggerize_1.digg)(this.modelClassData(), "i18nKey");
+    }
+    static humanAttributeName(attributeName) {
+        const keyName = digg(this.modelClassData(), "i18nKey");
         // @ts-expect-error
-        var i18n = config_js_1.default.getI18n();
+        const i18n = Config.getI18n();
         if (i18n)
-            return i18n.t("activerecord.attributes.".concat(keyName, ".").concat(BaseModel.snakeCase(attributeName)), { defaultValue: attributeName });
+            return i18n.t(`activerecord.attributes.${keyName}.${BaseModel.snakeCase(attributeName)}`, { defaultValue: attributeName });
         return inflection.humanize(attributeName);
-    };
+    }
     /**
      * @param {string} attributeName
      * @returns {boolean}
      */
-    BaseModel.prototype.isAttributeChanged = function (attributeName) {
-        var attributeNameUnderscore = inflection.underscore(attributeName);
-        var attributeData = this.modelClassData().attributes.find(function (attribute) { return (0, diggerize_1.digg)(attribute, "name") == attributeNameUnderscore; });
+    isAttributeChanged(attributeName) {
+        const attributeNameUnderscore = inflection.underscore(attributeName);
+        const attributeData = this.modelClassData().attributes.find((attribute) => digg(attribute, "name") == attributeNameUnderscore);
         if (!attributeData) {
-            var attributeNames = this.modelClassData().attributes.map(function (attribute) { return (0, diggerize_1.digg)(attribute, "name"); });
-            throw new Error("Couldn't find an attribute by that name: \"".concat(attributeName, "\" in: ").concat(attributeNames.join(", ")));
+            const attributeNames = this.modelClassData().attributes.map((attribute) => digg(attribute, "name"));
+            throw new Error(`Couldn't find an attribute by that name: "${attributeName}" in: ${attributeNames.join(", ")}`);
         }
         if (!(attributeNameUnderscore in this.changes))
             return false;
-        var oldValue = this.modelData[attributeNameUnderscore];
-        var newValue = this.changes[attributeNameUnderscore];
-        var changedMethod = this["_is".concat(inflection.camelize(attributeData.type, true), "Changed")];
+        const oldValue = this.modelData[attributeNameUnderscore];
+        const newValue = this.changes[attributeNameUnderscore];
+        const changedMethod = this[`_is${inflection.camelize(attributeData.type, true)}Changed`];
         if (!changedMethod)
-            throw new Error("Don't know how to handle type: ".concat(attributeData.type));
+            throw new Error(`Don't know how to handle type: ${attributeData.type}`);
         return changedMethod(oldValue, newValue);
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isChanged = function () {
-        var keys = Object.keys(this.changes);
+    isChanged() {
+        const keys = Object.keys(this.changes);
         if (keys.length > 0) {
             return true;
         }
         else {
             return false;
         }
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isNewRecord = function () {
+    isNewRecord() {
         if (this.newRecord !== undefined) {
             return this.newRecord;
         }
@@ -704,133 +555,121 @@ var BaseModel = /** @class */ (function () {
         else {
             return true;
         }
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isPersisted = function () { return !this.isNewRecord(); };
+    isPersisted() { return !this.isNewRecord(); }
     /**
      * @param {string} string
      * @returns {string}
      */
-    BaseModel.snakeCase = function (string) { return inflection.underscore(string); };
+    static snakeCase(string) { return inflection.underscore(string); }
     /**
      * @param {string} attributeName
      * @returns {boolean}
      */
-    BaseModel.prototype.savedChangeToAttribute = function (attributeName) {
+    savedChangeToAttribute(attributeName) {
         if (!this.previousModelData)
             return false;
-        var attributeNameUnderscore = inflection.underscore(attributeName);
-        var attributeData = this.modelClassData().attributes.find(function (attribute) { return attribute.name == attributeNameUnderscore; });
+        const attributeNameUnderscore = inflection.underscore(attributeName);
+        const attributeData = this.modelClassData().attributes.find((attribute) => attribute.name == attributeNameUnderscore);
         if (!attributeData) {
-            var attributeNames = this.modelClassData().attributes.map(function (attribute) { return attribute.name; });
-            throw new Error("Couldn't find an attribute by that name: \"".concat(attributeName, "\" in: ").concat(attributeNames.join(", ")));
+            const attributeNames = this.modelClassData().attributes.map((attribute) => attribute.name);
+            throw new Error(`Couldn't find an attribute by that name: "${attributeName}" in: ${attributeNames.join(", ")}`);
         }
         if (!(attributeNameUnderscore in this.previousModelData))
             return true;
-        var oldValue = this.previousModelData[attributeNameUnderscore];
-        var newValue = this.modelData[attributeNameUnderscore];
-        var changedMethodName = "_is".concat(inflection.camelize(attributeData.type), "Changed");
-        var changedMethod = this[changedMethodName];
+        const oldValue = this.previousModelData[attributeNameUnderscore];
+        const newValue = this.modelData[attributeNameUnderscore];
+        const changedMethodName = `_is${inflection.camelize(attributeData.type)}Changed`;
+        const changedMethod = this[changedMethodName];
         if (!changedMethod)
-            throw new Error("Don't know how to handle type: ".concat(attributeData.type));
+            throw new Error(`Don't know how to handle type: ${attributeData.type}`);
         return changedMethod(oldValue, newValue);
-    };
+    }
     /**
      * @param {BaseModel} model
      * @returns {void}
      */
-    BaseModel.prototype.setNewModel = function (model) {
+    setNewModel(model) {
         this.setNewModelData(model);
-        for (var relationshipName in model.relationships) {
+        for (const relationshipName in model.relationships) {
             this.relationships[relationshipName] = model.relationships[relationshipName];
         }
-        for (var relationshipCacheName in model.relationshipsCache) {
+        for (const relationshipCacheName in model.relationshipsCache) {
             this.relationshipsCache[relationshipCacheName] = model.relationshipsCache[name];
         }
-    };
-    BaseModel.prototype.setNewModelData = function (model) {
+    }
+    setNewModelData(model) {
         if (!("modelData" in model))
-            throw new Error("No modelData in model: ".concat(JSON.stringify(model)));
-        this.previousModelData = Object.assign({}, (0, diggerize_1.digg)(this, "modelData"));
-        for (var attributeName in model.modelData) {
+            throw new Error(`No modelData in model: ${JSON.stringify(model)}`);
+        this.previousModelData = Object.assign({}, digg(this, "modelData"));
+        for (const attributeName in model.modelData) {
             this.modelData[attributeName] = model.modelData[attributeName];
         }
-    };
-    BaseModel.prototype._isDateChanged = function (oldValue, newValue) {
+    }
+    _isDateChanged(oldValue, newValue) {
         if (Date.parse(oldValue) != Date.parse(newValue))
             return true;
-    };
-    BaseModel.prototype._isIntegerChanged = function (oldValue, newValue) {
+    }
+    _isIntegerChanged(oldValue, newValue) {
         if (parseInt(oldValue, 10) != parseInt(newValue, 10))
             return true;
-    };
-    BaseModel.prototype._isStringChanged = function (oldValue, newValue) {
-        var oldConvertedValue = "".concat(oldValue);
-        var newConvertedValue = "".concat(newValue);
+    }
+    _isStringChanged(oldValue, newValue) {
+        const oldConvertedValue = `${oldValue}`;
+        const newConvertedValue = `${newValue}`;
         if (oldConvertedValue != newConvertedValue)
             return true;
-    };
+    }
     /** @returns {ModelClassDataType} */
-    BaseModel.prototype.modelClassData = function () { return this.modelClass().modelClassData(); };
+    modelClassData() { return this.modelClass().modelClassData(); }
     /**
      * @returns {Promise<void>}
      */
-    BaseModel.prototype.reload = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var params, ransackParams, query, model;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        params = this.collection && this.collection.params();
-                        ransackParams = {};
-                        ransackParams["".concat(this.modelClass().primaryKey(), "_eq")] = this.primaryKey();
-                        query = this.modelClass().ransack(ransackParams);
-                        if (params) {
-                            if (params.preload) {
-                                query.queryArgs.preload = params.preload;
-                            }
-                            if (params.select) {
-                                query.queryArgs.select = params.select;
-                            }
-                            if (params.select_columns) {
-                                query.queryArgs.selectColumns = params.select_columns;
-                            }
-                        }
-                        return [4 /*yield*/, query.first()];
-                    case 1:
-                        model = _a.sent();
-                        this.setNewModel(model);
-                        this.changes = {};
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
+    async reload() {
+        const params = this.collection && this.collection.params();
+        const ransackParams = {};
+        ransackParams[`${this.modelClass().primaryKey()}_eq`] = this.primaryKey();
+        let query = this.modelClass().ransack(ransackParams);
+        if (params) {
+            if (params.preload) {
+                query.queryArgs.preload = params.preload;
+            }
+            if (params.select) {
+                query.queryArgs.select = params.select;
+            }
+            if (params.select_columns) {
+                query.queryArgs.selectColumns = params.select_columns;
+            }
+        }
+        const model = await query.first();
+        this.setNewModel(model);
+        this.changes = {};
+    }
     /**
      * @returns {Promise<{model: BaseModel, response?: object}>}
      */
-    BaseModel.prototype.save = function () {
+    save() {
         if (this.isNewRecord()) {
             return this.create();
         }
         else {
             return this.update();
         }
-    };
+    }
     /**
      * @returns {Promise<{model: BaseModel, response: object}>}
      */
-    BaseModel.prototype.saveRaw = function (rawData, options) {
-        if (options === void 0) { options = {}; }
+    saveRaw(rawData, options = {}) {
         if (this.isNewRecord()) {
             return this.createRaw(rawData, options);
         }
         else {
             return this.updateRaw(rawData, options);
         }
-    };
+    }
     /**
      * @param {Record<string, any>} [newAttributes]
      * @param {ParseValidationErrorsOptions} [options]
@@ -839,241 +678,195 @@ var BaseModel = /** @class */ (function () {
      *   response?: object
      * }>}
      */
-    BaseModel.prototype.update = function (newAttributes, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var paramKey, modelData, dataToUse, response, error_3;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (newAttributes) {
-                            this.assignAttributes(newAttributes);
-                        }
-                        if (Object.keys(this.changes).length == 0) {
-                            return [2 /*return*/, { model: this }];
-                        }
-                        paramKey = this.modelClassData().paramKey;
-                        modelData = this.changes;
-                        dataToUse = {};
-                        dataToUse[paramKey] = modelData;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                                args: {
-                                    query_params: this.collection && this.collection.params(),
-                                    save: dataToUse
-                                },
-                                command: "".concat(this.modelClassData().collectionName, "-update"),
-                                collectionName: this.modelClassData().collectionName,
-                                primaryKey: this.primaryKey(),
-                                type: "update"
-                            }, {})];
-                    case 2:
-                        response = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_3 = _a.sent();
-                        BaseModel.parseValidationErrors({ error: error_3, model: this, options: options });
-                        throw error_3;
-                    case 4:
-                        if (response.success) {
-                            if (response.model) {
-                                this._refreshModelFromResponse(response);
-                                this.changes = {};
-                            }
-                            return [2 /*return*/, { response: response, model: this }];
-                        }
-                        else {
-                            this.handleResponseError(response);
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BaseModel.prototype._refreshModelFromResponse = function (response) {
-        var newModel = (0, diggerize_1.digg)(response, "model");
+    async update(newAttributes, options) {
+        if (newAttributes) {
+            this.assignAttributes(newAttributes);
+        }
+        if (Object.keys(this.changes).length == 0) {
+            return { model: this };
+        }
+        const paramKey = this.modelClassData().paramKey;
+        const modelData = this.changes;
+        const dataToUse = {};
+        dataToUse[paramKey] = modelData;
+        let response;
+        try {
+            response = await CommandsPool.addCommand({
+                args: {
+                    query_params: this.collection && this.collection.params(),
+                    save: dataToUse
+                },
+                command: `${this.modelClassData().collectionName}-update`,
+                collectionName: this.modelClassData().collectionName,
+                primaryKey: this.primaryKey(),
+                type: "update"
+            }, {});
+        }
+        catch (error) {
+            BaseModel.parseValidationErrors({ error, model: this, options });
+            throw error;
+        }
+        if (response.success) {
+            if (response.model) {
+                this._refreshModelFromResponse(response);
+                this.changes = {};
+            }
+            return { response, model: this };
+        }
+        else {
+            this.handleResponseError(response);
+        }
+    }
+    _refreshModelFromResponse(response) {
+        let newModel = digg(response, "model");
         if (Array.isArray(newModel))
             newModel = newModel[0];
         this.setNewModel(newModel);
-    };
-    BaseModel.prototype._refreshModelDataFromResponse = function (response) {
-        var newModel = (0, diggerize_1.digg)(response, "model");
+    }
+    _refreshModelDataFromResponse(response) {
+        let newModel = digg(response, "model");
         if (Array.isArray(newModel))
             newModel = newModel[0];
         this.setNewModelData(newModel);
-    };
+    }
     /**
      * @param {FormData | Record<string, any>} rawData
      * @param {object} options
      * @returns {Record<string, any>}
      */
-    BaseModel._objectDataFromGivenRawData = function (rawData, options) {
+    static _objectDataFromGivenRawData(rawData, options) {
         if (rawData instanceof FormData || rawData.nodeName == "FORM") {
-            var formData = form_data_objectizer_1.default.formDataFromObject(rawData, options);
-            return form_data_objectizer_1.default.toObject(formData);
+            const formData = FormDataObjectizer.formDataFromObject(rawData, options);
+            return FormDataObjectizer.toObject(formData);
         }
         return rawData;
-    };
-    BaseModel.prototype.updateRaw = function (rawData_1) {
-        return __awaiter(this, arguments, void 0, function (rawData, options) {
-            var objectData, response, error_4;
-            if (options === void 0) { options = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        objectData = BaseModel._objectDataFromGivenRawData(rawData, options);
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                                args: {
-                                    query_params: this.collection && this.collection.params(),
-                                    save: objectData,
-                                    simple_model_errors: options === null || options === void 0 ? void 0 : options.simpleModelErrors
-                                },
-                                command: "".concat(this.modelClassData().collectionName, "-update"),
-                                collectionName: this.modelClassData().collectionName,
-                                primaryKey: this.primaryKey(),
-                                type: "update"
-                            }, {})];
-                    case 2:
-                        response = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_4 = _a.sent();
-                        BaseModel.parseValidationErrors({ error: error_4, model: this, options: options });
-                        throw error_4;
-                    case 4:
-                        if (response.model) {
-                            this._refreshModelFromResponse(response);
-                            this.changes = {};
-                        }
-                        return [2 /*return*/, { response: response, model: this }];
-                }
-            });
-        });
-    };
-    BaseModel.prototype.isValid = function () {
+    }
+    async updateRaw(rawData, options = {}) {
+        const objectData = BaseModel._objectDataFromGivenRawData(rawData, options);
+        let response;
+        try {
+            response = await CommandsPool.addCommand({
+                args: {
+                    query_params: this.collection && this.collection.params(),
+                    save: objectData,
+                    simple_model_errors: options?.simpleModelErrors
+                },
+                command: `${this.modelClassData().collectionName}-update`,
+                collectionName: this.modelClassData().collectionName,
+                primaryKey: this.primaryKey(),
+                type: "update"
+            }, {});
+        }
+        catch (error) {
+            BaseModel.parseValidationErrors({ error, model: this, options });
+            throw error;
+        }
+        if (response.model) {
+            this._refreshModelFromResponse(response);
+            this.changes = {};
+        }
+        return { response, model: this };
+    }
+    isValid() {
         throw new Error("Not implemented yet");
-    };
-    BaseModel.prototype.isValidOnServer = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var modelData, paramKey, dataToUse, response;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        modelData = this.getAttributes();
-                        paramKey = this.modelClassData().paramKey;
-                        dataToUse = {};
-                        dataToUse[paramKey] = modelData;
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand({
-                                args: {
-                                    save: dataToUse
-                                },
-                                command: "".concat(this.modelClassData().collectionName, "-valid"),
-                                collectionName: this.modelClassData().collectionName,
-                                primaryKey: this.primaryKey(),
-                                type: "valid"
-                            }, {})];
-                    case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, { valid: response.valid, errors: response.errors }];
-                }
-            });
-        });
-    };
+    }
+    async isValidOnServer() {
+        const modelData = this.getAttributes();
+        const paramKey = this.modelClassData().paramKey;
+        const dataToUse = {};
+        dataToUse[paramKey] = modelData;
+        const response = await CommandsPool.addCommand({
+            args: {
+                save: dataToUse
+            },
+            command: `${this.modelClassData().collectionName}-valid`,
+            collectionName: this.modelClassData().collectionName,
+            primaryKey: this.primaryKey(),
+            type: "valid"
+        }, {});
+        return { valid: response.valid, errors: response.errors };
+    }
     /**
      * @template {BaseModel} Self
      * @this {Self}
      * @returns {typeof BaseModel & (new (...args: any[]) => Self)}
      */
-    BaseModel.prototype.modelClass = function () {
+    modelClass() {
         return /** @type {any} */ (this.constructor);
-    };
-    BaseModel.prototype.preloadRelationship = function (relationshipName, model) {
+    }
+    preloadRelationship(relationshipName, model) {
         this.relationshipsCache[BaseModel.snakeCase(relationshipName)] = model;
         this.relationships[BaseModel.snakeCase(relationshipName)] = model;
-    };
+    }
     /**
      * @returns {void}
      */
-    BaseModel.prototype.markForDestruction = function () {
+    markForDestruction() {
         this._markedForDestruction = true;
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.markedForDestruction = function () { return this._markedForDestruction || false; };
+    markedForDestruction() { return this._markedForDestruction || false; }
     /**
      * @returns {number}
      */
-    BaseModel.prototype.uniqueKey = function () {
+    uniqueKey() {
         if (!this.uniqueKeyValue) {
-            var min = 5000000000000000;
-            var max = 9007199254740991;
-            var randomBetween = Math.floor(Math.random() * (max - min + 1) + min);
+            const min = 5000000000000000;
+            const max = 9007199254740991;
+            const randomBetween = Math.floor(Math.random() * (max - min + 1) + min);
             this.uniqueKeyValue = randomBetween;
         }
         return this.uniqueKeyValue;
-    };
-    BaseModel._callCollectionCommand = function (args, commandArgs) {
-        return __awaiter(this, void 0, void 0, function () {
-            var formOrDataObject, error_5, form;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        formOrDataObject = args.args;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, commands_pool_js_1.default.addCommand(args, commandArgs)];
-                    case 2: return [2 /*return*/, _a.sent()];
-                    case 3:
-                        error_5 = _a.sent();
-                        form = void 0;
-                        if (commandArgs.form) {
-                            form = commandArgs.form;
-                        }
-                        else if ((formOrDataObject === null || formOrDataObject === void 0 ? void 0 : formOrDataObject.nodeName) == "FORM") {
-                            form = formOrDataObject;
-                        }
-                        if (form)
-                            BaseModel.parseValidationErrors({ error: error_5, options: { form: form } });
-                        throw error_5;
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BaseModel._postDataFromArgs = function (args) {
-        var postData;
+    }
+    static async _callCollectionCommand(args, commandArgs) {
+        const formOrDataObject = args.args;
+        try {
+            return await CommandsPool.addCommand(args, commandArgs);
+        }
+        catch (error) {
+            let form;
+            if (commandArgs.form) {
+                form = commandArgs.form;
+            }
+            else if (formOrDataObject?.nodeName == "FORM") {
+                form = formOrDataObject;
+            }
+            if (form)
+                BaseModel.parseValidationErrors({ error, options: { form } });
+            throw error;
+        }
+    }
+    _callMemberCommand = (args, commandArgs) => CommandsPool.addCommand(args, commandArgs);
+    static _postDataFromArgs(args) {
+        let postData;
         if (args) {
             if (args instanceof FormData) {
                 postData = args;
             }
             else {
-                postData = object_to_formdata_1.default.serialize(args, {}, null, "args");
+                postData = objectToFormData.serialize(args, {}, null, "args");
             }
         }
         else {
             postData = new FormData();
         }
         return postData;
-    };
+    }
     /**
      * @param {string} attributeName
      * @returns {any}
      */
-    BaseModel.prototype.readAttribute = function (attributeName) {
-        var attributeNameUnderscore = inflection.underscore(attributeName);
+    readAttribute(attributeName) {
+        const attributeNameUnderscore = inflection.underscore(attributeName);
         return this.readAttributeUnderscore(attributeNameUnderscore);
-    };
+    }
     /**
      * @param {string} attributeName
      * @returns {any}
      */
-    BaseModel.prototype.readAttributeUnderscore = function (attributeName) {
+    readAttributeUnderscore(attributeName) {
         if (attributeName in this.changes) {
             return this.changes[attributeName];
         }
@@ -1082,26 +875,26 @@ var BaseModel = /** @class */ (function () {
         }
         else if (this.isNewRecord()) {
             // Return null if this is a new record and the attribute name is a recognized attribute
-            var attributes = (0, diggerize_1.digg)(this.modelClassData(), "attributes");
+            const attributes = digg(this.modelClassData(), "attributes");
             if (attributeName in attributes)
                 return null;
         }
         if (this.isPersisted()) {
-            throw new attribute_not_loaded_error_1.default("No such attribute: ".concat((0, diggerize_1.digg)(this.modelClassData(), "name"), "#").concat(attributeName, ": ").concat(JSON.stringify(this.modelData)));
+            throw new AttributeNotLoadedError(`No such attribute: ${digg(this.modelClassData(), "name")}#${attributeName}: ${JSON.stringify(this.modelData)}`);
         }
-    };
+    }
     /**
      * @returns {boolean}
      */
-    BaseModel.prototype.isAttributeLoaded = function (attributeName) {
-        var attributeNameUnderscore = inflection.underscore(attributeName);
+    isAttributeLoaded(attributeName) {
+        const attributeNameUnderscore = inflection.underscore(attributeName);
         if (attributeNameUnderscore in this.changes)
             return true;
         if (attributeNameUnderscore in this.modelData)
             return true;
         return false;
-    };
-    BaseModel.prototype._isPresent = function (value) {
+    }
+    _isPresent(value) {
         if (!value) {
             return false;
         }
@@ -1109,32 +902,22 @@ var BaseModel = /** @class */ (function () {
             return false;
         }
         return true;
-    };
-    BaseModel.prototype._loadBelongsToReflection = function (args_1) {
-        return __awaiter(this, arguments, void 0, function (args, queryArgs) {
-            var collection, model;
-            if (queryArgs === void 0) { queryArgs = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(args.reflectionName in this.relationships)) return [3 /*break*/, 1];
-                        return [2 /*return*/, this.relationships[args.reflectionName]];
-                    case 1:
-                        if (!(args.reflectionName in this.relationshipsCache)) return [3 /*break*/, 2];
-                        return [2 /*return*/, this.relationshipsCache[args.reflectionName]];
-                    case 2:
-                        collection = new collection_js_1.default(args, queryArgs);
-                        return [4 /*yield*/, collection.first()];
-                    case 3:
-                        model = _a.sent();
-                        this.relationshipsCache[args.reflectionName] = model;
-                        return [2 /*return*/, model];
-                }
-            });
-        });
-    };
-    BaseModel.prototype._readBelongsToReflection = function (_a) {
-        var reflectionName = _a.reflectionName;
+    }
+    async _loadBelongsToReflection(args, queryArgs = {}) {
+        if (args.reflectionName in this.relationships) {
+            return this.relationships[args.reflectionName];
+        }
+        else if (args.reflectionName in this.relationshipsCache) {
+            return this.relationshipsCache[args.reflectionName];
+        }
+        else {
+            const collection = new Collection(args, queryArgs);
+            const model = await collection.first();
+            this.relationshipsCache[args.reflectionName] = model;
+            return model;
+        }
+    }
+    _readBelongsToReflection({ reflectionName }) {
         if (reflectionName in this.relationships) {
             return this.relationships[reflectionName];
         }
@@ -1143,70 +926,49 @@ var BaseModel = /** @class */ (function () {
         }
         if (this.isNewRecord())
             return null;
-        var loadedRelationships = Object.keys(this.relationshipsCache);
-        var modelClassName = (0, diggerize_1.digg)(this.modelClassData(), "name");
-        throw new not_loaded_error_1.default("".concat(modelClassName, "#").concat(reflectionName, " hasn't been loaded yet. Only these were loaded: ").concat(loadedRelationships.join(", ")));
-    };
+        const loadedRelationships = Object.keys(this.relationshipsCache);
+        const modelClassName = digg(this.modelClassData(), "name");
+        throw new NotLoadedError(`${modelClassName}#${reflectionName} hasn't been loaded yet. Only these were loaded: ${loadedRelationships.join(", ")}`);
+    }
     /**
      * @template {typeof import("./base-model.js").default} AssocMC
      * @param {import("./collection.js").CollectionArgsType<AssocMC>} args
      * @param {import("./collection.js").QueryArgsType} queryArgs
      * @returns {Promise<Array<InstanceType<AssocMC>>>}
      */
-    BaseModel.prototype._loadHasManyReflection = function (args_1) {
-        return __awaiter(this, arguments, void 0, function (args, queryArgs) {
-            var collection, models;
-            if (queryArgs === void 0) { queryArgs = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (args.reflectionName in this.relationships) {
-                            return [2 /*return*/, this.relationships[args.reflectionName]];
-                        }
-                        else if (args.reflectionName in this.relationshipsCache) {
-                            return [2 /*return*/, this.relationshipsCache[args.reflectionName]];
-                        }
-                        collection = new collection_js_1.default(args, queryArgs);
-                        return [4 /*yield*/, collection.toArray()];
-                    case 1:
-                        models = _a.sent();
-                        this.relationshipsCache[args.reflectionName] = models;
-                        return [2 /*return*/, models];
-                }
-            });
-        });
-    };
+    async _loadHasManyReflection(args, queryArgs = {}) {
+        if (args.reflectionName in this.relationships) {
+            return this.relationships[args.reflectionName];
+        }
+        else if (args.reflectionName in this.relationshipsCache) {
+            return this.relationshipsCache[args.reflectionName];
+        }
+        const collection = new Collection(args, queryArgs);
+        const models = await collection.toArray();
+        this.relationshipsCache[args.reflectionName] = models;
+        return models;
+    }
     /**
      * @template {typeof import("./base-model.js").default} AssocMC
      * @param {import("./collection.js").CollectionArgsType<AssocMC>} args
      * @param {import("./collection.js").QueryArgsType} queryArgs
      * @returns {Promise<InstanceType<AssocMC>>}
      */
-    BaseModel.prototype._loadHasOneReflection = function (args_1) {
-        return __awaiter(this, arguments, void 0, function (args, queryArgs) {
-            var collection, model;
-            if (queryArgs === void 0) { queryArgs = {}; }
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(args.reflectionName in this.relationships)) return [3 /*break*/, 1];
-                        return [2 /*return*/, this.relationships[args.reflectionName]];
-                    case 1:
-                        if (!(args.reflectionName in this.relationshipsCache)) return [3 /*break*/, 2];
-                        return [2 /*return*/, this.relationshipsCache[args.reflectionName]];
-                    case 2:
-                        collection = new collection_js_1.default(args, queryArgs);
-                        return [4 /*yield*/, collection.first()];
-                    case 3:
-                        model = _a.sent();
-                        this.relationshipsCache[args.reflectionName] = model;
-                        return [2 /*return*/, model];
-                }
-            });
-        });
-    };
-    BaseModel.prototype._readHasOneReflection = function (_a) {
-        var reflectionName = _a.reflectionName;
+    async _loadHasOneReflection(args, queryArgs = {}) {
+        if (args.reflectionName in this.relationships) {
+            return this.relationships[args.reflectionName];
+        }
+        else if (args.reflectionName in this.relationshipsCache) {
+            return this.relationshipsCache[args.reflectionName];
+        }
+        else {
+            const collection = new Collection(args, queryArgs);
+            const model = await collection.first();
+            this.relationshipsCache[args.reflectionName] = model;
+            return model;
+        }
+    }
+    _readHasOneReflection({ reflectionName }) {
         if (reflectionName in this.relationships) {
             return this.relationships[reflectionName];
         }
@@ -1216,74 +978,59 @@ var BaseModel = /** @class */ (function () {
         if (this.isNewRecord()) {
             return null;
         }
-        var loadedRelationships = Object.keys(this.relationshipsCache);
-        var modelClassName = (0, diggerize_1.digg)(this.modelClassData(), "name");
-        throw new not_loaded_error_1.default("".concat(modelClassName, "#").concat(reflectionName, " hasn't been loaded yet. Only these were loaded: ").concat(loadedRelationships.join(", ")));
-    };
-    BaseModel.prototype._readModelDataFromArgs = function (args) {
+        const loadedRelationships = Object.keys(this.relationshipsCache);
+        const modelClassName = digg(this.modelClassData(), "name");
+        throw new NotLoadedError(`${modelClassName}#${reflectionName} hasn't been loaded yet. Only these were loaded: ${loadedRelationships.join(", ")}`);
+    }
+    _readModelDataFromArgs(args) {
         this.abilities = args.data.b || {};
         this.collection = args.collection;
         this.modelData = objectToUnderscore(args.data.a);
         this.preloadedRelationships = args.data.r;
-    };
-    BaseModel.prototype._readPreloadedRelationships = function (preloaded) {
+    }
+    _readPreloadedRelationships(preloaded) {
         if (!this.preloadedRelationships) {
             return;
         }
-        var relationships = (0, diggerize_1.digg)(this.modelClassData(), "relationships");
-        var _loop_1 = function (relationshipName) {
-            var relationshipData = this_1.preloadedRelationships[relationshipName];
-            var relationshipClassData = relationships.find(function (relationship) { return (0, diggerize_1.digg)(relationship, "name") == relationshipName; });
+        const relationships = digg(this.modelClassData(), "relationships");
+        for (const relationshipName in this.preloadedRelationships) {
+            const relationshipData = this.preloadedRelationships[relationshipName];
+            const relationshipClassData = relationships.find((relationship) => digg(relationship, "name") == relationshipName);
             if (!relationshipClassData) {
-                var modelName = (0, diggerize_1.digg)(this_1.modelClassData(), "name");
-                var relationshipsList = relationships.map(function (relationship) { return relationship.name; }).join(", ");
-                throw new Error("Could not find the relation ".concat(relationshipName, " on the ").concat(modelName, " model: ").concat(relationshipsList));
+                const modelName = digg(this.modelClassData(), "name");
+                const relationshipsList = relationships.map((relationship) => relationship.name).join(", ");
+                throw new Error(`Could not find the relation ${relationshipName} on the ${modelName} model: ${relationshipsList}`);
             }
-            var relationshipType = (0, diggerize_1.digg)(relationshipClassData, "collectionName");
-            if (relationshipName in this_1.relationshipsCache) {
-                throw new Error("".concat(relationshipName, " has already been loaded"));
+            const relationshipType = digg(relationshipClassData, "collectionName");
+            if (relationshipName in this.relationshipsCache) {
+                throw new Error(`${relationshipName} has already been loaded`);
             }
             if (!relationshipClassData) {
-                throw new Error("No relationship on ".concat((0, diggerize_1.digg)(this_1.modelClassData(), "name"), " by that name: ").concat(relationshipName));
+                throw new Error(`No relationship on ${digg(this.modelClassData(), "name")} by that name: ${relationshipName}`);
             }
             if (!relationshipData) {
-                this_1.relationshipsCache[relationshipName] = null;
-                this_1.relationships[relationshipName] = null;
+                this.relationshipsCache[relationshipName] = null;
+                this.relationships[relationshipName] = null;
             }
             else if (Array.isArray(relationshipData)) {
-                this_1.relationshipsCache[relationshipName] = [];
-                this_1.relationships[relationshipName] = [];
-                for (var _i = 0, relationshipData_1 = relationshipData; _i < relationshipData_1.length; _i++) {
-                    var relationshipId = relationshipData_1[_i];
-                    var model = preloaded.getModel(relationshipType, relationshipId);
-                    this_1.relationshipsCache[relationshipName].push(model);
-                    this_1.relationships[relationshipName].push(model);
+                this.relationshipsCache[relationshipName] = [];
+                this.relationships[relationshipName] = [];
+                for (const relationshipId of relationshipData) {
+                    const model = preloaded.getModel(relationshipType, relationshipId);
+                    this.relationshipsCache[relationshipName].push(model);
+                    this.relationships[relationshipName].push(model);
                 }
             }
             else {
-                var model = preloaded.getModel(relationshipType, relationshipData);
-                this_1.relationshipsCache[relationshipName] = model;
-                this_1.relationships[relationshipName] = model;
+                const model = preloaded.getModel(relationshipType, relationshipData);
+                this.relationshipsCache[relationshipName] = model;
+                this.relationships[relationshipName] = model;
             }
-        };
-        var this_1 = this;
-        for (var relationshipName in this.preloadedRelationships) {
-            _loop_1(relationshipName);
         }
-    };
+    }
     /**
      * @returns {number|string}
      */
-    BaseModel.prototype.primaryKey = function () { return this.readAttributeUnderscore(this.modelClass().primaryKey()); };
-    BaseModel.apiMakerType = "BaseModel";
-    /**
-     * @param {ValidationErrors} validationErrors
-     * @returns {CustomEvent}
-     */
-    BaseModel.newCustomEvent = function (validationErrors) {
-        return new CustomEvent("validation-errors", { detail: validationErrors });
-    };
-    return BaseModel;
-}());
-exports.default = BaseModel;
+    primaryKey() { return this.readAttributeUnderscore(this.modelClass().primaryKey()); }
+}
 //# sourceMappingURL=base-model.js.map