@azrico/webobject 1.4.78 → 1.4.80

package/dist/src/WebObjects/WebObject.d.ts

@@ -1,4 +1,4 @@
-import SimpleObject, { sendChangesType } from "../structs/SimpleObject";
+import { SimpleObject, sendChangesType } from "../index";
 import { WebObjectManager } from "../index";
 export type deltaParams = {
     type?: string;

package/dist/src/WebObjects/WebObject.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.WebObject = void 0;
-var _SimpleObject2 = _interopRequireDefault(require("../structs/SimpleObject"));
+var _index3 = require("../index");
 var _object = require("@azrico/object");
 var _string = require("@azrico/string");
 var _global = require("@azrico/global");
@@ -339,7 +339,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
               dlt = allProperties || !useDelta && isChild && chkChangables ? _objectSpread({}, this.allproperties) : _objectSpread({}, this.__delta);
               allkeys = Object.keys(dlt);
               changableKeys = chkChangables ? allkeys.filter(function (s) {
-                return _SimpleObject2["default"].canChangeKey(_this2, s, {
+                return _index3.SimpleObject.canChangeKey(_this2, s, {
                   useExtraProps: useExtraProps,
                   ignoreProtected: allProperties
                 });
@@ -911,7 +911,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
     }
   }]);
   return WebObject;
-}(_SimpleObject2["default"]);
+}(_index3.SimpleObject);
 exports.WebObject = WebObject;
 _defineProperty(WebObject, "__web_path", "");
 _defineProperty(WebObject, "__web_type", "");

package/dist/src/WebObjects/WebObjectManager.d.ts

@@ -1,12 +1,14 @@
-import { sendChangesType } from "../structs/SimpleObject";
+import { WebObject, sendChangesType } from "../index";
 import ObjectManager from "../structs/ObjectManager";
-import WebObject from "./WebObject";
 /**
  * This class manages the events of an Simple Object
  */
 export declare class WebObjectManager<T extends WebObject> extends ObjectManager<T> {
     static readonly __save_message: boolean;
+    protected __last_web_path: string;
+    protected __last_web_type: string;
     constructor();
+    setObject(toObj: T | undefined): boolean;
     /**
      * Update meta value of this object , meta data is stored in meta_data variable
      * @param key

package/dist/src/WebObjects/WebObjectManager.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.WebObjectManager = void 0;
+var _index = require("../index");
 var _ObjectManager2 = _interopRequireDefault(require("../structs/ObjectManager"));
 var _global = require("@azrico/global");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -14,6 +15,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 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, _toPropertyKey(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 _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -36,6 +39,8 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
     _classCallCheck(this, WebObjectManager);
     _this = _super.call(this);
     /* ---------------- should we display a message after saving ? -------------- */
+    _defineProperty(_assertThisInitialized(_this), "__last_web_path", "");
+    _defineProperty(_assertThisInitialized(_this), "__last_web_type", "");
     if (_this.constructor["__save_message"]) {
       _this.event_add("on_save", "onsave_sendmsg", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -78,17 +83,28 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
     return _this;
   }
   /* -------------------------------------------------------------------------- */
-  /*                                  Meta data                                 */
-  /* -------------------------------------------------------------------------- */
-  /**
-   * Update meta value of this object , meta data is stored in meta_data variable
-   * @param key
-   * @param value
-   * @param createIfNotExists should we create a new meta if key does not exist
-   * @param sendChange
-   * @returns
-   */
   _createClass(WebObjectManager, [{
+    key: "setObject",
+    value: function setObject(toObj) {
+      var res = _get(_getPrototypeOf(WebObjectManager.prototype), "setObject", this).call(this, toObj);
+      if (this.__currentObject instanceof _index.SimpleObject) {
+        this.__last_web_path == this.__currentObject.__web_path || this.__last_web_path;
+        this.__last_web_type == this.__currentObject.__web_type || this.__last_web_type;
+      }
+      return res;
+    }
+    /* -------------------------------------------------------------------------- */
+    /*                                  Meta data                                 */
+    /* -------------------------------------------------------------------------- */
+    /**
+     * Update meta value of this object , meta data is stored in meta_data variable
+     * @param key
+     * @param value
+     * @param createIfNotExists should we create a new meta if key does not exist
+     * @param sendChange
+     * @returns
+     */
+  }, {
     key: "setMetaValue",
     value: function setMetaValue(_x, _x2) {
       return (_setMetaValue = _setMetaValue || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(key, value) {

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

@@ -8,11 +8,9 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
     __eventList: any;
     __eventPrefix?: string;
     __stopEvents?: boolean;
-    private __currentObject?;
-    private __options?;
+    protected __currentObject?: ObjType | null;
+    protected __options?: object;
     __object_nullable: boolean;
-    __last_web_path: string;
-    __last_web_type: string;
     notifyChanged(type: string, key: PropOf<ObjType> | string, value?: any, subvalue?: string): Promise<false | any[] | undefined>;
     get obj(): ObjType | undefined;
     /**
@@ -102,7 +100,7 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
      */
     holdOption(key: string, value: any, nextvalue: any, action: Function): Promise<void>;
     getOption(key: string): any;
-    addError(title?: string, message?: string, sendToRegister?: boolean | "auto"): any;
+    addError(title?: string, message?: string, sendToRegister?: boolean | "auto"): any[] | undefined;
     getErrors(): any[];
     clearErrors(): boolean;
     static addError(o?: ObjectManager<any>, title?: string, message?: string, sendToRegister?: boolean | "auto"): any[] | undefined;

package/dist/src/structs/ObjectManager.js

@@ -9,7 +9,6 @@ var _SimpleObject = _interopRequireDefault(require("./SimpleObject"));
 var _string = require("@azrico/string");
 var _global = require("@azrico/global");
 var _object = require("@azrico/object");
-var _WebObject = _interopRequireDefault(require("../WebObjects/WebObject"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { 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 && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -34,8 +33,6 @@ var ObjectManager = /*#__PURE__*/function (_notifyChanged, _setValue, _setSubVal
     _defineProperty(this, "__options", void 0);
     //can the current object be set to null safely?
     _defineProperty(this, "__object_nullable", false);
-    _defineProperty(this, "__last_web_path", "");
-    _defineProperty(this, "__last_web_type", "");
     _defineProperty(this, "get", this.getValue);
   }
   _createClass(ObjectManager, [{
@@ -93,10 +90,6 @@ var ObjectManager = /*#__PURE__*/function (_notifyChanged, _setValue, _setSubVal
       if (this.__currentObject) {
         this.__currentObject.set_managerClass(this);
       }
-      if (this.__currentObject instanceof _WebObject["default"]) {
-        this.__last_web_path == this.__currentObject.__web_path || this.__last_web_path;
-        this.__last_web_type == this.__currentObject.__web_type || this.__last_web_type;
-      }
       if (toObj == null && !this.__object_nullable) {
         console.warn("setObject was used to set null. try to use empty objects instead of null");
       }

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

@@ -21,20 +21,20 @@ export declare class SimpleObject extends MapableObject {
     static readonly __checkProperties?: string[];
     static readonly __use_delta: boolean;
     _static(): Function;
-    __originalobject?: this;
-    __delta: Partial<this>;
-    __temp: any;
-    __changed: boolean;
-    __lastChanged?: string;
-    __is_readonly?: boolean;
-    __throw_errors?: boolean;
+    protected __originalobject?: this;
+    protected __delta: Partial<this>;
+    protected __temp: any;
+    protected __changed: boolean;
+    protected __lastChanged?: string;
+    protected __is_readonly?: boolean;
+    protected __throw_errors?: boolean;
     _deleted?: boolean;
     _deletedBy?: string;
-    __errors?: any[];
-    __showErrors?: boolean;
-    __saveResultObject?: any;
-    __saveResultIsSuccess: boolean;
-    __saveResultType?: saveResultType;
+    protected __errors?: any[];
+    protected __showErrors?: boolean;
+    protected __saveResultObject?: any;
+    protected __saveResultIsSuccess: boolean;
+    protected __saveResultType?: saveResultType;
     _index_key: string;
     _index_value: number;
     constructor(is_readonly?: boolean);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.78",
+    "version": "1.4.80",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",
@@ -75,7 +75,7 @@
         "@azrico/event": "^1.2.17",
         "@azrico/global": "^1.3.50",
         "@azrico/math": "^1.0.3",
-        "@azrico/object": "^1.4.86",
+        "@azrico/object": "^1.4.87",
         "@azrico/string": "^1.2.84",
         "@azrico/types": "^1.0.4",
         "@azrico/uid": "^1.0.5"