@azrico/webobject 1.4.152 → 1.4.154

package/dist/src/WebObjects/WebObject.js

@@ -1274,6 +1274,7 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
           search,
           readonly,
           fetchID,
+          usepath,
           result_items,
           res,
           _args23 = arguments;
@@ -1288,17 +1289,21 @@ var WebObject = exports.WebObject = /*#__PURE__*/function (_SimpleObject) {
               fetchID = p.shift();
               if (!search) search = {};
               _context23.next = 7;
-              return _global.gfunc.run_action("get", this.get_webname(), search, {
+              return _WebObjectPathHelper["default"].get_path(this, "get");
+            case 7:
+              usepath = _context23.sent;
+              _context23.next = 10;
+              return _global.gfunc.run_action("get", usepath, search, {
                 fetchID: fetchID
               });
-            case 7:
+            case 10:
               result_items = _context23.sent;
               // const selftype = (this.constructor ||
               //     Object.getPrototypeOf(this)) as any;
               res = WebObject.map_rowindex(WebObject.mapto(this, result_items, readonly));
               WebObject.setReadonly(res, readonly);
               return _context23.abrupt("return", res);
-            case 11:
+            case 14:
             case "end":
               return _context23.stop();
           }

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

@@ -10,9 +10,16 @@ export declare class WebObjectPathHelper {
         delete: string;
         new: string;
         save: string;
+        get: string;
     };
     static readonly pathOverrides: {};
-    static get_path(obj: WebObject, pn: string): Promise<string>;
+    /**
+     * get path that we use for `action` for the `obj`
+     * @param obj
+     * @param action
+     * @returns
+     */
+    static get_path(obj: WebObject | typeof WebObject, action: string): Promise<string>;
     /**
      * clear all paths that are override by `override_path`
      */

package/dist/src/WebObjects/WebObjectPathHelper.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.WebObjectPathHelper = void 0;
+var _WebObject = _interopRequireDefault(require("./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; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -20,27 +22,38 @@ var WebObjectPathHelper = exports.WebObjectPathHelper = /*#__PURE__*/function ()
   }
   _createClass(WebObjectPathHelper, null, [{
     key: "get_path",
-    value: function () {
-      var _get_path = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(obj, pn) {
-        var wn, usepath;
+    value: (
+    /**
+     * get path that we use for `action` for the `obj`
+     * @param obj
+     * @param action
+     * @returns
+     */
+    function () {
+      var _get_path = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(obj, action) {
+        var wn, wp, usepath;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              pn = String(pn).toLowerCase();
+              action = String(action).toLowerCase();
               wn = obj.get_webname();
+              wp = obj.__web_path;
               usepath = "";
-              if (WebObjectPathHelper.pathOverrides[wn] && WebObjectPathHelper.pathOverrides[wn][pn]) {
-                usepath = WebObjectPathHelper.pathOverrides[wn][pn];
+              if (WebObjectPathHelper.pathOverrides[wn] && WebObjectPathHelper.pathOverrides[wn][action]) {
+                usepath = WebObjectPathHelper.pathOverrides[wn][action];
               } else {
-                usepath = WebObjectPathHelper.defaultPaths[pn];
+                usepath = WebObjectPathHelper.defaultPaths[action];
               }
               if (!usepath) usepath = WebObjectPathHelper.defaultPaths["save"];
               if (typeof usepath === "function") usepath = String(usepath(obj));
               /* ----------------------------- place variables ---------------------------- */
-              usepath = String(usepath).replaceAll("{wn}", obj.get_webname()).replaceAll("{wp}", obj.__web_path).replaceAll("{id}", obj.getID());
+              usepath = String(usepath).replaceAll("{wn}", wn).replaceAll("{wp}", wp);
+              if (obj instanceof _WebObject["default"]) {
+                usepath = usepath.replaceAll("{id}", obj.getID());
+              }
               /* -------------------------------------------------------------------------- */
               return _context.abrupt("return", usepath);
-            case 8:
+            case 10:
             case "end":
               return _context.stop();
           }
@@ -54,6 +67,7 @@ var WebObjectPathHelper = exports.WebObjectPathHelper = /*#__PURE__*/function ()
     /**
      * clear all paths that are override by `override_path`
      */
+    )
   }, {
     key: "clear_overrides",
     value: (function () {
@@ -135,7 +149,8 @@ _defineProperty(WebObjectPathHelper, "defaultPaths", {
   unarchive: "{wn}/{id}/unarchive",
   "delete": "{wn}/{id}",
   "new": "{wn}",
-  save: "{wn}/{id}"
+  save: "{wn}/{id}",
+  get: "{wn}"
 });
 _defineProperty(WebObjectPathHelper, "pathOverrides", {});
 var _default = exports["default"] = WebObjectPathHelper;

package/dist/src/structs/ObjectManager.js

@@ -69,12 +69,11 @@ var ObjectManager = exports.ObjectManager = /*#__PURE__*/function (_RawObject) {
             case 3:
               if (value === undefined && type != "meta") value = obj.getValue(key);
               typestr = (type ? "$".concat(type, "$") : "") + String(key);
-              console.log("event_run", typestr, value);
-              _context.next = 8;
+              _context.next = 7;
               return this.event_run("on_change", typestr, value);
-            case 8:
+            case 7:
               return _context.abrupt("return", _context.sent);
-            case 9:
+            case 8:
             case "end":
               return _context.stop();
           }

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

@@ -41,6 +41,12 @@ export declare class SimpleObject extends MapableObject {
     _index_key: string;
     _index_value: number;
     constructor(is_readonly?: boolean);
+    /**
+     * load all properties in `initObject` into the current object
+     * @param initObject
+     * @param fullUpdate
+     * @returns
+     */
     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

@@ -131,6 +131,12 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     value: /* -------------------------------------------------------------------------- */
     /*                                    Load                                    */
     /* -------------------------------------------------------------------------- */
+    /**
+     * load all properties in `initObject` into the current object
+     * @param initObject
+     * @param fullUpdate
+     * @returns
+     */
     function loadValues(initObject) {
       var fullUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       return SimpleObject.loadValues(this, initObject, fullUpdate);
@@ -616,17 +622,16 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
               /* --------------------------- notify the manager --------------------------- */
               manager_class = this.manager;
               if (!(typeof (manager_class === null || manager_class === void 0 ? void 0 : manager_class.notifyChanged) === "function")) {
-                _context11.next = 12;
+                _context11.next = 11;
                 break;
               }
-              console.log("notify manager", type, key, value);
-              _context11.next = 11;
+              _context11.next = 10;
               return manager_class.notifyChanged(type, key, value, subvalue);
-            case 11:
+            case 10:
               return _context11.abrupt("return", _context11.sent);
-            case 12:
+            case 11:
               return _context11.abrupt("return", false);
-            case 13:
+            case 12:
             case "end":
               return _context11.stop();
           }
@@ -1154,6 +1159,11 @@ var SimpleObject = exports.SimpleObject = /*#__PURE__*/function (_MapableObject)
     key: "loadValues",
     value: function loadValues(obj, initObject) {
       var fullUpdate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+      if (typeof initObject === "number" || typeof initObject === "string") {
+        initObject = {
+          _id: initObject
+        };
+      }
       SimpleObject.factoryClear(obj);
       if (initObject == null) {
         for (var key in obj) {

package/package.json

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