@azrico/webobject 1.5.66 → 1.5.67

package/dist/src/structs/ObjectManager.d.ts

@@ -1,4 +1,5 @@
 import { PropOf, PropType, WriteablePropOf } from "@azrico/types";
+import EventContext from "@azrico/event";
 import SimpleObject, { WithManager } from "./SimpleObject";
 import { saveResultType, sendChangesType } from "./SimpleObject";
 import { ClassType } from "@azrico/types";
@@ -7,9 +8,7 @@ import RawObject from "./MapableObject";
  * This class manages the events of an Simple Object
  */
 export declare class ObjectManager<ObjType extends SimpleObject> extends RawObject {
-    __eventList: any;
-    __eventPrefix?: string;
-    __stopEvents?: boolean;
+    __eventContext: EventContext | {};
     protected static readonly __object_type: () => typeof SimpleObject | ClassType<SimpleObject>;
     protected __last_object_data: {
         [key: string]: string;
@@ -18,7 +17,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
     protected __options?: object;
     __object_nullable: boolean;
     constructor(defaultObject?: ObjType);
-    notifyChanged(type: string, key: PropOf<ObjType> | string, value?: any, subvalue?: string): Promise<false | any[] | undefined>;
+    notifyChanged(type: string, key: PropOf<ObjType> | string, value?: any, subvalue?: string): Promise<false | any[]>;
     /**
      * Get the object this manager is managing
      * @returns the object
@@ -75,7 +74,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
     getIndexOrID(): number | string;
     getIndex(): number;
     getID(): string;
-    event_run(eventName: string, ...params: any): Promise<any[] | undefined>;
+    event_run(eventName: string, ...params: any): Promise<any[]>;
     event_use(name: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): any;
     /**
      * only useful for getter functions that dont rely on states
@@ -85,8 +84,8 @@ export declare class ObjectManager<ObjType extends SimpleObject> extends RawObje
      * @returns
      */
     event_use_getter(name: string, runEvent: (...inputdata: any) => any, onlyOn?: any): any;
-    event_remove(name: string, uname: string): boolean;
-    event_add(name: string, uname: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): Promise<void>;
+    event_remove(name: string, uname: string): Promise<boolean | undefined>;
+    event_add(eventName: string, uniqueName: string, eventFunction: (...inputdata: any) => any, eventChecker?: any, runOnRegister?: boolean): Promise<void>;
     events_start(): void;
     events_stop(): void;
     events_clear(): void;

package/dist/src/structs/ObjectManager.js

@@ -4,13 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.ObjectManager = void 0;
-var _event = require("@azrico/event");
+var _event = _interopRequireWildcard(require("@azrico/event"));
 var _SimpleObject = _interopRequireDefault(require("./SimpleObject"));
 var _string = require("@azrico/string");
 var _global = require("@azrico/global");
 var _object = require("@azrico/object");
 var _MapableObject = _interopRequireDefault(require("./MapableObject"));
+var _useGetter = _interopRequireDefault(require("@azrico/event/dist/src/hooks/useGetter"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return r; }; var t, r = {}, e = Object.prototype, n = e.hasOwnProperty, o = "function" == typeof Symbol ? Symbol : {}, i = o.iterator || "@@iterator", a = o.asyncIterator || "@@asyncIterator", u = o.toStringTag || "@@toStringTag"; function c(t, r, e, n) { return Object.defineProperty(t, r, { value: e, enumerable: !n, configurable: !n, writable: !n }); } try { c({}, ""); } catch (t) { c = function c(t, r, e) { return t[r] = e; }; } function h(r, e, n, o) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype); return c(a, "_invoke", function (r, e, n) { var o = 1; return function (i, a) { if (3 === o) throw Error("Generator is already running"); if (4 === o) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var u = n.delegate; if (u) { var c = d(u, n); if (c) { if (c === f) continue; return c; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (1 === o) throw o = 4, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = 3; var h = s(r, e, n); if ("normal" === h.type) { if (o = n.done ? 4 : 2, h.arg === f) continue; return { value: h.arg, done: n.done }; } "throw" === h.type && (o = 4, n.method = "throw", n.arg = h.arg); } }; }(r, n, new Context(o || [])), !0), a; } function s(t, r, e) { try { return { type: "normal", arg: t.call(r, e) }; } catch (t) { return { type: "throw", arg: t }; } } r.wrap = h; var f = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var l = {}; c(l, i, function () { return this; }); var p = Object.getPrototypeOf, y = p && p(p(x([]))); y && y !== e && n.call(y, i) && (l = y); var v = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(l); function g(t) { ["next", "throw", "return"].forEach(function (r) { c(t, r, function (t) { return this._invoke(r, t); }); }); } function AsyncIterator(t, r) { function e(o, i, a, u) { var c = s(t[o], t, i); if ("throw" !== c.type) { var h = c.arg, f = h.value; return f && "object" == _typeof(f) && n.call(f, "__await") ? r.resolve(f.__await).then(function (t) { e("next", t, a, u); }, function (t) { e("throw", t, a, u); }) : r.resolve(f).then(function (t) { h.value = t, a(h); }, function (t) { return e("throw", t, a, u); }); } u(c.arg); } var o; c(this, "_invoke", function (t, n) { function i() { return new r(function (r, o) { e(t, n, r, o); }); } return o = o ? o.then(i, i) : i(); }, !0); } function d(r, e) { var n = e.method, o = r.i[n]; if (o === t) return e.delegate = null, "throw" === n && r.i["return"] && (e.method = "return", e.arg = t, d(r, e), "throw" === e.method) || "return" !== n && (e.method = "throw", e.arg = new TypeError("The iterator does not provide a '" + n + "' method")), f; var i = s(o, r.i, e.arg); if ("throw" === i.type) return e.method = "throw", e.arg = i.arg, e.delegate = null, f; var a = i.arg; return a ? a.done ? (e[r.r] = a.value, e.next = r.n, "return" !== e.method && (e.method = "next", e.arg = t), e.delegate = null, f) : a : (e.method = "throw", e.arg = new TypeError("iterator result is not an object"), e.delegate = null, f); } function w(t) { this.tryEntries.push(t); } function m(r) { var e = r[4] || {}; e.type = "normal", e.arg = t, r[4] = e; } function Context(t) { this.tryEntries = [[-1]], t.forEach(w, this), this.reset(!0); } function x(r) { if (null != r) { var e = r[i]; if (e) return e.call(r); if ("function" == typeof r.next) return r; if (!isNaN(r.length)) { var o = -1, a = function e() { for (; ++o < r.length;) if (n.call(r, o)) return e.value = r[o], e.done = !1, e; return e.value = t, e.done = !0, e; }; return a.next = a; } } throw new TypeError(_typeof(r) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, c(v, "constructor", GeneratorFunctionPrototype), c(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = c(GeneratorFunctionPrototype, u, "GeneratorFunction"), r.isGeneratorFunction = function (t) { var r = "function" == typeof t && t.constructor; return !!r && (r === GeneratorFunction || "GeneratorFunction" === (r.displayName || r.name)); }, r.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, c(t, u, "GeneratorFunction")), t.prototype = Object.create(v), t; }, r.awrap = function (t) { return { __await: t }; }, g(AsyncIterator.prototype), c(AsyncIterator.prototype, a, function () { return this; }), r.AsyncIterator = AsyncIterator, r.async = function (t, e, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(h(t, e, n, o), i); return r.isGeneratorFunction(e) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, g(v), c(v, u, "Generator"), c(v, i, function () { return this; }), c(v, "toString", function () { return "[object Generator]"; }), r.keys = function (t) { var r = Object(t), e = []; for (var n in r) e.unshift(n); return function t() { for (; e.length;) if ((n = e.pop()) in r) return t.value = n, t.done = !1, t; return t.done = !0, t; }; }, r.values = x, Context.prototype = { constructor: Context, reset: function reset(r) { if (this.prev = this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(m), !r) for (var e in this) "t" === e.charAt(0) && n.call(this, e) && !isNaN(+e.slice(1)) && (this[e] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0][4]; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(r) { if (this.done) throw r; var e = this; function n(t) { a.type = "throw", a.arg = r, e.next = t; } for (var o = e.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i[4], u = this.prev, c = i[1], h = i[2]; if (-1 === i[0]) return n("end"), !1; if (!c && !h) throw Error("try statement without catch or finally"); if (null != i[0] && i[0] <= u) { if (u < c) return this.method = "next", this.arg = t, n(c), !0; if (u < h) return n(h), !1; } } }, abrupt: function abrupt(t, r) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var n = this.tryEntries[e]; if (n[0] > -1 && n[0] <= this.prev && this.prev < n[2]) { var o = n; break; } } o && ("break" === t || "continue" === t) && o[0] <= r && r <= o[2] && (o = null); var i = o ? o[4] : {}; return i.type = t, i.arg = r, o ? (this.method = "next", this.next = o[2], f) : this.complete(i); }, complete: function complete(t, r) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && r && (this.next = r), f; }, finish: function finish(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[2] === t) return this.complete(e[4], e[3]), m(e), f; } }, "catch": function _catch(t) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var e = this.tryEntries[r]; if (e[0] === t) { var n = e[4]; if ("throw" === n.type) { var o = n.arg; m(e); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(r, e, n) { return this.delegate = { i: x(r), r: e, n: n }, "next" === this.method && (this.arg = t), f; } }, r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
@@ -39,9 +41,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
     var _this;
     _classCallCheck(this, ObjectManager);
     _this = _callSuper(this, ObjectManager);
-    _defineProperty(_this, "__eventList", {});
-    _defineProperty(_this, "__eventPrefix", void 0);
-    _defineProperty(_this, "__stopEvents", void 0);
+    _defineProperty(_this, "__eventContext", {});
     _defineProperty(_this, "__last_object_data", {});
     _defineProperty(_this, "__currentObject", void 0);
     _defineProperty(_this, "__options", void 0);
@@ -213,7 +213,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }, {
     key: "use",
     value: function use(key) {
-      return _event.EventManager.useProperty(this, key);
+      return (0, _event.useProperty)(this, key);
     }
     /**
      * set value
@@ -461,20 +461,14 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              if (!(this.__stopEvents === true)) {
-                _context7.next = 2;
-                break;
-              }
-              return _context7.abrupt("return");
-            case 2:
               for (_len = _args7.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
                 params[_key - 1] = _args7[_key];
               }
-              _context7.next = 5;
-              return _event.EventManager.run.apply(_event.EventManager, [this, eventName].concat(params));
-            case 5:
+              _context7.next = 3;
+              return _event["default"].run.apply(_event["default"], [this, eventName].concat(params));
+            case 3:
               return _context7.abrupt("return", _context7.sent);
-            case 6:
+            case 4:
             case "end":
               return _context7.stop();
           }
@@ -490,7 +484,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
     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);
+      return (0, _event.useEvent)(this, name, runEvent, onlyOn, runOnce);
     }
     /**
      * only useful for getter functions that dont rely on states
@@ -503,27 +497,33 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
     key: "event_use_getter",
     value: function event_use_getter(name, runEvent) {
       var onlyOn = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
-      return _event.EventManager.use_getter(this, name, runEvent, onlyOn);
+      return (0, _useGetter["default"])(this, name, runEvent, onlyOn);
     }
   }, {
     key: "event_remove",
     value: function event_remove(name, uname) {
-      return _event.EventManager.remove(this, name, uname);
+      return _event["default"].remove(this, name, uname);
     }
   }, {
     key: "event_add",
     value: function () {
-      var _event_add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(name, uname, runEvent) {
-        var onlyOn,
-          runOnce,
+      var _event_add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(eventName, uniqueName, eventFunction) {
+        var eventChecker,
+          runOnRegister,
           _args8 = arguments;
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
-              onlyOn = _args8.length > 3 && _args8[3] !== undefined ? _args8[3] : null;
-              runOnce = _args8.length > 4 && _args8[4] !== undefined ? _args8[4] : false;
+              eventChecker = _args8.length > 3 && _args8[3] !== undefined ? _args8[3] : null;
+              runOnRegister = _args8.length > 4 && _args8[4] !== undefined ? _args8[4] : false;
               _context8.next = 4;
-              return _event.EventManager.add(this, name, uname, runEvent, onlyOn, runOnce);
+              return _event.EventManager.add(this, {
+                eventName: eventName,
+                uniqueName: uniqueName,
+                eventFunction: eventFunction,
+                eventChecker: eventChecker,
+                runOnRegister: runOnRegister
+              });
             case 4:
             case "end":
               return _context8.stop();
@@ -538,12 +538,12 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }, {
     key: "events_start",
     value: function events_start() {
-      delete this.__stopEvents;
+      // delete this.__stopEvents;
     }
   }, {
     key: "events_stop",
     value: function events_stop() {
-      this.__stopEvents = true;
+      // this.__setopEvents = true;
     }
   }, {
     key: "events_clear",
@@ -760,7 +760,7 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
   }], [{
     key: "events_clear",
     value: function events_clear(obj) {
-      _event.EventManager.removeAll(obj);
+      _event["default"].removeAll(obj);
     }
   }, {
     key: "addError",

package/dist/src/structs/SimpleObject.d.ts

@@ -171,7 +171,7 @@ export declare class SimpleObject extends MapableObject {
      * @param subvalue
      * @returns true if manager was notified. false otherwise
      */
-    notifyChanged<MKey extends PropOf<this>>(type: string, key: MKey | string, value: any, subvalue?: any): Promise<false | any[] | undefined>;
+    notifyChanged<MKey extends PropOf<this>>(type: string, key: MKey | string, value: any, subvalue?: any): Promise<false | any[]>;
     /**
      * get a list of all keys that can be changed in given objcet
      * @param object
@@ -265,7 +265,7 @@ export declare class SimpleObject extends MapableObject {
     static getID(obj: any): string;
     event_run(eventName: string, ...params: any): Promise<any[] | undefined>;
     event_use(name: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): any;
-    event_remove(name: string, uname: string): boolean | undefined;
+    event_remove(name: string, uname: string): Promise<boolean | undefined> | undefined;
     event_add(name: string, uname: string, runEvent: (...inputdata: any) => any, onlyOn?: any, runOnce?: boolean): Promise<void>;
     getOriginal(): this | undefined;
     setOriginal(toObj?: null | 0 | any): this | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.5.66",
+    "version": "1.5.67",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -70,7 +70,7 @@
     },
     "dependencies": {
         "@azrico/convert": "^1.1.7",
-        "@azrico/event": "^1.2.91",
+        "@azrico/event": "^1.3.8",
         "@azrico/global": "^1.3.85",
         "@azrico/math": "^1.0.5",
         "@azrico/object": "^1.4.137",