@valbuild/next 0.61.0 → 0.62.0

package/dist/declarations/src/server/initValServer.d.ts

@@ -1,7 +1,9 @@
 import { ValConfig, ValModules } from "@valbuild/core";
 import type { draftMode } from "next/headers";
 import { NextResponse } from "next/server";
-declare const initValNextAppRouter: (valModules: ValModules, config: ValConfig, nextConfig: ValServerNextConfig) => (req: Request) => Promise<NextResponse<unknown>>;
+declare const initValNextAppRouter: (valModules: ValModules, config: ValConfig, nextConfig: ValServerNextConfig & {
+    formatter?: ((code: string, filePath: string) => string) | undefined;
+}) => (req: Request) => Promise<NextResponse<unknown>>;
 type ValServerNextConfig = {
     draftMode: typeof draftMode;
 };

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

@@ -6,7 +6,7 @@ var objectSpread2 = require('./objectSpread2-bb9509e8.cjs.dev.js');
 var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var internal = require('@valbuild/react/internal');
-var ValNextProvider = require('./ValNextProvider-ef4fdca6.cjs.dev.js');
+var ValNextProvider = require('./ValNextProvider-3df6c619.cjs.dev.js');
 var NextImage = require('next/image');
 var jsxRuntime = require('react/jsx-runtime');
 var ValApp = require('./ValApp-aff60572.cjs.dev.js');

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

@@ -6,7 +6,7 @@ var objectSpread2 = require('./objectSpread2-24e737a6.cjs.prod.js');
 var core = require('@valbuild/core');
 var stega = require('@valbuild/react/stega');
 var internal = require('@valbuild/react/internal');
-var ValNextProvider = require('./ValNextProvider-676d6cb8.cjs.prod.js');
+var ValNextProvider = require('./ValNextProvider-06d5c71e.cjs.prod.js');
 var NextImage = require('next/image');
 var jsxRuntime = require('react/jsx-runtime');
 var ValApp = require('./ValApp-0ec0c7f3.cjs.prod.js');

package/dist/valbuild-next.esm.js

@@ -5,7 +5,7 @@ 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-23099a43.esm.js';
+import { ValNextProvider } from './ValNextProvider-259bf24d.esm.js';
 import NextImage from 'next/image';
 import { jsx } from 'react/jsx-runtime';
 export { ValApp } from './ValApp-61103149.esm.js';

package/package.json

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

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

@@ -3,43 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
+var asyncToGenerator = require('../../dist/asyncToGenerator-ba66657c.cjs.dev.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
 var fp = require('@valbuild/core/fp');
 
-function optimizeTreePath(ids) {
-  return findUpperDirectory(ids);
-}
-function findUpperDirectory(paths) {
-  if (paths.length === 0) {
-    return null;
-  }
-  var pathSegments = paths[0].split("/");
-  for (var i = 1; i < paths.length; i++) {
-    var currentPathSegments = paths[i].split("/");
-    // Find the minimum length of the two paths
-    var minLength = Math.min(pathSegments.length, currentPathSegments.length);
-
-    // Iterate through the segments and find the common prefix
-    var commonPrefix = "";
-    for (var j = 0; j < minLength; j++) {
-      if (pathSegments[j] === currentPathSegments[j]) {
-        commonPrefix += pathSegments[j] + "/";
-      } else {
-        break;
-      }
-    }
-    pathSegments = commonPrefix.split("/").slice(0, -1);
-
-    // If there is no common prefix, return /
-    if (pathSegments.length <= 1) {
-      return "/";
-    }
-  }
-  var upperDirectory = pathSegments.join("/");
-  return upperDirectory;
-}
-
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
@@ -68,37 +36,58 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
       }
       var host = headers && getHost(headers);
       if (host && cookies) {
-        var _optimizeTreePath;
         var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        var valModuleIds = stega.getModuleIds(selector);
-        return api.getTree({
-          // TODO: get tree should probably have a list of ids instead
-          treePath: (_optimizeTreePath = optimizeTreePath(valModuleIds)) !== null && _optimizeTreePath !== void 0 ? _optimizeTreePath : undefined,
-          patch: true,
-          includeSource: true,
-          includeSchema: true,
-          headers: getValAuthHeaders(cookies)
-        }).then(function (res) {
-          if (fp.result.isOk(res)) {
-            var modules = res.value.modules;
-            return stega.stegaEncode(selector, {
-              disabled: !enabled,
-              getModule: function getModule(moduleId) {
-                var module = modules[moduleId];
-                if (module) {
-                  return module.source;
-                }
+        return api.getPatches().then( /*#__PURE__*/function () {
+          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
+            var allPatches;
+            return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!fp.result.isErr(patchesRes)) {
+                    _context.next = 3;
+                    break;
+                  }
+                  console.error("Val: could not fetch patches", patchesRes.error);
+                  throw Error(JSON.stringify(patchesRes.error, null, 2));
+                case 3:
+                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
+                    return mp.map(function (p) {
+                      return p.patch_id;
+                    });
+                  });
+                  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));
+                      }
+                    }
+                  }));
+                case 5:
+                case "end":
+                  return _context.stop();
               }
-            });
-          } 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));
-            }
-          }
-        })["catch"](function (err) {
+            }, _callee);
+          }));
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }())["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.");
@@ -129,20 +118,30 @@ function getHost(headers) {
   }
   return null;
 }
-function getValAuthHeaders(cookies) {
-  try {
-    var session = cookies.get(core.Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(core.Internal.VAL_SESSION_COOKIE, "=").concat(encodeURIComponent(session.value))
-      };
-    }
-    return {};
-  } catch (err) {
-    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return {};
-  }
-}
+
+// TODO: remove
+// function getValAuthHeaders(cookies: {
+//   get(name: string): { name: string; value: string } | undefined;
+// }): Record<string, string> {
+//   try {
+//     const session = cookies.get(Internal.VAL_SESSION_COOKIE);
+//     if (session) {
+//       return {
+//         Cookie: `${Internal.VAL_SESSION_COOKIE}=${encodeURIComponent(
+//           session.value
+//         )}`,
+//       };
+//     }
+//     return {};
+//   } catch (err) {
+//     console.error(
+//       "Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.",
+//       err
+//     );
+//     return {};
+//   }
+// }
+
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValRsc(config, rscNextConfig) {

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

@@ -3,43 +3,11 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('server-only');
+var asyncToGenerator = require('../../dist/asyncToGenerator-3551d940.cjs.prod.js');
 var stega = require('@valbuild/react/stega');
 var core = require('@valbuild/core');
 var fp = require('@valbuild/core/fp');
 
-function optimizeTreePath(ids) {
-  return findUpperDirectory(ids);
-}
-function findUpperDirectory(paths) {
-  if (paths.length === 0) {
-    return null;
-  }
-  var pathSegments = paths[0].split("/");
-  for (var i = 1; i < paths.length; i++) {
-    var currentPathSegments = paths[i].split("/");
-    // Find the minimum length of the two paths
-    var minLength = Math.min(pathSegments.length, currentPathSegments.length);
-
-    // Iterate through the segments and find the common prefix
-    var commonPrefix = "";
-    for (var j = 0; j < minLength; j++) {
-      if (pathSegments[j] === currentPathSegments[j]) {
-        commonPrefix += pathSegments[j] + "/";
-      } else {
-        break;
-      }
-    }
-    pathSegments = commonPrefix.split("/").slice(0, -1);
-
-    // If there is no common prefix, return /
-    if (pathSegments.length <= 1) {
-      return "/";
-    }
-  }
-  var upperDirectory = pathSegments.join("/");
-  return upperDirectory;
-}
-
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
@@ -68,37 +36,58 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
       }
       var host = headers && getHost(headers);
       if (host && cookies) {
-        var _optimizeTreePath;
         var api = new core.ValApi("".concat(host).concat(valApiEndpoints));
-        var valModuleIds = stega.getModuleIds(selector);
-        return api.getTree({
-          // TODO: get tree should probably have a list of ids instead
-          treePath: (_optimizeTreePath = optimizeTreePath(valModuleIds)) !== null && _optimizeTreePath !== void 0 ? _optimizeTreePath : undefined,
-          patch: true,
-          includeSource: true,
-          includeSchema: true,
-          headers: getValAuthHeaders(cookies)
-        }).then(function (res) {
-          if (fp.result.isOk(res)) {
-            var modules = res.value.modules;
-            return stega.stegaEncode(selector, {
-              disabled: !enabled,
-              getModule: function getModule(moduleId) {
-                var module = modules[moduleId];
-                if (module) {
-                  return module.source;
-                }
+        return api.getPatches().then( /*#__PURE__*/function () {
+          var _ref = asyncToGenerator._asyncToGenerator( /*#__PURE__*/asyncToGenerator._regeneratorRuntime().mark(function _callee(patchesRes) {
+            var allPatches;
+            return asyncToGenerator._regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!fp.result.isErr(patchesRes)) {
+                    _context.next = 3;
+                    break;
+                  }
+                  console.error("Val: could not fetch patches", patchesRes.error);
+                  throw Error(JSON.stringify(patchesRes.error, null, 2));
+                case 3:
+                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
+                    return mp.map(function (p) {
+                      return p.patch_id;
+                    });
+                  });
+                  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));
+                      }
+                    }
+                  }));
+                case 5:
+                case "end":
+                  return _context.stop();
               }
-            });
-          } 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));
-            }
-          }
-        })["catch"](function (err) {
+            }, _callee);
+          }));
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }())["catch"](function (err) {
           console.error("Val: failed while fetching modules", err);
           return stega.stegaEncode(selector, {});
         });
@@ -126,20 +115,30 @@ function getHost(headers) {
   }
   return null;
 }
-function getValAuthHeaders(cookies) {
-  try {
-    var session = cookies.get(core.Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(core.Internal.VAL_SESSION_COOKIE, "=").concat(encodeURIComponent(session.value))
-      };
-    }
-    return {};
-  } catch (err) {
-    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return {};
-  }
-}
+
+// TODO: remove
+// function getValAuthHeaders(cookies: {
+//   get(name: string): { name: string; value: string } | undefined;
+// }): Record<string, string> {
+//   try {
+//     const session = cookies.get(Internal.VAL_SESSION_COOKIE);
+//     if (session) {
+//       return {
+//         Cookie: `${Internal.VAL_SESSION_COOKIE}=${encodeURIComponent(
+//           session.value
+//         )}`,
+//       };
+//     }
+//     return {};
+//   } catch (err) {
+//     console.error(
+//       "Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.",
+//       err
+//     );
+//     return {};
+//   }
+// }
+
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValRsc(config, rscNextConfig) {

package/rsc/dist/valbuild-next-rsc.esm.js

@@ -1,41 +1,9 @@
 import 'server-only';
-import { getModuleIds, stegaEncode } from '@valbuild/react/stega';
-import { ValApi, Internal } from '@valbuild/core';
+import { _ as _asyncToGenerator, a as _regeneratorRuntime } from '../../dist/asyncToGenerator-0859ab5c.esm.js';
+import { stegaEncode } from '@valbuild/react/stega';
+import { ValApi } from '@valbuild/core';
 import { result } from '@valbuild/core/fp';
 
-function optimizeTreePath(ids) {
-  return findUpperDirectory(ids);
-}
-function findUpperDirectory(paths) {
-  if (paths.length === 0) {
-    return null;
-  }
-  var pathSegments = paths[0].split("/");
-  for (var i = 1; i < paths.length; i++) {
-    var currentPathSegments = paths[i].split("/");
-    // Find the minimum length of the two paths
-    var minLength = Math.min(pathSegments.length, currentPathSegments.length);
-
-    // Iterate through the segments and find the common prefix
-    var commonPrefix = "";
-    for (var j = 0; j < minLength; j++) {
-      if (pathSegments[j] === currentPathSegments[j]) {
-        commonPrefix += pathSegments[j] + "/";
-      } else {
-        break;
-      }
-    }
-    pathSegments = commonPrefix.split("/").slice(0, -1);
-
-    // If there is no common prefix, return /
-    if (pathSegments.length <= 1) {
-      return "/";
-    }
-  }
-  var upperDirectory = pathSegments.join("/");
-  return upperDirectory;
-}
-
 var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEnabled, getHeaders, getCookies) {
   return function (selector) {
     var enabled = false;
@@ -64,37 +32,58 @@ var initFetchValStega = function initFetchValStega(config, valApiEndpoints, isEn
       }
       var host = headers && getHost(headers);
       if (host && cookies) {
-        var _optimizeTreePath;
         var api = new ValApi("".concat(host).concat(valApiEndpoints));
-        var valModuleIds = getModuleIds(selector);
-        return api.getTree({
-          // TODO: get tree should probably have a list of ids instead
-          treePath: (_optimizeTreePath = optimizeTreePath(valModuleIds)) !== null && _optimizeTreePath !== void 0 ? _optimizeTreePath : undefined,
-          patch: true,
-          includeSource: true,
-          includeSchema: true,
-          headers: getValAuthHeaders(cookies)
-        }).then(function (res) {
-          if (result.isOk(res)) {
-            var modules = res.value.modules;
-            return stegaEncode(selector, {
-              disabled: !enabled,
-              getModule: function getModule(moduleId) {
-                var module = modules[moduleId];
-                if (module) {
-                  return module.source;
-                }
+        return api.getPatches().then( /*#__PURE__*/function () {
+          var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(patchesRes) {
+            var allPatches;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  if (!result.isErr(patchesRes)) {
+                    _context.next = 3;
+                    break;
+                  }
+                  console.error("Val: could not fetch patches", patchesRes.error);
+                  throw Error(JSON.stringify(patchesRes.error, null, 2));
+                case 3:
+                  allPatches = Object.values(patchesRes.value).flatMap(function (mp) {
+                    return mp.map(function (p) {
+                      return p.patch_id;
+                    });
+                  });
+                  return _context.abrupt("return", api.putTree({
+                    patchIds: allPatches
+                  }).then(function (res) {
+                    if (result.isOk(res)) {
+                      var modules = res.value.modules;
+                      return 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));
+                      }
+                    }
+                  }));
+                case 5:
+                case "end":
+                  return _context.stop();
               }
-            });
-          } 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));
-            }
-          }
-        })["catch"](function (err) {
+            }, _callee);
+          }));
+          return function (_x) {
+            return _ref.apply(this, arguments);
+          };
+        }())["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.");
@@ -125,20 +114,30 @@ function getHost(headers) {
   }
   return null;
 }
-function getValAuthHeaders(cookies) {
-  try {
-    var session = cookies.get(Internal.VAL_SESSION_COOKIE);
-    if (session) {
-      return {
-        Cookie: "".concat(Internal.VAL_SESSION_COOKIE, "=").concat(encodeURIComponent(session.value))
-      };
-    }
-    return {};
-  } catch (err) {
-    console.error("Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.", err);
-    return {};
-  }
-}
+
+// TODO: remove
+// function getValAuthHeaders(cookies: {
+//   get(name: string): { name: string; value: string } | undefined;
+// }): Record<string, string> {
+//   try {
+//     const session = cookies.get(Internal.VAL_SESSION_COOKIE);
+//     if (session) {
+//       return {
+//         Cookie: `${Internal.VAL_SESSION_COOKIE}=${encodeURIComponent(
+//           session.value
+//         )}`,
+//       };
+//     }
+//     return {};
+//   } catch (err) {
+//     console.error(
+//       "Val: could not read cookies! fetchVal can only be used server-side. Use useVal on clients.",
+//       err
+//     );
+//     return {};
+//   }
+// }
+
 var valApiEndpoints = "/api/val";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function initValRsc(config, rscNextConfig) {