@valbuild/core 0.33.0 → 0.35.0

package/dist/valbuild-core.esm.js

@@ -1,7 +1,7 @@
-import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, d as _defineProperty, e as _typeof, S as Schema, G as GetSchema, g as getValPath, i as image, V as VAL_EXTENSION, f as file, h as _objectSpread2, j as _slicedToArray, k as isFile, F as FILE_REF_PROP, P as Path, l as GetSource, m as isSerializedVal, n as convertFileSource, o as getSchema, p as isVal } from './index-499b9e87.esm.js';
-export { F as FILE_REF_PROP, q as GenericSelector, S as Schema, V as VAL_EXTENSION } from './index-499b9e87.esm.js';
-import { a as array, o as object, u as union, r as richtext$1, b as record, c as content, P as PatchError, n as newSelectorProxy, d as createValPathOfItem, i as isSelector, g as getSource, e as resolvePath, s as splitModuleIdAndModulePath } from './ops-1225f750.esm.js';
-export { i as expr } from './index-f0475164.esm.js';
+import { a as array, o as object, u as union, r as richtext$1, b as record, c as content, P as PatchError, n as newSelectorProxy, d as createValPathOfItem, i as isSelector, g as getSource, e as resolvePath, s as splitModuleIdAndModulePath } from './ops-ce47df64.esm.js';
+import { _ as _inherits, a as _createSuper, b as _classCallCheck, c as _createClass, d as _defineProperty, e as _typeof, S as Schema, G as GetSchema, g as getValPath, i as image, V as VAL_EXTENSION, f as file, h as _slicedToArray, j as isFile, F as FILE_REF_PROP, P as Path, k as GetSource, l as isSerializedVal, m as convertFileSource, n as getSchema, o as isVal } from './index-c83918b8.esm.js';
+export { F as FILE_REF_PROP, p as GenericSelector, S as Schema, V as VAL_EXTENSION } from './index-c83918b8.esm.js';
+export { i as expr } from './index-4f821892.esm.js';
 import { _ as _createForOfIteratorHelper, i as isErr, a as isOk, e as err, o as ok, r as result } from './result-b96df128.esm.js';
 
 var NumberSchema = /*#__PURE__*/function (_Schema) {
@@ -347,7 +347,7 @@ var KeyOfSchema = /*#__PURE__*/function (_Schema) {
     value: function serialize() {
       var path = 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",
@@ -414,19 +414,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 = {}, _defineProperty(_ref, VAL_EXTENSION, "richtext"), _defineProperty(_ref, "templateStrings", templateStrings), _defineProperty(_ref, "exprs", nodes), _ref;
+  return _defineProperty(_defineProperty(_defineProperty({}, VAL_EXTENSION, "richtext"), "templateStrings", templateStrings), "exprs", nodes);
 }
 
 function link(text, _ref) {
-  var _ref2;
   var href = _ref.href;
-  return _ref2 = {}, _defineProperty(_ref2, VAL_EXTENSION, "link"), _defineProperty(_ref2, "href", href), _defineProperty(_ref2, "children", [text]), _ref2;
+  return _defineProperty(_defineProperty(_defineProperty({}, 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> =
@@ -451,6 +450,7 @@ var initVal = function initVal() {
   //       richtext,
   //     },
   //     s,
+  //     config: {},
   //     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   //   } as any;
   // }
@@ -463,7 +463,8 @@ var initVal = function initVal() {
       richtext: richtext,
       link: link
     },
-    s: _objectSpread2({}, s)
+    s: s,
+    config: {}
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   };
 };
@@ -592,7 +593,7 @@ function getVal(selector) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isArrayOrArraySelector(child) {
   if (isSelector(child)) {
-    return _typeof(child[GetSource]) === "object" && _typeof(child[GetSource]) !== null && Array.isArray(child[GetSource]);
+    return _typeof(child[GetSource]) === "object" && child[GetSource] !== null && Array.isArray(child[GetSource]);
   }
   return Array.isArray(child);
 }
@@ -600,7 +601,7 @@ function isArrayOrArraySelector(child) {
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isObjectOrObjectSelector(child) {
   if (isSelector(child)) {
-    return _typeof(child[GetSource]) === "object" && _typeof(child[GetSource]) !== null && !Array.isArray(child[GetSource]);
+    return _typeof(child[GetSource]) === "object" && child[GetSource] !== null && !Array.isArray(child[GetSource]);
   }
   return _typeof(child) === "object";
 }
@@ -670,7 +671,6 @@ function strip(value) {
   }
 }
 function newValProxy(val) {
-  var _ref5;
   var source = val.val;
   switch (_typeof(source)) {
     case "function":
@@ -713,7 +713,7 @@ function newValProxy(val) {
     // intentional fallthrough
     // eslint-disable-next-line no-fallthrough
     default:
-      return _ref5 = {}, _defineProperty(_ref5, Path, val.valPath), _defineProperty(_ref5, "val", val.val), _ref5;
+      return _defineProperty(_defineProperty({}, Path, val.valPath), "val", val.val);
   }
 }
 function hasOwn(obj, prop) {
@@ -1087,8 +1087,8 @@ var ValApi = /*#__PURE__*/function () {
   }
   _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",
@@ -1100,6 +1100,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 () {
@@ -1118,7 +1123,7 @@ var ValApi = /*#__PURE__*/function () {
                 }
               }).then(function (res) {
                 return parse(res);
-              }));
+              })["catch"](createError));
             case 3:
             case "end":
               return _context.stop();
@@ -1141,18 +1146,18 @@ var ValApi = /*#__PURE__*/function () {
         body: JSON.stringify(_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,
@@ -1170,11 +1175,17 @@ var ValApi = /*#__PURE__*/function () {
         headers: headers
       }).then(function (res) {
         return parse(res);
-      });
+      })["catch"](createError);
     }
   }]);
   return ValApi;
 }();
+function createError(err$1) {
+  return err({
+    statusCode: 500,
+    message: err$1 instanceof Error ? err$1.message : "Unknown error"
+  });
+}
 
 // TODO: validate
 function parse(_x2) {
@@ -1182,6 +1193,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:
@@ -1197,31 +1209,41 @@ function _parse() {
           _context2.t1 = _context2.sent;
           return _context2.abrupt("return", _context2.t0.ok.call(_context2.t0, _context2.t1));
         case 9:
-          _context2.t2 = 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", err({
+            statusCode: res.status,
+            message: json.message || res.statusText,
+            details: json.details || Object.fromEntries(Object.entries(json).filter(function (_ref3) {
+              var _ref4 = _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", 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", 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);
 }
@@ -1239,19 +1261,19 @@ 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;
+  }
+}
 
 export { Internal, ValApi, derefPatch, initVal };

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-a0f36fe3.cjs.dev.js');
-var index = require('../../dist/index-43369070.cjs.dev.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-6deb169d.cjs.dev.js');
+var index = require('../../dist/index-a5295001.cjs.dev.js');
 require('../../dist/result-48320acd.cjs.dev.js');
 
 

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

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var expr_dist_valbuildCoreExpr = require('../../dist/index-425d164d.cjs.prod.js');
-var index = require('../../dist/index-30eee5ec.cjs.prod.js');
+var expr_dist_valbuildCoreExpr = require('../../dist/index-216627d7.cjs.prod.js');
+var index = require('../../dist/index-5bdaa229.cjs.prod.js');
 require('../../dist/result-26f67b40.cjs.prod.js');
 
 

package/expr/dist/valbuild-core-expr.esm.js

@@ -1,3 +1,3 @@
-export { e as evaluate, p as parse } from '../../dist/index-f0475164.esm.js';
-export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-499b9e87.esm.js';
+export { e as evaluate, p as parse } from '../../dist/index-4f821892.esm.js';
+export { C as Call, E as Expr, N as NilSym, s as StringLiteral, t as StringTemplate, r as Sym } from '../../dist/index-c83918b8.esm.js';
 import '../../dist/result-b96df128.esm.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/core",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "private": false,
   "description": "Val - supercharged hard-coded content",
   "scripts": {

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

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-43369070.cjs.dev.js');
+var index = require('../../dist/index-a5295001.cjs.dev.js');
 var result = require('../../dist/result-48320acd.cjs.dev.js');
 var util = require('../../dist/util-b213092b.cjs.dev.js');
-var ops = require('../../dist/ops-558f07b7.cjs.dev.js');
+var ops = require('../../dist/ops-bec039cc.cjs.dev.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

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

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('../../dist/index-30eee5ec.cjs.prod.js');
+var index = require('../../dist/index-5bdaa229.cjs.prod.js');
 var result = require('../../dist/result-26f67b40.cjs.prod.js');
 var util = require('../../dist/util-030d8a1f.cjs.prod.js');
-var ops = require('../../dist/ops-b263963e.cjs.prod.js');
+var ops = require('../../dist/ops-6489efeb.cjs.prod.js');
 
 function isNotRoot(path) {
   return result.isNonEmpty(path);

package/patch/dist/valbuild-core-patch.esm.js

@@ -1,8 +1,8 @@
-import { e as _typeof, j as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-499b9e87.esm.js';
+import { e as _typeof, h as _slicedToArray, c as _createClass, b as _classCallCheck, u as _toConsumableArray } from '../../dist/index-c83918b8.esm.js';
 import { f as isNonEmpty, e as err, o as ok, m as map, g as flatMap, i as isErr, h as flatMapReduce, j as filterOrElse, k as mapErr, l as map$1, n as all, p as flatten, q as allT } from '../../dist/result-b96df128.esm.js';
 import { p as pipe } from '../../dist/util-18613e99.esm.js';
-import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-1225f750.esm.js';
-export { P as PatchError } from '../../dist/ops-1225f750.esm.js';
+import { P as PatchError, s as splitModuleIdAndModulePath } from '../../dist/ops-ce47df64.esm.js';
+export { P as PatchError } from '../../dist/ops-ce47df64.esm.js';
 
 function isNotRoot(path) {
   return isNonEmpty(path);