@azrico/webobject 1.4.77 → 1.4.79

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;
@@ -10,8 +10,6 @@ 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: {
@@ -60,7 +58,7 @@ export declare class WebObject extends SimpleObject {
     static saveList(itemList: WebObject[], extraOptions?: {
         [key: string]: any;
     }): Promise<boolean>;
-    Save(): Promise<boolean>;
+    Save(): Promise<any>;
     Delete(): Promise<boolean>;
     canSave(deltaObj?: any): true | string;
     deltaIsValid(d: any): true | string;
@@ -70,11 +68,6 @@ export declare class WebObject extends SimpleObject {
      * @returns
      */
     get_deltaObject(p?: deltaParams): Promise<any>;
-    get __web_path(): string;
-    get __web_type(): string;
-    get_webtype: () => string;
-    get_webpath: () => string;
-    static get_webname(): string | undefined;
     get manager(): WebObjectManager<any> | undefined;
     onDelete(...p: any): Promise<any>;
     onLoad(...p: any): Promise<any>;

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");
@@ -49,12 +49,6 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
     _defineProperty(_assertThisInitialized(_this), "_creator", void 0);
     //multiple users can work on one object
     _defineProperty(_assertThisInitialized(_this), "_users", void 0);
-    _defineProperty(_assertThisInitialized(_this), "get_webtype", function () {
-      return _this.__web_type || _this.get_webpath();
-    });
-    _defineProperty(_assertThisInitialized(_this), "get_webpath", function () {
-      return _this.__web_path;
-    });
     _this.meta_data = {};
     return _this;
   }
@@ -168,19 +162,53 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
     key: "Save",
     value: function Save() {
       return (_Save = _Save || _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var deltaObject, putAction, putAddress, canSaveResult, resultObject;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              if (!(this.__throw_errors !== false)) {
-                _context2.next = 2;
+              _context2.next = 2;
+              return this.get_deltaObject();
+            case 2:
+              deltaObject = _context2.sent;
+              putAction = "post";
+              putAddress = this.isNew ? "".concat(this.__web_path) : "".concat(this.__web_path, "/").concat(this.getID()); //save
+              if ((0, _object.object_isEmpty)(deltaObject)) {
+                _context2.next = 18;
                 break;
               }
-              throw new Error("Save not implented");
-            case 2:
-              WebObject.addError(this, "Save not implented", "NOSAVE", true);
+              canSaveResult = this.canSave(deltaObject);
+              if (!(canSaveResult !== true)) {
+                _context2.next = 11;
+                break;
+              }
+              WebObject.addError(this, "Save not allowed", String(canSaveResult), true);
               this.setSaveResult(false, "canceled");
               return _context2.abrupt("return", false);
-            case 5:
+            case 11:
+              _context2.next = 13;
+              return _global.gfunc.run_action(putAction, putAddress, deltaObject);
+            case 13:
+              resultObject = _context2.sent;
+              this.setSaveResult(resultObject, "auto");
+              if (!this.__saveResultIsSuccess) {
+                console.error("bad save result : ", resultObject);
+                WebObject.addError(this, "Save result is not valid", "the response from server was not a valid saveresult object !", true);
+              }
+              _context2.next = 19;
+              break;
+            case 18:
+              /* nothing to save */
+              this.setSaveResult(null, "nothing");
+            case 19:
+              if (!this.isSaved) {
+                _context2.next = 23;
+                break;
+              }
+              _context2.next = 22;
+              return this.onSave();
+            case 22:
+              return _context2.abrupt("return", this.getSaveResult());
+            case 23:
             case "end":
               return _context2.stop();
           }
@@ -311,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
                 });
@@ -393,16 +421,6 @@ 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"];
-    }
-  }, {
-    key: "__web_type",
-    get: function get() {
-      return this.constructor["__web_type"];
-    }
   }, {
     key: "manager",
     get: function get() {
@@ -734,11 +752,6 @@ 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) {
@@ -884,10 +897,8 @@ 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", "");
 _defineProperty(WebObject, "__protectedProperties", ["_users"]);
 //you cant create a new weboject without these properties
 _defineProperty(WebObject, "__requiredProperties", []);

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

@@ -5,8 +5,6 @@ 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 __web_path: string;
-    static readonly __web_type: string;
     static readonly __save_message: boolean;
     constructor();
     /**

package/dist/src/WebObjects/WebObjectManager.js

@@ -191,13 +191,13 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
     key: "__web_path",
     get: function get() {
       var _this$obj5;
-      return ((_this$obj5 = this.obj) === null || _this$obj5 === void 0 ? void 0 : _this$obj5.__web_path) || this.constructor["__web_path"] || "";
+      return ((_this$obj5 = this.obj) === null || _this$obj5 === void 0 ? void 0 : _this$obj5.__web_path) || this.__last_web_path || this.__web_type;
     }
   }, {
     key: "__web_type",
     get: function get() {
       var _this$obj6;
-      return ((_this$obj6 = this.obj) === null || _this$obj6 === void 0 ? void 0 : _this$obj6.__web_type) || this.constructor["__web_type"] || "";
+      return ((_this$obj6 = this.obj) === null || _this$obj6 === void 0 ? void 0 : _this$obj6.__web_type) || this.__last_web_type || "";
     }
   }, {
     key: "get_webname",
@@ -372,8 +372,6 @@ var WebObjectManager = /*#__PURE__*/function (_ObjectManager, _setMetaValue, _ge
 }(_ObjectManager2["default"]);
 exports.WebObjectManager = WebObjectManager;
 //we use this as backup
-_defineProperty(WebObjectManager, "__web_path", "");
-_defineProperty(WebObjectManager, "__web_type", "");
 _defineProperty(WebObjectManager, "__save_message", true);
 var _default = WebObjectManager;
 exports["default"] = _default;

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

@@ -8,9 +8,11 @@ export declare class ObjectManager<ObjType extends SimpleObject> {
     __eventList: any;
     __eventPrefix?: string;
     __stopEvents?: boolean;
-    __currentObject?: ObjType | null;
-    __options?: object;
+    private __currentObject?;
+    private __options?;
     __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,6 +33,8 @@ 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, [{
@@ -90,6 +92,10 @@ 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,6 +9,8 @@ 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[];
@@ -38,6 +40,9 @@ export declare class SimpleObject extends MapableObject {
     _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,6 +65,7 @@ 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);
@@ -112,11 +113,22 @@ 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: /* -------------------------------------------------------------------------- */
@@ -880,6 +892,11 @@ 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;
@@ -1248,6 +1265,8 @@ 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.77",
+    "version": "1.4.79",
     "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"