roboto-js 1.1.2 → 1.1.4

package/dist/cjs/rbt_api.cjs

@@ -270,7 +270,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context6.abrupt("return", new _rbt_object["default"](record, this.axios));
+              return _context6.abrupt("return", new _rbt_user["default"](record, this.axios));
             case 10:
               _context6.prev = 10;
               _context6.t0 = _context6["catch"](1);
@@ -825,7 +825,6 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleError",
     value: function _handleError(err) {
-      debugger;
       // Invoke the custom error handler if provided
       if (this.customErrorHandler) {
         var res = this.customErrorHandler(err);
@@ -833,11 +832,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
       }
       if (_lodash["default"].isObject(err) && _lodash["default"].get(err, 'response')) {
         var msg = _lodash["default"].get(err, 'response.data.message', 'Error in API response');
-        if (msg.key) {
-          throw new Error(msg.key);
-        } else {
-          throw new Error(msg);
-        }
+        throw new Error(msg);
       } else {
         throw new Error(err.message || 'Unknown error');
       }

package/dist/cjs/rbt_object.cjs

@@ -136,10 +136,10 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
             case 17:
               _context.prev = 17;
               _context.t0 = _context["catch"](2);
-              console.log('RbtObject.save.error:');
-              console.log(_context.t0.response.data);
+              console.log('RbtObject.save.error:', _context.t0);
+              //console.log(e.response.data);
               throw _context.t0;
-            case 22:
+            case 21:
             case "end":
               return _context.stop();
           }

package/dist/cjs/rbt_user.cjs

@@ -31,9 +31,9 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
       isNew: options.isNew || false
     };
     if (record.data) {
-      this._data = record.data;
+      this._data = this._deepUnpackJson(record.data);
     } else {
-      this._data = record.dataJson ? JSON.parse(record.dataJson) : {};
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
     }
   }
   _createClass(RbtUser, [{
@@ -132,10 +132,10 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
             case 17:
               _context.prev = 17;
               _context.t0 = _context["catch"](0);
-              console.log('RbtUser.save.error:');
-              console.log(_context.t0.response.data);
+              console.log('RbtUser.save.error:', _context.t0);
+              //console.log(e.response.data);
               throw _context.t0;
-            case 22:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -145,7 +145,27 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
         return _save.apply(this, arguments);
       }
       return save;
-    }() //async delete() {
+    }()
+  }, {
+    key: "_deepUnpackJson",
+    value: function _deepUnpackJson(value) {
+      if (typeof value === 'string') {
+        try {
+          var parsed = JSON.parse(value);
+          return this._deepUnpackJson(parsed); // Recursively parse if the result is a string, object, or array
+        } catch (e) {
+          return value; // Return the original string if parsing fails
+        }
+      } else if (value !== null && _typeof(value) === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (var key in value) {
+          value[key] = this._deepUnpackJson(value[key]);
+        }
+      }
+      return value;
+    }
+
+    //async delete() {
     //  if (!this._internalData.type) {
     //    throw new Error('Cannot delete object without type');
     //  }

package/dist/esm/rbt_api.js

@@ -270,7 +270,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
               if (dataHash) {
                 record.data = dataHash;
               }
-              return _context6.abrupt("return", new _rbt_object["default"](record, this.axios));
+              return _context6.abrupt("return", new _rbt_user["default"](record, this.axios));
             case 10:
               _context6.prev = 10;
               _context6.t0 = _context6["catch"](1);
@@ -825,7 +825,6 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handleError",
     value: function _handleError(err) {
-      debugger;
       // Invoke the custom error handler if provided
       if (this.customErrorHandler) {
         var res = this.customErrorHandler(err);
@@ -833,11 +832,7 @@ var RbtApi = exports["default"] = /*#__PURE__*/function () {
       }
       if (_lodash["default"].isObject(err) && _lodash["default"].get(err, 'response')) {
         var msg = _lodash["default"].get(err, 'response.data.message', 'Error in API response');
-        if (msg.key) {
-          throw new Error(msg.key);
-        } else {
-          throw new Error(msg);
-        }
+        throw new Error(msg);
       } else {
         throw new Error(err.message || 'Unknown error');
       }

package/dist/esm/rbt_object.js

@@ -136,10 +136,10 @@ var RbtObject = exports["default"] = /*#__PURE__*/function () {
             case 17:
               _context.prev = 17;
               _context.t0 = _context["catch"](2);
-              console.log('RbtObject.save.error:');
-              console.log(_context.t0.response.data);
+              console.log('RbtObject.save.error:', _context.t0);
+              //console.log(e.response.data);
               throw _context.t0;
-            case 22:
+            case 21:
             case "end":
               return _context.stop();
           }

package/dist/esm/rbt_user.js

@@ -31,9 +31,9 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
       isNew: options.isNew || false
     };
     if (record.data) {
-      this._data = record.data;
+      this._data = this._deepUnpackJson(record.data);
     } else {
-      this._data = record.dataJson ? JSON.parse(record.dataJson) : {};
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
     }
   }
   _createClass(RbtUser, [{
@@ -132,10 +132,10 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
             case 17:
               _context.prev = 17;
               _context.t0 = _context["catch"](0);
-              console.log('RbtUser.save.error:');
-              console.log(_context.t0.response.data);
+              console.log('RbtUser.save.error:', _context.t0);
+              //console.log(e.response.data);
               throw _context.t0;
-            case 22:
+            case 21:
             case "end":
               return _context.stop();
           }
@@ -145,7 +145,27 @@ var RbtUser = exports["default"] = /*#__PURE__*/function () {
         return _save.apply(this, arguments);
       }
       return save;
-    }() //async delete() {
+    }()
+  }, {
+    key: "_deepUnpackJson",
+    value: function _deepUnpackJson(value) {
+      if (typeof value === 'string') {
+        try {
+          var parsed = JSON.parse(value);
+          return this._deepUnpackJson(parsed); // Recursively parse if the result is a string, object, or array
+        } catch (e) {
+          return value; // Return the original string if parsing fails
+        }
+      } else if (value !== null && _typeof(value) === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (var key in value) {
+          value[key] = this._deepUnpackJson(value[key]);
+        }
+      }
+      return value;
+    }
+
+    //async delete() {
     //  if (!this._internalData.type) {
     //    throw new Error('Cannot delete object without type');
     //  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roboto-js",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "type": "module",
   "description": "",
   "main": "dist/cjs/index.cjs",

package/src/rbt_api.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import CryptoJS from 'crypto-js';
 import RbtObject from './rbt_object.js';
 import RbtUser from './rbt_user.js';
-import RbtFile from './rbt_file.js';
+import RbtFile from './rbt_file.js'; 
 import _ from 'lodash';
 import { openDB } from 'idb';
 
@@ -159,7 +159,7 @@ export default class RbtApi {
       if(dataHash){
         record.data = dataHash;
       }
-      return new RbtObject(record, this.axios);
+      return new RbtUser(record, this.axios);
     } catch (e) {
       debugger;
       return this._handleError(e);
@@ -478,7 +478,6 @@ export default class RbtApi {
 
   _handleError(err) {
 
-    debugger;
     // Invoke the custom error handler if provided
     if (this.customErrorHandler) {
       let res = this.customErrorHandler(err);
@@ -487,13 +486,8 @@ export default class RbtApi {
 
     if (_.isObject(err) && _.get(err, 'response')) {
       const msg = _.get(err, 'response.data.message', 'Error in API response');
+      throw new Error(msg);
 
-      if(msg.key){
-        throw new Error(msg.key);
-      }
-      else{
-        throw new Error(msg);
-      }
     } else {
       throw new Error(err.message || 'Unknown error');
     }

package/src/rbt_object.js

@@ -104,8 +104,8 @@ export default class RbtObject {
       return this;
 
     } catch (e) {
-      console.log('RbtObject.save.error:');
-      console.log(e.response.data);
+      console.log('RbtObject.save.error:', e);
+      //console.log(e.response.data);
       throw e;
     }
   }

package/src/rbt_user.js

@@ -13,11 +13,11 @@ export default class RbtUser {
     };
 
     if(record.data){
-      this._data = record.data;
+      this._data = this._deepUnpackJson(record.data);
     } else {
-      this._data = record.dataJson ? JSON.parse(record.dataJson) : {};
+      this._data = record.dataJson ? this._deepUnpackJson(record.dataJson) : {};
     }
-    
+
   }
 
   get(path) {
@@ -103,12 +103,29 @@ export default class RbtUser {
       return this;
 
     } catch (e) {
-      console.log('RbtUser.save.error:');
-      console.log(e.response.data);
+      console.log('RbtUser.save.error:', e);
+      //console.log(e.response.data);
       throw e;
     }
   }
 
+  _deepUnpackJson(value){
+    if (typeof value === 'string') {
+        try {
+            const parsed = JSON.parse(value);
+            return this._deepUnpackJson(parsed); // Recursively parse if the result is a string, object, or array
+        } catch (e) {
+            return value; // Return the original string if parsing fails
+        }
+    } else if (value !== null && typeof value === 'object') {
+        // If it's an object (including arrays), recursively parse each value
+        for (const key in value) {
+            value[key] = this._deepUnpackJson(value[key]);
+        }
+    }
+    return value;
+  }
+
   //async delete() {
   //  if (!this._internalData.type) {
   //    throw new Error('Cannot delete object without type');