@valbuild/core 0.33.0 → 0.35.0

package/dist/valbuild-core.cjs.dev.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-43369070.cjs.dev.js');
-var ops = require('./ops-558f07b7.cjs.dev.js');
-var expr_dist_valbuildCoreExpr = require('./index-a0f36fe3.cjs.dev.js');
+var ops = require('./ops-bec039cc.cjs.dev.js');
+var index = require('./index-a5295001.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('./index-6deb169d.cjs.dev.js');
 var result = require('./result-48320acd.cjs.dev.js');
 
 var NumberSchema = /*#__PURE__*/function (_Schema) {
@@ -350,7 +350,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
     value: function serialize() {
       var path = index.getValPath(this.selector);
       if (!path) {
-        throw new Error("Cannot serialize oneOf schema with empty selector. keyOf must be used with a Val Module.");
+        throw new Error("Cannot serialize keyOf schema with empty selector. TIP: keyOf must be used with a Val Module.");
       }
       return {
         type: "keyOf",
@@ -417,19 +417,18 @@ function initSchema() {
  * Internally it is a Selector
  **/
 function richtext(templateStrings) {
-  var _ref;
   for (var _len = arguments.length, nodes = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     nodes[_key - 1] = arguments[_key];
   }
-  return _ref = {}, index._defineProperty(_ref, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref, "templateStrings", templateStrings), index._defineProperty(_ref, "exprs", nodes), _ref;
+  return index._defineProperty(index._defineProperty(index._defineProperty({}, index.VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", nodes);
 }
 
 function link(text, _ref) {
-  var _ref2;
   var href = _ref.href;
-  return _ref2 = {}, index._defineProperty(_ref2, index.VAL_EXTENSION, "link"), index._defineProperty(_ref2, "href", href), index._defineProperty(_ref2, "children", [text]), _ref2;
+  return index._defineProperty(index._defineProperty(index._defineProperty({}, index.VAL_EXTENSION, "link"), "href", href), "children", [text]);
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 // import { i18n, I18n } from "./source/future/i18n";
 // import { remote } from "./source/future/remote";
 // type NarrowStrings<A> =
@@ -454,6 +453,7 @@ var initVal = function initVal() {
   //       richtext,
   //     },
   //     s,
+  //     config: {},
   //     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   //   } as any;
   // }
@@ -466,7 +466,8 @@ var initVal = function initVal() {
       richtext: richtext,
       link: link
     },
-    s: index._objectSpread2({}, s)
+    s: s,
+    config: {}
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   };
 };
@@ -595,7 +596,7 @@ function getVal(selector) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isArrayOrArraySelector(child) {
   if (ops.isSelector(child)) {
-    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && Array.isArray(child[index.GetSource]);
+    return index._typeof(child[index.GetSource]) === "object" && child[index.GetSource] !== null && Array.isArray(child[index.GetSource]);
   }
   return Array.isArray(child);
 }
@@ -603,7 +604,7 @@ function isArrayOrArraySelector(child) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isObjectOrObjectSelector(child) {
   if (ops.isSelector(child)) {
-    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && !Array.isArray(child[index.GetSource]);
+    return index._typeof(child[index.GetSource]) === "object" && child[index.GetSource] !== null && !Array.isArray(child[index.GetSource]);
   }
   return index._typeof(child) === "object";
 }
@@ -673,7 +674,6 @@ function strip(value) {
   }
 }
 function newValProxy(val) {
-  var _ref5;
   var source = val.val;
   switch (index._typeof(source)) {
     case "function":
@@ -716,7 +716,7 @@ function newValProxy(val) {
     // intentional fallthrough
     // eslint-disable-next-line no-fallthrough
     default:
-      return _ref5 = {}, index._defineProperty(_ref5, index.Path, val.valPath), index._defineProperty(_ref5, "val", val.val), _ref5;
+      return index._defineProperty(index._defineProperty({}, index.Path, val.valPath), "val", val.val);
   }
 }
 function hasOwn(obj, prop) {
@@ -1090,8 +1090,8 @@ var ValApi = /*#__PURE__*/function () {
   }
   index._createClass(ValApi, [{
     key: "getDisableUrl",
-    value: function getDisableUrl() {
-      return "".concat(this.host, "/disable");
+    value: function getDisableUrl(redirectTo) {
+      return "".concat(this.host, "/disable?redirect_to=").concat(encodeURIComponent(redirectTo));
     }
   }, {
     key: "getEditUrl",
@@ -1103,6 +1103,11 @@ var ValApi = /*#__PURE__*/function () {
     value: function getLoginUrl(redirectTo) {
       return "".concat(this.host, "/authorize?redirect_to=").concat(encodeURIComponent(redirectTo));
     }
+  }, {
+    key: "getEnableUrl",
+    value: function getEnableUrl(redirectTo) {
+      return "".concat(this.host, "/enable?redirect_to=").concat(encodeURIComponent(redirectTo));
+    }
   }, {
     key: "getPatches",
     value: function () {
@@ -1121,7 +1126,7 @@ var ValApi = /*#__PURE__*/function () {
                 }
               }).then(function (res) {
                 return parse(res);
-              }));
+              })["catch"](createError));
             case 3:
             case "end":
               return _context.stop();
@@ -1144,18 +1149,18 @@ var ValApi = /*#__PURE__*/function () {
         body: JSON.stringify(index._defineProperty({}, moduleId, patches))
       }).then(function (res) {
         return parse(res);
-      });
+      })["catch"](createError);
     }
   }, {
     key: "getSession",
     value: function getSession() {
       return fetch("".concat(this.host, "/session")).then(function (res) {
-        return parse(res);
+        return parse(res)["catch"](createError);
       });
     }
   }, {
-    key: "getModules",
-    value: function getModules(_ref2) {
+    key: "getTree",
+    value: function getTree(_ref2) {
       var _ref2$patch = _ref2.patch,
         patch = _ref2$patch === void 0 ? false : _ref2$patch,
         _ref2$includeSchema = _ref2.includeSchema,
@@ -1173,11 +1178,17 @@ var ValApi = /*#__PURE__*/function () {
         headers: headers
       }).then(function (res) {
         return parse(res);
-      });
+      })["catch"](createError);
     }
   }]);
   return ValApi;
 }();
+function createError(err) {
+  return result.err({
+    statusCode: 500,
+    message: err instanceof Error ? err.message : "Unknown error"
+  });
+}
 
 // TODO: validate
 function parse(_x2) {
@@ -1185,6 +1196,7 @@ function parse(_x2) {
 }
 function _parse() {
   _parse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(res) {
+    var json;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -1200,31 +1212,41 @@ function _parse() {
           _context2.t1 = _context2.sent;
           return _context2.abrupt("return", _context2.t0.ok.call(_context2.t0, _context2.t1));
         case 9:
-          _context2.t2 = result.result;
-          _context2.t3 = res.status;
-          _context2.next = 13;
-          return res.text();
-        case 13:
-          _context2.t4 = _context2.sent;
-          _context2.t5 = {
-            statusCode: _context2.t3,
-            message: _context2.t4
-          };
-          return _context2.abrupt("return", _context2.t2.err.call(_context2.t2, _context2.t5));
+          _context2.prev = 9;
+          _context2.next = 12;
+          return res.json();
+        case 12:
+          json = _context2.sent;
+          return _context2.abrupt("return", result.err({
+            statusCode: res.status,
+            message: json.message || res.statusText,
+            details: json.details || Object.fromEntries(Object.entries(json).filter(function (_ref3) {
+              var _ref4 = index._slicedToArray(_ref3, 1),
+                key = _ref4[0];
+              return key !== "message";
+            }))
+          }));
         case 16:
-          _context2.next = 21;
-          break;
-        case 18:
-          _context2.prev = 18;
-          _context2.t6 = _context2["catch"](0);
+          _context2.prev = 16;
+          _context2.t2 = _context2["catch"](9);
           return _context2.abrupt("return", result.err({
-            message: _context2.t6 instanceof Error ? _context2.t6.message : "Unknown error"
+            statusCode: res.status,
+            message: res.statusText
           }));
+        case 19:
+          _context2.next = 24;
+          break;
         case 21:
+          _context2.prev = 21;
+          _context2.t3 = _context2["catch"](0);
+          return _context2.abrupt("return", result.err({
+            message: _context2.t3 instanceof Error ? _context2.t3.message : "Unknown error"
+          }));
+        case 24:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 18]]);
+    }, _callee2, null, [[0, 21], [9, 16]]);
   }));
   return _parse.apply(this, arguments);
 }
@@ -1242,20 +1264,20 @@ var Internal = {
   getSHA256Hash: getSHA256Hash,
   createPatchJSONPath: function createPatchJSONPath(modulePath) {
     return "/".concat(modulePath.split(".").map(function (segment) {
-      return JSON.parse(segment);
+      return segment && tryJsonParse(segment);
     }).join("/"));
   },
-  /**
-   * Enables draft mode: updates all Val modules with patches
-   */
-  VAL_DRAFT_MODE_COOKIE: "val_draft_mode",
-  /**
-   * Enables Val: show the overlay / menu
-   */
   VAL_ENABLE_COOKIE_NAME: "val_enable",
   VAL_STATE_COOKIE: "val_state",
   VAL_SESSION_COOKIE: "val_session"
 };
+function tryJsonParse(str) {
+  try {
+    return JSON.parse(str);
+  } catch (err) {
+    return str;
+  }
+}
 
 exports.FILE_REF_PROP = index.FILE_REF_PROP;
 exports.GenericSelector = index.GenericSelector;

package/dist/valbuild-core.cjs.prod.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./index-30eee5ec.cjs.prod.js');
-var ops = require('./ops-b263963e.cjs.prod.js');
-var expr_dist_valbuildCoreExpr = require('./index-425d164d.cjs.prod.js');
+var ops = require('./ops-6489efeb.cjs.prod.js');
+var index = require('./index-5bdaa229.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('./index-216627d7.cjs.prod.js');
 var result = require('./result-26f67b40.cjs.prod.js');
 
 var NumberSchema = /*#__PURE__*/function (_Schema) {
@@ -350,7 +350,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
     value: function serialize() {
       var path = index.getValPath(this.selector);
       if (!path) {
-        throw new Error("Cannot serialize oneOf schema with empty selector. keyOf must be used with a Val Module.");
+        throw new Error("Cannot serialize keyOf schema with empty selector. TIP: keyOf must be used with a Val Module.");
       }
       return {
         type: "keyOf",
@@ -417,19 +417,18 @@ function initSchema() {
  * Internally it is a Selector
  **/
 function richtext(templateStrings) {
-  var _ref;
   for (var _len = arguments.length, nodes = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     nodes[_key - 1] = arguments[_key];
   }
-  return _ref = {}, index._defineProperty(_ref, index.VAL_EXTENSION, "richtext"), index._defineProperty(_ref, "templateStrings", templateStrings), index._defineProperty(_ref, "exprs", nodes), _ref;
+  return index._defineProperty(index._defineProperty(index._defineProperty({}, index.VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", nodes);
 }
 
 function link(text, _ref) {
-  var _ref2;
   var href = _ref.href;
-  return _ref2 = {}, index._defineProperty(_ref2, index.VAL_EXTENSION, "link"), index._defineProperty(_ref2, "href", href), index._defineProperty(_ref2, "children", [text]), _ref2;
+  return index._defineProperty(index._defineProperty(index._defineProperty({}, index.VAL_EXTENSION, "link"), "href", href), "children", [text]);
 }
 
+/* eslint-disable @typescript-eslint/ban-types */
 // import { i18n, I18n } from "./source/future/i18n";
 // import { remote } from "./source/future/remote";
 // type NarrowStrings<A> =
@@ -454,6 +453,7 @@ var initVal = function initVal() {
   //       richtext,
   //     },
   //     s,
+  //     config: {},
   //     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   //   } as any;
   // }
@@ -466,7 +466,8 @@ var initVal = function initVal() {
       richtext: richtext,
       link: link
     },
-    s: index._objectSpread2({}, s)
+    s: s,
+    config: {}
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   };
 };
@@ -595,7 +596,7 @@ function getVal(selector) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isArrayOrArraySelector(child) {
   if (ops.isSelector(child)) {
-    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && Array.isArray(child[index.GetSource]);
+    return index._typeof(child[index.GetSource]) === "object" && child[index.GetSource] !== null && Array.isArray(child[index.GetSource]);
   }
   return Array.isArray(child);
 }
@@ -603,7 +604,7 @@ function isArrayOrArraySelector(child) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isObjectOrObjectSelector(child) {
   if (ops.isSelector(child)) {
-    return index._typeof(child[index.GetSource]) === "object" && index._typeof(child[index.GetSource]) !== null && !Array.isArray(child[index.GetSource]);
+    return index._typeof(child[index.GetSource]) === "object" && child[index.GetSource] !== null && !Array.isArray(child[index.GetSource]);
   }
   return index._typeof(child) === "object";
 }
@@ -673,7 +674,6 @@ function strip(value) {
   }
 }
 function newValProxy(val) {
-  var _ref5;
   var source = val.val;
   switch (index._typeof(source)) {
     case "function":
@@ -716,7 +716,7 @@ function newValProxy(val) {
     // intentional fallthrough
     // eslint-disable-next-line no-fallthrough
     default:
-      return _ref5 = {}, index._defineProperty(_ref5, index.Path, val.valPath), index._defineProperty(_ref5, "val", val.val), _ref5;
+      return index._defineProperty(index._defineProperty({}, index.Path, val.valPath), "val", val.val);
   }
 }
 function hasOwn(obj, prop) {
@@ -1090,8 +1090,8 @@ var ValApi = /*#__PURE__*/function () {
   }
   index._createClass(ValApi, [{
     key: "getDisableUrl",
-    value: function getDisableUrl() {
-      return "".concat(this.host, "/disable");
+    value: function getDisableUrl(redirectTo) {
+      return "".concat(this.host, "/disable?redirect_to=").concat(encodeURIComponent(redirectTo));
     }
   }, {
     key: "getEditUrl",
@@ -1103,6 +1103,11 @@ var ValApi = /*#__PURE__*/function () {
     value: function getLoginUrl(redirectTo) {
       return "".concat(this.host, "/authorize?redirect_to=").concat(encodeURIComponent(redirectTo));
     }
+  }, {
+    key: "getEnableUrl",
+    value: function getEnableUrl(redirectTo) {
+      return "".concat(this.host, "/enable?redirect_to=").concat(encodeURIComponent(redirectTo));
+    }
   }, {
     key: "getPatches",
     value: function () {
@@ -1121,7 +1126,7 @@ var ValApi = /*#__PURE__*/function () {
                 }
               }).then(function (res) {
                 return parse(res);
-              }));
+              })["catch"](createError));
             case 3:
             case "end":
               return _context.stop();
@@ -1144,18 +1149,18 @@ var ValApi = /*#__PURE__*/function () {
         body: JSON.stringify(index._defineProperty({}, moduleId, patches))
       }).then(function (res) {
         return parse(res);
-      });
+      })["catch"](createError);
     }
   }, {
     key: "getSession",
     value: function getSession() {
       return fetch("".concat(this.host, "/session")).then(function (res) {
-        return parse(res);
+        return parse(res)["catch"](createError);
       });
     }
   }, {
-    key: "getModules",
-    value: function getModules(_ref2) {
+    key: "getTree",
+    value: function getTree(_ref2) {
       var _ref2$patch = _ref2.patch,
         patch = _ref2$patch === void 0 ? false : _ref2$patch,
         _ref2$includeSchema = _ref2.includeSchema,
@@ -1173,11 +1178,17 @@ var ValApi = /*#__PURE__*/function () {
         headers: headers
       }).then(function (res) {
         return parse(res);
-      });
+      })["catch"](createError);
     }
   }]);
   return ValApi;
 }();
+function createError(err) {
+  return result.err({
+    statusCode: 500,
+    message: err instanceof Error ? err.message : "Unknown error"
+  });
+}
 
 // TODO: validate
 function parse(_x2) {
@@ -1185,6 +1196,7 @@ function parse(_x2) {
 }
 function _parse() {
   _parse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(res) {
+    var json;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -1200,31 +1212,41 @@ function _parse() {
           _context2.t1 = _context2.sent;
           return _context2.abrupt("return", _context2.t0.ok.call(_context2.t0, _context2.t1));
         case 9:
-          _context2.t2 = result.result;
-          _context2.t3 = res.status;
-          _context2.next = 13;
-          return res.text();
-        case 13:
-          _context2.t4 = _context2.sent;
-          _context2.t5 = {
-            statusCode: _context2.t3,
-            message: _context2.t4
-          };
-          return _context2.abrupt("return", _context2.t2.err.call(_context2.t2, _context2.t5));
+          _context2.prev = 9;
+          _context2.next = 12;
+          return res.json();
+        case 12:
+          json = _context2.sent;
+          return _context2.abrupt("return", result.err({
+            statusCode: res.status,
+            message: json.message || res.statusText,
+            details: json.details || Object.fromEntries(Object.entries(json).filter(function (_ref3) {
+              var _ref4 = index._slicedToArray(_ref3, 1),
+                key = _ref4[0];
+              return key !== "message";
+            }))
+          }));
         case 16:
-          _context2.next = 21;
-          break;
-        case 18:
-          _context2.prev = 18;
-          _context2.t6 = _context2["catch"](0);
+          _context2.prev = 16;
+          _context2.t2 = _context2["catch"](9);
           return _context2.abrupt("return", result.err({
-            message: _context2.t6 instanceof Error ? _context2.t6.message : "Unknown error"
+            statusCode: res.status,
+            message: res.statusText
           }));
+        case 19:
+          _context2.next = 24;
+          break;
         case 21:
+          _context2.prev = 21;
+          _context2.t3 = _context2["catch"](0);
+          return _context2.abrupt("return", result.err({
+            message: _context2.t3 instanceof Error ? _context2.t3.message : "Unknown error"
+          }));
+        case 24:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[0, 18]]);
+    }, _callee2, null, [[0, 21], [9, 16]]);
   }));
   return _parse.apply(this, arguments);
 }
@@ -1242,20 +1264,20 @@ var Internal = {
   getSHA256Hash: getSHA256Hash,
   createPatchJSONPath: function createPatchJSONPath(modulePath) {
     return "/".concat(modulePath.split(".").map(function (segment) {
-      return JSON.parse(segment);
+      return segment && tryJsonParse(segment);
     }).join("/"));
   },
-  /**
-   * Enables draft mode: updates all Val modules with patches
-   */
-  VAL_DRAFT_MODE_COOKIE: "val_draft_mode",
-  /**
-   * Enables Val: show the overlay / menu
-   */
   VAL_ENABLE_COOKIE_NAME: "val_enable",
   VAL_STATE_COOKIE: "val_state",
   VAL_SESSION_COOKIE: "val_session"
 };
+function tryJsonParse(str) {
+  try {
+    return JSON.parse(str);
+  } catch (err) {
+    return str;
+  }
+}
 
 exports.FILE_REF_PROP = index.FILE_REF_PROP;
 exports.GenericSelector = index.GenericSelector;