@azrico/webobject 1.4.77 → 1.4.78

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

@@ -60,7 +60,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;
@@ -72,10 +72,8 @@ export declare class WebObject extends SimpleObject {
     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;
+    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

@@ -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();
           }
@@ -396,7 +424,7 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
   }, {
     key: "__web_path",
     get: function get() {
-      return this.constructor["__web_path"];
+      return this.constructor["__web_path"] || this.__web_type;
     }
   }, {
     key: "__web_type",
@@ -408,10 +436,9 @@ var WebObject = /*#__PURE__*/function (_SimpleObject, _setMetaValue, _Save, _Del
     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,

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;
     /**
@@ -100,7 +102,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[] | undefined;
+    addError(title?: string, message?: string, sendToRegister?: boolean | "auto"): any;
     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,6 +9,7 @@ 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; }
@@ -33,6 +34,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 +93,10 @@ 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/package.json

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