@valbuild/next 0.63.5 → 0.65.0

package/dist/valbuild-next.esm.js

@@ -1,14 +1,14 @@
-import { _ as _objectSpread2 } from './objectSpread2-439bdcdd.esm.js';
+import { _ as _objectSpread2 } from './objectSpread2-c1340c1c.esm.js';
 import { initVal as initVal$1, Internal as Internal$1 } from '@valbuild/core';
 import * as core from '@valbuild/core';
 export { core as expr };
 export { FILE_REF_PROP, GenericSelector, Schema, VAL_EXTENSION, derefPatch, modules } from '@valbuild/core';
 import { stegaClean, stegaDecodeString, autoTagJSX } from '@valbuild/react/stega';
 export { ValRichText } from '@valbuild/react/internal';
-import { ValNextProvider } from './ValNextProvider-d94cd904.esm.js';
+import { ValNextProvider } from './ValNextProvider-0b711372.esm.js';
 import NextImage from 'next/image';
 import { jsx } from 'react/jsx-runtime';
-export { ValApp } from './ValApp-61103149.esm.js';
+export { ValApp } from './ValApp-50ec1e10.esm.js';
 import { V as VERSION } from './version-98ec5c7a.esm.js';
 
 function _typeof(o) {
@@ -70,38 +70,31 @@ var initVal = function initVal(config) {
 
 var ValProvider = ValNextProvider;
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
   }
-  return target;
+  return t;
 }
 
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-  var key, i;
+function _objectWithoutProperties(e, t) {
+  if (null == e) return {};
+  var o,
+    r,
+    i = _objectWithoutPropertiesLoose(e, t);
   if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
+    var s = Object.getOwnPropertySymbols(e);
+    for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
   }
-  return target;
+  return i;
 }
 
 var _excluded = ["src", "alt", "style", "width", "disableHotspot", "height"];
 function ValImage(props) {
-  var _src$metadata, _src$metadata2, _src$metadata3;
+  var _src$metadata, _src$metadata2, _src$metadata3, _src$metadata4;
   var src = props.src,
     alt = props.alt,
     style = props.style,
@@ -120,6 +113,7 @@ function ValImage(props) {
     objectPosition: "".concat(hotspot.x * 100, "% ").concat(hotspot.y * 100, "%")
   }) : style;
   var useMetadataDimensions = src.metadata !== undefined && !rest.fill && !width && !height;
+  var isUnoptimized = rest.unoptimized !== undefined ? rest.unoptimized : ((_src$metadata2 = src.metadata) === null || _src$metadata2 === void 0 ? void 0 : _src$metadata2.mimeType) === "image/svg+xml"; // SVGs are unoptimized by default
   return /*#__PURE__*/jsx(NextImage, _objectSpread2(_objectSpread2({}, _objectSpread2(_objectSpread2({}, rest), {}, {
     layout: undefined,
     objectFit: undefined,
@@ -134,8 +128,9 @@ function ValImage(props) {
     style: imageStyle,
     alt: raw(alt),
     fill: rest.fill,
-    width: useMetadataDimensions ? (_src$metadata2 = src.metadata) === null || _src$metadata2 === void 0 ? void 0 : _src$metadata2.width : width,
-    height: useMetadataDimensions ? (_src$metadata3 = src.metadata) === null || _src$metadata3 === void 0 ? void 0 : _src$metadata3.height : height
+    width: useMetadataDimensions ? (_src$metadata3 = src.metadata) === null || _src$metadata3 === void 0 ? void 0 : _src$metadata3.width : width,
+    height: useMetadataDimensions ? (_src$metadata4 = src.metadata) === null || _src$metadata4 === void 0 ? void 0 : _src$metadata4.height : height,
+    unoptimized: isUnoptimized
   }));
 }
 

package/package.json

@@ -8,7 +8,7 @@
     "next",
     "react"
   ],
-  "version": "0.63.5",
+  "version": "0.65.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest"
@@ -45,10 +45,11 @@
     "exports": true
   },
   "dependencies": {
-    "@valbuild/core": "~0.63.5",
-    "@valbuild/react": "~0.63.5",
-    "@valbuild/server": "~0.63.5",
-    "@valbuild/ui": "~0.63.5",
+    "@valbuild/core": "~0.65.0",
+    "@valbuild/react": "~0.65.0",
+    "@valbuild/server": "~0.65.0",
+    "@valbuild/shared": "~0.65.0",
+    "@valbuild/ui": "~0.65.0",
     "client-only": "^0.0.1",
     "server-only": "^0.0.1"
   },

package/rsc/dist/valbuild-next-rsc.cjs.d.ts

@@ -1,2 +1,2 @@
-export * from "../../dist/declarations/src/rsc/index";
-//# sourceMappingURL=valbuild-next-rsc.cjs.d.ts.map
+export * from "../../dist/declarations/src/rsc/index.js";
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmFsYnVpbGQtbmV4dC1yc2MuY2pzLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9kaXN0L2RlY2xhcmF0aW9ucy9zcmMvcnNjL2luZGV4LmQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEifQ==

package/rsc/dist/valbuild-next-rsc.cjs.dev.js

@@ -3,12 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var asyncToGenerator = require('../../dist/asyncToGenerator-ba66657c.cjs.dev.js');
+var objectSpread2 = require('../../dist/objectSpread2-792eb2c2.cjs.dev.js');
+var asyncToGenerator = require('../../dist/asyncToGenerator-6ba61221.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
+var internal = require('@valbuild/shared/internal');
+var server = require('@valbuild/server');
+var version = require('../../dist/version-82faa1d0.cjs.dev.js');
 
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+stega.SET_RSC(true);
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
     try {
@@ -28,54 +32,84 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
         console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
         headers = null;
       }
-      var cookies;
-      try {
-        cookies = getCookies();
-      } catch (err) {
-        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-        cookies = null;
-      }
+      var cookies = function () {
+        try {
+          return getCookies();
+        } catch (err) {
+          console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
+          return null;
+        }
+      }();
       var host = headers && getHost(headers);
       if (host && cookies) {
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        return api.getPatches().then( /*#__PURE__*/function () {
-          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
-            var allPatches;
+        return valServerPromise.then(/*#__PURE__*/function () {
+          var _ref = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(valServer) {
+            var _cookies$get, _cookies$get2;
+            var patchesRes, allPatches, treeRes, modules;
             return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  if (!fp.result.isErr(patchesRes)) {
-                    _context.next = 3;
+                  _context.next = 2;
+                  return valServer["/patches/~"]["GET"]({
+                    query: {
+                      omit_patch: true,
+                      author: undefined,
+                      patch_id: undefined,
+                      module_file_path: undefined
+                    },
+                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get === void 0 ? void 0 : _cookies$get.value)
+                  });
+                case 2:
+                  patchesRes = _context.sent;
+                  if (!(patchesRes.status !== 200)) {
+                    _context.next = 6;
                     break;
                   }
-                  console.error("Val: could not fetch patches", patchesRes.error);
-                  throw Error(JSON.stringify(patchesRes.error, null, 2));
-                case 3:
-                  allPatches = Object.keys(patchesRes.value.patches);
-                  return _context.abrupt("return", api.putTree({
-                    patchIds: allPatches
-                  }).then(function (res) {
-                    if (fp.result.isOk(res)) {
-                      var modules = res.value.modules;
-                      return stega.stegaEncode(selector, {
-                        disabled: !enabled,
-                        getModule: function getModule(path) {
-                          var module = modules[path];
-                          if (module) {
-                            return module.source;
-                          }
-                        }
-                      });
-                    } else {
-                      if (res.error.statusCode === 401) {
-                        console.warn("Val: authentication error: ", res.error.message);
-                      } else {
-                        console.error("Val: could not fetch modules", res.error);
-                        throw Error(JSON.stringify(res.error, null, 2));
+                  console.error("Val: could not fetch patches", patchesRes.json);
+                  throw Error(JSON.stringify(patchesRes.json, null, 2));
+                case 6:
+                  allPatches = Object.keys(patchesRes.json.patches);
+                  _context.next = 9;
+                  return valServer["/sources"]["PUT"]({
+                    path: "/",
+                    query: {
+                      validate_sources: true,
+                      validate_all: false,
+                      validate_binary_files: false
+                    },
+                    body: {
+                      patchIds: allPatches
+                    },
+                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get2 = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get2 === void 0 ? void 0 : _cookies$get2.value)
+                  });
+                case 9:
+                  treeRes = _context.sent;
+                  if (!(treeRes.status === 200)) {
+                    _context.next = 15;
+                    break;
+                  }
+                  modules = treeRes.json.modules;
+                  return _context.abrupt("return", stega.stegaEncode(selector, {
+                    disabled: !enabled,
+                    getModule: function getModule(path) {
+                      var module = modules[path];
+                      if (module) {
+                        return module.source;
                       }
                     }
                   }));
-                case 5:
+                case 15:
+                  if (!(treeRes.status === 401)) {
+                    _context.next = 19;
+                    break;
+                  }
+                  console.warn("Val: authentication error: ", treeRes.json.message);
+                  _context.next = 21;
+                  break;
+                case 19:
+                  console.error("Val: could not fetch modules", treeRes.json);
+                  throw Error(JSON.stringify(treeRes.json, null, 2));
+                case 21:
                 case "end":
                   return _context.stop();
               }
@@ -86,9 +120,6 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
           };
         }())["catch"](function (err) {
           console.error("Val: failed while fetching modules", err);
-          if (process.env.NODE_ENV === "development") {
-            throw Error("Val: Could not fetch data. This is likely due to a misconfiguration or a bug. Check the console for more details.");
-          }
           return stega.stegaEncode(selector, {});
         });
       }
@@ -141,11 +172,65 @@ function getHost(headers) {
 
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function initValRsc(config, rscNextConfig) {
+function initValRsc(config, valModules, rscNextConfig) {
+  var coreVersion = core.Internal.VERSION.core;
+  if (!coreVersion) {
+    throw new Error("Could not get @valbuild/core package version");
+  }
+  var nextVersion = version.VERSION;
+  if (!nextVersion) {
+    throw new Error("Could not get @valbuild/next package version");
+  }
+  var valServerPromise = server.createValServer(valModules, "/api/val", objectSpread2._objectSpread2({
+    versions: {
+      next: nextVersion,
+      core: coreVersion
+    }
+  }, config), config, {
+    isEnabled: function isEnabled() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee2() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", rscNextConfig.draftMode().isEnabled);
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    onEnable: function onEnable() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee3() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              rscNextConfig.draftMode().enable();
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }))();
+    },
+    onDisable: function onDisable() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee4() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              rscNextConfig.draftMode().disable();
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    function () {
+    valServerPromise, function () {
       return rscNextConfig.draftMode().isEnabled;
     }, function () {
       return rscNextConfig.headers();

package/rsc/dist/valbuild-next-rsc.cjs.prod.js

@@ -3,12 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
-var asyncToGenerator = require('../../dist/asyncToGenerator-3551d940.cjs.prod.js');
+var objectSpread2 = require('../../dist/objectSpread2-3c87fb4f.cjs.prod.js');
+var asyncToGenerator = require('../../dist/asyncToGenerator-67a5ff70.cjs.prod.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
-var fp = require('@valbuild/core/fp');
+var internal = require('@valbuild/shared/internal');
+var server = require('@valbuild/server');
+var version = require('../../dist/version-a9a6a619.cjs.prod.js');
 
-var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
+stega.SET_RSC(true);
+var initFetchValStega = function initFetchValStega(config, valApiEndpoints, valServerPromise, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
     try {
@@ -28,54 +32,84 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
         console.error("Val: could not read headers! fetchVal can only be used server-side. Use useVal on clients.", err);
         headers = null;
       }
-      var cookies;
-      try {
-        cookies = getCookies();
-      } catch (err) {
-        console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-        cookies = null;
-      }
+      var cookies = function () {
+        try {
+          return getCookies();
+        } catch (err) {
+          console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
+          return null;
+        }
+      }();
       var host = headers && getHost(headers);
       if (host && cookies) {
-        var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        return api.getPatches().then( /*#__PURE__*/function () {
-          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
-            var allPatches;
+        return valServerPromise.then(/*#__PURE__*/function () {
+          var _ref = asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(valServer) {
+            var _cookies$get, _cookies$get2;
+            var patchesRes, allPatches, treeRes, modules;
             return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  if (!fp.result.isErr(patchesRes)) {
-                    _context.next = 3;
+                  _context.next = 2;
+                  return valServer["/patches/~"]["GET"]({
+                    query: {
+                      omit_patch: true,
+                      author: undefined,
+                      patch_id: undefined,
+                      module_file_path: undefined
+                    },
+                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get === void 0 ? void 0 : _cookies$get.value)
+                  });
+                case 2:
+                  patchesRes = _context.sent;
+                  if (!(patchesRes.status !== 200)) {
+                    _context.next = 6;
+                    break;
+                  }
+                  console.error("Val: could not fetch patches", patchesRes.json);
+                  throw Error(JSON.stringify(patchesRes.json, null, 2));
+                case 6:
+                  allPatches = Object.keys(patchesRes.json.patches);
+                  _context.next = 9;
+                  return valServer["/sources"]["PUT"]({
+                    path: "/",
+                    query: {
+                      validate_sources: true,
+                      validate_all: false,
+                      validate_binary_files: false
+                    },
+                    body: {
+                      patchIds: allPatches
+                    },
+                    cookies: objectSpread2._defineProperty({}, internal.VAL_SESSION_COOKIE, (_cookies$get2 = cookies.get(internal.VAL_SESSION_COOKIE)) === null || _cookies$get2 === void 0 ? void 0 : _cookies$get2.value)
+                  });
+                case 9:
+                  treeRes = _context.sent;
+                  if (!(treeRes.status === 200)) {
+                    _context.next = 15;
                     break;
                   }
-                  console.error("Val: could not fetch patches", patchesRes.error);
-                  throw Error(JSON.stringify(patchesRes.error, null, 2));
-                case 3:
-                  allPatches = Object.keys(patchesRes.value.patches);
-                  return _context.abrupt("return", api.putTree({
-                    patchIds: allPatches
-                  }).then(function (res) {
-                    if (fp.result.isOk(res)) {
-                      var modules = res.value.modules;
-                      return stega.stegaEncode(selector, {
-                        disabled: !enabled,
-                        getModule: function getModule(path) {
-                          var module = modules[path];
-                          if (module) {
-                            return module.source;
-                          }
-                        }
-                      });
-                    } else {
-                      if (res.error.statusCode === 401) {
-                        console.warn("Val: authentication error: ", res.error.message);
-                      } else {
-                        console.error("Val: could not fetch modules", res.error);
-                        throw Error(JSON.stringify(res.error, null, 2));
+                  modules = treeRes.json.modules;
+                  return _context.abrupt("return", stega.stegaEncode(selector, {
+                    disabled: !enabled,
+                    getModule: function getModule(path) {
+                      var module = modules[path];
+                      if (module) {
+                        return module.source;
                       }
                     }
                   }));
-                case 5:
+                case 15:
+                  if (!(treeRes.status === 401)) {
+                    _context.next = 19;
+                    break;
+                  }
+                  console.warn("Val: authentication error: ", treeRes.json.message);
+                  _context.next = 21;
+                  break;
+                case 19:
+                  console.error("Val: could not fetch modules", treeRes.json);
+                  throw Error(JSON.stringify(treeRes.json, null, 2));
+                case 21:
                 case "end":
                   return _context.stop();
               }
@@ -138,11 +172,65 @@ function getHost(headers) {
 
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-function initValRsc(config, rscNextConfig) {
+function initValRsc(config, valModules, rscNextConfig) {
+  var coreVersion = core.Internal.VERSION.core;
+  if (!coreVersion) {
+    throw new Error("Could not get @valbuild/core package version");
+  }
+  var nextVersion = version.VERSION;
+  if (!nextVersion) {
+    throw new Error("Could not get @valbuild/next package version");
+  }
+  var valServerPromise = server.createValServer(valModules, "/api/val", objectSpread2._objectSpread2({
+    versions: {
+      next: nextVersion,
+      core: coreVersion
+    }
+  }, config), config, {
+    isEnabled: function isEnabled() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee2() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", rscNextConfig.draftMode().isEnabled);
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }))();
+    },
+    onEnable: function onEnable() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee3() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              rscNextConfig.draftMode().enable();
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }))();
+    },
+    onDisable: function onDisable() {
+      return asyncToGenerator._asyncToGenerator(/*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee4() {
+        return asyncToGenerator._regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              rscNextConfig.draftMode().disable();
+            case 1:
+            case "end":
+              return _context4.stop();
+          }
+        }, _callee4);
+      }))();
+    }
+  });
   return {
     fetchValStega: initFetchValStega(config, valApiEndpoints,
     // TODO: get from config
-    function () {
+    valServerPromise, function () {
       return rscNextConfig.draftMode().isEnabled;
     }, function () {
       return rscNextConfig.headers();