@azrico/webobject 1.4.79 → 1.4.80

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

@@ -10,6 +10,8 @@ export type deltaParams = {
     applyFilter?: boolean;
 };
 export declare class WebObject extends SimpleObject {
+    static readonly __web_path: string;
+    static readonly __web_type: string;
     static readonly __protectedProperties: string[];
     static readonly __requiredProperties: never[];
     meta_data: {
@@ -68,7 +70,10 @@ export declare class WebObject extends SimpleObject {
      * @returns
      */
     get_deltaObject(p?: deltaParams): Promise<any>;
+    get __web_path(): string;
+    get __web_type(): string;
     get manager(): WebObjectManager<any> | undefined;
+    static get_webname(): string | undefined;
     onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;
     onSave(...p: any): Promise<any>;

package/dist/src/WebObjects/WebObject.js

@@ -421,15 +421,24 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
         }, _callee6, this, [[17, 28, 31, 34]]);
       }))).apply(this, arguments);
     } /* --------------------------------- Getters -------------------------------- */
+  }, {
+    key: "__web_path",
+    get: function get() {
+      return this.constructor["__web_path"] || this.__web_type;
+    }
+  }, {
+    key: "__web_type",
+    get: function get() {
+      return this.constructor["__web_type"];
+    }
   }, {
     key: "manager",
     get: function get() {
       return this.get_managerClass() || undefined;
     }
-    /* -------------------------------------------------------------------------- */
   }, {
     key: "onDelete",
-    value: function onDelete() {
+    value: /* -------------------------------------------------------------------------- */function onDelete() {
       return (_onDelete = _onDelete || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _this$manager;
         var _len,
@@ -752,6 +761,11 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
         }, _callee12, this);
       }))).apply(this, arguments);
     }
+  }, {
+    key: "get_webname",
+    value: function get_webname() {
+      return this.__web_path || this.__web_type || this.__cache_name;
+    }
   }, {
     key: "saveResultHasID",
     value: function saveResultHasID(s) {
@@ -899,6 +913,8 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   return WebObject;
 }(_index3.SimpleObject);
 exports.WebObject = WebObject;
+_defineProperty(WebObject, "__web_path", "");
+_defineProperty(WebObject, "__web_type", "");
 _defineProperty(WebObject, "__protectedProperties", ["_users"]);
 //you cant create a new weboject without these properties
 _defineProperty(WebObject, "__requiredProperties", []);

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;
     /**

package/dist/src/structs/ObjectManager.js

@@ -33,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, [{
@@ -92,10 +90,6 @@ var ObjectManager = /*#__PURE__*/function (_notifyChanged, _setValue, _setSubVal
       if (this.__currentObject) {
         this.__currentObject.set_managerClass(this);
       }
-      if (this.__currentObject instanceof _SimpleObject["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

@@ -9,8 +9,6 @@ export type WriteablePropOf<obj> = keyof obj;
 export type PropType<obj, prop extends keyof obj> = obj[prop];
 export declare class SimpleObject extends MapableObject {
     #private;
-    static readonly __web_path: string;
-    static readonly __web_type: string;
     static readonly __cache_name?: string;
     static readonly __unchangeables?: string[];
     static readonly __changeables?: string[];
@@ -23,26 +21,23 @@ 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);
-    get __web_path(): string;
-    get __web_type(): string;
-    static get_webname(): string | undefined;
     loadValues(initObject: any, fullUpdate?: boolean): boolean;
     static loadValues(obj: SimpleObject, initObject: any, fullUpdate?: boolean): boolean;
     static getValue<T extends SimpleObject, MKey extends PropOf<T>>(o: T, key: MKey, original?: boolean): PropType<T, MKey> | undefined;

package/dist/src/structs/SimpleObject.js

@@ -65,7 +65,6 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setTemp, _
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setDefaultProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setProperty);
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _getSubProperty);
-    /* -------------------------------------------------------------------------- */
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _setSubProperty);
     //an exact copy of this object is stored here
     _defineProperty(_assertThisInitialized(_this), "__originalobject", void 0);
@@ -113,22 +112,11 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setTemp, _
     _this.clear_changes();
     return _this;
   }
-  /* -------------------------------------------------------------------------- */
   _createClass(SimpleObject, [{
     key: "_static",
     value: function _static() {
       return this.constructor;
     }
-  }, {
-    key: "__web_path",
-    get: function get() {
-      return this.constructor["__web_path"] || this.__web_type;
-    }
-  }, {
-    key: "__web_type",
-    get: function get() {
-      return this.constructor["__web_type"];
-    }
   }, {
     key: "loadValues",
     value: /* -------------------------------------------------------------------------- */
@@ -892,11 +880,6 @@ var SimpleObject = /*#__PURE__*/function (_MapableObject, _setValue, _setTemp, _
     /*                                   statics                                  */
     /* -------------------------------------------------------------------------- */
   }], [{
-    key: "get_webname",
-    value: function get_webname() {
-      return this.__web_path || this.__web_type || this.__cache_name;
-    }
-  }, {
     key: "loadValues",
     value: function loadValues(obj, initObject) {
       var fullUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
@@ -1265,8 +1248,6 @@ function _setSaveResultObject2(toObj) {
   if (toObj == null) toObj = null; //null or undefined
   this.__saveResultObject = toObj;
 }
-_defineProperty(SimpleObject, "__web_path", "");
-_defineProperty(SimpleObject, "__web_type", "");
 _defineProperty(SimpleObject, "__cache_name", void 0);
 //these properties should not be changed and are usually set by server
 _defineProperty(SimpleObject, "__unchangeables", void 0);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azrico/webobject",
-    "version": "1.4.79",
+    "version": "1.4.80",
     "description": "Stateful object",
     "author": "Azrideus",
     "license": "MIT",