@azrico/webobject 1.2.17 → 1.2.18

package/dist/src/structs/ObjectManager.js

@@ -1,575 +1,181 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = exports.ObjectManager = void 0;
-
-var _event = require("@azrico/event");
-
-var _SimpleObject = _interopRequireDefault(require("./SimpleObject"));
-
-var _string = require("@azrico/string");
-
-var _global = require("@azrico/global");
-
-var _object = require("@azrico/object");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+import { EventManager } from "@azrico/event";
+import SimpleObject from "./SimpleObject";
+import { combine_if_not_blank } from "@azrico/string";
+import { gfunc } from "@azrico/global";
+import { object_equals_loose } from "@azrico/object";
 /**
  * This class manages the events of an Simple Object
- */
-var ObjectManager = /*#__PURE__*/function () {
-  function ObjectManager() {
-    _classCallCheck(this, ObjectManager);
-
-    _defineProperty(this, "__eventList", void 0);
-
-    _defineProperty(this, "__eventPrefix", void 0);
-
-    _defineProperty(this, "__sendEvents", true);
-
-    _defineProperty(this, "__currentObject", void 0);
-
-    _defineProperty(this, "__options", void 0);
-
-    _defineProperty(this, "get", this.getValue);
-  }
-
-  _createClass(ObjectManager, [{
-    key: "notifyChanged",
-    value: function () {
-      var _notifyChanged = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(type, key, value, subvalue) {
-        var obj, typestr;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                obj = this.getObject();
-
-                if (obj) {
-                  _context.next = 3;
-                  break;
-                }
-
-                return _context.abrupt("return", false);
-
-              case 3:
-                if (value === undefined && type != "meta") value = obj.getValue(key);
-                typestr = (type ? "$".concat(type, "$") : "") + String(key);
-                _context.next = 7;
-                return this.event_run("on_change", typestr, value);
-
-              case 7:
-                return _context.abrupt("return", _context.sent);
-
-              case 8:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function notifyChanged(_x, _x2, _x3, _x4) {
-        return _notifyChanged.apply(this, arguments);
-      }
-
-      return notifyChanged;
-    }()
-    /* -------------------------------------------------------------------------- */
-
-  }, {
-    key: "obj",
-    get: function get() {
-      return this.getObject();
-    }
+ */
+export class ObjectManager {
+    __eventList;
+    __eventPrefix;
+    __sendEvents = true;
+    __currentObject;
+    __options;
+    async notifyChanged(type, key, value, subvalue) {
+        const obj = this.getObject();
+        if (!obj)
+            return false;
+        if (value === undefined && type != "meta")
+            value = obj.getValue(key);
+        const typestr = (type ? `$${type}$` : "") + String(key);
+        return await this.event_run("on_change", typestr, value);
+    }
+    /* -------------------------------------------------------------------------- */
+    get obj() {
+        return this.getObject();
+    }
     /**
      * Get the object this manager is managing
      * @returns the object
-     */
-
-  }, {
-    key: "getObject",
-    value: function getObject() {
-      var _this$__currentObject;
-
-      return (_this$__currentObject = this.__currentObject) !== null && _this$__currentObject !== void 0 ? _this$__currentObject : undefined;
-    }
+     */
+    getObject() {
+        return this.__currentObject ?? undefined;
+    }
     /**
      * Set the object this manager is managing
      * @param toObj
      * @returns
-     */
-
-  }, {
-    key: "setObject",
-    value: function setObject(toObj) {
-      var _this = this;
-
-      this.__currentObject = toObj;
-
-      if (this.__currentObject) {
-        this.__currentObject.get_managerClass = function () {
-          return _this;
-        };
-      }
-
-      return true;
-    }
-    /* -------------------------------------------------------------------------- */
-
-    /*                               Child functions                              */
-
-    /* -------------------------------------------------------------------------- */
-
-  }, {
-    key: "isChanged",
-    get: function get() {
-      return this.obj != null && this.obj.isChanged;
-    }
-  }, {
-    key: "isDeleted",
-    get: function get() {
-      return this.obj == null || this.obj.isDeleted;
-    }
-  }, {
-    key: "d",
-    get: function get() {
-      var _this$obj;
-
-      return (_this$obj = this.obj) === null || _this$obj === void 0 ? void 0 : _this$obj.d;
-    }
-  }, {
-    key: "canModify",
-    get: function get() {
-      var _this$obj2;
-
-      return !((_this$obj2 = this.obj) !== null && _this$obj2 !== void 0 && _this$obj2.canModify);
-    }
-  }, {
-    key: "isNew",
-    get: function get() {
-      return this.obj == null || this.obj.isNew;
-    }
-  }, {
-    key: "isSaved",
-    get: function get() {
-      var _this$obj3;
-
-      return ((_this$obj3 = this.obj) === null || _this$obj3 === void 0 ? void 0 : _this$obj3.isSaved) || false;
-    }
-  }, {
-    key: "__cache_name",
-    get: function get() {
-      return this.constructor["__cache_name"];
-    }
-  }, {
-    key: "getSaveResult",
-    value: function getSaveResult() {
-      var _this$getObject;
-
-      return ((_this$getObject = this.getObject()) === null || _this$getObject === void 0 ? void 0 : _this$getObject.getSaveResult()) || undefined;
-    }
-  }, {
-    key: "getSaveResultType",
-    value: function getSaveResultType() {
-      var _this$getObject2;
-
-      return ((_this$getObject2 = this.getObject()) === null || _this$getObject2 === void 0 ? void 0 : _this$getObject2.getSaveResultType()) || null;
-    }
-  }, {
-    key: "setSaveResult",
-    value: function setSaveResult(toObj, type) {
-      return this.setSaveResult(toObj, type);
-    }
-  }, {
-    key: "apply_changes",
-    value: function apply_changes() {
-      var _this$obj4;
-
-      return (_this$obj4 = this.obj) === null || _this$obj4 === void 0 ? void 0 : _this$obj4.apply_changes();
-    }
-  }, {
-    key: "getValue",
-    value: function getValue(key) {
-      var _this$obj5;
-
-      var original = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      return (_this$obj5 = this.obj) === null || _this$obj5 === void 0 ? void 0 : _this$obj5.getValue(key, original);
-    }
-  }, {
-    key: "setValue",
-    value:
+     */
+    setObject(toObj) {
+        this.__currentObject = toObj;
+        if (this.__currentObject) {
+            this.__currentObject.get_managerClass = (() => {
+                return this;
+            });
+        }
+        return true;
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                               Child functions                              */
+    /* -------------------------------------------------------------------------- */
+    get isChanged() {
+        return this.obj != null && this.obj.isChanged;
+    }
+    get isDeleted() {
+        return this.obj == null || this.obj.isDeleted;
+    }
+    get d() {
+        return this.obj?.d;
+    }
+    get canModify() {
+        return !this.obj?.canModify;
+    }
+    get isNew() {
+        return this.obj == null || this.obj.isNew;
+    }
+    get isSaved() {
+        return this.obj?.isSaved || false;
+    }
+    get __cache_name() {
+        return this.constructor["__cache_name"];
+    }
+    getSaveResult() {
+        return this.getObject()?.getSaveResult() || undefined;
+    }
+    getSaveResultType() {
+        return this.getObject()?.getSaveResultType() || null;
+    }
+    setSaveResult(toObj, type) {
+        return this.setSaveResult(toObj, type);
+    }
+    apply_changes() {
+        return this.obj?.apply_changes();
+    }
+    getValue(key, original = false) {
+        return this.obj?.getValue(key, original);
+    }
+    get = this.getValue;
     /**
      * set value
      * @param key
      * @param value
      * @return true if changed , false otherwise
-     */
-    function () {
-      var _setValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {
-        var _this$obj6;
-
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                _context2.next = 2;
-                return (_this$obj6 = this.obj) === null || _this$obj6 === void 0 ? void 0 : _this$obj6.setValue(key, value);
-
-              case 2:
-                _context2.t0 = _context2.sent;
-
-                if (_context2.t0) {
-                  _context2.next = 5;
-                  break;
-                }
-
-                _context2.t0 = false;
-
-              case 5:
-                return _context2.abrupt("return", _context2.t0);
-
-              case 6:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function setValue(_x5, _x6) {
-        return _setValue.apply(this, arguments);
-      }
-
-      return setValue;
-    }()
+     */
+    async setValue(key, value) {
+        return (await this.obj?.setValue(key, value)) || false;
+    }
     /**
      * set key of subObject
      * @param key
      * @param value
      * @param subvalue
      * @return true if changed , false otherwise
-     */
-
-  }, {
-    key: "setSubValue",
-    value: function () {
-      var _setSubValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, objKey, subvalue) {
-        var _this$obj7;
-
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return (_this$obj7 = this.obj) === null || _this$obj7 === void 0 ? void 0 : _this$obj7.setSubValue(key, objKey, subvalue);
-
-              case 2:
-                _context3.t0 = _context3.sent;
-
-                if (_context3.t0) {
-                  _context3.next = 5;
-                  break;
-                }
-
-                _context3.t0 = false;
-
-              case 5:
-                return _context3.abrupt("return", _context3.t0);
-
-              case 6:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
-
-      function setSubValue(_x7, _x8, _x9) {
-        return _setSubValue.apply(this, arguments);
-      }
-
-      return setSubValue;
-    }() //Push value on array
-
-  }, {
-    key: "pushValue",
-    value: function () {
-      var _pushValue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(key, value) {
-        var _this$obj8;
-
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return (_this$obj8 = this.obj) === null || _this$obj8 === void 0 ? void 0 : _this$obj8.pushValue(key, value);
-
-              case 2:
-                _context4.t0 = _context4.sent;
-
-                if (_context4.t0) {
-                  _context4.next = 5;
-                  break;
-                }
-
-                _context4.t0 = false;
-
-              case 5:
-                return _context4.abrupt("return", _context4.t0);
-
-              case 6:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4, this);
-      }));
-
-      function pushValue(_x10, _x11) {
-        return _pushValue.apply(this, arguments);
-      }
-
-      return pushValue;
-    }()
-    /* -------------------------------------------------------------------------- */
-
-  }, {
-    key: "getIndexOrID",
-    value: function getIndexOrID() {
-      var _this$obj9;
-
-      return ((_this$obj9 = this.obj) === null || _this$obj9 === void 0 ? void 0 : _this$obj9.getIndexOrID()) || -1;
-    }
-  }, {
-    key: "getIndex",
-    value: function getIndex() {
-      var _this$obj10;
-
-      return ((_this$obj10 = this.obj) === null || _this$obj10 === void 0 ? void 0 : _this$obj10.getIndex()) || -1;
-    }
-  }, {
-    key: "getID",
-    value: function getID() {
-      var _this$obj11;
-
-      return ((_this$obj11 = this.obj) === null || _this$obj11 === void 0 ? void 0 : _this$obj11.getID()) || "";
-    }
-    /* -------------------------------------------------------------------------- */
-
-    /*                                   Getters                                  */
-
-    /* -------------------------------------------------------------------------- */
-
-    /* -------------------------------------------------------------------------- */
-
-    /*                                   Events                                   */
-
-    /* -------------------------------------------------------------------------- */
-
-  }, {
-    key: "event_run",
-    value: function () {
-      var _event_run = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(eventName) {
-        var _len,
-            params,
-            _key,
-            _args5 = arguments;
-
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) {
-            switch (_context5.prev = _context5.next) {
-              case 0:
-                if (this.__sendEvents) {
-                  _context5.next = 2;
-                  break;
-                }
-
-                return _context5.abrupt("return");
-
-              case 2:
-                for (_len = _args5.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                  params[_key - 1] = _args5[_key];
-                }
-
-                _context5.next = 5;
-                return _event.EventManager.run.apply(_event.EventManager, [this, eventName].concat(params));
-
-              case 5:
-              case "end":
-                return _context5.stop();
-            }
-          }
-        }, _callee5, this);
-      }));
-
-      function event_run(_x12) {
-        return _event_run.apply(this, arguments);
-      }
-
-      return event_run;
-    }()
-  }, {
-    key: "event_use",
-    value: function event_use(name, runEvent) {
-      var onlyOn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-      var runOnce = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-      return _event.EventManager.use(this, name, runEvent, onlyOn, runOnce);
-    }
-  }, {
-    key: "event_remove",
-    value: function event_remove(name, uname) {
-      return _event.EventManager.remove(this, name, uname);
-    }
-  }, {
-    key: "event_add",
-    value: function () {
-      var _event_add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(name, uname, runEvent) {
-        var onlyOn,
-            runOnce,
-            _args6 = arguments;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                onlyOn = _args6.length > 3 && _args6[3] !== undefined ? _args6[3] : null;
-                runOnce = _args6.length > 4 && _args6[4] !== undefined ? _args6[4] : false;
-                _context6.next = 4;
-                return _event.EventManager.add(this, name, uname, runEvent, onlyOn, runOnce);
-
-              case 4:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6, this);
-      }));
-
-      function event_add(_x13, _x14, _x15) {
-        return _event_add.apply(this, arguments);
-      }
-
-      return event_add;
-    }()
-  }, {
-    key: "events_stop",
-    value: function events_stop() {
-      this.__sendEvents = false;
-    }
-  }, {
-    key: "events_clear",
-    value: function events_clear() {
-      ObjectManager.events_clear(this);
-    }
-  }, {
-    key: "toggleOption",
-    value:
-    /* -------------------------------------------------------------------------- */
-
-    /*                                   Options                                  */
-
-    /* -------------------------------------------------------------------------- */
-
+     */
+    async setSubValue(key, objKey, subvalue) {
+        return ((await this.obj?.setSubValue(key, objKey, subvalue)) || false);
+    }
+    //Push value on array
+    async pushValue(key, value) {
+        return (await this.obj?.pushValue(key, value)) || false;
+    }
+    /* -------------------------------------------------------------------------- */
+    getIndexOrID() {
+        return this.obj?.getIndexOrID() || -1;
+    }
+    getIndex() {
+        return this.obj?.getIndex() || -1;
+    }
+    getID() {
+        return this.obj?.getID() || "";
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                                   Getters                                  */
+    /* -------------------------------------------------------------------------- */
+    /* -------------------------------------------------------------------------- */
+    /*                                   Events                                   */
+    /* -------------------------------------------------------------------------- */
+    async event_run(eventName, ...params) {
+        if (!this.__sendEvents)
+            return;
+        await EventManager.run(this, eventName, ...params);
+    }
+    event_use(name, runEvent, onlyOn = null, runOnce = false) {
+        return EventManager.use(this, name, runEvent, onlyOn, runOnce);
+    }
+    event_remove(name, uname) {
+        return EventManager.remove(this, name, uname);
+    }
+    async event_add(name, uname, runEvent, onlyOn = null, runOnce = false) {
+        await EventManager.add(this, name, uname, runEvent, onlyOn, runOnce);
+    }
+    events_stop() {
+        this.__sendEvents = false;
+    }
+    events_clear() {
+        ObjectManager.events_clear(this);
+    }
+    static events_clear(obj) {
+        EventManager.removeAll(obj);
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                                   Options                                  */
+    /* -------------------------------------------------------------------------- */
     /**
      * Set an option to some value, if its already equal to the value it will be deleted instead
      * @param key
      * @param value
      * @returns
-     */
-    function () {
-      var _toggleOption = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(key, value) {
-        var oldval;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) {
-            switch (_context7.prev = _context7.next) {
-              case 0:
-                oldval = this.getOption(key);
-
-                if (!(0, _object.object_equals_loose)(oldval, value)) {
-                  _context7.next = 6;
-                  break;
-                }
-
-                _context7.next = 4;
-                return this.setOption(key, null);
-
-              case 4:
-                _context7.next = 8;
-                break;
-
-              case 6:
-                _context7.next = 8;
-                return this.setOption(key, value);
-
-              case 8:
-              case "end":
-                return _context7.stop();
-            }
-          }
-        }, _callee7, this);
-      }));
-
-      function toggleOption(_x16, _x17) {
-        return _toggleOption.apply(this, arguments);
-      }
-
-      return toggleOption;
-    }()
-  }, {
-    key: "setOption",
-    value: function () {
-      var _setOption = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(key, value) {
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) {
-            switch (_context8.prev = _context8.next) {
-              case 0:
-                if (this.__options == null) this.__options = {};
-
-                if (value == null) {
-                  delete this.__options[key];
-                } else {
-                  this.__options[key] = value;
-                }
-
-                _context8.next = 4;
-                return this.event_run("on_option_change", key, value);
-
-              case 4:
-                return _context8.abrupt("return", _context8.sent);
-
-              case 5:
-              case "end":
-                return _context8.stop();
-            }
-          }
-        }, _callee8, this);
-      }));
-
-      function setOption(_x18, _x19) {
-        return _setOption.apply(this, arguments);
-      }
-
-      return setOption;
-    }()
+     */
+    async toggleOption(key, value) {
+        var oldval = this.getOption(key);
+        if (object_equals_loose(oldval, value)) {
+            await this.setOption(key, null);
+        }
+        else
+            await this.setOption(key, value);
+    }
+    async setOption(key, value) {
+        if (this.__options == null)
+            this.__options = {};
+        if (value == null) {
+            delete this.__options[key];
+        }
+        else {
+            this.__options[key] = value;
+        }
+        return await this.event_run("on_option_change", key, value);
+    }
     /**
      * Sets an option then does an action,
      * after the action is run, updates the option again
@@ -577,113 +183,52 @@ var ObjectManager = /*#__PURE__*/function () {
      * @param value
      * @param nextvalue
      * @param action
-     */
-
-  }, {
-    key: "holdOption",
-    value: function () {
-      var _holdOption = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(key, value, nextvalue, action) {
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) {
-            switch (_context9.prev = _context9.next) {
-              case 0:
-                _context9.prev = 0;
-                this.setOption(key, value);
-
-                if (!(typeof action === "function")) {
-                  _context9.next = 5;
-                  break;
-                }
-
-                _context9.next = 5;
-                return action();
-
-              case 5:
-                _context9.prev = 5;
-                this.setOption(key, nextvalue);
-                return _context9.finish(5);
-
-              case 8:
-              case "end":
-                return _context9.stop();
-            }
-          }
-        }, _callee9, this, [[0,, 5, 8]]);
-      }));
-
-      function holdOption(_x20, _x21, _x22, _x23) {
-        return _holdOption.apply(this, arguments);
-      }
-
-      return holdOption;
-    }()
-  }, {
-    key: "getOption",
-    value: function getOption(key) {
-      if (this.__options == null) return undefined;
-      return this.__options[key];
-    }
-    /* -------------------------------------------------------------------------- */
-
-    /*                                   Errors                                   */
-
-    /* -------------------------------------------------------------------------- */
-
-  }, {
-    key: "addError",
-    value: function addError(title, message) {
-      var sendToRegister = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "auto";
-      return ObjectManager.addError(this, title, message, sendToRegister);
-    }
-  }, {
-    key: "getErrors",
-    value: function getErrors() {
-      return ObjectManager.getErrors(this);
-    }
-  }, {
-    key: "clearErrors",
-    value: function clearErrors() {
-      return ObjectManager.clearErrors(this);
-    }
-  }], [{
-    key: "events_clear",
-    value: function events_clear(obj) {
-      _event.EventManager.removeAll(obj);
-    }
-  }, {
-    key: "addError",
-    value: function addError(o, title, message) {
-      var sendToRegister = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "auto";
-
-      if (o && o.obj) {
-        return _SimpleObject["default"].addError(o.obj, title, message, sendToRegister);
-      }
-
-      var errStr = (0, _string.combine_if_not_blank)(title, " : ", message);
-      console.error("[REGISTER-ERROR]", errStr);
-
-      _global.gfunc.run_action("add_error", {
-        title: title,
-        message: message,
-        type: "error"
-      });
-    }
-  }, {
-    key: "getErrors",
-    value: function getErrors(o) {
-      var obj = o.obj;
-      return obj != null ? _SimpleObject["default"].getErrors(o.obj) : [];
-    }
-  }, {
-    key: "clearErrors",
-    value: function clearErrors(o) {
-      return _SimpleObject["default"].clearErrors(o.obj);
-    }
-  }]);
-
-  return ObjectManager;
-}();
-
-exports.ObjectManager = ObjectManager;
-var _default = ObjectManager;
-exports["default"] = _default;
+     */
+    async holdOption(key, value, nextvalue, action) {
+        try {
+            this.setOption(key, value);
+            if (typeof action === "function")
+                await action();
+        }
+        finally {
+            this.setOption(key, nextvalue);
+        }
+    }
+    getOption(key) {
+        if (this.__options == null)
+            return undefined;
+        return this.__options[key];
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                                   Errors                                   */
+    /* -------------------------------------------------------------------------- */
+    addError(title, message, sendToRegister = "auto") {
+        return ObjectManager.addError(this, title, message, sendToRegister);
+    }
+    getErrors() {
+        return ObjectManager.getErrors(this);
+    }
+    clearErrors() {
+        return ObjectManager.clearErrors(this);
+    }
+    static addError(o, title, message, sendToRegister = "auto") {
+        if (o && o.obj) {
+            return SimpleObject.addError(o.obj, title, message, sendToRegister);
+        }
+        const errStr = combine_if_not_blank(title, " : ", message);
+        console.error("[REGISTER-ERROR]", errStr);
+        gfunc.run_action("add_error", {
+            title: title,
+            message: message,
+            type: "error",
+        });
+    }
+    static getErrors(o) {
+        const obj = o.obj;
+        return obj != null ? SimpleObject.getErrors(o.obj) : [];
+    }
+    static clearErrors(o) {
+        return SimpleObject.clearErrors(o.obj);
+    }
+}
+export default ObjectManager;